Name and doc changes

5 files changed, 20 insertions, 20 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 62c00a71d12..bed1df3a8a7 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
@@ -329,7 +329,7 @@ public class ApplicationController {
 
                 try {
                     applicationPackage = application.get().deploymentJobs().deployedInternally()
-                            ? new ApplicationPackage(applicationStore.getApplicationPackage(application.get().id(), applicationVersion))
+                            ? new ApplicationPackage(applicationStore.get(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.
@@ -337,7 +337,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));
+                            : new ApplicationPackage(applicationStore.get(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 f1148858aab..633490b9299 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(id.tester(), version);
+        byte[] testPackage = controller.applications().applicationStore().get(id.tester(), 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 ec9f9c30e9b..fc8b299771d 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
@@ -234,26 +234,26 @@ 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, content);
+                               controller.applications().applicationStore().put(application.get().id(), appVersion, content);
                            });
             }
 
             long run = nextBuild(id);
             version.set(ApplicationVersion.from(revision, run));
 
-            controller.applications().applicationStore().putApplicationPackage(id,
-                                                                               version.get(),
-                                                                               packageBytes);
-            controller.applications().applicationStore().putTesterPackage(TesterId.of(id),
-                                                                          version.get(),
-                                                                          testPackageBytes);
+            controller.applications().applicationStore().put(id,
+                                                             version.get(),
+                                                             packageBytes);
+            controller.applications().applicationStore().put(TesterId.of(id),
+                                                             version.get(),
+                                                             testPackageBytes);
 
             application.get().deployments().values().stream()
                        .map(Deployment::applicationVersion)
                        .min(Comparator.comparingLong(applicationVersion -> applicationVersion.buildNumber().getAsLong()))
                        .ifPresent(oldestDeployed -> {
-                           controller.applications().applicationStore().pruneApplicationPackages(id, oldestDeployed);
-                           controller.applications().applicationStore().pruneTesterPackages(TesterId.of(id), oldestDeployed);
+                           controller.applications().applicationStore().prune(id, oldestDeployed);
+                           controller.applications().applicationStore().prune(TesterId.of(id), oldestDeployed);
                        });
 
             controller.applications().storeWithUpdatedConfig(application.withBuiltInternally(true), new ApplicationPackage(packageBytes));
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
index 8d9f5c3ac09..9e8ee16e0c1 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
@@ -88,8 +88,8 @@ public class InternalDeploymentTester {
      */
     public ApplicationVersion newSubmission() {
         ApplicationVersion version = jobs.submit(appId, BuildJob.defaultSourceRevision, 2, applicationPackage.zippedContent(), new byte[0]);
-        tester.applicationStore().putApplicationPackage(appId, version, applicationPackage.zippedContent());
-        tester.applicationStore().putTesterPackage(testerId, version, new byte[0]);
+        tester.applicationStore().put(appId, version, applicationPackage.zippedContent());
+        tester.applicationStore().put(testerId, version, new byte[0]);
         return version;
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java
index f24dba50083..bb9602903f4 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java
@@ -22,20 +22,20 @@ public class ApplicationStoreMock implements ApplicationStore {
     private final Map<ApplicationId, Map<ApplicationVersion, byte[]>> store = new ConcurrentHashMap<>();
 
     @Override
-    public byte[] getApplicationPackage(ApplicationId application, ApplicationVersion applicationVersion) {
+    public byte[] get(ApplicationId application, ApplicationVersion applicationVersion) {
         assertFalse(application.instance().isTester());
         return requireNonNull(store.get(application).get(applicationVersion));
     }
 
     @Override
-    public void putApplicationPackage(ApplicationId application, ApplicationVersion applicationVersion, byte[] applicationPackage) {
+    public void put(ApplicationId application, ApplicationVersion applicationVersion, byte[] applicationPackage) {
         assertFalse(application.instance().isTester());
         store.putIfAbsent(application, new ConcurrentHashMap<>());
         store.get(application).put(applicationVersion, applicationPackage);
     }
 
     @Override
-    public boolean pruneApplicationPackages(ApplicationId application, ApplicationVersion oldestToRetain) {
+    public boolean prune(ApplicationId application, ApplicationVersion oldestToRetain) {
         assertFalse(application.instance().isTester());
         return    store.containsKey(application)
                && store.get(application).keySet().removeIf(version -> version.compareTo(oldestToRetain) < 0);
@@ -47,18 +47,18 @@ public class ApplicationStoreMock implements ApplicationStore {
     }
 
     @Override
-    public byte[] getTesterPackage(TesterId tester, ApplicationVersion applicationVersion) {
+    public byte[] get(TesterId tester, ApplicationVersion applicationVersion) {
         return requireNonNull(store.get(tester.id()).get(applicationVersion));
     }
 
     @Override
-    public void putTesterPackage(TesterId tester, ApplicationVersion applicationVersion, byte[] testerPackage) {
+    public void put(TesterId tester, ApplicationVersion applicationVersion, byte[] testerPackage) {
         store.putIfAbsent(tester.id(), new ConcurrentHashMap<>());
         store.get(tester.id()).put(applicationVersion, testerPackage);
     }
 
     @Override
-    public boolean pruneTesterPackages(TesterId tester, ApplicationVersion oldestToRetain) {
+    public boolean prune(TesterId tester, ApplicationVersion oldestToRetain) {
         return    store.containsKey(tester.id())
                && store.get(tester.id()).keySet().removeIf(version -> version.compareTo(oldestToRetain) < 0);
     }