[java-identity-provider COMMIT] /trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resol...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Feb  6 09:02:54 2014
New Revision: 5324

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5324&view=rev
Log:
IDP-359 Plug principal connectors into AttributeResolverImpl

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverParser.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverParser.java?rev=5324&r1=5323&r2=5324&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverParser.java Thu Feb  6 09:02:54 2014
@@ -26,6 +26,7 @@
 import net.shibboleth.idp.attribute.resolver.impl.AttributeResolverImpl;
 import net.shibboleth.idp.attribute.resolver.spring.ad.BaseAttributeDefinitionParser;
 import net.shibboleth.idp.attribute.resolver.spring.dc.AbstractDataConnectorParser;
+import net.shibboleth.idp.saml.impl.attribute.principalconnector.PrinicpalConnectorCanonicalizer;
 import net.shibboleth.idp.spring.SpringSupport;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
@@ -60,9 +61,6 @@
         final Map<QName, List<Element>> configChildren = ElementSupport.getIndexedChildElements(config);
         List<Element> children;
 
-        // TODO principal connector
-        // children = configChildren.get(new QName(AttributeResolverNamespaceHandler.NAMESPACE, "PrincipalConnector"));
-        // SpringSupport.parseCustomElements(children, context);
         String id = StringSupport.trimOrNull(config.getAttributeNS(null, "id"));
 
         if (null == id) {
@@ -77,9 +75,14 @@
 
         children = configChildren.get(AbstractDataConnectorParser.ELEMENT_NAME);
         builder.addConstructorArgValue(SpringSupport.parseCustomElements(children, context));
-        
-        // Prinicipal
-        builder.addConstructorArgValue(null);
+
+        // Prinicipal.
+        children = configChildren.get(new QName(AttributeResolverNamespaceHandler.NAMESPACE, "PrincipalConnector"));
+        BeanDefinitionBuilder childBuilder =
+                BeanDefinitionBuilder.genericBeanDefinition(PrinicpalConnectorCanonicalizer.class);
+        childBuilder.addConstructorArgValue(SpringSupport.parseCustomElements(children, context));
+        builder.addConstructorArgValue(childBuilder.getBeanDefinition());
+
     }
 
     /** {@inheritDoc} */