[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: Wed Sep 28 11:39:05 2016
New Revision: 8434

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8434&view=rev
Log:
IDP-1047 Deprecate parameterized constructor for IdPAttributePrincipalValuesFunction

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

I cannot find a use of this in our configuration (except the test file which is
changed anyway), but just in case I have deprecated the constructor rather than
just remove it.



Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/IdPAttributePrincipalValuesFunction.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/SubjectDerivedAttributeDefinitionParser.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/IdPAttributePrincipalValuesFunction.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/IdPAttributePrincipalValuesFunction.java?rev=8434&r1=8433&r2=8434&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/IdPAttributePrincipalValuesFunction.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/IdPAttributePrincipalValuesFunction.java	Wed Sep 28 11:39:05 2016
@@ -26,31 +26,57 @@
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.IdPAttributeValue;
 import net.shibboleth.idp.authn.principal.IdPAttributePrincipal;
+import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
 
 /** Engine to mine values from {@link IdPAttributePrincipal}s. */
-public class IdPAttributePrincipalValuesFunction implements Function<Principal, List<IdPAttributeValue<?>>> {
-    
+public class IdPAttributePrincipalValuesFunction extends AbstractInitializableComponent implements
+        Function<Principal, List<IdPAttributeValue<?>>> {
+
     /** The Attribute Name to look for. */
-    @Nonnull private final String attributeName;
-    
+    @Nonnull private String attributeName;
+
     /**
      * Constructor.
-     *
+     * 
+     * @param attrName the name to filter on.
+     * @deprecated use the property setter instead
+     */
+    @Deprecated public IdPAttributePrincipalValuesFunction(@Nonnull final String attrName) {
+        attributeName = Constraint.isNotNull(attrName, "Attribute Name should be non-null");
+        LoggerFactory.getLogger(IdPAttributePrincipalValuesFunction.class).warn("Deprecated Constructor called");
+    }
+
+    /**  Constructor.  */
+    public IdPAttributePrincipalValuesFunction() {
+    }
+
+    /**
+     * Set the attribute name.
+     * 
      * @param attrName the name to filter on.
      */
-    public IdPAttributePrincipalValuesFunction(@Nonnull final String attrName) {
+    public void setAttributeName(@Nonnull final String attrName) {
         attributeName = Constraint.isNotNull(attrName, "Attribute Name should be non-null");
     }
 
     /** {@inheritDoc} */
+    @Override protected void doInitialize() throws ComponentInitializationException {
+        Constraint.isNotNull(attributeName, "Attribute Name should be non-null");
+        super.doInitialize();
+    }
+
+    /** {@inheritDoc} */
     @Override @Nullable public List<IdPAttributeValue<?>> apply(@Nullable final Principal principal) {
-        
-        if (null != principal && principal  instanceof IdPAttributePrincipal) {
+
+        if (null != principal && principal instanceof IdPAttributePrincipal) {
             final IdPAttributePrincipal attributePrincipal = (IdPAttributePrincipal) principal;
-            final IdPAttribute attribute = attributePrincipal.getAttribute(); 
+            final IdPAttribute attribute = attributePrincipal.getAttribute();
             if (null != attribute && attributeName.equals(attribute.getId())) {
                 return attribute.getValues();
             }

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinitionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinitionTest.java?rev=8434&r1=8433&r2=8434&view=diff
==============================================================================

[... 72 lines stripped ...]