Reduce code duplication

2 files changed, 9 insertions, 18 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 08cf4c2d5e0..95c8733b540 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -314,11 +314,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         tenant.getLocalSessionRepo().addSession(newSession);
 
         return Optional.of(Deployment.unprepared(newSession, this, hostProvisioner, tenant, timeout, clock,
-                                                 false /* don't validate as this is already deployed */,
-                                                 newSession.getDockerImageRepository(),
-                                                 newSession.getVespaVersion(),
-                                                 bootstrap,
-                                                 newSession.getAthenzDomain()));
+                                                 false /* don't validate as this is already deployed */, bootstrap));
     }
 
     @Override
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
index 629a0eadc0e..b3c5b38b9ba 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
@@ -68,10 +68,8 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
     private boolean ignoreSessionStaleFailure = false;
 
     private Deployment(LocalSession session, ApplicationRepository applicationRepository,
-                       Optional<Provisioner> hostProvisioner, Tenant tenant,
-                       Duration timeout, Clock clock, boolean prepared, boolean validate,
-                       Optional<String> dockerImageRepository, Version version, boolean isBootstrap,
-                       Optional<AthenzDomain> athenzDomain) {
+                       Optional<Provisioner> hostProvisioner, Tenant tenant, Duration timeout,
+                       Clock clock, boolean prepared, boolean validate, boolean isBootstrap) {
         this.session = session;
         this.applicationRepository = applicationRepository;
         this.hostProvisioner = hostProvisioner;
@@ -80,27 +78,24 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
         this.clock = clock;
         this.prepared = prepared;
         this.validate = validate;
-        this.dockerImageRepository = dockerImageRepository;
-        this.version = version;
+        this.dockerImageRepository = session.getDockerImageRepository();
+        this.version = session.getVespaVersion();
         this.isBootstrap = isBootstrap;
-        this.athenzDomain = athenzDomain;
+        this.athenzDomain = session.getAthenzDomain();
     }
 
     public static Deployment unprepared(LocalSession session, ApplicationRepository applicationRepository,
                                         Optional<Provisioner> hostProvisioner, Tenant tenant,
-                                        Duration timeout, Clock clock, boolean validate,
-                                        Optional<String> dockerImageRepository, Version version,
-                                        boolean isBootstrap, Optional<AthenzDomain> athenzDomain) {
+                                        Duration timeout, Clock clock, boolean validate, boolean isBootstrap) {
         return new Deployment(session, applicationRepository, hostProvisioner, tenant, timeout, clock, false,
-                              validate, dockerImageRepository, version, isBootstrap, athenzDomain);
+                              validate, isBootstrap);
     }
 
     public static Deployment prepared(LocalSession session, ApplicationRepository applicationRepository,
                                       Optional<Provisioner> hostProvisioner, Tenant tenant,
                                       Duration timeout, Clock clock, boolean isBootstrap) {
         return new Deployment(session, applicationRepository, hostProvisioner, tenant,
-                              timeout, clock, true, true, session.getDockerImageRepository(),
-                              session.getVespaVersion(), isBootstrap, session.getAthenzDomain());
+                              timeout, clock, true, true, isBootstrap);
     }
 
     public void setIgnoreSessionStaleFailure(boolean ignoreSessionStaleFailure) {