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

[noreply at shibboleth.net]

Author: tzeller
Date: Tue May 28 15:43:50 2013
New Revision: 4502

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4502&view=rev
Log:
Fix missed commits when refactoring MatchFunctor to Matcher and its evaluatePolicyRule() to matches().

Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/AndMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/OrMatcher.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/AndMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/AndMatcher.java?rev=4502&r1=4501&r2=4502&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/AndMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/AndMatcher.java Tue May 28 15:43:50 2013
@@ -40,9 +40,9 @@
 import com.google.common.base.Objects;
 
 /**
- * {@link Matcher} that implements the conjunction of matchers. That is, a given attribute value is considered to
- * have matched if, and only if, it is returned by every composed {@link Matcher}. The predicate is true if and
- * only if all composed {@link Matcher} returns true.
+ * {@link Matcher} that implements the conjunction of matchers. That is, a given attribute value is considered to have
+ * matched if, and only if, it is returned by every composed {@link Matcher}. The predicate is true if and only if all
+ * composed {@link Matcher} returns true.
  */
 @ThreadSafe
 public class AndMatcher extends AbstractComposedMatcher {
@@ -58,10 +58,10 @@
 
     /**
      * Return true iff all composed matchers return true. {@inheritDoc}
-     * @throws AttributeFilterException 
+     * 
+     * @throws AttributeFilterException
      */
-    public boolean evaluatePolicyRule( @Nullable final AttributeFilterContext filterContext) 
-            throws AttributeFilterException {
+    public boolean matches(@Nullable final AttributeFilterContext filterContext) throws AttributeFilterException {
         final List<Matcher> currentMatchers = getComposedMatchers();
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/OrMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/OrMatcher.java?rev=4502&r1=4501&r2=4502&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/OrMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/matcher/logic/OrMatcher.java Tue May 28 15:43:50 2013
@@ -37,8 +37,8 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 /**
- * {@link Matcher} that implements the disjunction of matchers. That is, a given attribute value is considered to
- * have matched if it is returned by any of the composed {@link Matcher}.
+ * {@link Matcher} that implements the disjunction of matchers. That is, a given attribute value is considered to have
+ * matched if it is returned by any of the composed {@link Matcher}.
  */
 @ThreadSafe
 public class OrMatcher extends AbstractComposedMatcher {
@@ -53,8 +53,7 @@
     }
 
     /** {@inheritDoc} */
-    public boolean evaluatePolicyRule(@Nonnull AttributeFilterContext filterContext)
-            throws AttributeFilterException {
+    public boolean matches(@Nonnull AttributeFilterContext filterContext) throws AttributeFilterException {
         final List<Matcher> currentMatchers = getComposedMatchers();
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);