[java-identity-provider] branch master updated: Replace deprecated Spring context builder.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=bd362598cdddd6d7b235260ba6129bf9b930281d

The following commit(s) were added to refs/heads/master by this push:
       new  bd36259   Replace deprecated Spring context builder.
bd36259 is described below

commit bd362598cdddd6d7b235260ba6129bf9b930281d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Mar 20 13:02:39 2017 -0400

    Replace deprecated Spring context builder.
---
 .../filter/spring/AttributeFilterServiceTest.java      | 15 +++++++--------
 .../idp/installer/ant/MetadataGeneratorTask.java       | 18 +++++++-----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
index 95174cc..c0c24d1 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor;
-import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.StringAttributeValue;
 import net.shibboleth.idp.attribute.filter.AttributeFilter;
@@ -33,9 +33,6 @@ import net.shibboleth.idp.attribute.filter.spring.impl.AttributeFilterServiceStr
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.service.ServiceException;
 
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -78,11 +75,13 @@ public class AttributeFilterServiceTest {
         if (null != testContext) {
             tearDownTestContext();
         }
+        
         final GenericApplicationContext context =
-                SpringSupport.newContext(name, Collections.singletonList(resource),
-                        Collections.<BeanFactoryPostProcessor> emptyList(),
-                        Collections.<BeanPostProcessor> singletonList(new IdentifiableBeanPostProcessor()),
-                        Collections.<ApplicationContextInitializer> emptyList(), null);
+                new ApplicationContextBuilder().setName(name)
+                    .setServiceConfiguration(resource)
+                    .setBeanPostProcessor(new IdentifiableBeanPostProcessor())
+                    .build();
+
         testContext = context;
         final AttributeFilterServiceStrategy strategy = new AttributeFilterServiceStrategy();
         strategy.setId("ID");
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java
index 8c0ae42..b9df976 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/MetadataGeneratorTask.java
@@ -25,7 +25,7 @@ import java.util.List;
 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.installer.metadata.MetadataGenerator;
 import net.shibboleth.idp.installer.metadata.MetadataGeneratorParameters;
 import net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer;
@@ -33,9 +33,6 @@ import net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.ClassPathResource;
@@ -208,13 +205,12 @@ public class MetadataGeneratorTask extends Task {
 
             final Resource resource = new ClassPathResource("net/shibboleth/idp/installer/metadata-generator.xml");
 
-            final ApplicationContextInitializer initializer = new Initializer();
-
-            final GenericApplicationContext context =
-                    SpringSupport.newContext(MetadataGeneratorTask.class.getName(),
-                            Collections.singletonList(resource), Collections.<BeanFactoryPostProcessor> emptyList(),
-                            Collections.<BeanPostProcessor> emptyList(), Collections.singletonList(initializer), null);
-
+            final GenericApplicationContext context = new ApplicationContextBuilder()
+                    .setName(MetadataGeneratorTask.class.getName())
+                    .setServiceConfigurations(Collections.singletonList(resource))
+                    .setContextInitializer(new Initializer())
+                    .build();
+            
             parameters = context.getBean("IdPConfiguration", MetadataGeneratorParameters.class);
 
             if (encryptionCert != null) {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.