Remove temporary code for bootstrapping versions list

3 files changed, 6 insertions, 16 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java
index bb7863a7b69..3ef38715c5d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java
@@ -108,9 +108,10 @@ public class Application {
     /** Returns the project id of this application, if it has any. */
     public OptionalLong projectId() { return projectId; }
 
-    /** Returns the last submitted version of this application.
-     * TODO: Replace with latest in {@link #versions }*/
-    public Optional<ApplicationVersion> latestVersion() { return latestVersion; }
+    /** Returns the last submitted version of this application. */
+    public Optional<ApplicationVersion> latestVersion() {
+        return versions.isEmpty() ? Optional.empty() : Optional.of(versions.last());
+    }
 
     /** Returns the currently deployed versions of the application */
     public SortedSet<ApplicationVersion> versions() {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
index 7377f9ab1e5..dee3c822465 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
@@ -229,16 +229,6 @@ public class ApplicationSerializer {
     }
 
     private void versionsToSlime(Application application, Cursor object) {
-        // Add all indirectly deployed versions as well
-        // Remove after all apps are updated
-        application.instances()
-                .values()
-                .stream()
-                .flatMap(instance -> instance.deployments().values().stream())
-                .map(Deployment::applicationVersion)
-                .forEach(application.versions()::add);
-        application.versions().removeIf(ApplicationVersion::isDeployedDirectly);
-
         application.versions().forEach(version -> toSlime(version, object.addObject()));
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
index 320cf978e7f..e509a199c82 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
@@ -93,12 +93,12 @@ public class ApplicationSerializerTest {
                                                                         Optional.of("best commit"),
                                                                         true,
                                                                         Optional.of("hash1"));
-        SortedSet<ApplicationVersion> versions = new TreeSet<>(Set.of(applicationVersion1));
         assertEquals("https://github/org/repo/tree/commit1", applicationVersion1.sourceUrl().get());
 
         ApplicationVersion applicationVersion2 = ApplicationVersion
                 .from(new SourceRevision("repo1", "branch1", "commit1"), 32, "a@b",
                       Version.fromString("6.3.1"), Instant.ofEpochMilli(496));
+        SortedSet<ApplicationVersion> versions = new TreeSet<>(Set.of(applicationVersion2));
         Instant activityAt = Instant.parse("2018-06-01T10:15:30.00Z");
         deployments.add(new Deployment(zone1, applicationVersion1, Version.fromString("1.2.3"), Instant.ofEpochMilli(3),
                                        DeploymentMetrics.none, DeploymentActivity.none, QuotaUsage.none, OptionalDouble.empty()));
@@ -159,9 +159,8 @@ public class ApplicationSerializerTest {
         assertEquals(original.latestVersion().get().sourceUrl(), serialized.latestVersion().get().sourceUrl());
         assertEquals(original.latestVersion().get().commit(), serialized.latestVersion().get().commit());
         assertEquals(original.latestVersion().get().bundleHash(), serialized.latestVersion().get().bundleHash());
-        // Check indirectly deployed versions are added, directly deployed are removed
         assertEquals(original.versions(), serialized.versions());
-        assertEquals(serialized.versions(), new TreeSet<>(Set.of(applicationVersion2)));
+        assertEquals(original.versions(), serialized.versions());
 
 
         assertEquals(original.deploymentSpec().xmlForm(), serialized.deploymentSpec().xmlForm());