[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 Feb 28 07:20:00 2013
New Revision: 4291

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4291&view=rev
Log:
IDP-255 Move Principal/Recipient/Issuer into a subcontext.

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContext.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContextTest.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML1NameIdentifierAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ComputedIDDataConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/StoredIDDataConnector.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/TestSources.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/dc/ComputedIDDataConnectorTest.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=4291&r1=4290&r2=4291&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 Thu Feb 28 07:20:00 2013
@@ -58,15 +58,6 @@
     /** Data connectors that have been resolved and the resultant attributes. */
     private final Map<String, ResolvedDataConnector> resolvedDataConnectors;
     
-    /** The unique principal. This is required by some resolvers and injected during setup. */
-    private String principal;
-    
-    /** The local entityID. This is required by some resolvers and injected during setup. */
-    private String attributeIssuerID;
-    
-    /** The other entityID. This is required by some resolvers and injected during setup. */
-    private String attributeRecipientID;
-
     /** Constructor. */
     public AttributeResolutionContext() {
         requestedAttributes = Constraints.constrainedSet(new HashSet<Attribute>(), Constraints.notNull());
@@ -79,54 +70,6 @@
 
         resolvedDataConnectors =
                 MapConstraints.constrainedMap(new HashMap<String, ResolvedDataConnector>(), MapConstraints.notNull());
-    }
-    
-    /** Gets the principal associated with this resolution. 
-     * 
-     * @return the principal associated with this resolution. 
-     */
-    @Nullable public String getPrincipal() {
-        return principal;
-    }
-    
-    /** Sets the principal associated with this resolution. 
-     * 
-     * @param value the principal associated with this resolution. 
-     */
-    @Nullable public void setPrincipal(@Nullable String value) {
-        principal = value;
-    }
-    
-    /** Gets the attribute issuer (me) associated with this resolution. 
-     * 
-     * @return the attribute issuer associated with this resolution. 
-     */
-    @Nullable public String getAttributeIssuerID() {
-        return attributeIssuerID;
-    }
-    
-    /** Sets the attribute issuer (me)  associated with this resolution. 
-     * 
-     * @param value the attribute issuer associated with this resolution. 
-     */
-    @Nullable public void setAttributeIssuerID(@Nullable String value) {
-        attributeIssuerID = value;
-    }
-
-    /** Gets the attribute recipient (her) associated with this resolution. 
-     * 
-     * @return the attribute recipient associated with this resolution. 
-     */
-    @Nullable public String getAttributeRecipientID() {
-        return attributeRecipientID;
-    }
-    
-    /** Sets the attribute recipient (her)  associated with this resolution. 
-     * 
-     * @param value the attribute recipient associated with this resolution. 
-     */
-    @Nullable public void setAttributeRecipientID(@Nullable String value) {
-        attributeRecipientID = value;
     }
 
     /**

Modified: trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContextTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContextTest.java?rev=4291&r1=4290&r2=4291&view=diff
==============================================================================

[... 258 lines stripped ...]