[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 Aug  7 07:19:35 2013
New Revision: 4672

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4672&view=rev
Log:
IDP-207 Cleanup some javadoc/annotations/logging

Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilter.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/BaseBridgingClass.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/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

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilter.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilter.java?rev=4672&r1=4671&r2=4672&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilter.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilter.java Wed Aug  7 07:19:35 2013
@@ -52,7 +52,7 @@
 
 //TODO(lajoie) perf metrics
 
-/** Services that filters out attributes and values based upon loaded policies. */
+/** Service that filters out attributes and values based upon loaded policies. */
 @ThreadSafe
 public class AttributeFilter extends AbstractDestructableIdentifiableInitializableComponent implements
         ValidatableComponent, DestructableComponent, UnmodifiableComponent {
@@ -217,7 +217,7 @@
      * 
      * @return Returns the logPrefix.
      */
-    public String getLogPrefix() {
+    protected String getLogPrefix() {
         String result;
 
         result = logPrefix;
@@ -227,5 +227,4 @@
         }
         return result;
     }
-
 }

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java?rev=4672&r1=4671&r2=4672&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/AttributeFilterPolicy.java Wed Aug  7 07:19:35 2013
@@ -31,6 +31,7 @@
 import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
 import net.shibboleth.utilities.java.support.collection.CollectionSupport;
 import net.shibboleth.utilities.java.support.component.AbstractDestructableIdentifiableInitializableComponent;
@@ -81,11 +82,10 @@
      * @param attributeRules value filtering policies employed if this policy is active
      */
     public AttributeFilterPolicy(@Nonnull @NotEmpty String policyId, @Nonnull PolicyRequirementRule requirementRule,
-            @Nullable Collection<AttributeRule> attributeRules) {
+            @Nullable @NullableElements Collection<AttributeRule> attributeRules) {
         setId(policyId);
 
-        rule =
-                Constraint.isNotNull(requirementRule, "Attribute filter policy activiation criterion can not be null");
+        rule = Constraint.isNotNull(requirementRule, "Attribute filter policy activiation criterion can not be null");
 
         ArrayList<AttributeRule> checkedPolicies = new ArrayList<AttributeRule>();
         CollectionSupport.addIf(checkedPolicies, attributeRules, Predicates.notNull());
@@ -141,18 +141,16 @@
         if (isActive == Tristate.FAIL) {
             log.warn("{} Policy requirement rule failed for this request", getLogPrefix());
         } else if (isActive == Tristate.FALSE) { 
-            log.debug("{} policy is active for this request", getLogPrefix());
+            log.debug("{} Policy is active for this request", getLogPrefix());
         } else {
-            log.debug("{} policy is not active for this request", getLogPrefix());

[... 308 lines stripped ...]