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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Dec  7 09:12:24 2015
New Revision: 8017

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8017&view=rev
Log:
IDP-877  Fail in parsing if dependencies not supplied correctly.

https://issues.shibboleth.net/jira/browse/IDP-877

We used to warn if an attribute definition had a <Dependency> but no sourceAttributeID.  This then broke run time constraints.  So we just fail the parse.

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

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.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/BaseAttributeDefinitionParser.java?rev=8017&r1=8016&r2=8017&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java	Mon Dec  7 09:12:24 2015
@@ -34,6 +34,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.ManagedMap;
 import org.springframework.beans.factory.xml.ParserContext;
@@ -97,7 +98,8 @@
                         getLogPrefix(), sourceAttributeId);
             }
         } else if (needsAttributeSourceID()) {
-            log.warn("{} sourceAttributeID was not specified but is required", getLogPrefix());
+            log.error("{} sourceAttributeID was not specified but is required", getLogPrefix());
+            throw new BeanCreationException(getLogPrefix()+": sourceAttributeID was not specified but is required");
         }
 
         final List<Element> attributeEncoders =