From 068ffa701a18bd203f3ecd264fdaf7737c18443a Mon Sep 17 00:00:00 2001
From: jonmv <venstad@gmail.com>
Date: Mon, 28 Aug 2023 09:54:25 +0200
Subject: Wire empty host TTL all the way

---
 .../main/java/com/yahoo/config/application/api/DeploymentSpec.java    | 2 +-
 .../com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'config-model-api/src')

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
-- 
cgit v1.2.3