Merge pull request #10335 from vespa-engine/mpolden/fix-todo

Remove support for legacy serialization format

3 files changed, 3 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 e006a35a8f0..bc35b109a76 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
@@ -228,7 +228,7 @@ public class Application {
 
     public Optional<String> pemDeployKey() { return pemDeployKey; }
 
-    /** Returns the status of the global rotation assigned to this. Wil be empty if this does not have a global rotation. */
+    /** Returns the status of the global rotation assigned to this. Empty if this does not have a global rotation. */
     public Map<HostName, RotationStatus> rotationStatus() {
         return rotationStatus;
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ControllerVersionSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ControllerVersionSerializer.java
index 58902619cf2..0e8b6087901 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ControllerVersionSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ControllerVersionSerializer.java
@@ -37,11 +37,8 @@ public class ControllerVersionSerializer {
     public ControllerVersion fromSlime(Slime slime) {
         var root = slime.get();
         var version = Version.fromString(root.field(VERSION_FIELD).asString());
-        // TODO(mpolden): Make the following two fields non-optional after August 2019
-        var commitSha = Serializers.optionalString(root.field(COMMIT_SHA_FIELD))
-                                   .orElse("badc0ffee");
-        var commitDate = Serializers.optionalInstant(root.field(COMMIT_DATE_FIELD))
-                                    .orElse(Instant.EPOCH);
+        var commitSha = root.field(COMMIT_SHA_FIELD).asString();
+        var commitDate = Instant.ofEpochMilli(root.field(COMMIT_DATE_FIELD).asLong());
         return new ControllerVersion(version, commitSha, commitDate);
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ControllerVersionSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ControllerVersionSerializerTest.java
index 4d2627f50c2..1691df43dd5 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ControllerVersionSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ControllerVersionSerializerTest.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.hosted.controller.persistence;
 
 import com.yahoo.component.Version;
-import com.yahoo.vespa.config.SlimeUtils;
 import com.yahoo.vespa.hosted.controller.versions.ControllerVersion;
 import org.junit.Test;
 
@@ -26,13 +25,4 @@ public class ControllerVersionSerializerTest {
         assertEquals(version.commitDate(), serialized.commitDate());
     }
 
-    @Test // TODO(mpolden): Remove after August 2019
-    public void legacy_serialization() {
-        var slime = SlimeUtils.jsonToSlime("{\"version\":\"7.42.1\"}");
-        var serialized = serializer.fromSlime(slime);
-        assertEquals(Version.fromString("7.42.1"), serialized.version());
-        assertEquals("badc0ffee", serialized.commitSha());
-        assertEquals(Instant.EPOCH, serialized.commitDate());
-    }
-
 }