[java-shib-attribute] branch main updated: Eliminate unneeded beans from tests.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-shib-attribute.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=ba0dd8a29de3b3cca30986f3d8340f4ec8ea4444

The following commit(s) were added to refs/heads/main by this push:
     new ba0dd8a29 Eliminate unneeded beans from tests.
ba0dd8a29 is described below

commit ba0dd8a29de3b3cca30986f3d8340f4ec8ea4444
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jun 14 09:23:46 2023 -0400

    Eliminate unneeded beans from tests.
---
 .../idp/attribute/filter/failfast/filterBeans.xml   | 21 ---------------------
 .../filter/failfast/filterBeansDefaultFF.xml        | 21 ---------------------
 2 files changed, 42 deletions(-)

diff --git a/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeans.xml b/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeans.xml
index 84831f911..4de8cddfe 100644
--- a/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeans.xml
+++ b/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeans.xml
@@ -9,29 +9,9 @@
 
 	default-init-method="initialize" default-destroy-method="destroy">
 
-    <bean id="shibboleth.PropertySourcesPlaceholderConfigurer" destroy-method=""
-        class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
-        p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
     <bean id="shibboleth.IdentifiableBeanPostProcessor" destroy-method=""
         class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
 
-    <!-- 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"
@@ -40,7 +20,6 @@
         
     <bean id="shibboleth.AttributeFilterService" class="net.shibboleth.shared.spring.service.ReloadableSpringService"
         p:serviceConfigurations="%{ServiceConfiguration}"
-        p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer"
         p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
         p:reloadCheckDelay="0"
         p:failFast="%{failFast}">
diff --git a/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeansDefaultFF.xml b/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeansDefaultFF.xml
index 1ae0fe22b..188db2b12 100644
--- a/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeansDefaultFF.xml
+++ b/shib-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/failfast/filterBeansDefaultFF.xml
@@ -9,29 +9,9 @@
 
 	default-init-method="initialize" default-destroy-method="destroy">
 
-    <bean id="shibboleth.PropertySourcesPlaceholderConfigurer" destroy-method=""
-        class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
-        p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
     <bean id="shibboleth.IdentifiableBeanPostProcessor" destroy-method=""
         class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
 
-    <!-- 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"
@@ -40,7 +20,6 @@
         
     <bean id="shibboleth.AttributeFilterService" class="net.shibboleth.shared.spring.service.ReloadableSpringService"
         p:serviceConfigurations="%{ServiceConfiguration}"
-        p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer"
         p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
         p:reloadCheckDelay="0">
         <constructor-arg name="claz" value="net.shibboleth.idp.attribute.filter.AttributeFilter" />

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