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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Oct 16 11:59:11 2014
New Revision: 6723

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6723&view=rev
Log:
Fix some logging errors, some general cleanup.

Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeIssuerRegexpPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AttributeRequesterRegexpPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AuthenticationMethodPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/AuthenticationMethodRegexpPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/NumOfAttributeValuesPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNamePolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PrincipalNameRegexpPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/AttributeRequesterNameIDFormatExactPolicyRule.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/saml/impl/RegistrationAuthorityPolicyRule.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java?rev=6723&r1=6722&r2=6723&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeInMetadataMatcher.java Thu Oct 16 11:59:11 2014
@@ -54,7 +54,7 @@
 public class AttributeInMetadataMatcher extends AbstractIdentifiableInitializableComponent implements Matcher {
 
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(AttributeInMetadataMatcher.class);
+    @Nonnull private final Logger log = LoggerFactory.getLogger(AttributeInMetadataMatcher.class);
 
     /** Whether optionally requested attributes should be matched. */
     private boolean onlyIfRequired;
@@ -100,7 +100,7 @@
      * 
      * @param strategy what to set.
      */
-    public void setObjectStrategy(@Nonnull Function<SAMLMetadataContext, ? extends XMLObject> strategy) {
+    public void setObjectStrategy(@Nonnull final Function<SAMLMetadataContext, ? extends XMLObject> strategy) {
         objectStrategy = Constraint.isNotNull(strategy, "ObjectStrategy must be non null");
     }
 
@@ -141,23 +141,23 @@
             @Nonnull final AttributeFilterContext filterContext) {
         final SAMLMetadataContext metadataContext = filterContext.getRequesterMetadataContext();
         if (null == metadataContext) {
-            log.warn("{} : No metadata context when filtering.", getLogPrefix());
+            log.warn("{} No metadata context when filtering", getLogPrefix());
             return null;
         }
 
         final XMLObject xmlObject = getXMLObjectStrategy().apply(metadataContext);
         if (null == xmlObject) {
-            log.warn("{} : No RP XML Object found when filtering.", getLogPrefix());
+            log.warn("{} No RP XML Object found when filtering", getLogPrefix());
             return null;
         }
         final List<AttributesMapContainer> containerList =
                 xmlObject.getObjectMetadata().get(AttributesMapContainer.class);
         if (null == containerList || containerList.isEmpty()) {
-            log.debug("{} : No mapped attributes found when filtering.", getLogPrefix());
+            log.debug("{} No mapped attributes found when filtering", getLogPrefix());
             return null;
         }
         if (containerList.size() > 1) {

[... 446 lines stripped ...]