[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filte...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Dec 17 03:16:49 2014
New Revision: 7131

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7131&view=rev
Log:
IDP-543 Ensure that all beans created by a factory and custom schemas are destroyed correctly.
IDP-542 By way of a test we do the tear down of all created application contexts for all tests based on AbstractMetadataParser

Modified:
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/PatternFactoryBean.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/CredentialConfigFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileCachingHttpClientFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractBasicCredentialFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractX509CredentialFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/AbstractBasicPKIXValidationInfoFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/ChainingSignatureTrustEngineFactory.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataParserTest.java

Modified: trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java?rev=7131&r1=7130&r2=7131&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java (original)
+++ trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java Wed Dec 17 03:16:49 2014
@@ -34,7 +34,6 @@
 import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.component.DestroyedComponentException;
 import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
 
 import org.testng.Assert;
@@ -381,14 +380,6 @@
         Assert.assertTrue(policyRule.isDestroyed());
         Assert.assertTrue(matcher.isInitialized());
         Assert.assertTrue(matcher.isDestroyed());
-
-        try {
-            ComponentSupport.initialize(filter);
-
-            Assert.fail();
-        } catch (DestroyedComponentException e) {
-            // OK
-        }
     }
 
 }

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/PatternFactoryBean.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/PatternFactoryBean.java?rev=7131&r1=7130&r2=7131&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/PatternFactoryBean.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/PatternFactoryBean.java Wed Dec 17 03:16:49 2014
@@ -19,12 +19,12 @@
 
 import java.util.regex.Pattern;
 
-import org.springframework.beans.factory.config.AbstractFactoryBean;
+import net.shibboleth.ext.spring.factory.AbstractComponentAwareFactoryBean;
 
 /**
  * Factory bean for {@link Pattern}. Allows us to inject property based case sensitivity.
  */
-public class PatternFactoryBean extends AbstractFactoryBean<Pattern> {
+public class PatternFactoryBean extends AbstractComponentAwareFactoryBean<Pattern> {
 
     /** Whether the we are case sensitive or not. */
     private Boolean caseSensitive;
@@ -74,7 +74,7 @@
     }
 
     /** {@inheritDoc} */
-    @Override protected Pattern createInstance() throws Exception {
+    @Override protected Pattern doCreateInstance() throws Exception {
         if (null == getCaseSensitive() || getCaseSensitive()) {
             return Pattern.compile(regexp, 0);
         } else {


[... 382 lines stripped ...]