summaryrefslogtreecommitdiffstats
path: root/config-model-api/src/main/java/com/yahoo/config/application
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-06-02 16:23:35 +0200
committerjonmv <venstad@gmail.com>2023-06-02 16:23:35 +0200
commit3fa0461f0378b1d7566b8536f374f976e69bffa4 (patch)
tree717be3664ce484e8abb5dedecc641627cd1a2e7d /config-model-api/src/main/java/com/yahoo/config/application
parenta82b87143f8dcc1218a0ce5718fcf09c73c1485c (diff)
Revert signature
Diffstat (limited to 'config-model-api/src/main/java/com/yahoo/config/application')
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java4
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java2
2 files changed, 3 insertions, 3 deletions
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 9ce1a48f226..a4be547fe70 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
@@ -277,9 +277,9 @@ public class DeploymentInstanceSpec extends DeploymentSpec.Steps {
}
/** Returns the host TTL to use for given environment and region, if any */
- public Optional<Duration> hostTTL(Environment environment, RegionName region) {
+ public Optional<Duration> hostTTL(Environment environment, Optional<RegionName> region) {
return zones().stream()
- .filter(zone -> zone.concerns(environment, Optional.of(region)))
+ .filter(zone -> zone.concerns(environment, region))
.findFirst()
.flatMap(DeploymentSpec.DeclaredZone::hostTTL)
.or(() -> hostTTL);
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 5e79ceb738f..f355a61fa8a 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
@@ -209,7 +209,7 @@ public class DeploymentSpec {
* deploy to, e.g., test and staging zones, and want to avoid the delay of having to provision hosts.
*/
public Optional<Duration> hostTTL(InstanceName instance, Environment environment, RegionName region) {
- return instance(instance).flatMap(spec -> spec.hostTTL(environment, region))
+ return instance(instance).flatMap(spec -> spec.hostTTL(environment, Optional.of(region)))
.or(this::hostTTL);
}