Simplify

2 files changed, 11 insertions, 12 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
index 86eee9e1623..e5ef6dd38c7 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
@@ -5,6 +5,7 @@ import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.component.Version;
 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.model.api.ConfigChangeAction;
 import com.yahoo.config.model.api.ConfigDefinitionRepo;
 import com.yahoo.config.model.api.HostInfo;
@@ -26,7 +27,6 @@ import com.yahoo.vespa.config.server.application.ApplicationCuratorDatabase;
 import com.yahoo.vespa.config.server.application.ApplicationSet;
 import com.yahoo.vespa.config.server.application.PermanentApplicationPackage;
 import com.yahoo.vespa.config.server.deploy.ModelContextImpl;
-import com.yahoo.vespa.config.server.filedistribution.FileDistributionProvider;
 import com.yahoo.vespa.config.server.host.HostValidator;
 import com.yahoo.vespa.config.server.provision.HostProvisionerProvider;
 import com.yahoo.vespa.config.server.session.PrepareParams;
@@ -53,7 +53,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
     private final ConfigDefinitionRepo configDefinitionRepo;
     private final HostValidator<ApplicationId> hostValidator;
     private final PrepareParams params;
-    private final FileDistributionProvider fileDistributionProvider;
+    private final FileRegistry fileRegistry;
     private final Optional<ApplicationSet> currentActiveApplicationSet;
     private final ModelContext.Properties properties;
     private final Curator curator;
@@ -61,7 +61,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
     public PreparedModelsBuilder(ModelFactoryRegistry modelFactoryRegistry,
                                  PermanentApplicationPackage permanentApplicationPackage,
                                  ConfigDefinitionRepo configDefinitionRepo,
-                                 FileDistributionProvider fileDistributionProvider,
+                                 FileRegistry fileRegistry,
                                  HostProvisionerProvider hostProvisionerProvider,
                                  Curator curator,
                                  HostValidator<ApplicationId> hostValidator,
@@ -73,7 +73,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
         super(modelFactoryRegistry, configserverConfig, properties.zone(), hostProvisionerProvider, deployLogger);
         this.permanentApplicationPackage = permanentApplicationPackage;
         this.configDefinitionRepo = configDefinitionRepo;
-        this.fileDistributionProvider = fileDistributionProvider;
+        this.fileRegistry = fileRegistry;
         this.hostValidator = hostValidator;
         this.curator = curator;
         this.params = params;
@@ -99,7 +99,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
                 permanentApplicationPackage.applicationPackage(),
                 deployLogger(),
                 configDefinitionRepo,
-                fileDistributionProvider.getFileRegistry(),
+                fileRegistry,
                 new ApplicationCuratorDatabase(applicationId.tenant(), curator).readReindexingStatus(applicationId),
                 createHostProvisioner(applicationPackage, provisioned),
                 provisioned,
@@ -110,7 +110,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
                 wantedNodeVespaVersion);
 
         ModelCreateResult result = createAndValidateModel(modelFactory, applicationId, modelVersion, modelContext);
-        return new PreparedModelResult(modelVersion, result.getModel(), fileDistributionProvider, result.getConfigChangeActions());
+        return new PreparedModelResult(modelVersion, result.getModel(), fileRegistry, result.getConfigChangeActions());
     }
 
     private ModelCreateResult createAndValidateModel(ModelFactory modelFactory, ApplicationId applicationId, Version modelVersion, ModelContext modelContext) {
@@ -185,16 +185,16 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
 
         public final Version version;
         public final Model model;
-        public final FileDistributionProvider fileDistributionProvider;
+        public final FileRegistry fileRegistry;
         public final List<ConfigChangeAction> actions;
 
         public PreparedModelResult(Version version,
                                    Model model,
-                                   FileDistributionProvider fileDistributionProvider,
+                                   FileRegistry fileRegistry,
                                    List<ConfigChangeAction> actions) {
             this.version = version;
             this.model = model;
-            this.fileDistributionProvider = fileDistributionProvider;
+            this.fileRegistry = fileRegistry;
             this.actions = actions;
         }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index b9f79763a41..20910ce882d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -37,7 +37,6 @@ import com.yahoo.vespa.config.server.filedistribution.FileDistributionFactory;
 import com.yahoo.vespa.config.server.filedistribution.FileDistributionProvider;
 import com.yahoo.vespa.config.server.host.HostValidator;
 import com.yahoo.vespa.config.server.http.InvalidApplicationException;
-import com.yahoo.vespa.config.server.http.UnknownVespaVersionException;
 import com.yahoo.vespa.config.server.modelfactory.ModelFactoryRegistry;
 import com.yahoo.vespa.config.server.modelfactory.PreparedModelsBuilder;
 import com.yahoo.vespa.config.server.provision.HostProvisionerProvider;
@@ -214,7 +213,7 @@ public class SessionPreparer {
             this.preparedModelsBuilder = new PreparedModelsBuilder(modelFactoryRegistry,
                                                                    permanentApplicationPackage,
                                                                    configDefinitionRepo,
-                                                                   fileDistributionProvider,
+                                                                   fileDistributionProvider.getFileRegistry(),
                                                                    hostProvisionerProvider,
                                                                    curator,
                                                                    hostValidator,
@@ -367,7 +366,7 @@ public class SessionPreparer {
         public Map<Version, FileRegistry> getFileRegistries() {
             return results.stream()
                     .collect(Collectors.toMap((prepareResult -> prepareResult.version),
-                            (prepareResult -> prepareResult.fileDistributionProvider.getFileRegistry())));
+                            (prepareResult -> prepareResult.fileRegistry)));
         }
 
         /**