[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: Sun Oct  2 11:04:52 2016
New Revision: 8445

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8445&view=rev
Log:
IDP-1047 Move AttributeResolverImpl  from constructor  parameterization to setProperty

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


Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML1NameIdentifierAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML2NameIDAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScopedAttributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SimpleAttributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/TemplateAttributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/ComputedIDDataConnectorTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverServiceStrategy.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java?rev=8445&r1=8444&r2=8445&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java	Sun Oct  2 11:04:52 2016
@@ -44,7 +44,6 @@
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
 import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
-import net.shibboleth.utilities.java.support.annotation.ParameterName;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -80,34 +79,26 @@
     @Nonnull private final Logger log = LoggerFactory.getLogger(AttributeResolverImpl.class);
 
     /** Attribute definitions defined for this resolver. */
-    @Nonnull private final Map<String, AttributeDefinition> attributeDefinitions;
+    @NonnullAfterInit private Map<String, AttributeDefinition> attributeDefinitions;
 
     /** Data connectors defined for this resolver. */
-    @Nonnull private final Map<String, DataConnector> dataConnectors;
+    @NonnullAfterInit private Map<String, DataConnector> dataConnectors;
 
     /** cache for the log prefix - to save multiple recalculations. */
-    @NonnullAfterInit private final String logPrefix;
+    @NonnullAfterInit private String logPrefix;
 
     /** The Principal mapper. */
-    @Nullable private final LegacyPrincipalDecoder principalConnector;
-
-    /**
-     * Constructor.
-     * 
-     * @param resolverId ID of this resolver
+    @Nullable private LegacyPrincipalDecoder principalConnector;
+
+    /** {@inheritDoc} */
+    @Override public void setId(@Nonnull @NotEmpty final String resolverId) {
+        super.setId(resolverId);
+    }
+    
+    /** Sets the attribute definitions for this resolver.
      * @param definitions attribute definitions loaded in to this resolver
-     * @param connectors data connectors loaded in to this resolver
-     * @param principalResolver code to resolve the principal
-     */
-    public AttributeResolverImpl(@Nonnull @NotEmpty @ParameterName(name="resolverId") final String resolverId,
-      @Nullable @NullableElements @ParameterName(name="definitions") final Collection<AttributeDefinition> definitions,
-      @Nullable @NullableElements @ParameterName(name="connectors") final Collection<DataConnector> connectors,
-      @Nullable final LegacyPrincipalDecoder principalResolver) {
-
-        setId(resolverId);
-
-        logPrefix = new StringBuilder("Attribute Resolver '").append(getId()).append("':").toString();
-
+     */

[... 2159 lines stripped ...]