Update users, too

3 files changed, 6 insertions, 6 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 61e61d62c07..33dfcde9f13 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -328,7 +328,7 @@ public class ApplicationController {
 
                 try {
                     applicationPackage = application.get().deploymentJobs().deployedInternally()
-                            ? new ApplicationPackage(applicationStore.getApplicationPackage(application.get().id(), applicationVersion.id()))
+                            ? new ApplicationPackage(applicationStore.getApplicationPackage(application.get().id(), applicationVersion))
                             : new ApplicationPackage(artifactRepository.getApplicationPackage(application.get().id(), applicationVersion.id()));
                 }
                 catch (RuntimeException e) { // If application has switched deployment pipeline, artifacts stored prior to the switch are in the other artifact store.
@@ -336,7 +336,7 @@ public class ApplicationController {
                              + (application.get().deploymentJobs().deployedInternally() ? "internally" : "externally"));
                     applicationPackage = application.get().deploymentJobs().deployedInternally()
                             ? new ApplicationPackage(artifactRepository.getApplicationPackage(application.get().id(), applicationVersion.id()))
-                            : new ApplicationPackage(applicationStore.getApplicationPackage(application.get().id(), applicationVersion.id()));
+                            : new ApplicationPackage(applicationStore.getApplicationPackage(application.get().id(), applicationVersion));
                 }
                 validateRun(application.get(), zone, platformVersion, applicationVersion);
             }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index 4fc58f58eea..1f3dd30b8c6 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -452,7 +452,7 @@ public class InternalStepRunner implements StepRunner {
     private ApplicationPackage testerPackage(RunId id) {
         ApplicationVersion version = controller.jobController().run(id).get().versions().targetApplication();
 
-        byte[] testPackage = controller.applications().applicationStore().getTesterPackage(JobController.testerOf(id.application()), version.id());
+        byte[] testPackage = controller.applications().applicationStore().getTesterPackage(JobController.testerOf(id.application()), version);
         byte[] servicesXml = servicesXml(controller.system());
 
         DeploymentSpec spec = controller.applications().require(id.application()).deploymentSpec();
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index 98c27857950..18ae1274553 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -231,7 +231,7 @@ public class JobController {
                            .distinct()
                            .forEach(appVersion -> {
                                byte[] content = controller.applications().artifacts().getApplicationPackage(application.get().id(), appVersion.id());
-                               controller.applications().applicationStore().putApplicationPackage(application.get().id(), appVersion.id(), content);
+                               controller.applications().applicationStore().putApplicationPackage(application.get().id(), appVersion, content);
                            });
             }
 
@@ -239,10 +239,10 @@ public class JobController {
             version.set(ApplicationVersion.from(revision, run));
 
             controller.applications().applicationStore().putApplicationPackage(id,
-                                                                               version.get().id(),
+                                                                               version.get(),
                                                                                packageBytes);
             controller.applications().applicationStore().putTesterPackage(testerOf(id),
-                                                                          version.get().id(),
+                                                                          version.get(),
                                                                           testPackageBytes);
 
             controller.applications().storeWithUpdatedConfig(application.withBuiltInternally(true), new ApplicationPackage(packageBytes));