[java-shib-attribute] branch main updated: Eliminate unneeded beans from tests.
Scott Cantor
cantor.2 at osu.edu
Wed Jun 14 13:21:37 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-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=8d02c3f9cb9eb46115a31d6106d3f917c24a7956
The following commit(s) were added to refs/heads/main by this push:
new 8d02c3f9c Eliminate unneeded beans from tests.
8d02c3f9c is described below
commit 8d02c3f9cb9eb46115a31d6106d3f917c24a7956
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jun 14 09:21:33 2023 -0400
Eliminate unneeded beans from tests.
---
.../resolver/failfast/attributeResolverBeans.xml | 20 --------------------
.../failfast/attributeResolverBeansDefaultFF.xml | 20 --------------------
.../idp/attribute/resolver/spring/customBean.xml | 2 +-
.../resolver/spring/dc/http/spring-beans.xml | 4 ----
.../resolver/spring/dc/storage/spring-beans.xml | 4 ----
.../attribute/resolver/spring/idp-1676-service.xml | 2 +-
.../idp/attribute/resolver/spring/storageService.xml | 14 ++------------
.../idp/saml/attribute/impl/customBean.xml | 4 ----
8 files changed, 4 insertions(+), 66 deletions(-)
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeans.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeans.xml
index f5d805fb4..05fd9769f 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeans.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeans.xml
@@ -9,27 +9,8 @@
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" 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.FunctionToFunctionConverter" />
- <bean class="net.shibboleth.shared.spring.config.PredicateToPredicateConverter" />
- <bean class="net.shibboleth.shared.spring.config.StringToDurationConverter" />
- </set>
- </property>
- </bean>
<bean id="shibboleth.VelocityEngine" destroy-method=""
class="net.shibboleth.shared.spring.velocity.VelocityEngineFactoryBean">
@@ -54,7 +35,6 @@
<bean id="shibboleth.AttributeResolverService" class="net.shibboleth.shared.spring.service.ReloadableSpringService"
p:serviceConfigurations="%{ServiceConfiguration}"
- p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer"
p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
p:failFast="%{failFast}"
p:reloadCheckDelay="0">
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeansDefaultFF.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeansDefaultFF.xml
index 1ae5e17c2..547c883b4 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeansDefaultFF.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverBeansDefaultFF.xml
@@ -9,28 +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" 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.FunctionToFunctionConverter" />
- <bean class="net.shibboleth.shared.spring.config.PredicateToPredicateConverter" />
- <bean class="net.shibboleth.shared.spring.config.StringToDurationConverter" />
- </set>
- </property>
- </bean>
-
<bean id="shibboleth.VelocityEngine" destroy-method=""
class="net.shibboleth.shared.spring.velocity.VelocityEngineFactoryBean">
<property name="velocityProperties">
@@ -54,7 +35,6 @@
<bean id="shibboleth.AttributeResolverService" 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.resolver.AttributeResolver" />
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
index df9cb4f98..d38448f1d 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
@@ -20,7 +20,7 @@
</util:map>
<bean id="shibboleth.Predicate" destroy-method=""
- class="com.google.common.base.Predicates" factory-method="alwaysFalse"/>
+ class="net.shibboleth.shared.logic.PredicateSupport" factory-method="alwaysFalse"/>
<bean id="shibboleth.PropertySourcesPlaceholderConfigurer" destroy-method=""
class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/spring-beans.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/spring-beans.xml
index 079ae126f..00d35bc31 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/spring-beans.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/spring-beans.xml
@@ -46,9 +46,5 @@
</props>
</property>
</bean>
-
- <bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
- class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
- p:placeholderPrefix="%{" p:placeholderSuffix="}" />
</beans>
\ No newline at end of file
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storage/spring-beans.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storage/spring-beans.xml
index b7bd273b0..b7281957b 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storage/spring-beans.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/storage/spring-beans.xml
@@ -20,10 +20,6 @@
</props>
</property>
</bean>
-
- <bean id="shibboleth.PropertySourcesPlaceholderConfigurer"
- class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
- p:placeholderPrefix="%{" p:placeholderSuffix="}" />
<bean id="myStorageService" p:id="myStorageService" class="org.opensaml.storage.impl.MemoryStorageService" />
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idp-1676-service.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idp-1676-service.xml
index fd0b084df..8de668322 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idp-1676-service.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/idp-1676-service.xml
@@ -11,7 +11,7 @@
<!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
<bean id="shibboleth.IdentifiableBeanPostProcessor" destroy-method=""
class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
-
+
<bean id="shibboleth.VelocityEngine" destroy-method=""
class="net.shibboleth.shared.spring.velocity.VelocityEngineFactoryBean">
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/storageService.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/storageService.xml
index 7c2140e50..2adf4b26d 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/storageService.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/storageService.xml
@@ -7,18 +7,8 @@
default-init-method="initialize"
default-destroy-method="destroy">
-
- <!-- This bean MUST be called "conversionService" to work properly. -->
- <bean id="conversionService" destroy-method=""
- class="org.springframework.context.support.ConversionServiceFactoryBean">
- <property name="converters">
- <list>
- <bean class="net.shibboleth.shared.spring.config.StringToIPRangeConverter" destroy-method=""/>
- <bean class="net.shibboleth.shared.spring.config.StringToDurationConverter" destroy-method=""/>
- <bean class="net.shibboleth.shared.spring.config.StringToResourceConverter" destroy-method="" />
- </list>
- </property>
- </bean>
+
<bean id="shibboleth.StorageService" p:id="test" class="org.opensaml.storage.impl.MemoryStorageService"
p:cleanupInterval="PT10M" />
+
</beans>
diff --git a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/saml/attribute/impl/customBean.xml b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/saml/attribute/impl/customBean.xml
index 0c35475de..fd946f060 100644
--- a/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/saml/attribute/impl/customBean.xml
+++ b/shib-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/saml/attribute/impl/customBean.xml
@@ -21,10 +21,6 @@
<bean id="shibboleth.Predicate" destroy-method=""
class="net.shibboleth.shared.logic.PredicateSupport" factory-method="alwaysFalse"/>
-
- <bean id="shibboleth.PropertySourcesPlaceholderConfigurer" destroy-method=""
- class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
- p:placeholderPrefix="%{" p:placeholderSuffix="}" />
<!-- Necessary for encoder parsing to function, normally part of registry wiring. -->
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list