Revert "Remove compatibility serialisation for revisions, and add (de-) for job types"

2 files changed, 22 insertions, 5 deletions

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 5941812d66d..1fc99b0da1c 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
@@ -159,7 +159,6 @@ public class ApplicationSerializerTest {
         assertEquals(original.id(), serialized.id());
         assertEquals(original.createdAt(), serialized.createdAt());
         assertEquals(applicationVersion1, serialized.revisions().last().get());
-        assertEquals(applicationVersion1, serialized.revisions().get(serialized.instances().get(id1.instance()).deployments().get(zone1).revision()));
         assertEquals(original.revisions().last(), serialized.revisions().last());
         assertEquals(original.revisions().last().get().authorEmail(), serialized.revisions().last().get().authorEmail());
         assertEquals(original.revisions().last().get().buildTime(), serialized.revisions().last().get().buildTime());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializerTest.java
index c63af87c08c..f5922fd74aa 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializerTest.java
@@ -90,6 +90,21 @@ public class RunSerializerTest {
         assertEquals(new Version(1, 2, 3), run.versions().targetPlatform());
         RevisionId revision1 = RevisionId.forDevelopment(123, id.job());
         RevisionId revision2 = RevisionId.forProduction(122);
+        ApplicationVersion applicationVersion1 = new ApplicationVersion(revision1,
+                                                                        Optional.of(new SourceRevision("git@github.com:user/repo.git", "master", "f00bad")),
+                                                                        Optional.of("a@b"),
+                                                                        Optional.of(Version.fromString("6.3.1")),
+                                                                        Optional.of(Instant.ofEpochMilli(100)),
+                                                                        Optional.empty(),
+                                                                        Optional.empty(),
+                                                                        Optional.empty(),
+                                                                        true,
+                                                                        false,
+                                                                        Optional.empty(),
+                                                                        0);
+        ApplicationVersion applicationVersion2 = ApplicationVersion.from(revision2, new SourceRevision("git@github.com:user/repo.git",
+                                                                                            "master",
+                                                                                            "badb17"));
         assertEquals(revision1, run.versions().targetRevision());
         assertEquals("because", run.reason().get());
         assertEquals(new Version(1, 2, 2), run.versions().sourcePlatform().get());
@@ -123,6 +138,8 @@ public class RunSerializerTest {
                         .build(),
                 run.steps());
 
+        Map<RevisionId, ApplicationVersion> revisions = Map.of(revision1, applicationVersion1, revision2, applicationVersion2);
+
         run = run.with(1L << 50)
                  .with(Instant.now().truncatedTo(MILLIS))
                  .noNodesDownSince(Instant.now().truncatedTo(MILLIS))
@@ -131,7 +148,8 @@ public class RunSerializerTest {
         assertEquals(aborted, run.status());
         assertTrue(run.hasEnded());
 
-        Run phoenix = serializer.runsFromSlime(serializer.toSlime(List.of(run))).get(id);
+        // Run phoenix = serializer.runsFromSlime(serializer.toSlime(List.of(run))); // TODO jonmv: use runs again, once compatability code is gone.
+        Run phoenix = serializer.runFromSlime(serializer.toSlime(run, revisions::get));
         assertEquals(run.id(), phoenix.id());
         assertEquals(run.start(), phoenix.start());
         assertEquals(run.end(), phoenix.end());
@@ -144,11 +162,11 @@ public class RunSerializerTest {
         assertEquals(run.isDryRun(), phoenix.isDryRun());
         assertEquals(run.reason(), phoenix.reason());
 
-        assertEquals(new String(SlimeUtils.toJsonBytes(serializer.toSlime(run).get(), false), UTF_8),
-                     new String(SlimeUtils.toJsonBytes(serializer.toSlime(phoenix).get(), false), UTF_8));
+        assertEquals(new String(SlimeUtils.toJsonBytes(serializer.toSlime(run, revisions::get).get(), false), UTF_8),
+                     new String(SlimeUtils.toJsonBytes(serializer.toSlime(phoenix, revisions::get).get(), false), UTF_8));
 
         Run initial = Run.initial(id, run.versions(), run.isRedeployment(), run.start(), JobProfile.production, Optional.empty());
-        assertEquals(initial, serializer.runFromSlime(serializer.toSlime(initial)));
+        assertEquals(initial, serializer.runFromSlime(serializer.toSlime(initial, revisions::get)));
     }
 
 }