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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Mar 19 12:14:33 2016
New Revision: 8168

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8168&view=rev
Log:
IDP-926 Fix tests, rationalize names (attributeValueS)

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


Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/SubjectDerivedAttributeValuesFunction.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/ContextDerivedAttributeDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/ContextDerivedAttributeDefinitionsParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/contextDerivedBeans.xml

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinition.java?rev=8168&r1=8167&r2=8168&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinition.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinition.java	Sat Mar 19 12:14:33 2016
@@ -57,7 +57,7 @@
      * 
      * The function returns null or an empty list if the {@link Principal} isn't relevant.
      */
-    @Nonnull private Function<ProfileRequestContext, List<IdPAttributeValue<?>>> attributeValueFunction;
+    @Nonnull private Function<ProfileRequestContext, List<IdPAttributeValue<?>>> attributeValuesFunction;
 
     /** Constructor. */
     public ContextDerivedAttributeDefinition() {
@@ -83,10 +83,10 @@
      * 
      * @param function what to set.
      */
-    public void setAttributeValueFunction(
+    public void setAttributeValuesFunction(
             @Nonnull final Function<ProfileRequestContext, List<IdPAttributeValue<?>>> function) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        attributeValueFunction = Constraint.isNotNull(function, "Attribute Function cannot be null");
+        attributeValuesFunction = Constraint.isNotNull(function, "Attribute Function cannot be null");
     }
 
     @Override @Nullable protected IdPAttribute doAttributeDefinitionResolve(
@@ -94,7 +94,7 @@
             @Nonnull final AttributeResolverWorkContext workContext) throws ResolutionException {
 
         final ProfileRequestContext prc = prcLookupStrategy.apply(resolutionContext);
-        final List<IdPAttributeValue<?>> results = attributeValueFunction.apply(prc);
+        final List<IdPAttributeValue<?>> results = attributeValuesFunction.apply(prc);
 
         log.debug("{} Generated {} values.", getLogPrefix(), results.size());
         log.trace("{} Values:", getLogPrefix(), results);
@@ -106,7 +106,7 @@
     /** {@inheritDoc} */
     @Override protected void doInitialize() throws ComponentInitializationException {
         Constraint.isNotNull(prcLookupStrategy, "ProfileRequestContext lookup strategy cannot be null");
-        Constraint.isNotNull(attributeValueFunction, "AttributeValue Function cannot be null");
+        Constraint.isNotNull(attributeValuesFunction, "AttributeValue Function cannot be null");
 
         super.doInitialize();
     }

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/SubjectDerivedAttributeValuesFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/SubjectDerivedAttributeValuesFunction.java?rev=8168&r1=8167&r2=8168&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/SubjectDerivedAttributeValuesFunction.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/SubjectDerivedAttributeValuesFunction.java	Sat Mar 19 12:14:33 2016
@@ -58,7 +58,7 @@
      * 
      * The {@link Function} returns null or an empty list if the {@link Principal} isn't relevant.
      */
-    @Nonnull private Function<Principal, List<IdPAttributeValue<?>>> attributeValueFunction;

[... 148 lines stripped ...]