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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Feb  9 08:13:55 2017
New Revision: 8614

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8614&view=rev
Log:
IDP-680 Tidy code prior to handlineg new dependency types

Three private methods which overloaded the same name and thus added to the confusion in a confusing module have been renamed appropriately.
One deprecated function has been rationalized to call the non-deprecated version with a bogus value to fill in the logging.

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupport.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupport.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupport.java?rev=8614&r1=8613&r2=8614&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupport.java	(original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/PluginDependencySupport.java	Thu Feb  9 08:13:55 2017
@@ -69,38 +69,8 @@
             @Nonnull @NonnullElements final Collection<ResolverPluginDependency> dependencies) {
         Constraint.isNotNull(workContext, "Attribute resolution context cannot be null");
         Constraint.isNotNull(dependencies, "Resolver dependency collection cannot be null");
-
-        final List<IdPAttributeValue<?>> values = new ArrayList<>();
-
-        for (final ResolverPluginDependency dependency : dependencies) {
-            Constraint.isNotNull(dependency, "Resolver dependency cannot be null");
-
-            final ResolvedAttributeDefinition attributeDefinition =
-                    workContext.getResolvedIdPAttributeDefinitions().get(dependency.getDependencyPluginId());
-            if (attributeDefinition != null) {
-                final IdPAttribute resolvedAttribute = attributeDefinition.getResolvedAttribute();
-                addAttributeValues(resolvedAttribute, values);
-                continue;
-            }
-
-            final ResolvedDataConnector dataConnector =
-                    workContext.getResolvedDataConnectors().get(dependency.getDependencyPluginId());
-            if (dataConnector != null) {
-                if (dependency.getDependencyAttributeId() == null) {
-                    LOG.error("Data connector dependencies must specify a dependant attribute ID");
-                    return Collections.EMPTY_LIST;
-                }
-
-                if (null != dataConnector.getResolvedAttributes()) {
-                    final IdPAttribute resolvedAttribute =
-                            dataConnector.getResolvedAttributes().get(dependency.getDependencyAttributeId());
-                    addAttributeValues(resolvedAttribute, values);
-                    continue;
-                }
-            }
-        }
-
-        return values;
+        
+        return getMergedAttributeValues(workContext, dependencies, "<unknown>");
     }
 
     /**
@@ -147,7 +117,7 @@
                 }
 
                 final IdPAttribute resolvedAttribute = attributeDefinition.getResolvedAttribute();
-                addAttributeValues(resolvedAttribute, values);
+                mergeAttributeValues(resolvedAttribute, values);
                 continue;
             }
 
@@ -164,7 +134,7 @@
                 if (null != dataConnector.getResolvedAttributes()) {
                     final IdPAttribute resolvedAttribute =
                             dataConnector.getResolvedAttributes().get(dependency.getDependencyAttributeId());
-                    addAttributeValues(resolvedAttribute, values);
+                    mergeAttributeValues(resolvedAttribute, values);
                     continue;
                 }
             }
@@ -202,7 +172,7 @@
             final ResolvedAttributeDefinition attributeDefinition =
                     workContext.getResolvedIdPAttributeDefinitions().get(dependency.getDependencyPluginId());
             if (attributeDefinition != null) {
-                addAttributeValues(attributeDefinition.getResolvedAttribute(), result);
+                addAttribute(attributeDefinition.getResolvedAttribute(), result);
                 continue;
             }
 
@@ -210,7 +180,7 @@
                     workContext.getResolvedDataConnectors().get(dependency.getDependencyPluginId());
             if (dataConnector != null) {
                 if (null != dataConnector.getResolvedAttributes()) {
-                    addAttributeValues(dataConnector.getResolvedAttributes(), result);
+                    mergeAttributes(dataConnector.getResolvedAttributes(), result);
                     continue;
                 }
             }
@@ -225,14 +195,14 @@
      * @param sources the source attributes
      * @param target current set attribute values
      */

[... 41 lines stripped ...]