[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl: AffiliationNa...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Mar 24 13:46:56 2014
New Revision: 3727

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3727&view=rev
Log:
Make protected method suitable for cases without an AuthnRequest.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AffiliationNameIDPolicyPredicate.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/DefaultNameIDPolicyPredicate.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AffiliationNameIDPolicyPredicate.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AffiliationNameIDPolicyPredicate.java?rev=3727&r1=3726&r2=3727&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AffiliationNameIDPolicyPredicate.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AffiliationNameIDPolicyPredicate.java Mon Mar 24 13:46:56 2014
@@ -29,7 +29,6 @@
 
 import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.saml.metadata.resolver.MetadataResolver;
-import org.opensaml.saml.saml2.core.AuthnRequest;
 import org.opensaml.saml.saml2.metadata.AffiliateMember;
 import org.opensaml.saml.saml2.metadata.AffiliationDescriptor;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
@@ -77,11 +76,10 @@
 
     /** {@inheritDoc} */
     @Override
-    protected boolean doApply(@Nonnull final AuthnRequest request, @Nonnull @NotEmpty final String issuer,
-            @Nonnull @NotEmpty final String qualifier) {
+    protected boolean doApply(@Nonnull @NotEmpty final String issuer, @Nonnull @NotEmpty final String qualifier) {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         
-        if (super.doApply(request, issuer, qualifier)) {
+        if (super.doApply(issuer, qualifier)) {
             return true;
         }
         

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/DefaultNameIDPolicyPredicate.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/DefaultNameIDPolicyPredicate.java?rev=3727&r1=3726&r2=3727&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/DefaultNameIDPolicyPredicate.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/DefaultNameIDPolicyPredicate.java Mon Mar 24 13:46:56 2014
@@ -97,7 +97,7 @@
         final Issuer issuer = request.getIssuer();
         if (issuer != null && issuer.getValue() != null &&
                 (issuer.getFormat() == null || NameID.ENTITY.equals(issuer.getFormat()))) {
-            return doApply(request, issuer.getValue(), qualifier);
+            return doApply(issuer.getValue(), qualifier);
         } else {
             log.debug("Request did not contain an Issuer");
         }
@@ -108,14 +108,12 @@
     /**
      * Apply a predicate to the request.
      * 
-     * @param request   the request
      * @param issuer    request issuer
      * @param qualifier the qualifier
      * 
      * @return  true iff the combination of inputs satisfies a policy
      */
-    protected boolean doApply(@Nonnull final AuthnRequest request, @Nonnull @NotEmpty final String issuer,
-            @Nonnull @NotEmpty final String qualifier) {
+    protected boolean doApply(@Nonnull @NotEmpty final String issuer, @Nonnull @NotEmpty final String qualifier) {
         
         if (qualifier.equals(issuer)) {
             log.debug("Requested SPNqmeQualifier {} matches request issuer", qualifier);