[java-opensaml] 01/02: JSSH-71 Remove the impact of the DestructableComponent Interface
Codeberg
noreply at shibboleth.net
Fri May 22 15:20:12 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch dev/JSSH-71
in repository java-opensaml.
View the commit online:
https://codeberg.org/Shibboleth/java-opensaml/commit/0c1be83aa6c76555251781b3ef7060bd0d8e63d5
commit 0c1be83aa6c76555251781b3ef7060bd0d8e63d5
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri May 22 14:37:39 2026 +0100
JSSH-71 Remove the impact of the DestructableComponent Interface
https://shibboleth.atlassian.net/browse/JSSH-71
Remove use of doDestroy method where all it would do was clear down fields
---
.../action/AbstractHandlerDelegatingProfileAction.java | 11 +----------
.../impl/AbstractDynamicHTTPMetadataResolver.java | 16 +---------------
.../metadata/resolver/impl/AbstractMetadataResolver.java | 13 -------------
.../resolver/impl/AbstractReloadingMetadataResolver.java | 11 +----------
.../resolver/impl/FileBackedHTTPMetadataResolver.java | 12 +-----------
.../resolver/impl/FilesystemMetadataResolver.java | 12 +-----------
.../metadata/resolver/impl/HTTPMetadataResolver.java | 16 +---------------
.../resolver/impl/ResourceBackedMetadataResolver.java | 12 +-----------
.../org/opensaml/storage/impl/MemoryStorageService.java | 9 ---------
.../impl/client/XMLClientStorageServiceStore.java | 6 ------
10 files changed, 7 insertions(+), 111 deletions(-)
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractHandlerDelegatingProfileAction.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractHandlerDelegatingProfileAction.java
index ba0b5fa16..262231e6e 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractHandlerDelegatingProfileAction.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractHandlerDelegatingProfileAction.java
@@ -30,7 +30,6 @@ import org.opensaml.profile.context.navigate.ParentProfileRequestContextLookup;
import com.google.common.base.Predicates;
-import net.shibboleth.shared.component.DestructableComponent;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.StringSupport;
@@ -99,15 +98,7 @@ public abstract class AbstractHandlerDelegatingProfileAction<DelegateType extend
errorEvent = StringSupport.trimOrNull(event);
}
- /** {@inheritDoc} */
- protected void doDestroy() {
- super.doDestroy();
- if (delegate != null && delegate instanceof DestructableComponent) {
- ((DestructableComponent) delegate).destroy();
- }
- }
-
- /**
+ /**
* Get the delegate instance.
*
* @return the delegate instance
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
index 5927a1c81..ae427a164 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
@@ -78,7 +78,7 @@ public abstract class AbstractDynamicHTTPMetadataResolver extends AbstractDynami
@Nonnull private final Logger log = LoggerFactory.getLogger(AbstractDynamicHTTPMetadataResolver.class);
/** HTTP Client used to pull the metadata. */
- @NonnullAfterInit private HttpClient httpClient;
+ @Nonnull private HttpClient httpClient;
/** List of supported MIME types for use in Accept request header and validation of
* response Content-Type header.*/
@@ -237,20 +237,6 @@ public abstract class AbstractDynamicHTTPMetadataResolver extends AbstractDynami
log.debug("{} Supported content types are: {}", getLogPrefix(), getSupportedContentTypes());
}
- /** {@inheritDoc} */
- @Override
- protected void doDestroy() {
- // TODO: if we pull this, httpClient should be Nonnull.
- httpClient = null;
- httpClientSecurityParameters = null;
-
- supportedContentTypes = null;
- supportedContentTypesValue = null;
- supportedMediaTypes = null;
-
- super.doDestroy();
- }
-
/** {@inheritDoc} */
@Override
@Nullable protected XMLObject fetchFromOriginSource(@Nullable final CriteriaSet criteria)
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
index eeda041c3..f274ab9fa 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
@@ -382,19 +382,6 @@ public abstract class AbstractMetadataResolver extends AbstractIdentifiableIniti
}
}
- /** {@inheritDoc} */
- @Override protected void doDestroy() {
- // TODO: if we pull this, unmarshallerFactory should be Nonnull.
- unmarshallerFactory = null;
- mdFilter = null;
- entityBackingStore = null;
- parser = null;
- criterionPredicateRegistry = null;
- activationCondition = null;
-
- super.doDestroy();
- }
-
/**
* Subclasses should override this method to perform any initialization logic necessary. Default implementation is a
* no-op.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
index 439aa30ee..d5b6decdb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
@@ -308,16 +308,7 @@ public abstract class AbstractReloadingMetadataResolver extends AbstractBatchMet
if (createdOwnTaskTimer) {
taskTimer.cancel();
}
-
- timerRefresh = null;
- expirationTime = null;
- lastRefresh = null;
- lastUpdate = null;
- nextRefresh = null;
- wasLastRefreshSuccess = null;
- lastSuccessfulRefresh = null;
- lastFailureCause = null;
-
+
super.doDestroy();
}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java
index 5f2d1c549..ada980340 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java
@@ -34,7 +34,6 @@ import org.w3c.dom.Document;
import com.google.common.io.Files;
-import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.LoggerFactory;
@@ -64,7 +63,7 @@ public class FileBackedHTTPMetadataResolver extends HTTPMetadataResolver {
@Nonnull private final Logger log = LoggerFactory.getLogger(FileBackedHTTPMetadataResolver.class);
/** File containing the backup of the metadata. */
- @NonnullAfterInit private File metadataBackupFile;
+ @Nonnull private File metadataBackupFile;
/** Flag used to track state of whether currently initializing or not. */
private boolean initializing;
@@ -176,15 +175,6 @@ public class FileBackedHTTPMetadataResolver extends HTTPMetadataResolver {
backupFileInitNextRefreshDelay = delay;
}
- /** {@inheritDoc} */
- @Override
- protected void doDestroy() {
- // TODO: if we pull this, becomes Nonnull.
- metadataBackupFile = null;
-
- super.doDestroy();
- }
-
/** {@inheritDoc} */
@Override
protected void initMetadataResolver() throws ComponentInitializationException {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolver.java
index 7cac67788..22180beb7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolver.java
@@ -25,7 +25,6 @@ import javax.annotation.Nullable;
import org.slf4j.Logger;
-import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.resolver.ResolverException;
@@ -51,7 +50,7 @@ public class FilesystemMetadataResolver extends AbstractReloadingMetadataResolve
@Nonnull private final Logger log = LoggerFactory.getLogger(FilesystemMetadataResolver.class);
/** The metadata file. */
- @NonnullAfterInit private File metadataFile;
+ @Nonnull private File metadataFile;
/**
* Constructor.
@@ -91,15 +90,6 @@ public class FilesystemMetadataResolver extends AbstractReloadingMetadataResolve
metadataFile = Constraint.isNotNull(file, "Metadata file cannot be null");
}
- /** {@inheritDoc} */
- @Override
- protected void doDestroy() {
- // TODO: if we pull this, becomes Nonnull.
- metadataFile = null;
-
- super.doDestroy();
- }
-
/** {@inheritDoc} */
@Override
@Nonnull protected String getMetadataIdentifier() {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
index 575a5a9e8..70ba3cadc 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
@@ -30,7 +30,6 @@ import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpStatus;
-import org.apache.hc.core5.http.io.entity.EntityUtils;
import org.opensaml.saml.metadata.resolver.RemoteMetadataResolver;
import org.opensaml.security.httpclient.HttpClientSecurityParameters;
import org.opensaml.security.httpclient.HttpClientSecuritySupport;
@@ -61,7 +60,7 @@ public class HTTPMetadataResolver extends AbstractReloadingMetadataResolver impl
@Nonnull private final Logger log = LoggerFactory.getLogger(HTTPMetadataResolver.class);
/** HTTP Client used to pull the metadata. */
- @NonnullAfterInit private HttpClient httpClient;
+ @Nonnull private HttpClient httpClient;
/** URL to the Metadata. */
@NonnullAfterInit private URI metadataURI;
@@ -165,19 +164,6 @@ public class HTTPMetadataResolver extends AbstractReloadingMetadataResolver impl
httpClientSecurityParameters = params;
}
- /** {@inheritDoc} */
- @Override
- protected void doDestroy() {
- // TODO: if we pull this, httpClient and metadataURI become Nonnull.
- httpClient = null;
- httpClientSecurityParameters = null;
- metadataURI = null;
- cachedMetadataETag = null;
- cachedMetadataLastModified = null;
-
- super.doDestroy();
- }
-
/** {@inheritDoc} */
@Override
protected String getMetadataIdentifier() {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolver.java
index acb6b2f5a..763fc9af5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolver.java
@@ -24,7 +24,6 @@ import javax.annotation.Nullable;
import org.slf4j.Logger;
import net.shibboleth.shared.annotation.ParameterName;
-import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.resolver.ResolverException;
import net.shibboleth.shared.resource.Resource;
@@ -40,7 +39,7 @@ public class ResourceBackedMetadataResolver extends AbstractReloadingMetadataRes
@Nonnull private final Logger log = LoggerFactory.getLogger(ResourceBackedMetadataResolver.class);
/** Resource from which metadata is read. */
- @NonnullAfterInit private Resource metadataResource;
+ @Nonnull private Resource metadataResource;
/**
* Constructor.
@@ -76,15 +75,6 @@ public class ResourceBackedMetadataResolver extends AbstractReloadingMetadataRes
metadataResource = resource;
}
- /** {@inheritDoc} */
- @Override
- protected void doDestroy() {
- // If we pull this, becomes Nonnull.
- metadataResource = null;
-
- super.doDestroy();
- }
-
/** {@inheritDoc} */
@Override
@Nonnull protected String getMetadataIdentifier() {
diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/MemoryStorageService.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/MemoryStorageService.java
index 44b642e07..11cb84300 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/MemoryStorageService.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/MemoryStorageService.java
@@ -69,15 +69,6 @@ public class MemoryStorageService extends AbstractMapBackedStorageService implem
lock = new ReentrantReadWriteLock(true);
}
- /** {@inheritDoc} */
- @Override
- protected void doDestroy() {
- contextMap = null;
- lock = null;
- super.doDestroy();
- }
-
-
/** {@inheritDoc} */
@Override
@Nonnull @Live protected Map<String, Map<String, MutableStorageRecord<?>>> getContextMap() {
diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/XMLClientStorageServiceStore.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/XMLClientStorageServiceStore.java
index 970ca3af1..297c1d83e 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/XMLClientStorageServiceStore.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/XMLClientStorageServiceStore.java
@@ -217,12 +217,6 @@ public class XMLClientStorageServiceStore extends AbstractClientStorageServiceSt
((BasicParserPool) parserPool).initialize();
}
- /** {@inheritDoc} */
- @Override
- protected void doDestroy() {
- ((BasicParserPool) parserPool).destroy();
- }
-
/** {@inheritDoc} */
@Nonnull public ClientStorageServiceStore load(@Nullable @NotEmpty final String raw,
@Nonnull final ClientStorageSource src) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list