[java-shib-metadata] branch main updated: Eliminate unneeded test beans and move context creation to our builder.
Scott Cantor
cantor.2 at osu.edu
Wed Jun 14 13:13:20 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-metadata.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=2bc2ab6c9a16728d5aeed741d6bb7c337ead608c
The following commit(s) were added to refs/heads/main by this push:
new 2bc2ab6c Eliminate unneeded test beans and move context creation to our builder.
2bc2ab6c is described below
commit 2bc2ab6c9a16728d5aeed741d6bb7c337ead608c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jun 14 09:13:17 2023 -0400
Eliminate unneeded test beans and move context creation to our builder.
---
.../http/HTTPResourceConfigurationTests.java | 40 ++++++++--------------
.../shibboleth/spring/failfast/metadataBeans.xml | 20 -----------
.../spring/failfast/metadataBeansDefaultFF.xml | 20 -----------
.../net/shibboleth/spring/http/HTTPResources.xml | 4 ---
.../net/shibboleth/spring/http/parent.xml | 30 ----------------
.../net/shibboleth/spring/metadata/beans.xml | 7 +---
.../spring/metadata/filter/algorithmBeans.xml | 2 +-
7 files changed, 17 insertions(+), 106 deletions(-)
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java
index 489df91e..8ba0285f 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java
@@ -24,7 +24,6 @@ import java.nio.file.Path;
import javax.annotation.Nonnull;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
@@ -34,8 +33,9 @@ import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Test;
import net.shibboleth.shared.annotation.constraint.NonnullBeforeTest;
-import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
+import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
import net.shibboleth.shared.testing.RepositorySupport;
import net.shibboleth.shared.testing.ResourceTestHelper;
@@ -57,32 +57,21 @@ public class HTTPResourceConfigurationTests {
@NonnullBeforeTest private GenericApplicationContext globalContext = null;
@BeforeSuite public void setup() throws IOException {
- MockPropertySource propSource = new MockPropertySource("localProperties");
- propSource.setProperty(PROP_RESOURCE_URL, RepositorySupport.buildHTTPResourceURL(REPO_IDP, DOC_XML, false));
-
final Path p = Files.createTempDirectory("HTTPResourceConfigurationTests");
theDir = p.toFile();
- globalContext = new GenericApplicationContext();
-
- globalContext.getEnvironment().getPropertySources().addFirst(propSource);
-
- final XmlBeanDefinitionReader globalContextDefinitionReader =
- new SchemaTypeAwareXMLBeanDefinitionReader(globalContext);
-
- globalContextDefinitionReader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
- globalContextDefinitionReader.loadBeanDefinitions(new ClassPathResource("net/shibboleth/spring/http/parent.xml"));
- globalContext.refresh();
-
- theContext = new GenericApplicationContext(globalContext);
- theContext.getBeanFactory().registerSingleton("theDir", theDir);
+ final ApplicationContextBuilder globalBuilder = new ApplicationContextBuilder();
+ final MockPropertySource propSource = new MockPropertySource("localProperties");
+ propSource.setProperty(PROP_RESOURCE_URL, RepositorySupport.buildHTTPResourceURL(REPO_IDP, DOC_XML, false));
+ globalBuilder.setPropertySources(CollectionSupport.singletonList(propSource));
+ //globalBuilder.setServiceConfiguration(new ClassPathResource("net/shibboleth/spring/http/parent.xml"));
+ globalContext = globalBuilder.build();
+ globalContext.getBeanFactory().registerSingleton("theDir", theDir);
- final XmlBeanDefinitionReader beanDefinitionReader =
- new SchemaTypeAwareXMLBeanDefinitionReader(theContext);
-
- beanDefinitionReader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
- beanDefinitionReader.loadBeanDefinitions(new ClassPathResource("net/shibboleth/spring/http/HTTPResources.xml"));
- theContext.refresh();
+ final ApplicationContextBuilder childBuilder = new ApplicationContextBuilder();
+ childBuilder.setParentContext(globalContext);
+ childBuilder.setServiceConfiguration(new ClassPathResource("net/shibboleth/spring/http/HTTPResources.xml"));
+ theContext = childBuilder.build();
}
@AfterSuite public void tearDown() {
@@ -128,4 +117,5 @@ public class HTTPResourceConfigurationTests {
@Test public void file() throws IOException {
testResource(getResource("fileResource"));
}
-}
+
+}
\ No newline at end of file
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml
index 683e45fc..51eaf702 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeans.xml
@@ -8,27 +8,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize" default-destroy-method="destroy">
-
- <bean id="shibboleth.PropertySourcesPlaceholderConfigurer" destroy-method=""
- class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
- p:placeholderPrefix="%{" p:placeholderSuffix="}" />
- <!-- This bean MUST be called "conversionService" to work properly. -->
- <bean id="conversionService" destroy-method=""
- class="org.springframework.context.support.ConversionServiceFactoryBean">
- <property name="converters">
- <set>
- <bean class="net.shibboleth.shared.spring.config.StringToIPRangeConverter" destroy-method=""/>
- <bean class="net.shibboleth.shared.spring.config.BooleanToPredicateConverter" destroy-method=""/>
- <bean class="net.shibboleth.shared.spring.config.StringBooleanToPredicateConverter" destroy-method=""/>
- <bean class="net.shibboleth.shared.spring.config.StringToResourceConverter" destroy-method=""/>
- <bean class="net.shibboleth.shared.spring.config.FunctionToFunctionConverter" destroy-method=""/>
- <bean class="net.shibboleth.shared.spring.config.PredicateToPredicateConverter" destroy-method=""/>
- <bean class="net.shibboleth.shared.spring.config.StringToDurationConverter" destroy-method=""/>
- </set>
- </property>
- </bean>
-
<bean id="myParserPool"
class="net.shibboleth.shared.xml.impl.BasicParserPool"
p:maxPoolSize="1000"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml
index f6e3d372..6e200000 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/failfast/metadataBeansDefaultFF.xml
@@ -8,27 +8,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
default-init-method="initialize" default-destroy-method="destroy">
-
- <bean id="shibboleth.PropertySourcesPlaceholderConfigurer" destroy-method=""
- class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
- p:placeholderPrefix="%{" p:placeholderSuffix="}" />
- <!-- This bean MUST be called "conversionService" to work properly. -->
- <bean id="conversionService" destroy-method=""
- class="org.springframework.context.support.ConversionServiceFactoryBean">
- <property name="converters">
- <set>
- <bean class="net.shibboleth.shared.spring.config.StringToIPRangeConverter" destroy-method=""/>
- <bean class="net.shibboleth.shared.spring.config.BooleanToPredicateConverter" destroy-method=""/>
- <bean class="net.shibboleth.shared.spring.config.StringBooleanToPredicateConverter" destroy-method=""/>
- <bean class="net.shibboleth.shared.spring.config.StringToResourceConverter" destroy-method=""/>
- <bean class="net.shibboleth.shared.spring.config.FunctionToFunctionConverter" destroy-method=""/>
- <bean class="net.shibboleth.shared.spring.config.PredicateToPredicateConverter" destroy-method=""/>
- <bean class="net.shibboleth.shared.spring.config.StringToDurationConverter" destroy-method=""/>
- </set>
- </property>
- </bean>
-
<bean id="myParserPool"
class="net.shibboleth.shared.xml.impl.BasicParserPool"
p:maxPoolSize="1000"
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml
index 21a2ca6a..45378dcb 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml
@@ -4,10 +4,6 @@
xmlns:c="http://www.springframework.org/schema/c"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
- class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
- p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
<bean id="clientBuilder"
class="net.shibboleth.shared.httpclient.FileCachingHttpClientBuilder"
p:maxCacheEntries="3" p:cacheDirectory-ref="theDir" />
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/parent.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/parent.xml
deleted file mode 100644
index d9364c39..00000000
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/parent.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
- default-init-method="initialize">
-
- <bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
- class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
- p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
- <!-- This bean MUST be called "conversionService" to work properly. -->
- <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
- <property name="converters">
- <set>
- <bean class="net.shibboleth.shared.spring.config.StringToIPRangeConverter" />
- <bean class="net.shibboleth.shared.spring.config.BooleanToPredicateConverter" />
- <bean class="net.shibboleth.shared.spring.config.StringBooleanToPredicateConverter" />
- <bean class="net.shibboleth.shared.spring.config.StringToResourceConverter" />
- <bean class="net.shibboleth.shared.spring.config.StringToDurationConverter" />
- </set>
- </property>
- </bean>
-</beans>
\ No newline at end of file
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml
index e63a756a..76fad639 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/beans.xml
@@ -9,17 +9,12 @@
default-init-method="initialize" default-destroy-method="destroy" default-lazy-init="true">
- <bean id="shibboleth.PropertySourcesPlaceholderConfigurer" destroy-method=""
- class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
- p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
<bean id="shibboleth.ParserPool"
class="net.shibboleth.shared.xml.impl.BasicParserPool"
p:maxPoolSize="100"
p:coalescing="true" p:ignoreComments="true"
p:ignoreElementContentWhitespace="true" p:namespaceAware="true" />
-
<bean id="myParserPool"
class="net.shibboleth.shared.xml.impl.BasicParserPool"
p:maxPoolSize="1000"
@@ -72,7 +67,7 @@
</bean>
<bean id="predicate.AlwaysFalse" destroy-method=""
- class="com.google.common.base.Predicates" factory-method="alwaysFalse" />
+ class="net.shibboleth.shared.logic.PredicateSupport" factory-method="alwaysFalse" />
<bean id="metadata.persistentCacheManager" destroy-method=""
class="org.opensaml.core.xml.persist.MapLoadSaveManager" />
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/algorithmBeans.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/algorithmBeans.xml
index 78d85a40..0fcb592f 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/algorithmBeans.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/metadata/filter/algorithmBeans.xml
@@ -9,6 +9,6 @@
default-init-method="initialize" default-lazy-init="true">
- <bean id="predicate.AlwaysFalse" class="com.google.common.base.Predicates" factory-method="alwaysFalse" />
+ <bean id="predicate.AlwaysFalse" class="net.shibboleth.shared.logic.PredicateSupport" factory-method="alwaysFalse" />
</beans>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list