Use ZoneApi internally in UpgradePolicy

1 files changed, 15 insertions, 7 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/UpgradePolicy.java b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/UpgradePolicy.java
index 54e67ab9940..abcb4edce95 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/UpgradePolicy.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/UpgradePolicy.java
@@ -15,30 +15,38 @@ import java.util.stream.Stream;
  */
 public class UpgradePolicy {
 
-    private final List<List<ZoneId>> zones;
+    private final List<List<ZoneApi>> zones;
 
-    private UpgradePolicy(List<List<ZoneId>> zones) {
+    private UpgradePolicy(List<List<ZoneApi>> zones) {
         this.zones = zones;
     }
 
-    public List<List<ZoneId>> asList() {
+    public List<List<ZoneId>> deprecatedAsList() {
+        return zones.stream()
+                .map(list -> list.stream()
+                        .map(ZoneApi::toDeprecatedId)
+                        .collect(Collectors.toList()))
+                .collect(Collectors.toList());
+    }
+
+    public List<List<ZoneApi>> asList() {
         return List.copyOf(zones);
     }
 
-    private UpgradePolicy with(ZoneId... zone) {
-        List<List<ZoneId>> zones = new ArrayList<>(this.zones);
+    private UpgradePolicy with(ZoneApi... zone) {
+        List<List<ZoneApi>> zones = new ArrayList<>(this.zones);
         zones.add(Arrays.asList(zone));
         return new UpgradePolicy(zones);
     }
 
     /** Upgrade given zone as the next step */
     public UpgradePolicy upgrade(ZoneApi zone) {
-        return with(zone.toDeprecatedId());
+        return with(zone);
     }
 
     /** Upgrade given zones in parallel as the next step */
     public UpgradePolicy upgradeInParallel(ZoneApi... zone) {
-        return with(Stream.of(zone).map(ZoneApi::toDeprecatedId).toArray(ZoneId[]::new));
+        return with(zone);
     }
 
     public static UpgradePolicy create() {