[java-shib-metadata] branch main updated: JSMD-4 - Remove unnecessary lazy-init declarations in parsers

[Codeberg]

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

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

View the commit online:
https://codeberg.org/Shibboleth/java-shib-metadata/commit/3335a24127061516c5c3daf3a6a475cc0d73bdd7

The following commit(s) were added to refs/heads/main by this push:
     new 3335a241 JSMD-4 - Remove unnecessary lazy-init declarations in parsers
3335a241 is described below

commit 3335a24127061516c5c3daf3a6a475cc0d73bdd7
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Tue Jul 14 14:54:57 2026 -0400

    JSMD-4 - Remove unnecessary lazy-init declarations in parsers
    
    https://shibboleth.atlassian.net/browse/JSMD-4
---
 .../shibboleth/spring/metadata/AbstractMetadataProviderParser.java    | 2 --
 .../spring/metadata/HTTPMetadataProvidersParserSupport.java           | 3 ++-
 .../spring/metadata/ResourceBackedMetadataProviderParser.java         | 4 ----
 .../spring/security/credential/AbstractCredentialParser.java          | 2 --
 .../shibboleth/spring/security/trust/AbstractTrustEngineParser.java   | 1 -
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
index 030e358f..d78ac652 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractMetadataProviderParser.java
@@ -168,7 +168,6 @@ public abstract class AbstractMetadataProviderParser extends AbstractCustomBeanD
         if (isTopMost(element)) {
             builder.setInitMethodName("initialize");
             builder.setDestroyMethodName("destroy");
-            builder.setLazyInit(true);
             
             final BeanDefinitionBuilder childBeanDefinitionBuilder =
                     BeanDefinitionBuilder.genericBeanDefinition(getNativeBeanClass(element));
@@ -203,7 +202,6 @@ public abstract class AbstractMetadataProviderParser extends AbstractCustomBeanD
 
         builder.setInitMethodName("initialize");
         builder.setDestroyMethodName("destroy");
-        builder.setLazyInit(true);
 
         final String resolverId = StringSupport.trimOrNull(element.getAttributeNS(null, "id"));
         builder.addPropertyValue("id", resolverId);
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java
index 82359816..794c0105 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/HTTPMetadataProvidersParserSupport.java
@@ -158,6 +158,7 @@ public final class HTTPMetadataProvidersParserSupport {
         return builder.getBeanDefinition();
     }
 
+// Checkstyle: CyclomaticComplexity OFF
     /**
      * Build a {@link BeanDefinitionBuilder} for a {@link HttpClientFactoryBean} and populate it from the "standard"
      * attributes which are shared between the Dynamic and Static providers. non standard defaults are applied by the
@@ -175,7 +176,6 @@ public final class HTTPMetadataProvidersParserSupport {
             @Nullable final BeanDefinition httpClientSecurityParameters) {
 
         final BeanDefinitionBuilder clientBuilder = BeanDefinitionBuilder.genericBeanDefinition(clientBuildClass);
-        clientBuilder.setLazyInit(true);
 
         if (element.hasAttributeNS(null, "connectionTimeout")) {
             clientBuilder.addPropertyValue("connectionTimeout",
@@ -227,5 +227,6 @@ public final class HTTPMetadataProvidersParserSupport {
 
         return clientBuilder;
     }
+// Checkstyle: CyclomaticComplexity ON
     
 }
\ No newline at end of file
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ResourceBackedMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ResourceBackedMetadataProviderParser.java
index 7c6c47c7..7892a2bb 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ResourceBackedMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/ResourceBackedMetadataProviderParser.java
@@ -35,9 +35,6 @@ import net.shibboleth.shared.xml.AttributeSupport;
 
 /**
  * Parser for a ResourceBackedMetadataProvider.
- * 
- * <p>This is the most complicated of the parsers. We reach into the resource and find out what sort it is
- * and them summon up an appropriate provider.</p>
  */
 public class ResourceBackedMetadataProviderParser extends AbstractReloadingMetadataProviderParser {
 
@@ -84,7 +81,6 @@ public class ResourceBackedMetadataProviderParser extends AbstractReloadingMetad
         
         final BeanDefinitionBuilder resourceConverter =
                 BeanDefinitionBuilder.genericBeanDefinition(ResourceHelper.class);
-        resourceConverter.setLazyInit(true);
         resourceConverter.setFactoryMethod("of");
         resourceConverter.addConstructorArgReference(beanRef);
         builder.addConstructorArgValue(resourceConverter.getBeanDefinition());
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java
index be1a0712..6404bf11 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/credential/AbstractCredentialParser.java
@@ -57,8 +57,6 @@ public abstract class AbstractCredentialParser extends AbstractCustomBeanDefinit
     @Override protected void doParse(@Nonnull final Element element, @Nonnull final ParserContext parserContext,
             @Nonnull final BeanDefinitionBuilder builder) {
         super.doParse(element, parserContext, builder);
-        
-        builder.setLazyInit(true);
 
         parseAttributes(element, builder);
         parseKeyNames(ElementSupport.getChildElements(element, KEY_NAME_ELEMENT_NAME), builder);
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractTrustEngineParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractTrustEngineParser.java
index 993a4a05..f9ecda23 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractTrustEngineParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/security/trust/AbstractTrustEngineParser.java
@@ -40,7 +40,6 @@ public abstract class AbstractTrustEngineParser extends AbstractCustomBeanDefini
     @Override protected void doParse(@Nonnull final Element element, @Nonnull final ParserContext parserContext,
             @Nonnull final BeanDefinitionBuilder builder) {
         super.doParse(element, parserContext, builder);
-        builder.setLazyInit(true);
     }
 
 }
\ No newline at end of file

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