[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: Sat Mar  2 08:15:33 2013
New Revision: 4293

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4293&view=rev
Log:
https://issues.shibboleth.net/jira/browse/IDP-265

AttributeResolutionException becomes ResolutionException (and loses inheritance from AttributeException) in preparation for PrincipalResolution (which has nothing to do with Attributes)

Added:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolutionException.java
      - copied, changed from r4288, trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionException.java
Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContext.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionException.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolver.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseDataConnector.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/BaseResolverPlugin.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolvedAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnector.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContextTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverTest.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/BaseDataConnectorTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/BaseResolverPluginTest.java
    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-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockStaticAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockStaticDataConnector.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnectorTest.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/ResolverTestSupport.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContext.java?rev=4293&r1=4292&r2=4293&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContext.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContext.java Sat Mar  2 08:15:33 2013
@@ -137,16 +137,16 @@
      * @param definition the resolved attribute definition, must not be null
      * @param attribute the attribute produced by the given attribute definition, may be null
      * 
-     * @throws AttributeResolutionException thrown if a result of a resolution for the given attribute definition have
+     * @throws ResolutionException thrown if a result of a resolution for the given attribute definition have
      *             already been recorded
      */
     public void recordAttributeDefinitionResolution(@Nonnull final BaseAttributeDefinition definition,
-            @Nonnull final Optional<Attribute> attribute) throws AttributeResolutionException {
+            @Nonnull final Optional<Attribute> attribute) throws ResolutionException {
         Constraint.isNotNull(definition, "Resolver attribute definition can not be null");
         Constraint.isNotNull(attribute, "Resolved attribute can not be null");
 
         if (resolvedAttributeDefinitions.containsKey(definition.getId())) {
-            throw new AttributeResolutionException("The resolution of attribute definition " + definition.getId()
+            throw new ResolutionException("The resolution of attribute definition " + definition.getId()
                     + " has already been recorded");
         }
 
@@ -169,16 +169,16 @@
      * @param connector the resolved data connector, must not be null
      * @param attributes the attribute produced by the given data connector, may be null
      * 

[... 610 lines stripped ...]