From dbfe084153c6413aae2b527bb4c0efe7c4af1267 Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Wed, 20 Jun 2018 13:09:13 -0400
Subject: [PATCH] SHIBUI-526 merging master and conflicts resolution

---
 .../IncommonJPAMetadataResolverServiceImplTests.groovy    | 2 +-
 backend/src/test/resources/conf/278.2.xml                 | 8 --------
 backend/src/test/resources/conf/278.xml                   | 8 --------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
index a501e2402..4e4600ae9 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/IncommonJPAMetadataResolverServiceImplTests.groovy
@@ -63,7 +63,7 @@ class IncommonJPAMetadataResolverServiceImplTests extends Specification {
         mr.metadataFilters << requiredValidUntilFilterForXmlGenerationTests()
         mr.metadataFilters.add(new EntityAttributesFilter().with {
             it.entityAttributesFilterTarget = new EntityAttributesFilterTarget().with {
-                it.entityAttributesFilterTargetType = EntityAttributesFilterTargetType.ENTITY
+                it.entityAttributesFilterTargetType = EntityAttributesFilterTarget.EntityAttributesFilterTargetType.ENTITY
                 it.value = ['https://sp1.example.org']
                 it
             }
diff --git a/backend/src/test/resources/conf/278.2.xml b/backend/src/test/resources/conf/278.2.xml
index 19efe257b..bd6c3b082 100644
--- a/backend/src/test/resources/conf/278.2.xml
+++ b/backend/src/test/resources/conf/278.2.xml
@@ -45,20 +45,12 @@
                       refreshDelayFactor="0.75">
         <MetadataFilter xsi:type="SignatureValidation" requireSignedRoot="true"
                         certificateFile="%{idp.home}/credentials/inc-md-cert.pem" />
-        <MetadataFilter xsi:type="RequiredValidUntil" maxValidityInterval="P14D" />
-        <MetadataFilter xsi:type="EntityRoleWhiteList" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-            <RetainedRole>md:SPSSODescriptor</RetainedRole>
-        </MetadataFilter>
     </MetadataProvider>
     <MetadataProvider id="LocalDynamic"
                       initializeFromPersistentCacheInBackground="true"
                       removeIdleEntityData="true"
                       xsi:type="DynamicHttpMetadataProvider">
         <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" requireSignedRoot="true" xsi:type="SignatureValidation"/>
-        <MetadataFilter maxValidityInterval="P14D" xsi:type="RequiredValidUntil"/>
-        <MetadataFilter xsi:type="EntityRoleWhiteList" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-            <RetainedRole>md:SPSSODescriptor</RetainedRole>
-        </MetadataFilter>
     </MetadataProvider>
 
 </MetadataProvider>
\ No newline at end of file
diff --git a/backend/src/test/resources/conf/278.xml b/backend/src/test/resources/conf/278.xml
index 1e6f0aa9b..7241943ab 100644
--- a/backend/src/test/resources/conf/278.xml
+++ b/backend/src/test/resources/conf/278.xml
@@ -38,19 +38,11 @@
                       refreshDelayFactor="0.75">
         <MetadataFilter xsi:type="SignatureValidation" requireSignedRoot="true"
                         certificateFile="%{idp.home}/credentials/inc-md-cert.pem" />
-        <MetadataFilter xsi:type="RequiredValidUntil" maxValidityInterval="P14D" />
-        <MetadataFilter xsi:type="EntityRoleWhiteList" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-            <RetainedRole>md:SPSSODescriptor</RetainedRole>
-        </MetadataFilter>
     </MetadataProvider>
     <MetadataProvider id="LocalDynamic"
                       initializeFromPersistentCacheInBackground="true"
                       removeIdleEntityData="true"
                       xsi:type="DynamicHttpMetadataProvider">
         <MetadataFilter certificateFile="%{idp.home}/credentials/inc-md-cert.pem" requireSignedRoot="true" xsi:type="SignatureValidation"/>
-        <MetadataFilter maxValidityInterval="P14D" xsi:type="RequiredValidUntil"/>
-        <MetadataFilter xsi:type="EntityRoleWhiteList" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-            <RetainedRole>md:SPSSODescriptor</RetainedRole>
-        </MetadataFilter>
     </MetadataProvider>
 </MetadataProvider>
\ No newline at end of file