[java-shib-attribute] 02/02: IDP-2036 Mapped Attribute Definition does not implements all the common Attributes

[Rod Widdowson]

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

rdw pushed a commit to branch main
in repository java-shib-attribute.

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

commit fa3301859c4407578acb6742637305f146b670ec
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Nov 12 14:52:09 2022 +0000

    IDP-2036 Mapped Attribute Definition does not implements all the common Attributes
    
    https://shibboleth.atlassian.net/browse/IDP-2036
    
    Add test and fix.
---
 .../spring/ad/mapped/impl/MappedAttributeDefinitionParser.java        | 4 ++--
 .../spring/ad/mapped/impl/MappedAttributeDefinitionParserTest.java    | 2 ++
 .../attribute/resolver/spring/ad/mapped/resolver/mappedNoDefault.xml  | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java
index a0994d6fc..6ece4fb27 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParser.java
@@ -33,14 +33,14 @@ import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
 import net.shibboleth.idp.attribute.resolver.ad.mapped.impl.MappedAttributeDefinition;
-import net.shibboleth.idp.attribute.resolver.spring.BaseResolverPluginParser;
+import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
 import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
 import net.shibboleth.shared.primitive.StringSupport;
 import net.shibboleth.shared.spring.util.SpringSupport;
 import net.shibboleth.shared.xml.ElementSupport;
 
 /** Bean definition parser for a {@link MappedAttributeDefinition}. */
-public class MappedAttributeDefinitionParser extends BaseResolverPluginParser {
+public class MappedAttributeDefinitionParser extends BaseAttributeDefinitionParser {
 
     /** Schema type name. */
     @Nonnull public static final QName TYPE_NAME_RESOLVER =
diff --git a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParserTest.java b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParserTest.java
index 2c8c887be..8b8efe069 100644
--- a/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParserTest.java
+++ b/shib-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/MappedAttributeDefinitionParserTest.java
@@ -68,6 +68,8 @@ public class MappedAttributeDefinitionParserTest extends BaseAttributeDefinition
     @Test public void noDefault() {
         final MappedAttributeDefinition defn = getDefinition("resolver/mappedNoDefault.xml");
 
+        assertTrue(defn.isDependencyOnly());
+        assertTrue(defn.isPreRequested());
         assertFalse(defn.isPassThru());
         assertEquals(defn.getValueMaps().size(), 1);
         assertNull(defn.getDefaultAttributeValue());
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mappedNoDefault.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mappedNoDefault.xml
index ef8e960aa..09d27e09e 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mappedNoDefault.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/resolver/mappedNoDefault.xml
@@ -1,5 +1,6 @@
 <AttributeDefintion xsi:type="Mapped"
 	xmlns="urn:mace:shibboleth:2.0:resolver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Mapped"
+    dependencyOnly="true" preRequested="true"
     xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
     <InputAttributeDefinition ref="TheOrphan" />                    
 	<ValueMap>

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