[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 Mar 18 13:19:31 2013
New Revision: 4344

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4344&view=rev
Log:
IDP-208 Add the PrincipalName and PrincipalRegexp filtercontext criteria and tests

Added:
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/
      - copied from r4337, trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/predicate/
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/NavigationHelperTest.java   (with props)
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/PrincipalNameMatcherTest.java   (with props)
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/PrincipalNameRegexpMatcherTest.java   (with props)
Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/PrincipalNameMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/PrincipalNameRegexpMatcher.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/AttributeScopeRegexpPredicateTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/AttributeScopeStringPredicateTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/AttributeValueRegexpPredicateTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/AttributeValueStringPredicateTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/BaseRegexpPredicateTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/BaseStringPredicateTest.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/DataSources.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/PrincipalNameMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/PrincipalNameMatcher.java?rev=4344&r1=4343&r2=4344&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/PrincipalNameMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/PrincipalNameMatcher.java Mon Mar 18 13:19:31 2013
@@ -25,6 +25,7 @@
 import net.shibboleth.idp.attribute.filtering.AttributeFilterContext;
 import net.shibboleth.idp.attribute.filtering.impl.matcher.AbstractStringMatchFunctor;
 import net.shibboleth.idp.attribute.resolver.AttributeRecipientContext;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
 /**
  * Compare the principal name for this resolution with the provided name.
@@ -36,6 +37,9 @@
 
     /** {@inheritDoc} */
     public boolean apply(@Nullable AttributeFilterContext filterContext) {
+        
+        ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+        
         final AttributeRecipientContext recipient =
                 NavigationHelper.locateRecipientContext(NavigationHelper.locateResolverContext(filterContext));
         final String principal = recipient.getPrincipal();

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/PrincipalNameRegexpMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/PrincipalNameRegexpMatcher.java?rev=4344&r1=4343&r2=4344&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/PrincipalNameRegexpMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/filtercontext/PrincipalNameRegexpMatcher.java Mon Mar 18 13:19:31 2013
@@ -22,6 +22,7 @@
 import net.shibboleth.idp.attribute.filtering.AttributeFilterContext;
 import net.shibboleth.idp.attribute.filtering.impl.matcher.AbstractRegexpStringMatchFunctor;
 import net.shibboleth.idp.attribute.resolver.AttributeRecipientContext;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,6 +37,9 @@
 
     /** {@inheritDoc} */

[... 8 lines stripped ...]