Stop supporting legacy serialization format

2 files changed, 0 insertions, 45 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/OsVersionChangeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/OsVersionChangeSerializer.java
index e3fef458711..c9890194d73 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/OsVersionChangeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/OsVersionChangeSerializer.java
@@ -5,7 +5,6 @@ import com.yahoo.component.Version;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.slime.ArrayTraverser;
 import com.yahoo.slime.Inspector;
-import com.yahoo.slime.ObjectTraverser;
 import com.yahoo.slime.Slime;
 import com.yahoo.slime.SlimeUtils;
 import com.yahoo.vespa.hosted.provision.os.OsVersionChange;
@@ -43,11 +42,7 @@ public class OsVersionChangeSerializer {
             targetObject.setString(VERSION_FIELD, target.version().toFullString());
             target.upgradeBudget().ifPresent(duration -> targetObject.setLong(UPGRADE_BUDGET_FIELD, duration.toMillis()));
             target.lastRetiredAt().ifPresent(instant -> targetObject.setLong(LAST_RETIRED_AT_FIELD, instant.toEpochMilli()));
-            // TODO(mpolden): Stop writing old format after May 2020
-            var versionObject = object.setObject(NodeSerializer.toString(nodeType));
-            versionObject.setString(VERSION_FIELD, target.version().toFullString());
         });
-
         try {
             return SlimeUtils.toJsonBytes(slime);
         } catch (IOException e) {
@@ -58,15 +53,6 @@ public class OsVersionChangeSerializer {
     public static OsVersionChange fromJson(byte[] data) {
         var targets = new HashMap<NodeType, OsVersionTarget>();
         var inspector = SlimeUtils.jsonToSlime(data).get();
-        // TODO(mpolden): Remove handling of old format after May 2020
-        inspector.traverse((ObjectTraverser) (key, value) -> {
-            if (isNodeType(key)) {
-                Version version = Version.fromString(value.field(VERSION_FIELD).asString());
-                OsVersionTarget target = new OsVersionTarget(NodeType.valueOf(key), version, Optional.empty(),
-                                                             Optional.empty());
-                targets.put(NodeSerializer.nodeTypeFromString(key), target);
-            }
-        });
         inspector.field(TARGETS_FIELD).traverse((ArrayTraverser) (idx, arrayInspector) -> {
             var version = Version.fromString(arrayInspector.field(VERSION_FIELD).asString());
             var nodeType = NodeSerializer.nodeTypeFromString(arrayInspector.field(NODE_TYPE_FIELD).asString());
@@ -77,15 +63,6 @@ public class OsVersionChangeSerializer {
         return new OsVersionChange(targets);
     }
 
-    private static boolean isNodeType(String name) {
-        try {
-            NodeType.valueOf(name);
-            return true;
-        } catch (IllegalArgumentException ignored) {
-            return false;
-        }
-    }
-
     private static Optional<Long> optionalLong(Inspector field) {
         return field.valid() ? Optional.of(field.asLong()) : Optional.empty();
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/OsVersionChangeSerializerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/OsVersionChangeSerializerTest.java
index a5b759f63d1..15b9cfec4ca 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/OsVersionChangeSerializerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/OsVersionChangeSerializerTest.java
@@ -7,7 +7,6 @@ import com.yahoo.vespa.hosted.provision.os.OsVersionChange;
 import com.yahoo.vespa.hosted.provision.os.OsVersionTarget;
 import org.junit.Test;
 
-import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Map;
@@ -31,25 +30,4 @@ public class OsVersionChangeSerializerTest {
         assertEquals(serialized, change);
     }
 
-    @Test
-    public void legacy_serialization() {
-        // Read old format
-        var change = new OsVersionChange(Map.of(
-                NodeType.host, new OsVersionTarget(NodeType.host, Version.fromString("1.2.3"), Optional.empty(), Optional.empty()),
-                NodeType.proxyhost, new OsVersionTarget(NodeType.proxyhost, Version.fromString("4.5.6"), Optional.empty(), Optional.empty()),
-                NodeType.confighost, new OsVersionTarget(NodeType.confighost, Version.fromString("7.8.9"), Optional.empty(), Optional.empty())
-        ));
-        var legacyFormat = "{\"host\":{\"version\":\"1.2.3\"},\"proxyhost\":{\"version\":\"4.5.6\"},\"confighost\":{\"version\":\"7.8.9\"}}";
-        assertEquals(change, OsVersionChangeSerializer.fromJson(legacyFormat.getBytes(StandardCharsets.UTF_8)));
-
-        // Write format supported by both old and new serializer
-        var oldFormat = "{\"targets\":[{\"nodeType\":\"host\",\"version\":\"1.2.3\"}," +
-                        "{\"nodeType\":\"proxyhost\",\"version\":\"4.5.6\"}," +
-                        "{\"nodeType\":\"confighost\",\"version\":\"7.8.9\"}]," +
-                        "\"host\":{\"version\":\"1.2.3\"}," +
-                        "\"proxyhost\":{\"version\":\"4.5.6\"}," +
-                        "\"confighost\":{\"version\":\"7.8.9\"}}";
-        assertEquals(oldFormat, new String(OsVersionChangeSerializer.toJson(change), StandardCharsets.UTF_8));
-    }
-
 }