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

[noreply at shibboleth.net]

Author: scantor
Date: Thu May  8 10:45:03 2014
New Revision: 5888

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5888&view=rev
Log:
A different approach to a generic predicate with more flexibility in what gets tested.

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/logic/AttributeIssuerIdPredicate.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/logic/AttributePrincipalPredicate.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/logic/AttributeRecipientIdPredicate.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/logic/RelyingPartyIdPredicate.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/logic/AttributeIssuerIdPredicate.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/logic/AttributeIssuerIdPredicate.java?rev=5888&r1=5887&r2=5888&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/logic/AttributeIssuerIdPredicate.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/logic/AttributeIssuerIdPredicate.java Thu May  8 10:45:03 2014
@@ -23,18 +23,20 @@
 
 import net.shibboleth.idp.attribute.resolver.context.navigate.AttributeIssuerIdLookupFunction;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.logic.CollectionContainmentPredicate;
+import net.shibboleth.utilities.java.support.logic.StrategyIndirectedPredicate;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.profile.context.ProfileRequestContext;
 
+import com.google.common.base.Predicate;
+
 /**
  * Predicate that evaluates a {@link ProfileRequestContext} by looking for an attribute issuer
- * that matches one of a designated set. The ID is obtained from a lookup function, by default from
- * a {@link net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext} child of the
- * profile request context.
+ * that matches one of a designated set or a generic predicate. The ID is obtained from a lookup
+ * function, by default from a {@link net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext}
+ * child of the profile request context.
  */
-public class AttributeIssuerIdPredicate extends CollectionContainmentPredicate<ProfileRequestContext,String> {
+public class AttributeIssuerIdPredicate extends StrategyIndirectedPredicate<ProfileRequestContext,String> {
 
     /**
      * Constructor.
@@ -45,4 +47,13 @@
         super(new AttributeIssuerIdLookupFunction(), StringSupport.normalizeStringCollection(candidates));
     }
 
+    /**
+     * Constructor.
+     * 
+     * @param pred generalized predicate
+     */
+    public AttributeIssuerIdPredicate(@Nonnull final Predicate<String> pred) {
+        super(new AttributeIssuerIdLookupFunction(), pred);
+    }
+
 }

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/logic/AttributePrincipalPredicate.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/logic/AttributePrincipalPredicate.java?rev=5888&r1=5887&r2=5888&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/logic/AttributePrincipalPredicate.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/logic/AttributePrincipalPredicate.java Thu May  8 10:45:03 2014
@@ -23,18 +23,20 @@
 
 import net.shibboleth.idp.attribute.resolver.context.navigate.AttributePrincipalLookupFunction;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.logic.CollectionContainmentPredicate;
+import net.shibboleth.utilities.java.support.logic.StrategyIndirectedPredicate;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.profile.context.ProfileRequestContext;
 
+import com.google.common.base.Predicate;
+
 /**
  * Predicate that evaluates a {@link ProfileRequestContext} by looking for an attribute subject
- * that matches one of a designated set. The ID is obtained from a lookup function, by default from
- * a {@link net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext} child of the
- * profile request context.
+ * that matches one of a designated set or a generic predicate. The ID is obtained from a lookup
+ * function, by default from a {@link net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext}
+ * child of the profile request context.
  */

[... 107 lines stripped ...]