Minor simplification

3 files changed, 5 insertions, 10 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
index f2d9eb835be..b581688d571 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java
@@ -97,9 +97,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder<Application> {
                                             ApplicationPackage applicationPackage,
                                             ApplicationId applicationId,
                                             Optional<DockerImage> wantedDockerImageRepository,
-                                            Version wantedNodeVespaVersion,
-                                            Optional<AllocatedHosts> ignored // Ignored since we have this in the app package for activated models
-    ) {
+                                            Version wantedNodeVespaVersion) {
         log.log(Level.FINE, () -> String.format("Loading model version %s for session %s application %s",
                                                 modelFactory.version(), applicationGeneration, applicationId));
         ModelContext.Properties modelContextProperties = createModelContextProperties(applicationId, wantedNodeVespaVersion, applicationPackage);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
index 3f655ec66f6..b270da89e28 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
@@ -181,8 +181,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
                                                                applicationPackage,
                                                                applicationId,
                                                                wantedDockerImageRepository,
-                                                               wantedNodeVespaVersion,
-                                                               allocatedHosts.asOptional());
+                                                               wantedNodeVespaVersion);
             allocatedHosts.set(latestModelVersion.getModel().allocatedHosts()); // Update with additional clusters allocated
             builtModelVersions.add(latestModelVersion);
         }
@@ -202,8 +201,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
                                                              applicationPackage,
                                                              applicationId,
                                                              wantedDockerImageRepository,
-                                                             wantedNodeVespaVersion,
-                                                             allocatedHosts.asOptional());
+                                                             wantedNodeVespaVersion);
                 allocatedHosts.set(modelVersion.getModel().allocatedHosts()); // Update with additional clusters allocated
                 builtModelVersions.add(modelVersion);
             } catch (RuntimeException e) {
@@ -259,7 +257,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
 
     protected abstract MODELRESULT buildModelVersion(ModelFactory modelFactory, ApplicationPackage applicationPackage,
                                                      ApplicationId applicationId, Optional<DockerImage> dockerImageRepository,
-                                                     Version wantedNodeVespaVersion, Optional<AllocatedHosts> allocatedHosts);
+                                                     Version wantedNodeVespaVersion);
 
     /**
      * Returns a host provisioner returning the previously allocated hosts if available and when on hosted Vespa,
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 ca909ea87dd..51e61edfff3 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
@@ -90,8 +90,7 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
                                                     ApplicationPackage applicationPackage,
                                                     ApplicationId applicationId,
                                                     Optional<DockerImage> wantedDockerImageRepository,
-                                                    Version wantedNodeVespaVersion,
-                                                    Optional<AllocatedHosts> allocatedHosts) {
+                                                    Version wantedNodeVespaVersion) {
         Version modelVersion = modelFactory.version();
         log.log(Level.FINE, () -> "Building model " + modelVersion + " for " + applicationId);