From 6598f824b59e480f2518b32e494f5bbc96d585c2 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 11 Feb 2022 10:40:34 +0000
Subject: [PATCH] Use AssuranceCertificationMatcher to simplify SIRTFI handling

Change SIRTFI parent bean to the ukf bean from ukf-mda 0.9.12
---
 mdx/uk/generate.xml | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 4e4feae..86922b2 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -136,26 +136,8 @@
     <!--
         Entity attribute matcher for the SIRTFI assurance certification.
     -->
-    <bean id="SIRTFI.entity.attribute.matcher" parent="mda.MultiPredicateMatcher">
-        <property name="nameFormatPredicate">
-            <bean class="com.google.common.base.Predicates"
-                factory-method="equalTo"
-                c:_="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-            />
-        </property>
-        <property name="namePredicate">
-            <bean class="com.google.common.base.Predicates"
-                factory-method="equalTo"
-                c:_="urn:oasis:names:tc:SAML:attribute:assurance-certification"
-            />
-        </property>
-        <property name="valuePredicate">
-            <bean class="com.google.common.base.Predicates"
-                factory-method="equalTo"
-                c:_="https://refeds.org/sirtfi"
-            />
-        </property>
-    </bean>
+    <bean id="SIRTFI.entity.attribute.matcher" parent="ukf.AssuranceCertificationMatcher"
+        c:_="https://refeds.org/sirtfi"/>
 
     <!--
         Remove the REFEDS metadata namespace.