From f8ed8f9443bf776df9aa3972c5e4d224f2c13743 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 5 May 2020 15:00:00 +0100
Subject: [PATCH] Parameterise cacheDuration in generated metadata

---
 build.xml                | 9 +++++++++
 mdx/uk/generate.xml      | 6 ++++--
 mdx/uk/mdq-multisign.xml | 2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index dfec8eb1..1246600d 100644
--- a/build.xml
+++ b/build.xml
@@ -121,6 +121,13 @@
     <!-- Same value, as an ISO 8601 duration. -->
     <property name="validUntil.perEntity.duration" value="P${validUntil.perEntity.days}D"/>
 
+    <!-- Default cacheDuration for all generated metadata, as an ISO 8601 duration. -->
+    <property name="cacheDuration.default.duration" value="PT6H"/>
+    <!-- Specific cacheDuration for aggregates. -->
+    <property name="cacheDuration.aggregate.duration" value="${cacheDuration.default.duration}"/>
+    <!-- Specific cacheDuration for per-entity metadata. -->
+    <property name="cacheDuration.perEntity.duration" value="${cacheDuration.default.duration}"/>
+
     <!--
         ***************************************************************
         ***                                                         ***
@@ -1576,6 +1583,8 @@
     -->
     <property name="mda.java.endorsed.dirs" value="${tools.dir}/endorsed"/>
     <property name="mda.blocklists.dir" value="${blocklists.dir}"/>
+    <property name="mda.cacheDuration.aggregate.duration" value="${cacheDuration.aggregate.duration}"/>
+    <property name="mda.cacheDuration.perEntity.duration" value="${cacheDuration.perEntity.duration}"/>
     <property name="mda.edugain.dir" value="${edugain.dir}"/>
     <property name="mda.entities.dir" value="${entities.dir}"/>
     <property name="mda.mdx.dir" value="${mdx.dir}"/>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 55dd2482..c1d9111f 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -631,7 +631,8 @@
 
                 <ref bean="uk_strip_UKFederationMember"/>
                 <ref bean="assembleAggregate"/>
-                <bean parent="mda.SetCacheDurationStage" p:cacheDuration="PT6H"/>
+                <bean parent="mda.SetCacheDurationStage"
+                    p:cacheDuration="${cacheDuration.aggregate.duration}"/>
                 <ref bean="stripEntityScopes"/>
                 <ref bean="uk_finaliseTest"/>
                 <ref bean="uk_normaliseTest"/>
@@ -854,7 +855,8 @@
                 <ref bean="assembleAggregate"/>
                 <ref bean="stripEntityScopes"/>
                 <ref bean="stripEmptyExtensions"/>
-                <bean parent="mda.SetCacheDurationStage" p:cacheDuration="PT6H"/>
+                <bean parent="mda.SetCacheDurationStage"
+                    p:cacheDuration="${cacheDuration.aggregate.duration}"/>
                 <ref bean="uk_finaliseExport"/>
 
                 <bean id="uk_normaliseExportPreview" parent="mda.XSLTransformationStage"
diff --git a/mdx/uk/mdq-multisign.xml b/mdx/uk/mdq-multisign.xml
index bdd11292..a32e00ef 100644
--- a/mdx/uk/mdq-multisign.xml
+++ b/mdx/uk/mdq-multisign.xml
@@ -75,7 +75,7 @@
                         <bean parent="ukf.FixedStringIdentifierGenerationStrategy" c:_="_"/>
                     </constructor-arg>
                 </bean>
-                <bean parent="mda.SetCacheDurationStage" p:cacheDuration="PT6H"/>
+                <bean parent="mda.SetCacheDurationStage" p:cacheDuration="${cacheDuration.perEntity.duration}"/>
                 <bean parent="mda.SetValidUntilStage" p:validityDuration="${validUntil.perEntity.duration}"/>
 
                 <!-- Identity transform fixes signing issues. -->