[java-shib-attribute] 01/06: JSSH-71 Remove the impact of the DestructableComponent Interface

Codeberg noreply at shibboleth.net
Wed Jul 22 14:16:00 UTC 2026


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

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

View the commit online:
https://codeberg.org/Shibboleth/java-shib-attribute/commit/dad1bf3cba6dd23b48fcc9b063162cd71eb262ae

commit dad1bf3cba6dd23b48fcc9b063162cd71eb262ae
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jul 20 19:16:01 2026 +0100

    JSSH-71 Remove the impact of the DestructableComponent Interface
    
    https://shibboleth.atlassian.net/browse/JSSH-71
    
    Remove all builder.setDestroyMethodName("destroy") from the custom
    resolver and filter parsers
---
 .../shibboleth/idp/attribute/filter/spring/BaseFilterParser.java    | 1 -
 .../idp/attribute/filter/spring/basic/impl/AnyParser.java           | 1 -
 .../filter/spring/matcher/BaseAttributeValueMatcherParser.java      | 3 ---
 .../attribute/filter/spring/policyrule/BasePolicyRuleParser.java    | 1 -
 .../idp/attribute/resolver/spring/BaseResolverPluginParser.java     | 1 -
 .../spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java     | 1 -
 .../attribute/resolver/spring/ad/mapped/impl/SourceValueParser.java | 1 -
 .../resolver/spring/dc/http/impl/HTTPDataConnectorParser.java       | 3 ---
 .../resolver/spring/dc/impl/ComputedIdDataConnectorParser.java      | 1 -
 .../resolver/spring/dc/impl/StoredIdDataConnectorParser.java        | 1 -
 .../resolver/spring/dc/impl/SubjectDataConnectorParser.java         | 1 -
 .../resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java       | 4 +---
 .../resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java     | 3 ---
 .../spring/dc/saml/impl/AbstractSAMLDataConnectorParser.java        | 6 ------
 .../dc/saml/impl/SimpleAggregationSAMLDataConnectorParser.java      | 3 ---
 .../spring/dc/storage/impl/StorageServiceDataConnectorParser.java   | 2 --
 16 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java
index e1afa6499..bf3f730da 100644
--- a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java
+++ b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/BaseFilterParser.java
@@ -150,7 +150,6 @@ public abstract class BaseFilterParser extends AbstractCustomBeanDefinitionParse
         super.doParse(element, parserContext, builder);
 
         builder.setInitMethodName("initialize");
-        builder.setDestroyMethodName("destroy");
         
         // We use a prototype scope because it eliminates the overhead during context closure,
         // which is a problem when there are thousands of singletons. This means the destroy()
diff --git a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/AnyParser.java b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/AnyParser.java
index f25ba9b4c..824d2d8b0 100644
--- a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/AnyParser.java
+++ b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/impl/AnyParser.java
@@ -48,6 +48,5 @@ public class AnyParser extends BaseFilterParser {
         // This one is neither initializable not destructable
         //
         builder.setInitMethodName(null);
-        builder.setDestroyMethodName(null);
     }
 }
