[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: Wed Apr  3 11:26:45 2013
New Revision: 4388

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4388&view=rev
Log:
Start on Testing framework for parsers.

Added:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/TestDependency.java   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idInParentDependency.xml   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/noIdInParentDependency.xml   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/orphanDependency.xml   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ResolverPluginDependencyBeanDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.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=4388&r1=4387&r2=4388&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 Wed Apr  3 11:26:45 2013
@@ -28,6 +28,8 @@
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
 
 /** Bean definition parser for a {@link ResolverPluginDependency}. */
 public class ResolverPluginDependencyBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
@@ -49,8 +51,21 @@
         log.info("Parsing configuration for {} with pluginId : {}", config.getLocalName(), pluginId);
         builder.addConstructorArgValue(pluginId);
 
-        // TODO null checking ?
-        String attributeId = config.getParentNode().getAttributes().getNamedItemNS(null, "id").getNodeValue();
+        NamedNodeMap parentAttr = config.getParentNode().getAttributes();
+        String attributeId;
+        if (null == parentAttr) {
+            log.error("Parsing configuration for {}: no parent element or no attributes.",  config.getLocalName());
+            attributeId = config.getLocalName() + "MISSING_PARENT";
+        } else {
+            Node attr = parentAttr.getNamedItemNS(null, "id");
+            if (null == attr) {
+                log.error("Parsing configuration for {}: no 'id' in parent element.",  config.getLocalName());
+                attributeId = config.getLocalName() + "MISSING_PARENTS_ID";
+            } else {
+                attributeId = attr.getNodeValue();
+            }
+        }
+        
         log.info("Parsing configuration for {} with attributeId : {}", config.getLocalName(), attributeId);
         builder.addConstructorArgValue(attributeId);
     }

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml?rev=4388&r1=4387&r2=4388&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml Wed Apr  3 11:26:45 2013
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration>
+    <logger name="net.shibboleth.idp.attribute.resolver.spring" level="DEBUG"/>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -10,7 +11,7 @@
     </appender>
 
     <root>
-        <level value="warn" />
+        <level value="WARN" />
         <appender-ref ref="STDOUT" />
     </root>