[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: Sun Jan 19 09:01:10 2014
New Revision: 5215

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5215&view=rev
Log:
IDP-361 Separate the filter context into public and private parts

Added:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContext.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterContextTest.java
      - copied, changed from r5214, trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeFilterContextTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/context/AttributeFilterWorkContextTest.java
Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterImpl.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeRule.java
    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/context/AttributeFilterContext.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeFilterContextTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicyTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/AttributeValueFilterPolicyTest.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterImpl.java?rev=5215&r1=5214&r2=5215&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterImpl.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterImpl.java Sun Jan 19 09:01:10 2014
@@ -28,6 +28,7 @@
 
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
+import net.shibboleth.idp.attribute.filter.context.AttributeFilterWorkContext;
 import net.shibboleth.idp.service.AbstractServiceableComponent;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -52,8 +53,7 @@
 
 /** Service that filters out attributes and values based upon loaded policies. */
 @ThreadSafe
-public class AttributeFilterImpl extends AbstractServiceableComponent<AttributeFilter> implements
-        AttributeFilter {
+public class AttributeFilterImpl extends AbstractServiceableComponent<AttributeFilter> implements AttributeFilter {
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(AttributeFilterImpl.class);
@@ -84,12 +84,12 @@
      * 
      * @return immutable collection of filter policies
      */
-    @Nonnull @NonnullElements @Unmodifiable public List<AttributeFilterPolicy> getFilterPolicies() {
+    @Override @Nonnull @NonnullElements @Unmodifiable public List<AttributeFilterPolicy> getFilterPolicies() {
         return filterPolicies;
     }
 
     /** {@inheritDoc} */
-    public void validate() throws ComponentValidationException {
+    @Override public void validate() throws ComponentValidationException {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
 
@@ -121,12 +121,16 @@
      * 
      * @throws AttributeFilterException thrown if there is a problem retrieving or applying the attribute filter policy
      */
-    public void filterAttributes(@Nonnull final AttributeFilterContext filterContext) throws AttributeFilterException {
+    @Override public void filterAttributes(@Nonnull final AttributeFilterContext filterContext)
+            throws AttributeFilterException {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
 
         Constraint.isNotNull(filterContext, "Attribute filter context can not be null");
         Map<String, IdPAttribute> prefilteredAttributes = filterContext.getPrefilteredIdPAttributes();
+
+        // Create work context to hold intermediate results.
+        filterContext.getSubcontext(AttributeFilterWorkContext.class, true);
 
         log.debug("{} beginning process of filtering the following {} attributes: {}", new Object[] {getLogPrefix(),

[... 714 lines stripped ...]