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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Jul 13 04:03:03 2013
New Revision: 4563

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4563&view=rev
Log:
IDP-287 Start to clean up old style tristating.  Matcher doesn't throw AttributeFilteringException any more

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/MatcherFromPolicy.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/MockMatcher.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java?rev=4563&r1=4562&r2=4563&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/Matcher.java Sat Jul 13 04:03:03 2013
@@ -47,8 +47,7 @@
     public static final Matcher MATCHES_ALL = new Matcher() {
 
         /** {@inheritDoc} */
-        public Set<AttributeValue> getMatchingValues(Attribute attribute, AttributeFilterContext filterContext)
-                throws AttributeFilterException {
+        public Set<AttributeValue> getMatchingValues(Attribute attribute, AttributeFilterContext filterContext) {
             return Collections.unmodifiableSet(attribute.getValues());
         }
 
@@ -62,8 +61,7 @@
     public static final Matcher MATCHES_NONE = new Matcher() {
 
         /** {@inheritDoc} */
-        public Set<AttributeValue> getMatchingValues(Attribute attribute, AttributeFilterContext filterContext)
-                throws AttributeFilterException {
+        public Set<AttributeValue> getMatchingValues(Attribute attribute, AttributeFilterContext filterContext) {
             return Collections.emptySet();
         }
 
@@ -77,8 +75,7 @@
     public static final Matcher MATCHER_FAILS = new Matcher() {
 
         /** {@inheritDoc} */
-        public Set<AttributeValue> getMatchingValues(Attribute attribute, AttributeFilterContext filterContext)
-                throws AttributeFilterException {
+        public Set<AttributeValue> getMatchingValues(Attribute attribute, AttributeFilterContext filterContext) {
             return null;
         }
 
@@ -93,10 +90,8 @@
      * @param attribute the attribute under question.
      * @param filterContext the filter context
      * @return The result of this rule. Null if we failed.
-     * @throws AttributeFilterException never. TODO remove this
      */
     @Nullable @NonnullElements @Unmodifiable public Set<AttributeValue> getMatchingValues(
-            @Nonnull final Attribute attribute, @Nonnull final AttributeFilterContext filterContext)
-            throws AttributeFilterException;
+            @Nonnull final Attribute attribute, @Nonnull final AttributeFilterContext filterContext);
 
 }

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/MatcherFromPolicy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/MatcherFromPolicy.java?rev=4563&r1=4562&r2=4563&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/MatcherFromPolicy.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/MatcherFromPolicy.java Sat Jul 13 04:03:03 2013
@@ -39,8 +39,8 @@
  * 
  * If the rule is true then we return all values, else we return none. If the rule fails we return null.
  */
-public class MatcherFromPolicy extends BaseBridgingClass implements Matcher,
-        IdentifiableComponent, ValidatableComponent, DestructableComponent {
+public class MatcherFromPolicy extends BaseBridgingClass implements Matcher, IdentifiableComponent,
+        ValidatableComponent, DestructableComponent {
 
     /** The rule we are shadowing. */
     private final PolicyRequirementRule rule;
@@ -50,6 +50,7 @@
 
     /**
      * Constructor.
+     * 
      * @param theRule the class we are bridging to
      */
     public MatcherFromPolicy(@Nonnull PolicyRequirementRule theRule) {
@@ -59,10 +60,17 @@
 
     /** {@inheritDoc} */
     @Nullable public Set<AttributeValue> getMatchingValues(@Nonnull Attribute attribute,
-            @Nonnull AttributeFilterContext filterContext) throws AttributeFilterException {
+            @Nonnull AttributeFilterContext filterContext) {
+
+        final Tristate result;
         
-        final Tristate result = rule.matches(filterContext);
-        
+        try {
+            result = rule.matches(filterContext);
+        } catch (AttributeFilterException e) {
+           // TODO
+            return null;

[... 22 lines stripped ...]