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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Nov  4 05:25:19 2013
New Revision: 4924

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4924&view=rev
Log:
IDP 322 The documentation states that the default value for sourceAttributeID is the ID of this attribute.  Make this so.

Also make use of getSourceAttributeId() inside AbstractAttributeDefinition rather than the field.  That way I may in the future avoid having to spend an hour wondering why this method is never called and yet again have to derive attribute dependency resolution from first principles.

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

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java?rev=4924&r1=4923&r2=4924&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java Mon Nov  4 05:25:19 2013
@@ -220,9 +220,9 @@
 
         // Set up the dependencies first. Then the initialize in the parent
         // will correctly rehash the dependencies.
-        if (null != sourceAttributeID) {
+        if (null != getSourceAttributeId()) {
             for (ResolverPluginDependency depends : getDependencies()) {
-                depends.setDependencyAttributeId(sourceAttributeID);
+                depends.setDependencyAttributeId(getSourceAttributeId());
             }
         }
         super.doInitialize();

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=4924&r1=4923&r2=4924&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 Nov  4 05:25:19 2013
@@ -95,11 +95,14 @@
         log.debug("{} setting displayDescriptions {}.", getLogPrefix(), dependencyOnly);
         builder.addPropertyValue("dependencyOnly", dependencyOnly);
 
+        final String sourceAttributeId;
         if (config.hasAttributeNS(null, "sourceAttributeID")) {
-            String sourceAttributeId = config.getAttributeNodeNS(null, "sourceAttributeID").getValue();
+            sourceAttributeId = config.getAttributeNodeNS(null, "sourceAttributeID").getValue();
             log.debug("{} setting sourceAttributeId {}.", getLogPrefix(), sourceAttributeId);
-            builder.addPropertyValue("sourceAttributeId", sourceAttributeId);
+        } else {
+            sourceAttributeId = getDefinitionId();
         }
+        builder.addPropertyValue("sourceAttributeId", sourceAttributeId);
 
         final List<Element> attributeEncoders =
                 ElementSupport.getChildElements(config, new QName(AttributeResolverNamespaceHandler.NAMESPACE,