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

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Jul  9 17:14:49 2014
New Revision: 6259

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6259&view=rev
Log:
Minor cleanup.

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=6259&r1=6258&r2=6259&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 Wed Jul  9 17:14:49 2014
@@ -32,15 +32,16 @@
 import com.google.common.base.Function;
 
 /**
- * Strategy for summoning up a {@link AttributeFilterImpl} from a populated {@link ApplicationContext}. We do this by
- * finding all the configured {@link AttributeFilterPolicy} beans and bunging them into the Filter which we then
- * initialize.
+ * Strategy for summoning up an {@link AttributeFilterImpl} from a populated {@link ApplicationContext}. We do this by
+ * finding all the configured {@link AttributeFilterPolicy} beans and bunging them into the Attribute Filter which we
+ * then initialize.
  */
 public class AttributeFilterServiceStrategy extends AbstractIdentifiableInitializableComponent implements
         Function<ApplicationContext, ServiceableComponent<AttributeFilter>> {
 
     /** {@inheritDoc} */
-    @Override @Nullable public ServiceableComponent<AttributeFilter> apply(@Nullable ApplicationContext appContext) {
+    @Override
+    @Nullable public ServiceableComponent<AttributeFilter> apply(@Nullable final ApplicationContext appContext) {
 
         final AttributeFilterImpl filter =
                 new AttributeFilterImpl(getId(), appContext.getBeansOfType(AttributeFilterPolicy.class).values());
@@ -49,7 +50,7 @@
         try {
             filter.initialize();
         } catch (ComponentInitializationException e) {
-            throw new ServiceException("Exception initializing filter for " + appContext.getDisplayName(), e);
+            throw new ServiceException("Unable to initialize attribute filter for " + appContext.getDisplayName(), e);
         }
         return filter;
     }

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=6259&r1=6258&r2=6259&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 Wed Jul  9 17:14:49 2014
@@ -37,28 +37,32 @@
 import com.google.common.base.Function;
 
 /**
- * Strategy for summoning up a {@link AttributeResolverImpl} from a populated {@link ApplicationContext}. We do this by
+ * Strategy for summoning up an {@link AttributeResolverImpl} from a populated {@link ApplicationContext}. We do this by
  * finding all the configured {@link AttributeDefinition}, {@link DataConnector} and {@link PrincipalConnector} beans
- * and bunging them into the Attribute resolver which we then initialize.
+ * and bunging them into the Attribute Resolver which we then initialize.
  */
 public class AttributeResolverServiceStrategy extends AbstractIdentifiableInitializableComponent implements
         Function<ApplicationContext, ServiceableComponent<AttributeResolver>> {
 
     /** {@inheritDoc} */
-    @Override @Nullable public ServiceableComponent<AttributeResolver> apply(@Nullable ApplicationContext appContext) {
+    @Override
+    @Nullable public ServiceableComponent<AttributeResolver> apply(@Nullable final ApplicationContext appContext) {
 
-        Collection<PrincipalConnector> pcs = appContext.getBeansOfType(PrincipalConnector.class).values();
-        PrinicpalConnectorCanonicalizer pcc = new PrinicpalConnectorCanonicalizer(pcs);
-        
-        final AttributeResolverImpl resolver =
-                new AttributeResolverImpl(getId(), appContext.getBeansOfType(AttributeDefinition.class).values(),
-                        appContext.getBeansOfType(DataConnector.class).values(), pcc);

[... 20 lines stripped ...]