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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Apr  4 10:44:27 2013
New Revision: 4389

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4389&view=rev
Log:
IDP-205.  The dependency parser should be collecting sourceAtttributeID from the parent.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ResolverPluginDependencyBeanDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeDefinitionBeanDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idInParentDependency.xml

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ResolverPluginDependencyBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ResolverPluginDependencyBeanDefinitionParser.java?rev=4389&r1=4388&r2=4389&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ResolverPluginDependencyBeanDefinitionParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ResolverPluginDependencyBeanDefinitionParser.java Thu Apr  4 10:44:27 2013
@@ -52,22 +52,25 @@
         builder.addConstructorArgValue(pluginId);
 
         NamedNodeMap parentAttr = config.getParentNode().getAttributes();
-        String attributeId;
+        //
+        // TODO, these are only present in Attribute Definitions, maybe we should inject them post ad hoc 
+        // in the BaseAttributeefinitionParser
+        String sourceAttributeId;
         if (null == parentAttr) {
-            log.error("Parsing configuration for {}: no parent element or no attributes.",  config.getLocalName());
-            attributeId = config.getLocalName() + "MISSING_PARENT";
+            log.debug("Parsing configuration for {}: no parent element or no attributes.",  config.getLocalName());
+            sourceAttributeId = null;
         } else {
-            Node attr = parentAttr.getNamedItemNS(null, "id");
+            Node attr = parentAttr.getNamedItemNS(null, "sourceAttributeID");
             if (null == attr) {
-                log.error("Parsing configuration for {}: no 'id' in parent element.",  config.getLocalName());
-                attributeId = config.getLocalName() + "MISSING_PARENTS_ID";
+                log.debug("Parsing configuration for {}: no 'sourceAttributeID' in parent element, probably a DataConnector.",  config.getLocalName());
+                sourceAttributeId = null;
             } else {
-                attributeId = attr.getNodeValue();
+                sourceAttributeId = attr.getNodeValue();
             }
         }
         
-        log.info("Parsing configuration for {} with attributeId : {}", config.getLocalName(), attributeId);
-        builder.addConstructorArgValue(attributeId);
+        log.info("Parsing configuration for {} with attributeId : {}", config.getLocalName(), sourceAttributeId);
+        builder.addConstructorArgValue(sourceAttributeId);
     }
 
     /** {@inheritDoc} */

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeDefinitionBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeDefinitionBeanDefinitionParser.java?rev=4389&r1=4388&r2=4389&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeDefinitionBeanDefinitionParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/SimpleAttributeDefinitionBeanDefinitionParser.java Thu Apr  4 10:44:27 2013
@@ -22,8 +22,6 @@
 import net.shibboleth.idp.attribute.resolver.impl.ad.SimpleAttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.spring.BaseResolverPluginBeanDefinitionParser;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
@@ -34,9 +32,6 @@
     /** Schema type name. */
     public static final QName TYPE_NAME = new QName(AttributeDefinitionNamespaceHandler.NAMESPACE, "Simple");
 
-    /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(SimpleAttributeDefinitionBeanDefinitionParser.class);
-
     /** {@inheritDoc} */
     protected Class getBeanClass(Element element) {
         return SimpleAttributeDefinition.class;
@@ -45,9 +40,5 @@
     /** {@inheritDoc} */

[... 21 lines stripped ...]