diff options
author | jonmv <venstad@gmail.com> | 2023-08-28 09:54:25 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-08-28 09:54:25 +0200 |
commit | 068ffa701a18bd203f3ecd264fdaf7737c18443a (patch) | |
tree | 829063ab1cf44ca02d533a04859444c0aefa2218 /config-model-api/src | |
parent | b85c362192bdfdafe44c7fe1257c463d5ad4340f (diff) |
Wire empty host TTL all the way
Diffstat (limited to 'config-model-api/src')
2 files changed, 3 insertions, 3 deletions
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 e49619c45cf..fbca1eff46f 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 @@ -212,7 +212,7 @@ public class DeploymentSpec { .or(this::hostTTL); } - public Optional<Duration> hostTTL() { return hostTTL; } + Optional<Duration> hostTTL() { return hostTTL; } /** * Returns the most specific zone endpoint, where specificity is given, in decreasing order: diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java index 4bfecabaf69..6e8b9836188 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java @@ -166,7 +166,7 @@ public class DeploymentSpecXmlReader { stringAttribute(athenzDomainAttribute, root).map(AthenzDomain::from), stringAttribute(athenzServiceAttribute, root).map(AthenzService::from), readCloudAccounts(root), - stringAttribute(hostTTLAttribute, root).map(s -> toDuration(s, "empty host TTL")), + readHostTTL(root), applicationEndpoints, xmlForm, deprecatedElements); @@ -206,7 +206,7 @@ public class DeploymentSpecXmlReader { List<DeploymentSpec.ChangeBlocker> changeBlockers = readChangeBlockers(instanceElement, parentTag); Optional<AthenzService> athenzService = mostSpecificAttribute(instanceElement, athenzServiceAttribute).map(AthenzService::from); Map<CloudName, CloudAccount> cloudAccounts = readCloudAccounts(instanceElement); - Optional<Duration> hostTTL = mostSpecificAttribute(instanceElement, hostTTLAttribute).map(s -> toDuration(s, "empty host TTL")); + Optional<Duration> hostTTL = readHostTTL(instanceElement); Notifications notifications = readNotifications(instanceElement, parentTag); // Values where there is no default |