Rename some application -> instance and extract a method

2 files changed, 24 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 f8685501fc7..b6a647b434e 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
@@ -151,7 +151,7 @@ public class ApplicationController {
         Once.after(Duration.ofMinutes(1), () -> {
             Instant start = clock.instant();
             int count = 0;
-            for (Instance instance : curator.readApplications()) {
+            for (Instance instance : curator.readInstances()) {
                 lockIfPresent(instance.id(), this::store);
                 count++;
             }
@@ -162,7 +162,7 @@ public class ApplicationController {
 
     /** Returns the application with the given id, or null if it is not present */
     public Optional<Instance> get(ApplicationId id) {
-        return curator.readApplication(id);
+        return curator.readInstance(id);
     }
 
     /**
@@ -176,12 +176,12 @@ public class ApplicationController {
 
     /** Returns a snapshot of all applications */
     public List<Instance> asList() {
-        return sort(curator.readApplications());
+        return sort(curator.readInstances());
     }
 
     /** Returns all applications of a tenant */
     public List<Instance> asList(TenantName tenant) {
-        return sort(curator.readApplications(tenant));
+        return sort(curator.readInstances(tenant));
     }
 
     public ArtifactRepository artifacts() { return artifactRepository; }
@@ -703,7 +703,7 @@ public class ApplicationController {
                                                    application.get().deployments().keySet().stream().map(ZoneId::toString)
                                                               .sorted().collect(Collectors.joining(", ")));
 
-            curator.removeApplication(applicationId);
+            curator.removeInstance(applicationId);
             applicationStore.removeAll(applicationId);
             applicationStore.removeAll(TesterId.of(applicationId));
 
@@ -734,7 +734,7 @@ public class ApplicationController {
      * @param application a locked application to store
      */
     public void store(LockedInstance application) {
-        curator.writeApplication(application.get());
+        curator.writeInstance(application.get());
     }
 
     /**
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
index 07deaf336ff..c0bddb5205a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
@@ -50,6 +50,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.LongStream;
+import java.util.stream.Stream;
 
 import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.collectingAndThen;
@@ -331,33 +332,36 @@ public class CuratorDb {
 
     // -------------- Application ---------------------------------------------
 
-    public void writeApplication(Instance instance) {
+    public void writeInstance(Instance instance) {
         curator.set(applicationPath(instance.id()), asJson(instanceSerializer.toSlime(instance)));
     }
 
-    public Optional<Instance> readApplication(ApplicationId application) {
+    public Optional<Instance> readInstance(ApplicationId application) {
         return readSlime(applicationPath(application)).map(instanceSerializer::fromSlime);
     }
 
-    public List<Instance> readApplications() {
-        return readApplications(ignored -> true);
+    public List<Instance> readInstances() {
+        return readInstances(ignored -> true);
     }
 
-    public List<Instance> readApplications(TenantName name) {
-        return readApplications(application -> application.tenant().equals(name));
+    public List<Instance> readInstances(TenantName name) {
+        return readInstances(application -> application.tenant().equals(name));
     }
 
-    private List<Instance> readApplications(Predicate<ApplicationId> applicationFilter) {
+    private Stream<ApplicationId> readInstanceIds() {
         return curator.getChildren(applicationRoot).stream()
-                      .map(ApplicationId::fromSerializedForm)
-                      .filter(applicationFilter)
-                      .map(this::readApplication)
-                      .flatMap(Optional::stream)
-                      .collect(collectingAndThen(Collectors.toList(), Collections::unmodifiableList));
+                      .map(ApplicationId::fromSerializedForm);
+    }
+
+    private List<Instance> readInstances(Predicate<ApplicationId> instanceFilter) {
+        return readInstanceIds().filter(instanceFilter)
+                                .map(this::readInstance)
+                                .flatMap(Optional::stream)
+                                .collect(Collectors.toUnmodifiableList());
     }
 
-    public void removeApplication(ApplicationId application) {
-        curator.delete(applicationPath(application));
+    public void removeInstance(ApplicationId id) {
+        curator.delete(applicationPath(id));
     }
 
     // -------------- Job Runs ------------------------------------------------