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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Jun  4 12:37:58 2013
New Revision: 4517

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4517&view=rev
Log:
IDP-208 A Start on the EntityAttributeFilters: AttributeRequesterEntityAttributeExactMatcher and supporting infrastructure and tests (part ii)

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeRecipientContext.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeRecipientContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeRecipientContext.java?rev=4517&r1=4516&r2=4517&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeRecipientContext.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AttributeRecipientContext.java Tue Jun  4 12:37:58 2013
@@ -44,7 +44,7 @@
     private EntityDescriptor issuerMetadata;
 
     /** The issuer's metadata. */
-    private EntityDescriptor requesterMetadata;
+    private EntityDescriptor attributeRecipientMetadata;
 
     /** Gets the principal associated with this resolution. 
      * 
@@ -103,7 +103,7 @@
     /** Gets how the principal was authenticated.
      * @param method The principalAuthenticationMethod to set.
      */
-    public void setPrincipalAuthenticationMethod(String method) {
+    public void setPrincipalAuthenticationMethod(@Nullable String method) {
         this.principalAuthenticationMethod = method;
     }
 
@@ -111,7 +111,7 @@
      * Return the metadata for the entity issuing the attributes.
      * @return Returns the issuerMetadata.
      */
-    public EntityDescriptor getIssuerMetadata() {
+    @Nullable public EntityDescriptor getIssuerMetadata() {
         return issuerMetadata;
     }
 
@@ -119,7 +119,7 @@
      * Sets the metadata for the entity issuing the attributes.
      * @param metadata The issuerMetadata to set.
      */
-    public void setIssuerMetadata(EntityDescriptor metadata) {
+    public void setIssuerMetadata(@Nullable EntityDescriptor metadata) {
         this.issuerMetadata = metadata;
     }
 
@@ -127,16 +127,16 @@
      * Return the metadata for the entity requesting the attributes.
      * @return Returns the requesterMetadata.
      */
-    public EntityDescriptor getRequesterMetadata() {
-        return requesterMetadata;
+    @Nullable public EntityDescriptor getAttributeRecipientMetadata() {
+        return attributeRecipientMetadata;
     }
 
     /**
      * Sets the metadata for the entity requesting the attributes.
      * @param metadata The requesterMetadata to set.
      */
-    public void setRequesterMetadata(EntityDescriptor metadata) {
-        this.requesterMetadata = metadata;
+    public void setAttributeRecipientMetadata(@Nullable EntityDescriptor metadata) {
+        this.attributeRecipientMetadata = metadata;
     }
 
 }