[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:05:26 2013
New Revision: 4564

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

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/MatcherFromPolicy.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcher.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherId.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyRequirementRule.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/MockPolicyRequirementRule.java

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=4564&r1=4563&r2=4564&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:05:26 2013
@@ -62,14 +62,7 @@
     @Nullable public Set<AttributeValue> getMatchingValues(@Nonnull Attribute attribute,
             @Nonnull AttributeFilterContext filterContext) {
 
-        final Tristate result;
-        
-        try {
-            result = rule.matches(filterContext);
-        } catch (AttributeFilterException e) {
-           // TODO
-            return null;
-        }
+        final Tristate result= rule.matches(filterContext);
 
         if (Tristate.FAIL == result) {
             log.warn("{} The rule returned FAIL, returning null", getLogPrefix());

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcher.java?rev=4564&r1=4563&r2=4564&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcher.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcher.java Sat Jul 13 04:05:26 2013
@@ -56,7 +56,7 @@
     }
 
     /** {@inheritDoc} */
-    public Tristate matches(@Nonnull AttributeFilterContext context) throws AttributeFilterException {
+    public Tristate matches(@Nonnull AttributeFilterContext context) {
         
         log.info("{} Applying matcher supplied as policy to all values of all attributes", getLogPrefix());
 

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherId.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherId.java?rev=4564&r1=4563&r2=4564&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherId.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherId.java Sat Jul 13 04:05:26 2013
@@ -70,7 +70,7 @@
     }
 
     /** {@inheritDoc} */
-    @Nonnull public Tristate matches(@Nonnull AttributeFilterContext context) throws AttributeFilterException {
+    @Nonnull public Tristate matches(@Nonnull AttributeFilterContext context) {
         
         log.info("{} Applying matcher supplied as policy to all values of attribute {}", getLogPrefix(), attributeId);
 

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyRequirementRule.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyRequirementRule.java?rev=4564&r1=4563&r2=4564&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyRequirementRule.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyRequirementRule.java Sat Jul 13 04:05:26 2013
@@ -50,7 +50,7 @@
     /** A {@link PolicyRequirementRule} that returns true matched. */
     public static final PolicyRequirementRule MATCHES_ALL = new PolicyRequirementRule() {
 
-        public Tristate matches(@Nonnull AttributeFilterContext filterContext) throws AttributeFilterException {

[... 48 lines stripped ...]