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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Oct 31 09:40:35 2013
New Revision: 4918

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4918&view=rev
Log:
IDP 322 Start to introduce Interfaces for components

This is the third of three checkins.

BaseSubjectNamePrincipalConnectorDefinition becomes and interface and gets renamed to SubjectNamePrincipalConnectorDefinition.  All the concrete definitions extend AbstractSubjectNamePrincipalConnectorDefintion.  All other uses of attribute definition are now cast in terms of the interface.

Added:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/SubjectNamePrincipalConnectorDefinition.java
      - copied, changed from r4913, trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseSubjectNamePrincipalConnectorDefinition.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinitionTest.java
      - copied, changed from r4914, trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractSubjectNamePrincipalConnectorDefinitionTest.java
      - copied, changed from r4911, trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/BaseSubjectNamePrincipalConnectorDefinitionTest.java
Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractSubjectNamePrincipalConnectorDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseSubjectNamePrincipalConnectorDefinition.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/BaseSubjectNamePrincipalConnectorDefinitionTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockSubjectNamePrincipalConnector.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractSubjectNamePrincipalConnectorDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractSubjectNamePrincipalConnectorDefinition.java?rev=4918&r1=4917&r2=4918&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractSubjectNamePrincipalConnectorDefinition.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractSubjectNamePrincipalConnectorDefinition.java Thu Oct 31 09:40:35 2013
@@ -48,7 +48,7 @@
  * TODO This is highly likely to change, or even become irrelevant.
  */
 public abstract class AbstractSubjectNamePrincipalConnectorDefinition extends AbstractResolverPlugin<String> implements
-        PrincipalConnectorDefinition<AttributeResolutionContext> {
+        SubjectNamePrincipalConnectorDefinition {
 
     /**
      * The nameID format we are interested in.

Copied: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/SubjectNamePrincipalConnectorDefinition.java (from r4913, trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseSubjectNamePrincipalConnectorDefinition.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/SubjectNamePrincipalConnectorDefinition.java?p2=trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/SubjectNamePrincipalConnectorDefinition.java&p1=trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseSubjectNamePrincipalConnectorDefinition.java&r1=4913&r2=4918&rev=4918&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseSubjectNamePrincipalConnectorDefinition.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/SubjectNamePrincipalConnectorDefinition.java Thu Oct 31 09:40:35 2013
@@ -17,94 +17,52 @@
 
 package net.shibboleth.idp.attribute.resolver;
 
-import java.util.Collections;
 import java.util.Set;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;

[... 285 lines stripped ...]