Replace unnecessary usage of toDeprecatedId

3 files changed, 6 insertions, 6 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/InfrastructureUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/InfrastructureUpgrader.java
index 7e6ad8cdacb..159eb234aa7 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/InfrastructureUpgrader.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/InfrastructureUpgrader.java
@@ -98,7 +98,7 @@ public abstract class InfrastructureUpgrader extends Maintainer {
         try {
             return controller().configServer()
                                .nodeRepository()
-                               .list(zone.toDeprecatedId(), application.id())
+                               .list(zone.getId(), application.id())
                                .stream()
                                .filter(node -> requireUpgradeOf(node, application, zone))
                                .map(versionField)
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java
index 75144bcd880..f5b9d8263e5 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java
@@ -72,7 +72,7 @@ public class OsVersionStatus {
                 continue; // Avoid querying applications that are not eligible for OS upgrades
             }
             for (ZoneApi zone : zonesToUpgrade(controller)) {
-                controller.configServer().nodeRepository().list(zone.toDeprecatedId(), application.id()).stream()
+                controller.configServer().nodeRepository().list(zone.getId(), application.id()).stream()
                           .filter(node -> OsUpgrader.eligibleForUpgrade(node, application))
                           .map(node -> new Node(node.hostname(), node.currentOsVersion(), zone.getEnvironment(), zone.getRegionName()))
                           .forEach(node -> {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
index e68e4171def..cb5e7cc90a1 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java
@@ -299,7 +299,7 @@ public class SystemUpgraderTest {
         for (ZoneApi zone : zones) {
             for (Node node : listNodes(zone, application)) {
                 nodeRepository().putByHostname(
-                        zone.toDeprecatedId(),
+                        zone.getId(),
                         new Node(node.hostname(), node.state(), node.type(), node.owner(), node.wantedVersion(), node.wantedVersion()));
             }
 
@@ -318,13 +318,13 @@ public class SystemUpgraderTest {
     }
 
     private void failNodeIn(ZoneApi zone, SystemApplication application) {
-        List<Node> nodes = nodeRepository().list(zone.toDeprecatedId(), application.id());
+        List<Node> nodes = nodeRepository().list(zone.getId(), application.id());
         if (nodes.isEmpty()) {
             throw new IllegalArgumentException("No nodes allocated to " + application.id());
         }
         Node node = nodes.get(0);
         nodeRepository().putByHostname(
-                zone.toDeprecatedId(),
+                zone.getId(),
                 new Node(node.hostname(), Node.State.failed, node.type(), node.owner(), node.currentVersion(), node.wantedVersion()));
     }
 
@@ -362,7 +362,7 @@ public class SystemUpgraderTest {
     }
 
     private List<Node> listNodes(ZoneApi zone, SystemApplication application) {
-        return nodeRepository().list(zone.toDeprecatedId(), application.id()).stream()
+        return nodeRepository().list(zone.getId(), application.id()).stream()
                                .filter(SystemUpgrader::eligibleForUpgrade)
                                .collect(Collectors.toList());
     }