Restore public API for old ContainerModelBuilder

4 files changed, 12 insertions, 5 deletions

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 163653f703b..d8482499a93 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -205,7 +205,7 @@
       "public java.util.Optional athenzService(com.yahoo.config.provision.Environment, com.yahoo.config.provision.RegionName)",
       "public com.yahoo.config.application.api.Notifications notifications()",
       "public java.util.List endpoints()",
-      "public boolean deploysTo(com.yahoo.config.provision.Environment, java.util.Optional)",
+      "public boolean deploysTo(com.yahoo.config.provision.Environment, com.yahoo.config.provision.RegionName)",
       "public boolean equals(java.lang.Object)",
       "public int hashCode()",
       "public java.lang.String toString()"
@@ -307,6 +307,7 @@
     "methods": [
       "public void <init>()",
       "public final boolean concerns(com.yahoo.config.provision.Environment)",
+      "public boolean deploysTo(com.yahoo.config.provision.Environment, java.util.Optional)",
       "public abstract boolean concerns(com.yahoo.config.provision.Environment, java.util.Optional)",
       "public java.util.List zones()",
       "public java.time.Duration delay()",
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java
index 541e52cf6e9..2c397c95d5b 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java
@@ -201,8 +201,8 @@ public class DeploymentInstanceSpec extends DeploymentSpec.Steps {
     public List<Endpoint> endpoints() { return endpoints; }
 
     /** Returns whether this instance deploys to the given zone, either implicitly or explicitly */
-    public boolean deploysTo(Environment environment, Optional<RegionName> region) {
-        return zones().stream().anyMatch(zone -> zone.concerns(environment, region));
+    public boolean deploysTo(Environment environment, RegionName region) {
+        return zones().stream().anyMatch(zone -> zone.concerns(environment, Optional.of(region)));
     }
 
     @Override
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
index 67b3d585881..8c05b47e8e8 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
@@ -277,6 +277,12 @@ public class DeploymentSpec {
         }
 
         /** Returns whether this step specifies the given environment, and, optionally, region. */
+        // TODO jonmv: Remove when 7.147 is the oldest version.
+        public boolean deploysTo(Environment environment, Optional<RegionName> region) {
+            return concerns(environment, region);
+        }
+
+        /** Returns whether this step specifies the given environment, and, optionally, region. */
         public abstract boolean concerns(Environment environment, Optional<RegionName> region);
 
         /** Returns the zones deployed to in this step. */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index d3505b31d8f..72e2f073453 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -614,7 +614,7 @@ public class ApplicationController {
                                                       .map(Deployment::zone)
                                                       .filter(zone ->      deploymentSpec.instance(instance).isEmpty()
                                                                       || ! deploymentSpec.requireInstance(instance).deploysTo(zone.environment(),
-                                                                                                                              Optional.of(zone.region())))
+                                                                                                                              zone.region()))
                                                       .collect(Collectors.toList());
 
         if (deploymentsToRemove.isEmpty())
@@ -645,7 +645,7 @@ public class ApplicationController {
             ZoneId zone = job.zone(controller.system());
             if (deploymentSpec.instance(instance.name())
                               // TODO jonmv: Properly convert to job here.
-                              .map(spec -> spec.deploysTo(zone.environment(), Optional.of(zone.region())))
+                              .map(spec -> spec.deploysTo(zone.environment(), zone.region()))
                               .orElse(false))
                 continue;
             instance = instance.withoutDeploymentJob(job);