From 3fa0461f0378b1d7566b8536f374f976e69bffa4 Mon Sep 17 00:00:00 2001 From: jonmv Date: Fri, 2 Jun 2023 16:23:35 +0200 Subject: Revert signature --- .../yahoo/config/application/api/DeploymentInstanceSpec.java | 4 ++-- .../com/yahoo/config/application/api/DeploymentSpec.java | 2 +- .../application/api/DeploymentSpecWithoutInstanceTest.java | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'config-model-api') 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 hostTTL(Environment environment, RegionName region) { + public Optional hostTTL(Environment environment, Optional 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 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); } diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java index 013c161ad9b..e5578723612 100644 --- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java +++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java @@ -778,9 +778,9 @@ public class DeploymentSpecWithoutInstanceTest { DeploymentSpec spec = DeploymentSpec.fromXml(r); assertEquals(Optional.of(Duration.ofDays(1)), spec.hostTTL()); DeploymentInstanceSpec instance = spec.requireInstance("default"); - assertEquals(Optional.of(Duration.ofMinutes(1)), instance.hostTTL(prod, RegionName.from("us-east-1"))); - assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(prod, RegionName.from("us-west-1"))); - assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(test, RegionName.defaultName())); + assertEquals(Optional.of(Duration.ofMinutes(1)), instance.hostTTL(prod, Optional.of(RegionName.from("us-east-1")))); + assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(prod, Optional.of(RegionName.from("us-west-1")))); + assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(test, Optional.empty())); r = """ @@ -793,9 +793,9 @@ public class DeploymentSpecWithoutInstanceTest { spec = DeploymentSpec.fromXml(r); assertEquals(Optional.empty(), spec.hostTTL()); instance = spec.requireInstance("default"); - assertEquals(Optional.of(Duration.ofMinutes(1)), instance.hostTTL(prod, RegionName.from("us-east-1"))); - assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(prod, RegionName.from("us-west-1"))); - assertEquals(Optional.empty(), instance.hostTTL(test, RegionName.defaultName())); + assertEquals(Optional.of(Duration.ofMinutes(1)), instance.hostTTL(prod, Optional.of(RegionName.from("us-east-1")))); + assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(prod, Optional.of(RegionName.from("us-west-1")))); + assertEquals(Optional.empty(), instance.hostTTL(test, Optional.empty())); } private static Set endpointRegions(String endpointId, DeploymentSpec spec) { -- cgit v1.2.3