\ No newline at end of file
diff --git a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java
index 7d4f6b354..59cac4463 100644
--- a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java
+++ b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/matcher/BaseAttributeValueMatcherParser.java
@@ -99,7 +99,6 @@ public abstract class BaseAttributeValueMatcherParser extends BaseFilterParser {
                     BeanDefinitionBuilder.genericBeanDefinition(getNativeBeanClass());
             
             childBuilder.setInitMethodName("initialize");
-            childBuilder.setDestroyMethodName("destroy");
 
             doNativeParse(element, parserContext, childBuilder);
             childBuilder.addPropertyValue("id", "PMId:" + myId);
@@ -113,12 +112,10 @@ public abstract class BaseAttributeValueMatcherParser extends BaseFilterParser {
             final BeanDefinitionBuilder childBuilder =
                     BeanDefinitionBuilder.genericBeanDefinition(PolicyFromMatcherId.class);
             childBuilder.setInitMethodName("initialize");
-            childBuilder.setDestroyMethodName("destroy");
             
             final BeanDefinitionBuilder grandChildBuilder =
                     BeanDefinitionBuilder.genericBeanDefinition(getNativeBeanClass());
             grandChildBuilder.setInitMethodName("initialize");
-            grandChildBuilder.setDestroyMethodName("destroy");
 
             doNativeParse(element, parserContext, grandChildBuilder);
             grandChildBuilder.addPropertyValue("id", "PMId:" + myId);
diff --git a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/BasePolicyRuleParser.java b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/BasePolicyRuleParser.java
index 188e8df92..c49b019ba 100644
--- a/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/BasePolicyRuleParser.java
+++ b/shib-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/BasePolicyRuleParser.java
@@ -86,7 +86,6 @@ public abstract class BasePolicyRuleParser extends BaseFilterParser {
                     BeanDefinitionBuilder.genericBeanDefinition(getNativeBeanClass());
 
             childBuilder.setInitMethodName("initialize");
-            childBuilder.setDestroyMethodName("destroy");
 
             doNativeParse(element, parserContext, childBuilder);
             childBuilder.addPropertyValue("id", "PMId:" + myId);
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
index d7d47f7fe..9952a44ac 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
@@ -99,7 +99,6 @@ public abstract class BaseResolverPluginParser extends AbstractCustomBeanDefinit
             defnId = id;
         }
         builder.setInitMethodName("initialize");
-        builder.setDestroyMethodName("destroy");
 
         if (config.hasAttributeNS(null, "activationConditionRef")) {
             if (config.hasAttributeNS(null, "relyingParties") ||
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
index f28f09ef9..397a73258 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/impl/SubjectDerivedAttributeDefinitionParser.java
@@ -104,7 +104,6 @@ public class SubjectDerivedAttributeDefinitionParser extends BaseAttributeDefini
         final BeanDefinitionBuilder contextFunctionBuilder =
                 BeanDefinitionBuilder.genericBeanDefinition(subjectDerivedClass);
         contextFunctionBuilder.setInitMethodName("initialize");
-        contextFunctionBuilder.setDestroyMethodName("destroy");
         contextFunctionBuilder.addPropertyValue("id", getDefinitionId());
 
         if (config.hasAttributeNS(null, "forCanonicalization")) {
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/SourceValueParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/SourceValueParser.java
index 9b69a8064..628c30a64 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/SourceValueParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/impl/SourceValueParser.java
@@ -52,7 +52,6 @@ public class SourceValueParser extends AbstractCustomBeanDefinitionParser {
         super.doParse(config, parserContext, builder);
 
         builder.setInitMethodName("initialize");
-        builder.setDestroyMethodName("destroy");
         
         final String value = config.getTextContent();
         builder.addPropertyValue("value", value);
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
index 7b07b5e56..63425e216 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
@@ -136,7 +136,6 @@ public class HTTPDataConnectorParser extends AbstractDataConnectorParser {
         }
 
         builder.setInitMethodName("initialize");
-        builder.setDestroyMethodName("destroy");
     }
 // Checkstyle: CyclomaticComplexity|MethodLength ON
     
@@ -238,7 +237,6 @@ public class HTTPDataConnectorParser extends AbstractDataConnectorParser {
             final BeanDefinitionBuilder templateBuilder =
                     BeanDefinitionBuilder.genericBeanDefinition(TemplatedURLBuilder.class);
             templateBuilder.setInitMethodName("initialize");
-            templateBuilder.setDestroyMethodName("destroy");
 
             String velocityEngineRef = StringSupport.trimOrNull(configElement.getAttributeNS(null, "templateEngine"));
             if (null == velocityEngineRef) {
@@ -300,7 +298,6 @@ public class HTTPDataConnectorParser extends AbstractDataConnectorParser {
             final BeanDefinitionBuilder templateBuilder =
                     BeanDefinitionBuilder.genericBeanDefinition(TemplatedBodyBuilder.class);
             templateBuilder.setInitMethodName("initialize");
-            templateBuilder.setDestroyMethodName("destroy");
 
             String velocityEngineRef = StringSupport.trimOrNull(configElement.getAttributeNS(null, "templateEngine"));
             if (null == velocityEngineRef) {
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
index 63d99325c..b7f46036b 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
@@ -71,7 +71,6 @@ public class ComputedIdDataConnectorParser extends PairwiseIdDataConnectorParser
         final BeanDefinitionBuilder builder =
                 BeanDefinitionBuilder.genericBeanDefinition(ComputedPairwiseIdStore.class);
         builder.setInitMethodName("initialize");
-        builder.setDestroyMethodName("destroy");
 
         if (config.hasAttributeNS(null, "algorithm")) {
             builder.addPropertyValue("algorithm", config.getAttributeNS(null, "algorithm"));
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java
index 50a525249..75e4ebe82 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java
@@ -63,7 +63,6 @@ public class StoredIdDataConnectorParser extends ComputedIdDataConnectorParser {
         final BeanDefinitionBuilder builder =
                 BeanDefinitionBuilder.genericBeanDefinition(JDBCPairwiseIdStore.class);
         builder.setInitMethodName("initialize");
-        builder.setDestroyMethodName("destroy");
 
         final String beanDataSource = ManagedConnectionParser.getBeanDataSourceID(config);
         if (beanDataSource != null) {
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
index 159c709ea..fa1e38a66 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
@@ -85,7 +85,6 @@ public class SubjectDataConnectorParser extends AbstractDataConnectorParser {
         final BeanDefinitionBuilder contextFunctionBuilder =
                 BeanDefinitionBuilder.genericBeanDefinition(subjectDerivedClass);
         contextFunctionBuilder.setInitMethodName("initialize");
-        contextFunctionBuilder.setDestroyMethodName("destroy");
         contextFunctionBuilder.addPropertyValue("id", getDefinitionId());
 
         if (element.hasAttributeNS(null, "forCanonicalization")) {
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index 4b419a1d7..0ac712e79 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -200,8 +200,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
         }
 
         builder.setInitMethodName("initialize");
-        builder.setDestroyMethodName("destroy");
-    }
+}
 
     // Checkstyle: CyclomaticComplexity|MethodLength ON
 
@@ -668,7 +667,6 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
                 connectionFactory.addPropertyValue("failFastInitialize", FAIL_FAST_DEFAULT);
             }
             connectionFactory.setInitMethodName("initialize");
-            connectionFactory.setDestroyMethodName("close");
             return connectionFactory.getBeanDefinition();
         }
 
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
index 3664edc08..1b7b38b01 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
@@ -118,7 +118,6 @@ public class RDBMSDataConnectorParser extends AbstractDataConnectorParser {
         }
 
         builder.setInitMethodName("initialize");
-        builder.setDestroyMethodName("destroy");
     }
 
     /**
@@ -176,7 +175,6 @@ public class RDBMSDataConnectorParser extends AbstractDataConnectorParser {
             final BeanDefinitionBuilder templateBuilder =
                     BeanDefinitionBuilder.genericBeanDefinition(TemplatedExecutableStatementBuilder.class);
             templateBuilder.setInitMethodName("initialize");
-            templateBuilder.setDestroyMethodName("destroy");
 
             String velocityEngineRef = StringSupport.trimOrNull(configElement.getAttribute("templateEngine"));
             if (null == velocityEngineRef) {
@@ -206,7 +204,6 @@ public class RDBMSDataConnectorParser extends AbstractDataConnectorParser {
             templateBuilder.addPropertyValue("templateText", queryText);
 
             templateBuilder.setInitMethodName("initialize");
-            templateBuilder.setDestroyMethodName("destroy");
             return templateBuilder.getBeanDefinition();
         }
         
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/saml/impl/AbstractSAMLDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/saml/impl/AbstractSAMLDataConnectorParser.java
index 28c8d8ea8..4b343bb4f 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/saml/impl/AbstractSAMLDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/saml/impl/AbstractSAMLDataConnectorParser.java
@@ -210,7 +210,6 @@ public abstract class AbstractSAMLDataConnectorParser extends AbstractDataConnec
                 SpringSupport.parseCustomElements(dataConnectorDependencyElements, parserContext, samlBuilder));
         
         samlBuilder.setInitMethodName("initialize");
-        samlBuilder.setDestroyMethodName("destroy");
         
         return samlBuilder.getBeanDefinition();
     }
@@ -240,7 +239,6 @@ public abstract class AbstractSAMLDataConnectorParser extends AbstractDataConnec
                 "attributeFilterService");
         
         mappingBuilder.setInitMethodName("initialize");
-        mappingBuilder.setDestroyMethodName("destroy");
         
         return mappingBuilder.getBeanDefinition();
     }
@@ -299,7 +297,6 @@ public abstract class AbstractSAMLDataConnectorParser extends AbstractDataConnec
         }
         
         queryBuilder.setInitMethodName("initialize");
-        queryBuilder.setDestroyMethodName("destroy");
         
         return queryBuilder.getBeanDefinition();
     }
@@ -319,7 +316,6 @@ public abstract class AbstractSAMLDataConnectorParser extends AbstractDataConnec
                 BeanDefinitionBuilder.genericBeanDefinition(CriteriaDecryptionConfigurationLookup.class);
         addCustomProperties(configLookupBuilder, "decryptionConfigurationResolver", "securityConfigurationProfileId");
         configLookupBuilder.setInitMethodName("initialize");
-        configLookupBuilder.setDestroyMethodName("destroy");
 
         final BeanDefinitionBuilder builder =
                 BeanDefinitionBuilder.genericBeanDefinition(DecryptionProcessor.class);
@@ -328,7 +324,6 @@ public abstract class AbstractSAMLDataConnectorParser extends AbstractDataConnec
         addCustomProperties(builder, "decryptionParametersResolver");
         
         builder.setInitMethodName("initialize");
-        builder.setDestroyMethodName("destroy");
 
         return builder.getBeanDefinition();
     }
@@ -350,7 +345,6 @@ public abstract class AbstractSAMLDataConnectorParser extends AbstractDataConnec
         addCustomProperties(builder, "assertionValidationContextBuilder", "assertionValidator");
         
         builder.setInitMethodName("initialize");
-        builder.setDestroyMethodName("destroy");
 
         return builder.getBeanDefinition();
     }
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/saml/impl/SimpleAggregationSAMLDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/saml/impl/SimpleAggregationSAMLDataConnectorParser.java
index 3b3eb8632..d20390eef 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/saml/impl/SimpleAggregationSAMLDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/saml/impl/SimpleAggregationSAMLDataConnectorParser.java
@@ -110,7 +110,6 @@ public class SimpleAggregationSAMLDataConnectorParser extends AbstractSAMLDataCo
         builder.addPropertyValue("entityIDSources", entityIDSources);
         
         builder.setInitMethodName("initialize");
-        builder.setDestroyMethodName("destroy");
     }
 
     /** {@inheritDoc} */
@@ -137,7 +136,6 @@ public class SimpleAggregationSAMLDataConnectorParser extends AbstractSAMLDataCo
         addCustomProperties(strategyBuilder, "selfEntityIDResolver");
         
         strategyBuilder.setInitMethodName("initialize");
-        strategyBuilder.setDestroyMethodName("destroy");
 
         return strategyBuilder.getBeanDefinition();
     }
@@ -169,7 +167,6 @@ public class SimpleAggregationSAMLDataConnectorParser extends AbstractSAMLDataCo
         }
 
         strategyBuilder.setInitMethodName("initialize");
-        strategyBuilder.setDestroyMethodName("destroy");
 
         return strategyBuilder.getBeanDefinition();
     }
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParser.java
index 9e1e8b788..7af26c56a 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/storage/impl/StorageServiceDataConnectorParser.java
@@ -108,7 +108,6 @@ public class StorageServiceDataConnectorParser extends AbstractDataConnectorPars
         }
 
         builder.setInitMethodName("initialize");
-        builder.setDestroyMethodName("destroy");
     }
 
     /**
@@ -165,7 +164,6 @@ public class StorageServiceDataConnectorParser extends AbstractDataConnectorPars
             final BeanDefinitionBuilder templateBuilder =
                     BeanDefinitionBuilder.genericBeanDefinition(TemplatedSearchBuilder.class);
             templateBuilder.setInitMethodName("initialize");
-            templateBuilder.setDestroyMethodName("destroy");
 
             String velocityEngineRef = StringSupport.trimOrNull(configElement.getAttributeNS(null, "templateEngine"));
             if (null == velocityEngineRef) {

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


More information about the commits mailing list