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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Feb 24 07:00:38 2014
New Revision: 5461

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5461&view=rev
Log:
IDP-370 Remove cascading of initialize/destroy from attribute-resolver-impl

Modified:
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockDataConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/PrincipalAuthenticationMethodAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/mapped/MappedAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ComputedIDDataConnectorTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML1NameIdentifierAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/StoredIDDataConnectorTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIDDataConnector.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/TestSources.java

Modified: trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockAttributeDefinition.java?rev=5461&r1=5460&r2=5461&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockAttributeDefinition.java Mon Feb 24 07:00:38 2014
@@ -47,8 +47,9 @@
      * 
      * @param id unique ID of this attribute definition
      * @param value static value returned by this definition
+     * @throws ComponentInitializationException 
      */
-    public MockAttributeDefinition(final String id, final IdPAttribute value) {
+    public MockAttributeDefinition(final String id, final IdPAttribute value) throws ComponentInitializationException {
         setId(id);
         staticValue = value;
     }

Modified: trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockDataConnector.java?rev=5461&r1=5460&r2=5461&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockDataConnector.java (original)
+++ trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockDataConnector.java Mon Feb 24 07:00:38 2014
@@ -17,6 +17,7 @@
 
 package net.shibboleth.idp.attribute.resolver;
 
+import java.util.HashSet;
 import java.util.Map;
 
 import javax.annotation.Nonnull;
@@ -49,10 +50,12 @@
      * 
      * @param id unique ID for this data connector
      * @param connectorValues static collection of values returned by this connector
+     * @throws ComponentInitializationException 
      */
-    public MockDataConnector(String id, Map<String, IdPAttribute> connectorValues) {
+    public MockDataConnector(String id, Map<String, IdPAttribute> connectorValues) throws ComponentInitializationException {
         setId(id);
         values = connectorValues;
+        initialize();
     }
 
     /**
@@ -64,6 +67,21 @@
     public MockDataConnector(final String id, final ResolutionException exception) {
         setId(id);
         resolutionException = exception;
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param id
+     * @param map
+     * @param newHashSet
+     * @throws ComponentInitializationException 
+     */
+    public MockDataConnector(String id, Map<String, IdPAttribute> connectorValues, HashSet<ResolverPluginDependency> newHashSet) throws ComponentInitializationException {
+        setDependencies(newHashSet);
+        setId(id);
+        values = connectorValues;
+        initialize();
     }
 

[... 662 lines stripped ...]