Fix serialization TODO

2 files changed, 1 insertions, 35 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java
index 0b37638b29b..a9c6c54a44a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializer.java
@@ -8,7 +8,6 @@ import com.yahoo.config.provision.RotationName;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.slime.ArrayTraverser;
 import com.yahoo.slime.Cursor;
-import com.yahoo.slime.Inspector;
 import com.yahoo.slime.Slime;
 import com.yahoo.vespa.hosted.controller.application.RoutingPolicy;
 
@@ -58,7 +57,7 @@ public class RoutingPolicySerializer {
             Set<RotationName> rotations = new LinkedHashSet<>();
             inspect.field(rotationsField).traverse((ArrayTraverser) (j, rotation) -> rotations.add(RotationName.from(rotation.asString())));
             policies.add(new RoutingPolicy(owner,
-                                           clusterId(inspect.field(clusterField)),
+                                           ClusterSpec.Id.from(inspect.field(clusterField).asString()),
                                            ZoneId.from(inspect.field(zoneField).asString()),
                                            HostName.from(inspect.field(canonicalNameField).asString()),
                                            Serializers.optionalField(inspect.field(dnsZoneField), Function.identity()),
@@ -67,10 +66,4 @@ public class RoutingPolicySerializer {
         return Collections.unmodifiableSet(policies);
     }
 
-    // TODO: Remove and inline after Vespa 7.43
-    private static ClusterSpec.Id clusterId(Inspector field) {
-        return Serializers.optionalField(field, ClusterSpec.Id::from).orElseGet(() -> new ClusterSpec.Id("default"));
-    }
-
-
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java
index 4a4fd39ccb7..1aefe3f62bd 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java
@@ -7,7 +7,6 @@ import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.RotationName;
 import com.yahoo.config.provision.zone.ZoneId;
-import com.yahoo.vespa.config.SlimeUtils;
 import com.yahoo.vespa.hosted.controller.application.RoutingPolicy;
 import org.junit.Test;
 
@@ -43,30 +42,4 @@ public class RoutingPolicySerializerTest {
         assertEquals(loadBalancers, serialized);
     }
 
-    @Test
-    public void test_legacy_serialization() { // TODO: Remove after 7.43 has been released
-        String json = "{\n" +
-                      "  \"routingPolicies\": [\n" +
-                      "    {\n" +
-                      "      \"alias\": \"my-pretty-alias\",\n" +
-                      "      \"zone\": \"prod.us-north-1\",\n" +
-                      "      \"canonicalName\": \"long-and-ugly-name\",\n" +
-                      "      \"dnsZone\": \"zone1\",\n" +
-                      "      \"rotations\": [\n" +
-                      "        \"r1\",\n" +
-                      "        \"r2\"\n" +
-                      "      ]\n" +
-                      "    }\n" +
-                      "  ]\n" +
-                      "}";
-        ApplicationId owner = ApplicationId.defaultId();
-        Set<RoutingPolicy> expected = Set.of(new RoutingPolicy(owner,
-                                                               ClusterSpec.Id.from("default"),
-                                                               ZoneId.from("prod", "us-north-1"),
-                                                               HostName.from("long-and-ugly-name"),
-                                                               Optional.of("zone1"),
-                                                               Set.of(RotationName.from("r1"), RotationName.from("r2"))));
-        assertEquals(expected, serializer.fromSlime(owner, SlimeUtils.jsonToSlime(json)));
-    }
-
 }