Fix TODOs

3 files changed, 6 insertions, 73 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
index 0f43aaece7f..0c79793e6a9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
@@ -74,7 +74,6 @@ public class CuratorDb {
     private static final Path applicationRoot = root.append("applications");
     private static final Path jobRoot = root.append("jobs");
     private static final Path controllerRoot = root.append("controllers");
-    private static final Path legacyRoutingPoliciesRoot = root.append("loadBalancerAliases");
     private static final Path routingPoliciesRoot = root.append("routingPolicies");
 
     private final StringSetSerializer stringSetSerializer = new StringSetSerializer();
@@ -186,15 +185,7 @@ public class CuratorDb {
     }
 
     public Lock lockRoutingPolicies() {
-        Set<Version> clusterVersions = cluster().stream()
-                                                .map(this::readControllerVersion)
-                                                .collect(Collectors.toSet());
-        // TODO: Remove this once cluster has completely upgraded once
-        Path newPath = lockRoot.append("routingPolicies");
-        if (clusterVersions.size() > 1 && !curator.exists(newPath)) {
-            return lock(lockRoot.append("loadBalancerAliases"), defaultLockTimeout);
-        }
-        return lock(newPath, defaultLockTimeout);
+        return lock(lockRoot.append("routingPolicies"), defaultLockTimeout);
     }
     // -------------- Helpers ------------------------------------------
 
@@ -482,17 +473,10 @@ public class CuratorDb {
     }
 
     public Set<RoutingPolicy> readRoutingPolicies() {
-        List<String> children;
-        if (curator.exists(routingPoliciesRoot)) {
-            children = curator.getChildren(routingPoliciesRoot);
-            curator.delete(legacyRoutingPoliciesRoot);
-        } else {
-            children = curator.getChildren(legacyRoutingPoliciesRoot); // TODO: Remove after 7.9 has been released
-        }
-        return children.stream()
-                       .map(ApplicationId::fromSerializedForm)
-                       .flatMap(application -> readRoutingPolicies(application).stream())
-                       .collect(Collectors.toUnmodifiableSet());
+        return curator.getChildren(routingPoliciesRoot).stream()
+                      .map(ApplicationId::fromSerializedForm)
+                      .flatMap(application -> readRoutingPolicies(application).stream())
+                      .collect(Collectors.toUnmodifiableSet());
     }
 
     public Set<RoutingPolicy> readRoutingPolicies(ApplicationId application) {
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 86ef56a2587..841aedbf5fb 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
@@ -2,9 +2,7 @@
 package com.yahoo.vespa.hosted.controller.persistence;
 
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.HostName;
-import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.RotationName;
 import com.yahoo.slime.ArrayTraverser;
 import com.yahoo.slime.Cursor;
@@ -27,9 +25,6 @@ import java.util.function.Function;
 public class RoutingPolicySerializer {
 
     private static final String routingPoliciesField = "routingPolicies";
-    private static final String aliasesField = "aliases";
-    private static final String idField = "id";
-    private static final String recordIdField = "recordId";
     private static final String aliasField = "alias";
     private static final String canonicalNameField = "canonicalName";
     private static final String zoneField = "zone";
@@ -58,19 +53,11 @@ public class RoutingPolicySerializer {
         Set<RoutingPolicy> policies = new LinkedHashSet<>();
         Cursor root = slime.get();
         Cursor field = root.field(routingPoliciesField);
-        if (!field.valid()) {
-            field = root.field(aliasesField); // TODO: Remove after 7.9 has been released
-        }
         field.traverse((ArrayTraverser) (i, inspect) -> {
             Set<RotationName> rotations = new LinkedHashSet<>();
             inspect.field(rotationsField).traverse((ArrayTraverser) (j, rotation) -> rotations.add(RotationName.from(rotation.asString())));
-            Inspector recordId = inspect.field(recordIdField);
-            if (!recordId.valid()) {
-                recordId = inspect.field(idField); // TODO: Remove after 7.9 has been released
-            }
             policies.add(new RoutingPolicy(owner,
-                                           // TODO: Remove fallback after 7.13 has been released
-                                           optionalField(inspect.field(zoneField), ZoneId::from).orElse(ZoneId.from(Environment.defaultEnvironment(), RegionName.defaultName())),
+                                           ZoneId.from(inspect.field(zoneField).asString()),
                                            HostName.from(inspect.field(aliasField).asString()),
                                            HostName.from(inspect.field(canonicalNameField).asString()),
                                            optionalField(inspect.field(dnsZoneField), Function.identity()),
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 505bcce50d5..e329aee7fc6 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
@@ -3,16 +3,12 @@ package com.yahoo.vespa.hosted.controller.persistence;
 
 import com.google.common.collect.ImmutableSet;
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.HostName;
-import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.RotationName;
-import com.yahoo.vespa.config.SlimeUtils;
 import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.application.RoutingPolicy;
 import org.junit.Test;
 
-import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
 
@@ -44,38 +40,4 @@ public class RoutingPolicySerializerTest {
         assertEquals(loadBalancers, serialized);
     }
 
-    // TODO: Remove after 7.10 has been released
-    @Test
-    public void test_serialization_old_format() {
-        String json = "{\n" +
-                      "  \"aliases\": [\n" +
-                      "    {\n" +
-                      "      \"id\": \"record-id-1\",\n" +
-                      "      \"alias\": \"my-pretty-alias\",\n" +
-                      "      \"canonicalName\": \"long-and-ugly-name\"" +
-                      "    },\n" +
-                      "    {\n" +
-                      "      \"id\": \"record-id-2\",\n" +
-                      "      \"alias\": \"my-pretty-alias-2\",\n" +
-                      "      \"canonicalName\": \"long-and-ugly-name-2\"" +
-                      "    }\n" +
-                      "  ]\n" +
-                      "}\n";
-        ApplicationId owner = ApplicationId.defaultId();
-        Set<RoutingPolicy> loadBalancers = ImmutableSet.of(new RoutingPolicy(owner,
-                                                                             ZoneId.from(Environment.defaultEnvironment(), RegionName.defaultName()),
-                                                                             HostName.from("my-pretty-alias"),
-                                                                             HostName.from("long-and-ugly-name"),
-                                                                             Optional.empty(),
-                                                                             Collections.emptySet()),
-                                                           new RoutingPolicy(owner,
-                                                                             ZoneId.from(Environment.defaultEnvironment(), RegionName.defaultName()),
-                                                                             HostName.from("my-pretty-alias-2"),
-                                                                             HostName.from("long-and-ugly-name-2"),
-                                                                             Optional.empty(),
-                                                                             Collections.emptySet()));
-        RoutingPolicySerializer serializer = new RoutingPolicySerializer();
-        assertEquals(loadBalancers, serializer.fromSlime(owner, SlimeUtils.jsonToSlime(json)));
-    }
-
 }