[java-shib-attribute] 06/06: JSSH-71 Remove the impact of the DestructableComponent Interface
Codeberg
noreply at shibboleth.net
Wed Jul 22 14:16:05 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/7df06f9f448c205dde4771224933b6cabe4da000
commit 7df06f9f448c205dde4771224933b6cabe4da000
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 21 16:51:30 2026 +0100
JSSH-71 Remove the impact of the DestructableComponent Interface
https://shibboleth.atlassian.net/browse/JSSH-71
Remove a lot of explicit destroy methods in the tests
---
.../idp/attribute/filter/BaseBridgingClassTester.java | 1 -
.../filter/matcher/logic/impl/OrMatcherTest.java | 2 --
.../impl/AttributeTranscoderRegistryImplTest.java | 18 +++++++-----------
.../storage/impl/StorageServiceDataConnectorTest.java | 5 -----
.../resolver/impl/AttributeResolverImplTest.java | 3 ---
.../resolver/testing/MockAttributeDefinition.java | 19 -------------------
.../attribute/resolver/testing/MockDataConnector.java | 19 -------------------
.../impl/SAML1ByteAttributeTranscoderTest.java | 5 -----
.../SAML1ScopedStringAttributeTranscoderTest.java | 5 -----
.../impl/SAML1StringAttributeTranscoderTest.java | 5 -----
.../impl/SAML2ByteAttributeTranscoderTest.java | 5 -----
.../impl/SAML2DateTimeAttributeTranscoderTest.java | 5 -----
.../SAML2ScopedStringAttributeTranscoderTest.java | 5 -----
.../impl/SAML2StringAttributeTranscoderTest.java | 5 -----
.../impl/SAML2XMLObjectAttributeTranscoderTest.java | 5 -----
.../impl/SAML2ScopedStringNameIDTranscoderTest.java | 5 -----
.../impl/SAML2StringNameIDTranscoderTest.java | 5 -----
17 files changed, 7 insertions(+), 110 deletions(-)
diff --git a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/BaseBridgingClassTester.java b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/BaseBridgingClassTester.java
index 785acdebc..a1adfb239 100644
--- a/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/BaseBridgingClassTester.java
+++ b/shib-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filter/BaseBridgingClassTester.java
@@ -70,7 +70,6 @@ public class BaseBridgingClassTester {
Assert.assertEquals(base.getLogPrefix(), s);
base.initialize();
Assert.assertNotEquals(base.getLogPrefix(), s);
- base.destroy();
}
diff --git a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
index fe1283973..41543e676 100644
--- a/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
+++ b/shib-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/OrMatcherTest.java
@@ -109,8 +109,6 @@ public class OrMatcherTest extends AbstractMatcherPolicyRuleTest {
assertEquals(result.size(), 2);
assertTrue(result.contains(value2) && result.contains(value1));
- matcher.destroy();
-
}
@Test public void testNoMatchingValues() throws Exception {
diff --git a/shib-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java b/shib-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java
index 8481a11cc..9eb33a55a 100644
--- a/shib-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java
+++ b/shib-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java
@@ -14,6 +14,10 @@
package net.shibboleth.idp.attribute.transcoding.impl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -22,8 +26,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.function.Function;
-import static org.testng.Assert.*;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -35,14 +37,14 @@ import net.shibboleth.idp.attribute.StringAttributeValue;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoder;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry.NamingFunction;
+import net.shibboleth.idp.attribute.transcoding.BasicNamingFunction;
+import net.shibboleth.idp.attribute.transcoding.TranscoderSupport;
+import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.testing.MockApplicationContext;
-import net.shibboleth.idp.attribute.transcoding.BasicNamingFunction;
-import net.shibboleth.idp.attribute.transcoding.TranscoderSupport;
-import net.shibboleth.idp.attribute.transcoding.TranscodingRule;
/**
* Test for {@link AttributeTranscoderRegistryImpl}.
@@ -126,12 +128,6 @@ public class AttributeTranscoderRegistryImplTest {
assertEquals(registry.getDescriptions(new IdPAttribute("foo")).size(), 3);
}
- @AfterClass public void tearDown() {
- registry.destroy();
- registry = null;
- }
-
-
@Test public void testEncodeNoMappings() throws AttributeEncodingException {
assertTrue(registry.getTranscodingRules(new IdPAttribute("frobnitz"), Pair.class).isEmpty());
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/StorageServiceDataConnectorTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/StorageServiceDataConnectorTest.java
index 7dbd6ed5a..fef96af88 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/StorageServiceDataConnectorTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/StorageServiceDataConnectorTest.java
@@ -68,11 +68,6 @@ public class StorageServiceDataConnectorTest {
connector.setStorageService(mss);
}
- @AfterMethod public void tearDown() {
- connector.destroy();
- storage.destroy();
- }
-
@Test public void testSimpleMissing() throws ComponentInitializationException, ResolutionException, ScriptException, IOException {
final TemplatedSearchBuilder builder = new TemplatedSearchBuilder();
diff --git a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
index 5595f9619..a750c5728 100644
--- a/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
+++ b/shib-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
@@ -92,9 +92,6 @@ public class AttributeResolverImplTest {
assertEquals(resolver.getDataConnectors().size(), 1);
assertTrue(resolver.getDataConnectors().containsKey("bar"));
- attrDef.destroy();
- resolver.destroy();
- dataCon.destroy();
assertTrue(attrDef.isInitialized());
assertTrue(dataCon.isInitialized());
diff --git a/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockAttributeDefinition.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockAttributeDefinition.java
index 20520495c..8429d23ac 100644
--- a/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockAttributeDefinition.java
+++ b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockAttributeDefinition.java
@@ -30,9 +30,6 @@ import net.shibboleth.shared.component.ComponentInitializationException;
@ThreadSafe
public class MockAttributeDefinition extends AbstractAttributeDefinition {
- /** Number of times {@link #destroy()} was called. */
- private int destroyCount;
-
/** Number of times {@link #initialize()} was called. */
private int initializeCount;
@@ -79,14 +76,6 @@ public class MockAttributeDefinition extends AbstractAttributeDefinition {
return staticValue;
}
- /** {@inheritDoc} */
- @Override
- public void doDestroy() {
- super.doDestroy();
- destroyCount += 1;
- }
-
-
/** {@inheritDoc} */
@Override
public boolean isInitialized() {
@@ -100,14 +89,6 @@ public class MockAttributeDefinition extends AbstractAttributeDefinition {
initializeCount += 1;
}
- /**
- * Gets the number of times {@link #destroy()} was called.
- *
- * @return number of times {@link #destroy()} was called
- */
- public int getDestroyCount() {
- return destroyCount;
- }
/**
* Gets the number of times {@link #initialize()} was called.
diff --git a/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockDataConnector.java b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockDataConnector.java
index fb0b0c962..c7e63213d 100644
--- a/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockDataConnector.java
+++ b/shib-attribute-testing/src/main/java/net/shibboleth/idp/attribute/resolver/testing/MockDataConnector.java
@@ -36,9 +36,6 @@ import net.shibboleth.shared.component.ComponentInitializationException;
@ThreadSafe
public class MockDataConnector extends AbstractDataConnector {
- /** Number of times {@link #destroy()} was called. */
- private int destroyCount;
-
/** Number of times {@link #initialize()} was called. */
private int initializeCount;
@@ -106,13 +103,6 @@ public class MockDataConnector extends AbstractDataConnector {
return values;
}
- /** {@inheritDoc} */
- @Override
- public void doDestroy() {
- super.doDestroy();
- destroyCount += 1;
- }
-
/** {@inheritDoc} */
@Override
@@ -127,15 +117,6 @@ public class MockDataConnector extends AbstractDataConnector {
initializeCount += 1;
}
- /**
- * Gets the number of times {@link #destroy()} was called.
- *
- * @return number of times {@link #destroy()} was called
- */
- public int getDestroyCount() {
- return destroyCount;
- }
-
/**
* Gets the number of times {@link #initialize()} was called.
*
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
index 37f4b3ba6..2acc18302 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ByteAttributeTranscoderTest.java
@@ -109,11 +109,6 @@ public class SAML1ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
registry.initialize();
}
- @AfterClass public void tearDown() {
- registry.destroy();
- registry = null;
- }
-
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void emptyEncode() throws Exception {
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
index 357ab92bb..2a6a75f8d 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1ScopedStringAttributeTranscoderTest.java
@@ -114,11 +114,6 @@ public class SAML1ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
registry.initialize();
}
- @AfterClass public void tearDown() {
- registry.destroy();
- registry = null;
- }
-
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void emptyEncode() throws Exception {
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
index 0128c8dc9..326bcd042 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML1StringAttributeTranscoderTest.java
@@ -103,11 +103,6 @@ public class SAML1StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
registry.initialize();
}
- @AfterClass public void tearDown() {
- registry.destroy();
- registry = null;
- }
-
@Test(expectedExceptions = {AttributeEncodingException.class,}) public void emptyEncode() throws Exception {
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
index 7fc76bb55..033ce78a8 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ByteAttributeTranscoderTest.java
@@ -111,11 +111,6 @@ public class SAML2ByteAttributeTranscoderTest extends OpenSAMLInitBaseTestCase {
registry.initialize();
}
- @AfterClass public void tearDown() {
- registry.destroy();
- registry = null;
- }
-
@Test public void emptyEncode() throws Exception {
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2DateTimeAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2DateTimeAttributeTranscoderTest.java
index 1c03e9e28..7072706e5 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2DateTimeAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2DateTimeAttributeTranscoderTest.java
@@ -111,11 +111,6 @@ public class SAML2DateTimeAttributeTranscoderTest extends OpenSAMLInitBaseTestCa
registry.initialize();
}
- @AfterClass public void tearDown() {
- registry.destroy();
- registry = null;
- }
-
@Test public void emptyEncode() throws Exception {
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
index 8461270b7..70ad1e3cf 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2ScopedStringAttributeTranscoderTest.java
@@ -109,11 +109,6 @@ public class SAML2ScopedStringAttributeTranscoderTest extends OpenSAMLInitBaseTe
registry.initialize();
}
- @AfterClass public void tearDown() {
- registry.destroy();
- registry = null;
- }
-
@Test public void emptyEncode() throws Exception {
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
index 6db92d33b..aa9ac070a 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2StringAttributeTranscoderTest.java
@@ -105,11 +105,6 @@ public class SAML2StringAttributeTranscoderTest extends OpenSAMLInitBaseTestCase
registry.initialize();
}
- @AfterClass public void tearDown() {
- registry.destroy();
- registry = null;
- }
-
@Test public void emptyEncode() throws Exception {
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
index c3fde93af..e844dd966 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/attribute/transcoding/impl/SAML2XMLObjectAttributeTranscoderTest.java
@@ -111,11 +111,6 @@ public class SAML2XMLObjectAttributeTranscoderTest extends OpenSAMLInitBaseTestC
registry.initialize();
}
- @AfterClass public void tearDown() {
- registry.destroy();
- registry = null;
- }
-
@Test public void emptyEncode() throws Exception {
final IdPAttribute inputAttribute = new IdPAttribute(ATTR_NAME);
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/saml2/nameid/transcoding/impl/SAML2ScopedStringNameIDTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/saml2/nameid/transcoding/impl/SAML2ScopedStringNameIDTranscoderTest.java
index 7f4d95589..7e3fe895e 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/saml2/nameid/transcoding/impl/SAML2ScopedStringNameIDTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/saml2/nameid/transcoding/impl/SAML2ScopedStringNameIDTranscoderTest.java
@@ -87,11 +87,6 @@ public class SAML2ScopedStringNameIDTranscoderTest extends OpenSAMLInitBaseTestC
registry.initialize();
}
- @AfterClass public void tearDown() {
- registry.destroy();
- registry = null;
- }
-
@Test(expectedExceptions=AttributeEncodingException.class)
public void failedEncode() throws Exception {
final IdPAttribute inputAttribute = new IdPAttribute(ID);
diff --git a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/saml2/nameid/transcoding/impl/SAML2StringNameIDTranscoderTest.java b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/saml2/nameid/transcoding/impl/SAML2StringNameIDTranscoderTest.java
index 2b012b0e3..a6d08f668 100644
--- a/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/saml2/nameid/transcoding/impl/SAML2StringNameIDTranscoderTest.java
+++ b/shib-saml-attribute-impl/src/test/java/net/shibboleth/idp/saml/saml2/nameid/transcoding/impl/SAML2StringNameIDTranscoderTest.java
@@ -85,11 +85,6 @@ public class SAML2StringNameIDTranscoderTest extends OpenSAMLInitBaseTestCase {
registry.initialize();
}
- @AfterClass public void tearDown() {
- registry.destroy();
- registry = null;
- }
-
@Test(expectedExceptions=AttributeEncodingException.class)
public void failedEncode() throws Exception {
final IdPAttribute inputAttribute = new IdPAttribute(ID);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list