[java-shib-metadata] branch main updated: Remove remaining shib-attribute dependencies.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-shib-metadata.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=ff212dc973cfc39495770f2d163151e535ef7a63

The following commit(s) were added to refs/heads/main by this push:
     new ff212dc97 Remove remaining shib-attribute dependencies.
ff212dc97 is described below

commit ff212dc973cfc39495770f2d163151e535ef7a63
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jun 29 15:35:35 2022 -0400

    Remove remaining shib-attribute dependencies.
---
 shib-metadata-api/pom.xml                             |  6 ------
 .../metadata/filter/PredicateFilterParserTest.java    | 19 +------------------
 .../spring/metadata/filter/predicateMappedTag.xml     | 18 ------------------
 3 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/shib-metadata-api/pom.xml b/shib-metadata-api/pom.xml
index f00a9868b..439274583 100644
--- a/shib-metadata-api/pom.xml
+++ b/shib-metadata-api/pom.xml
@@ -21,12 +21,6 @@
 
     <dependencies>
         <!-- Compile Dependencies -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>shib-attribute-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-saml-api</artifactId>
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/PredicateFilterParserTest.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/PredicateFilterParserTest.java
index 9236a989c..13bafa1e0 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/PredicateFilterParserTest.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/metadata/filter/PredicateFilterParserTest.java
@@ -33,7 +33,6 @@ import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import net.shibboleth.idp.attribute.logic.MappedEntityAttributesPredicate;
 import net.shibboleth.spring.metadata.AbstractMetadataParserTest;
 import net.shibboleth.utilities.java.support.logic.ScriptedPredicate;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -100,22 +99,6 @@ public class PredicateFilterParserTest extends AbstractMetadataParserTest {
         }
     }
 
-    @Test
-    public void mapped() throws IOException {
-        final PredicateFilter filter = getBean(PredicateFilter.class, "filter/predicateMappedTag.xml");
-        Assert.assertNotNull(filter);
-        Assert.assertEquals(filter.getDirection(), Direction.EXCLUDE);
-        
-        final MappedEntityAttributesPredicate condition = (MappedEntityAttributesPredicate) filter.getCondition();
-        Assert.assertTrue(condition.getTrimTags());
-        Assert.assertEquals(condition.getCandidates().size(), 2);
-        
-        final Candidate c1 = (Candidate) condition.getCandidates().toArray()[0];
-        final Candidate c2 = (Candidate) condition.getCandidates().toArray()[1];
-        Assert.assertEquals(c1.getValues().size(), 2);
-        Assert.assertEquals(c2.getValues().size(), 2);
-    }
-
     @Test
     public void script() throws IOException {
         final PredicateFilter filter = getBean(PredicateFilter.class, "filter/predicateScript.xml");
@@ -153,4 +136,4 @@ public class PredicateFilterParserTest extends AbstractMetadataParserTest {
         Iterable<EntityDescriptor> entities = resolver.resolve(new CriteriaSet(new EntityIdCriterion("https://sp.example.org/sp/TRUE")));
         Assert.assertTrue(filter.getCondition().test(entities.iterator().next()));
     }
-}
\ No newline at end of file
+}
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/predicateMappedTag.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/predicateMappedTag.xml
deleted file mode 100644
index 0907d3714..000000000
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/predicateMappedTag.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataFilter xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
-                       urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
-	xsi:type="metadata:Predicate" direction="exclude" removeEmptyEntitiesDescriptors="false" trim="true">
-    
-    <metadata:MappedTag name="urn:foo">
-        <metadata:Value>bar</metadata:Value>
-        <metadata:Value>baz</metadata:Value>
-    </metadata:MappedTag>
-    
-    <metadata:MappedTag name="urn:fob">
-        <metadata:Value>bat</metadata:Value>
-        <metadata:Value>baf</metadata:Value>
-    </metadata:MappedTag>
-</metadata:MetadataFilter>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.