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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Feb 23 12:57:37 2017
New Revision: 8631

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8631&view=rev
Log:
Replace deprecated Spring context creation method.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/DataConnectorFactoryBean.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/DataConnectorFactoryBean.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/impl/DataConnectorFactoryBean.java?rev=8631&r1=8630&r2=8631&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/DataConnectorFactoryBean.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/DataConnectorFactoryBean.java	Thu Feb 23 12:57:37 2017
@@ -28,7 +28,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
 import net.shibboleth.idp.attribute.resolver.AbstractDataConnector;
 import net.shibboleth.idp.attribute.resolver.spring.impl.AbstractResolverPluginFactoryBean;
 import net.shibboleth.utilities.java.support.annotation.Duration;
@@ -244,10 +244,13 @@
         }
         setValues(result);
 
-        appContext =
-                SpringSupport.newContext("HybridSpringDataConnector", getResources(), getBeanFactoryPostProcessors(),
-                        getBeanPostProcessors(), Collections.EMPTY_LIST, parentContext);
-
+        appContext = new ApplicationContextBuilder()
+                .setName("HybridSpringDataConnector")
+                .setServiceConfigurations(getResources())
+                .setBeanFactoryPostProcessors(getBeanFactoryPostProcessors())
+                .setBeanPostProcessors(getBeanPostProcessors())
+                .setParentContext(getParentContext()).build();
+        
         final PropertyDescriptor[] descriptors =
                 Introspector.getBeanInfo(getObjectType(), AbstractDataConnector.class).getPropertyDescriptors();