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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jun  3 10:25:27 2013
New Revision: 4510

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4510&view=rev
Log:
IDP-283 Update to use trstating (rather than a borrowed exception).  Removes sereral todos

Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeIssuerMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeIssuerRegexpMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeRequesterMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeRequesterRegexpMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/NavigationHelper.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/PrincipalNameMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/PrincipalNameRegexpMatcher.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeIssuerMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeIssuerRegexpMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeRequesterMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeRequesterRegexpMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/NavigationHelperTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/PrincipalNameMatcherTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/PrincipalNameRegexpMatcherTest.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeIssuerMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeIssuerMatcher.java?rev=4510&r1=4509&r2=4510&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeIssuerMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeIssuerMatcher.java Mon Jun  3 10:25:27 2013
@@ -20,6 +20,7 @@
 import javax.annotation.Nullable;
 
 import net.shibboleth.idp.attribute.filter.AttributeFilterContext;
+import net.shibboleth.idp.attribute.filter.MatcherException;
 import net.shibboleth.idp.attribute.filter.impl.matcher.AbstractStringMatcher;
 import net.shibboleth.idp.attribute.resolver.AttributeRecipientContext;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -59,8 +60,7 @@
         final String issuer = recipient.getAttributeIssuerID();
 
         if (null == issuer) {
-            log.error("{} No attribute issuer found for comparison", getLogPrefix());
-            return false;
+           throw new MatcherException(getLogPrefix() + " No attribute issuer found for comparison");
         }
         log.debug("{} found attribute issuer: ", getLogPrefix(), issuer);
 

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeIssuerRegexpMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeIssuerRegexpMatcher.java?rev=4510&r1=4509&r2=4510&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeIssuerRegexpMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/filtercontext/AttributeIssuerRegexpMatcher.java Mon Jun  3 10:25:27 2013
@@ -20,6 +20,7 @@
 import javax.annotation.Nullable;
 
 import net.shibboleth.idp.attribute.filter.AttributeFilterContext;
+import net.shibboleth.idp.attribute.filter.MatcherException;
 import net.shibboleth.idp.attribute.filter.impl.matcher.AbstractRegexpStringMatcher;
 import net.shibboleth.idp.attribute.resolver.AttributeRecipientContext;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -59,8 +60,7 @@
         final String issuer = recipient.getAttributeIssuerID();
 
         if (null == issuer) {

[... 698 lines stripped ...]