diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2019-12-02 08:40:57 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2019-12-02 08:40:57 +0100 |
| commit | 7adc4051326cb29a2dfcfa4e034451aae8ee8118 (patch) | |
| tree | 086de6d2c5c86f37501655abf18d89bbd6ccfd9a /config-model-api | |
| parent | b127005594b314a5fa5ffddcd458de80ca240eef (diff) | |
Restore public API for old ContainerModelBuilder
Diffstat (limited to 'config-model-api')
3 files changed, 10 insertions, 3 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. */ |