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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Apr 30 03:48:48 2014
New Revision: 5800

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5800&view=rev
Log:
IDP-390 Move help method out to SpringSupport.  (Experimentally) modify createBeanFactory(Element) to take a parent application context

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/spring/SpringSupport.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java?rev=5800&r1=5799&r2=5800&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java Wed Apr 30 03:48:48 2014
@@ -30,6 +30,7 @@
 import net.shibboleth.idp.attribute.resolver.AbstractDataConnector;
 import net.shibboleth.idp.attribute.resolver.spring.AttributeResolverNamespaceHandler;
 import net.shibboleth.idp.attribute.resolver.spring.BaseResolverPluginParser;
+import net.shibboleth.idp.spring.SpringSupport;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
@@ -37,7 +38,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
@@ -102,27 +102,6 @@
     }
 
     /**
-     * Retrieves the bean of the supplied type from the supplied bean factory. Returns null if no bean definition is
-     * found.
-     * 
-     * @param <T> type of bean to return
-     * @param beanFactory to get the bean from
-     * @param clazz type of the bean to retrieve
-     * 
-     * @return spring bean
-     */
-    @Nullable protected <T> T getBean(@Nonnull final BeanFactory beanFactory, @Nonnull final Class<T> clazz) {
-        T bean = null;
-        try {
-            bean = beanFactory.getBean(clazz);
-            log.debug("created spring bean {}", bean);
-        } catch (NoSuchBeanDefinitionException e) {
-            log.debug("no spring bean configured of type {}", clazz);
-        }
-        return bean;
-    }
-
-    /**
      * Returns the results of {@link Introspector#getBeanInfo(Class, Class)} for the supplied connector class.
      * 
      * @param connectorClass to introspect
@@ -153,7 +132,7 @@
             @Nonnull BeanFactory beanFactory, @Nonnull final Class<? extends AbstractDataConnector> connectorClass) {
         for (PropertyDescriptor descriptor : getBeanPropertyDescriptors(connectorClass)) {
             log.debug("parsing property descriptor {}", descriptor);
-            final Object value = getBean(beanFactory, descriptor.getPropertyType());
+            final Object value = SpringSupport.getBean(beanFactory, descriptor.getPropertyType());
             if (value != null) {
                 builder.addPropertyValue(descriptor.getName(), value);
                 log.debug("added property value {}", value);

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/spring/SpringSupport.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/spring/SpringSupport.java?rev=5800&r1=5799&r2=5800&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/spring/SpringSupport.java (original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/spring/SpringSupport.java Wed Apr 30 03:48:48 2014
@@ -31,7 +31,10 @@
 import net.shibboleth.utilities.java.support.xml.SerializeSupport;
 import net.shibboleth.utilities.java.support.xml.XmlConstants;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.ParserContext;
@@ -51,6 +54,9 @@
  * Helper class for performing some common Spring-related functions.
  */
 public final class SpringSupport {
+    
+    /** Log. */
+    static final Logger LOG = LoggerFactory.getLogger(SpringSupport.class);
 
     /** Constructor. */

[... 53 lines stripped ...]