[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: Wed Feb 15 15:41:05 2012
New Revision: 4117

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4117&view=rev
Log:
IDP-153
Unite tests, bugfixes, tighten up component initialization rules and make sure all @NonNull methods to precisely that

Added:
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicyTest.java   (with props)
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeValueFilterPolicyTest.java   (with props)
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/MockPredicate.java   (with props)
Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterContext.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngine.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeValueFilterPolicy.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilterContextTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/AttributeFilteringEngineTest.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/MockAttributeValueMatcher.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterContext.java?rev=4117&r1=4116&r2=4117&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterContext.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterContext.java Wed Feb 15 15:41:05 2012
@@ -114,7 +114,7 @@
         String trimmedAttributeId =
                 Assert.isNotNull(StringSupport.trimOrNull(attributeId), "Attribute ID can not be null or empty");
         Assert.isTrue(prefilteredAttributes.containsKey(trimmedAttributeId), "no attribute with ID "
-                + trimmedAttributeId + " exsists in the pre-filtered attribute set");
+                + trimmedAttributeId + " exists in the pre-filtered attribute set");
 
         if (attributeValues == null || attributeValues.isEmpty()) {
             return;
@@ -163,7 +163,7 @@
         String trimmedAttributeId =
                 Assert.isNotNull(StringSupport.trimOrNull(attributeId), "Attribute ID can not be null or empty");
         Assert.isTrue(prefilteredAttributes.containsKey(trimmedAttributeId), "no attribute with ID "
-                + trimmedAttributeId + " exsists in the pre-filtered attribute set");
+                + trimmedAttributeId + " exists in the pre-filtered attribute set");
 
         if (attributeValues == null || attributeValues.isEmpty()) {
             return;

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java?rev=4117&r1=4116&r2=4117&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterPolicy.java Wed Feb 15 15:41:05 2012
@@ -69,16 +69,24 @@
 
     /** Filters to be used on attribute values. Default value: {@link Collections#emptyList()} */
     private List<AttributeValueFilterPolicy> valuePolicies;
+    
+    /** Whether the Id has been set. */
+    private boolean idSet;
 
     /** Constructor. */
     public AttributeFilterPolicy() {
         activationCriteria = Predicates.alwaysFalse();
         valuePolicies = Collections.emptyList();
+        setId("<Uninitialized FilterPolicy>");
+        idSet = false;
     }
 
     /** {@inheritDoc} */
     public synchronized void setId(@Nonnull @NotEmpty final String componentId) {
+        ifDestroyedThrowDestroyedComponentException(getId());
+        ifInitializedThrowUnmodifiabledComponentException(getId());
         super.setId(componentId);
+        idSet = true;
     }
 
     /**
@@ -201,6 +209,10 @@
     /** {@inheritDoc} */
     protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
+        
+        if (!idSet) {
+            throw new ComponentInitializationException("Identifier not set");
+        }
 
         if (activationCriteria == null) {

[... 583 lines stripped ...]