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

[noreply at shibboleth.net]

Author: rdw
Date: Fri Jul 11 07:50:15 2014
New Revision: 6278

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6278&view=rev
Log:
IDP-429 log the creation of the services

This provides some debug support when the user specified two components with the same ID.

Modified:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceStrategy.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverServiceStrategy.java

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceStrategy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceStrategy.java?rev=6278&r1=6277&r2=6278&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceStrategy.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceStrategy.java Fri Jul 11 07:50:15 2014
@@ -17,6 +17,8 @@
 
 package net.shibboleth.idp.attribute.filter.spring;
 
+import java.util.Collection;
+
 import javax.annotation.Nullable;
 
 import net.shibboleth.idp.attribute.filter.AttributeFilter;
@@ -27,6 +29,8 @@
 import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 
 import com.google.common.base.Function;
@@ -39,12 +43,17 @@
 public class AttributeFilterServiceStrategy extends AbstractIdentifiableInitializableComponent implements
         Function<ApplicationContext, ServiceableComponent<AttributeFilter>> {
 
+    /** log. */
+    private final Logger log = LoggerFactory.getLogger(AttributeFilterServiceStrategy.class);
+
     /** {@inheritDoc} */
-    @Override
-    @Nullable public ServiceableComponent<AttributeFilter> apply(@Nullable final ApplicationContext appContext) {
+    @Override @Nullable public ServiceableComponent<AttributeFilter>
+            apply(@Nullable final ApplicationContext appContext) {
 
-        final AttributeFilterImpl filter =
-                new AttributeFilterImpl(getId(), appContext.getBeansOfType(AttributeFilterPolicy.class).values());
+        final Collection<AttributeFilterPolicy> afps = appContext.getBeansOfType(AttributeFilterPolicy.class).values();
+        log.debug("Creating Attribute Filter {} with  {} Policies", getId(), afps.size());
+
+        final AttributeFilterImpl filter = new AttributeFilterImpl(getId(), afps);
         filter.setApplicationContext(appContext);
 
         try {

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverServiceStrategy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverServiceStrategy.java?rev=6278&r1=6277&r2=6278&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverServiceStrategy.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverServiceStrategy.java Fri Jul 11 07:50:15 2014
@@ -32,6 +32,8 @@
 import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 
 import com.google.common.base.Function;
@@ -44,9 +46,12 @@
 public class AttributeResolverServiceStrategy extends AbstractIdentifiableInitializableComponent implements
         Function<ApplicationContext, ServiceableComponent<AttributeResolver>> {
 
+    /** log. */
+    private final Logger log = LoggerFactory.getLogger(AttributeResolverServiceStrategy.class);
+
     /** {@inheritDoc} */
-    @Override
-    @Nullable public ServiceableComponent<AttributeResolver> apply(@Nullable final ApplicationContext appContext) {
+    @Override @Nullable public ServiceableComponent<AttributeResolver> apply(
+            @Nullable final ApplicationContext appContext) {
 
         final Collection<PrincipalConnector> pcs = appContext.getBeansOfType(PrincipalConnector.class).values();
         final PrinicpalConnectorCanonicalizer pcc = new PrinicpalConnectorCanonicalizer(pcs);
@@ -55,6 +60,9 @@
                 appContext.getBeansOfType(AttributeDefinition.class).values();
 

[... 8 lines stripped ...]