[java-metadata-aggregator] branch main updated: MDA-308 - Remove deprecated functionality
Ian Young
ian at iay.org.uk
Tue Sep 16 16:55:27 UTC 2025
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch main
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=28c1d53d98404173407d1d742ed3a29eb3633e71
The following commit(s) were added to refs/heads/main by this push:
new 28c1d53 MDA-308 - Remove deprecated functionality
28c1d53 is described below
commit 28c1d53d98404173407d1d742ed3a29eb3633e71
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Tue Sep 16 17:55:25 2025 +0100
MDA-308 - Remove deprecated functionality
https://shibboleth.atlassian.net/browse/MDA-308
---
.../metadata/dom/NamespacesStrippingStage.java | 26 -------
.../metadata/dom/XMLSignatureSigningStage.java | 28 --------
.../metadata/dom/XMLSignatureValidationStage.java | 52 --------------
.../dom/saml/ContactPersonFilterStage.java | 26 -------
.../metadata/dom/saml/EntityFilterStage.java | 25 -------
.../metadata/dom/saml/EntityRoleFilterStage.java | 25 -------
.../metadata/dom/saml/GenerateIdStage.java | 20 ------
.../saml/mdattr/EntityAttributeFilteringStage.java | 28 --------
.../EntityRegistrationAuthorityFilterStage.java | 29 --------
.../metadata/pipeline/CompositeStage.java | 32 ---------
.../pipeline/PipelineDemultiplexerStage.java | 77 ---------------------
.../metadata/pipeline/PipelineMergeStage.java | 32 ---------
.../metadata/pipeline/SplitMergeStage.java | 32 ---------
.../x509/X509RSAOpenSSLKeylistValidator.java | 26 -------
.../resources/net/shibboleth/metadata/beans.xml | 80 ----------------------
.../net/shibboleth/metadata/BeansFileTest.java | 5 --
.../metadata/dom/NamespacesStrippingStageTest.java | 29 --------
.../dom/XMLSignatureSigningStageSpringTestOld.java | 40 -----------
.../dom/XMLSignatureValidationStageTest.java | 64 -----------------
.../dom/saml/ContactPersonFilterStageTest.java | 62 -----------------
.../metadata/dom/saml/EntityFilterStageTest.java | 31 ---------
.../dom/saml/EntityRoleFilterStageTest.java | 44 ------------
.../metadata/dom/saml/GenerateIdStageTest.java | 18 -----
.../mdattr/EntityAttributeFilteringStageTest.java | 22 ------
...EntityRegistrationAuthorityFilterStageTest.java | 36 ----------
.../metadata/pipeline/CompositeStageTest.java | 16 -----
.../pipeline/PipelineDemultiplexerStageTest.java | 36 ----------
.../metadata/pipeline/PipelineMergeStageTest.java | 10 ---
.../metadata/pipeline/SplitMergeStageTest.java | 10 ---
.../x509/X509RSAOpenSSLKeylistValidatorTest.java | 30 --------
...MLSignatureSigningStageSpringTestOld-config.xml | 23 -------
31 files changed, 1014 deletions(-)
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java
index 43d9884..949e4db 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespacesStrippingStage.java
@@ -25,8 +25,6 @@ import javax.annotation.concurrent.ThreadSafe;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.collection.CollectionSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* A stage which removes all evidence of a given collection of XML namespaces from each metadata item.
@@ -111,30 +109,6 @@ public class NamespacesStrippingStage extends AbstractNamespacesStrippingStage {
keeping = keep;
}
- /**
- * Indicate whether the stage is keeping the designated namespaces or removing them (the default).
- *
- * @return <code>true</code> if keeping, <code>false</code> for removing (the default)
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- public final synchronized boolean isWhitelisting() {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "isWhitelisting",
- "NamespacesStrippingStage", "isKeeping");
- return isKeeping();
- }
-
- /**
- * Set whether the stage is whether the stage is keeping the designated namespaces or removing them (the default).
- *
- * @param keep <code>true</code> if keeping, <code>false</code> for removing (the default)
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- public synchronized void setWhitelisting(final boolean keep) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setWhitelisting",
- "NamespacesStrippingStage", "setKeeping");
- setKeeping(keep);
- }
-
@Override
protected boolean removingNamespace(@Nullable final String namespace) {
// Handle ineligible null element, for the default namespace case
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
index f3f6a78..6cba9ab 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
@@ -40,8 +40,6 @@ import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.shared.primitive.LoggerFactory;
/**
@@ -182,32 +180,6 @@ public class XMLSignatureSigningStage extends AbstractStage<Element> {
shaVariant = Constraint.isNotNull(variant, "SHA variant can not be null");
}
- /**
- * Gets the SHA algorithm variant used when computing the signature and digest.
- *
- * @return SHA algorithm variant used when computing the signature and digest
- *
- * @deprecated Use {@link #getSHAVariant}.
- */
- @Deprecated(forRemoval = true)
- public final @Nonnull SHAVariant getShaVariant() {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "getShaVariant", "XMLSignatureSigningStage", "getSHAVariant");
- return getSHAVariant();
- }
-
- /**
- * Sets the SHA algorithm variant used when computing the signature and digest.
- *
- * @param variant SHA algorithm variant used when computing the signature and digest
- *
- * @deprecated Use {@link #setSHAVariant}.
- */
- @Deprecated(forRemoval = true)
- public synchronized void setShaVariant(@Nonnull final SHAVariant variant) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setShaVariant", "XMLSignatureSigningStage", "setSHAVariant");
- setSHAVariant(variant);
- }
-
/**
* Gets the private key used to sign the content.
*
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
index b334c4e..8c1113b 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
@@ -41,9 +41,7 @@ import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.primitive.DeprecationSupport;
import net.shibboleth.shared.primitive.LoggerFactory;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.shared.xml.SerializeSupport;
/**
@@ -226,56 +224,6 @@ public class XMLSignatureValidationStage extends AbstractStage<Element> {
return disallowedSignatureMethods;
}
- /**
- * Set the collection of identifiers to be disallowed as digest algorithms.
- *
- * @param identifiers collection of identifiers to be disallowed
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- public synchronized void setBlacklistedDigests(
- @Nonnull @NonnullElements @Unmodifiable final Collection<String> identifiers) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setBlacklistedDigests",
- "XMLSignatureValidationStage", "setDisallowedDigests");
- setDisallowedDigests(identifiers);
- }
-
- /**
- * Gets the set of disallowed digest algorithm identifiers.
- *
- * @return the set of disallowed digest algorithm identifiers
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- @Nonnull @NonnullElements @Unmodifiable public final synchronized Set<String> getBlacklistedDigests() {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "getBlacklistedDigests",
- "XMLSignatureValidationStage", "getDisallowedDigests");
- return getDisallowedDigests();
- }
-
- /**
- * Set the collection of identifiers to be disallowed as signature methods.
- *
- * @param identifiers collection of identifiers to be disallowed
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- public synchronized void setBlacklistedSignatureMethods(
- @Nonnull @NonnullElements @Unmodifiable final Collection<String> identifiers) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setBlacklistedSignatureMethods",
- "XMLSignatureValidationStage", "setDisallowedSignatureMethods");
- setDisallowedSignatureMethods(identifiers);
- }
-
- /**
- * Gets the set of disallowed signature method identifiers.
- *
- * @return the set of disallowed signature method identifiers
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- @Nonnull @NonnullElements @Unmodifiable public final synchronized Set<String> getBlacklistedSignatureMethods() {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "getBlacklistedSignatureMethods",
- "XMLSignatureValidationStage", "getDisallowedSignatureMethods");
- return getDisallowedSignatureMethods();
- }
-
/**
* Gets whether empty references are permitted.
*
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
index a934827..bab8eff 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
@@ -33,10 +33,8 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.primitive.DeprecationSupport;
import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.shared.xml.AttributeSupport;
import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.shared.xml.SerializeSupport;
@@ -148,30 +146,6 @@ public class ContactPersonFilterStage extends AbstractIteratingStage<Element> {
keepingTypes = keeping;
}
- /**
- * Gets whether the designated roles should be kept ({@code true}) or removed ({@code false}).
- *
- * @return true if the designated roles should be kept ({@code true}), false otherwise
- */
- @Deprecated(forRemoval=true, since="0.10.0")
- public final synchronized boolean isWhitelistingTypes() {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "isWhitelistingTypes",
- "ContactPersonFilterStage", "isKeepingTypes");
- return isKeepingTypes();
- }
-
- /**
- * Sets whether the list of designated roles should be kept or removed.
- *
- * @param keeping {@code true} if the designated roles should be kept, {@code false} otherwise
- */
- @Deprecated(forRemoval=true, since="0.10.0")
- public synchronized void setWhitelistingTypes(final boolean keeping) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setWhitelistingTypes",
- "ContactPersonFilterStage", "setKeepingTypes");
- setKeepingTypes(keeping);
- }
-
@Override
protected void doExecute(@Nonnull final Item<Element> item) throws StageProcessingException {
final Element descriptor = item.unwrap();
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
index 6d20bee..8b420b1 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
@@ -30,9 +30,7 @@ import net.shibboleth.metadata.pipeline.AbstractFilteringStage;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.collection.CollectionSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport;
import net.shibboleth.shared.primitive.LoggerFactory;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.shared.xml.ElementSupport;
/**
@@ -104,29 +102,6 @@ public class EntityFilterStage extends AbstractFilteringStage<Element> {
checkSetterPreconditions();
keepingEntities = keeping;
}
- /**
- * Whether the stage is keeping or removing the designated entities.
- *
- * @return {@code true} if keeping, {@code false} otherwise
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- public final synchronized boolean isWhitelistingEntities() {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "isWhitelistingEntities",
- "EntityFilterStage", "isKeepingEntities");
- return isKeepingEntities();
- }
-
- /**
- * Sets whether to keep or remove the designated entities.
- *
- * @param keeping {@code true} if the designated entities should be kept, {@code false} otherwise
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- public synchronized void setWhitelistingEntities(final boolean keeping) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setWhitelistingEntities",
- "EntityFilterStage", "setKeepingEntities");
- setKeepingEntities(keeping);
- }
/**
* Gets whether EntitiesDescriptor that do not contain EntityDescriptors should be removed.
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
index 023459b..12c0552 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
@@ -32,9 +32,7 @@ import net.shibboleth.metadata.pipeline.AbstractFilteringStage;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.collection.CollectionSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport;
import net.shibboleth.shared.primitive.LoggerFactory;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.shared.xml.DOMTypeSupport;
import net.shibboleth.shared.xml.ElementSupport;
import net.shibboleth.shared.xml.QNameSupport;
@@ -123,29 +121,6 @@ public class EntityRoleFilterStage extends AbstractFilteringStage<Element> {
checkSetterPreconditions();
keepingRoles = keeping;
}
- /**
- * Gets whether the stage is keeping the list of designated roles.
- *
- * @return {@code true} if the designated roles should be kept, {@code false} otherwise
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- public final synchronized boolean isWhitelistingRoles() {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "isWhitelistingRoles",
- "EntityRoleFilterStage", "isKeepingRoles");
- return isKeepingRoles();
- }
-
- /**
- * Sets whether to keep the designated roles.
- *
- * @param keeping {@code true} if the designated roles should be kept, {@code false} otherwise
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- public synchronized void setWhitelistingRoles(final boolean keeping) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setWhitelistingRoles",
- "EntityRoleFilterStage", "setKeepingRoles");
- setKeepingRoles(keeping);
- }
/**
* Gets whether EntityDescriptor elements without roles (after filtering) should be removed altogether.
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java
index 1d31991..5d036a8 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java
@@ -28,8 +28,6 @@ import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.shared.security.IdentifierGenerationStrategy;
import net.shibboleth.shared.security.impl.Type4UUIDIdentifierGenerationStrategy;
import net.shibboleth.shared.xml.AttributeSupport;
@@ -57,24 +55,6 @@ public class GenerateIdStage extends AbstractIteratingStage<Element> {
public GenerateIdStage() {
}
- /**
- * Constructor.
- *
- * <p>
- * Note: BeansFileTest has an explicit exception to allow this deprecated
- * constructor. It should be updated when this constructor is removed.
- * </p>
- *
- * @param newGenerator ID generation strategy to use
- * @deprecated Use the zero-argument constructor and the property instead.
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- public GenerateIdStage(@Nonnull final IdentifierGenerationStrategy newGenerator) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "single-argument constructor", "GenerateIdStage",
- "zero-argument constructor and 'generator' property");
- generator = Constraint.isNotNull(newGenerator, "ID generation strategy can not be null");
- }
-
/**
* Gets the {@link IdentifierGenerationStrategy} being used.
*
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
index e1c409a..0e3917b 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
@@ -37,9 +37,7 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.primitive.DeprecationSupport;
import net.shibboleth.shared.primitive.LoggerFactory;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.shared.xml.ElementSupport;
/**
@@ -263,32 +261,6 @@ public class EntityAttributeFilteringStage extends AbstractIteratingStage<Elemen
return keeping;
}
- /**
- * Sets the mode of operation.
- *
- * @param newValue <code>true</code> to keep matched attributes (default),
- * <code>false</code> to remove
- */
- @Deprecated(forRemoval=true, since="0.10.0")
- public synchronized void setWhitelisting(final boolean newValue) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setWhitelisting",
- "EntityAttributeFilteringStage", "setKeeping");
- setKeeping(newValue);
- }
-
- /**
- * Indicates whether the stage is set to keeping or removing mode.
- *
- * @return <code>true</code> if keeping matched attributes (default),
- * <code>false</code> if removing
- */
- @Deprecated(forRemoval=true, since="0.10.0")
- public final synchronized boolean isWhitelisting() {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "isWhitelisting",
- "EntityAttributeFilteringStage", "isKeeping");
- return isKeeping();
- }
-
/**
* Set whether to record removed entity attributes.
*
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
index 806d3e5..ba12739 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
@@ -31,9 +31,7 @@ import net.shibboleth.metadata.pipeline.AbstractFilteringStage;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.collection.CollectionSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport;
import net.shibboleth.shared.primitive.LoggerFactory;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.shared.xml.AttributeSupport;
import net.shibboleth.shared.xml.ElementSupport;
@@ -135,33 +133,6 @@ public class EntityRegistrationAuthorityFilterStage extends AbstractFilteringSta
keepingAuthorities = keeping;
}
- /**
- * Whether entities from the designated registration authorities should be
- * kept ({@code true}) or removed ({@code false)}.
- *
- * @return {@code true} if entities from the designated registration authorities
- * should be kept, otherwise {@code false}
- */
- @Deprecated(forRemoval=true, since="0.10.0")
- public final synchronized boolean isWhitelistingRegistrationAuthorities() {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "isWhitelistingRegistrationAuthorities",
- "EntityRegistrationAuthorityFilterStage", "isKeepingRegistrationAuthorities");
- return isKeepingRegistrationAuthorities();
- }
-
- /**
- * Sets whether entities from the designated registration authorities should be kept or removed.
- *
- * @param keeping {@code true} if entities from the designated registration authorities
- * should be kept, {@code false} if they should be removed
- */
- @Deprecated(forRemoval=true, since="0.10.0")
- public synchronized void setWhitelistingRegistrationAuthorities(final boolean keeping) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setWhitelistingRegistrationAuthorities",
- "EntityRegistrationAuthorityFilterStage", "setKeepingRegistrationAuthorities");
- setKeepingRegistrationAuthorities(keeping);
- }
-
/**
* Gets whether EntitiesDescriptor that do not contain EntityDescriptors should be removed.
*
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
index 70e91bf..54c5d1b 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
@@ -29,8 +29,6 @@ import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.shared.primitive.LoggerFactory;
/**
@@ -105,36 +103,6 @@ public class CompositeStage<T> extends AbstractStage<T> implements Pipeline<T> {
composedStages = CollectionSupport.copyToList(stages);
}
- /**
- * Gets an unmodifiable list of the stages that compose this stage.
- *
- * @return list the stages that compose this stage, never null nor containing null elements
- *
- * @deprecated Replaced by {@link #getStages}.
- * @see #getStages
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- @Nonnull @NonnullElements @Unmodifiable
- public final List<Stage<T>> getComposedStages() {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "getComposedStages", "CompositeStage", "getStages");
- return getStages();
- }
-
- /**
- * Sets the list of stages that compose this stage.
- *
- * @param stages list of the stages that compose this stage
- *
- * @deprecated Replaced by {@link #setStages}.
- * @see #setStages
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- public final void setComposedStages(
- @Nonnull @NonnullElements @Unmodifiable final List<Stage<T>> stages) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setComposedStages", "CompositeStage", "setStages");
- setStages(stages);
- }
-
/**
* Returns whether we are logging progress.
*
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
index de18416..c6db9f6 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
@@ -17,7 +17,6 @@ package net.shibboleth.metadata.pipeline;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.function.Predicate;
@@ -35,11 +34,8 @@ import net.shibboleth.metadata.pipeline.impl.PipelineCallable;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.collection.CollectionSupport;
-import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* A stage which, given an item collection and a list of {@link PipelineAndStrategy} objects each
@@ -108,20 +104,6 @@ public class PipelineDemultiplexerStage<T> extends AbstractStage<T> {
return executor;
}
- /**
- * Gets the executor service used to run the selected and non-selected item pipelines.
- *
- * @return executor service used to run the selected and non-selected item pipelines
- *
- * @deprecated
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- @Nonnull public final synchronized Executor getExecutorService() {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "getExecutorService",
- "PipelineDemultiplexerStage", "getExecutor");
- return executor;
- }
-
/**
* Sets the executor used to run the selected and non-selected item pipelines.
*
@@ -134,21 +116,6 @@ public class PipelineDemultiplexerStage<T> extends AbstractStage<T> {
executor = Constraint.isNotNull(exec, "executor can not be null");
}
- /**
- * Sets the executor service used to run the selected and non-selected item pipelines.
- *
- * @param service executor service used to run the selected and non-selected item pipelines
- *
- * @deprecated
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- public synchronized void setExecutorService(@Nonnull final ExecutorService service) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setExecutorService",
- "PipelineDemultiplexerStage", "setExecutor");
- checkSetterPreconditions();
- executor = Constraint.isNotNull(service, "ExecutorService can not be null");
- }
-
/**
* Gets whether this child waits for all the invoked pipelines to complete before proceeding.
*
@@ -187,50 +154,6 @@ public class PipelineDemultiplexerStage<T> extends AbstractStage<T> {
collectionFactory = Constraint.isNotNull(factory, "Collection factory can not be null");
}
- /**
- * Gets the pipeline and item selection strategies used to demultiplex item collections within this stage.
- *
- * @return pipeline and item selection strategies used to demultiplex item collections within this stage
- * @deprecated
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- @Nonnull @NonnullElements @Unmodifiable public final synchronized List<Pair<Pipeline<T>, Predicate<Item<T>>>>
- getPipelineAndSelectionStrategies() {
-
- DeprecationSupport.warnOnce(ObjectType.METHOD, "getPipelineAndSelectionStrategies",
- "PipelineDemultiplexerStage", "getPipelinesAndStrategies");
-
- final List<Pair<Pipeline<T>, Predicate<Item<T>>>> pas = new ArrayList<>();
- for (final var entry : pipelinesAndStrategies) {
- pas.add(new Pair<>(entry.pipeline(), entry.strategy()));
- }
- return pas;
- }
-
- /**
- * Sets the pipeline and item selection strategies used to demultiplex item collections within this stage.
- *
- * @param passes pipeline and item selection strategies used to demultiplex item collections within this stage
- * @deprecated
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- public synchronized void setPipelineAndSelectionStrategies(
- @Nonnull @NonnullElements @Unmodifiable final List<Pair<Pipeline<T>, Predicate<Item<T>>>> passes) {
- checkSetterPreconditions();
-
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setPipelineAndSelectionStrategies",
- "PipelineDemultiplexerStage", "setPipelinesAndStrategies");
-
- final List<PipelineAndStrategy<T>> pas = new ArrayList<>();
- for (final Pair<Pipeline<T>, Predicate<Item<T>>> pass : passes) {
- final @Nonnull var pipeline = Constraint.isNotNull(pass.getFirst(), "Pipeline can not be null");
- final @Nonnull var strategy = Constraint.isNotNull(pass.getSecond(), "strategy can not be null");
- pas.add(new PipelineAndStrategy<T>(pipeline, strategy));
- }
-
- pipelinesAndStrategies = CollectionSupport.copyToList(pas);
- }
-
/**
* Gets the pipelines and item selection strategies used to demultiplex item collections within this stage.
*
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
index e4c7ae5..1a75d07 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
@@ -17,7 +17,6 @@ package net.shibboleth.metadata.pipeline;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.function.Supplier;
@@ -38,8 +37,6 @@ import net.shibboleth.shared.annotation.constraint.Unmodifiable;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* This {@link Stage} allows the merging of multiple pipeline outputs into a single {@link List} that can then be
@@ -98,20 +95,6 @@ public class PipelineMergeStage<T> extends AbstractStage<T> {
return executor;
}
- /**
- * Gets the executor service used to run the selected and non-selected item pipelines.
- *
- * @return executor service used to run the selected and non-selected item pipelines
- *
- * @deprecated
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- @Nonnull public final synchronized Executor getExecutorService() {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "getExecutorService",
- "PipelineMergeStage", "getExecutor");
- return executor;
- }
-
/**
* Sets the executor used to run the selected and non-selected item pipelines.
*
@@ -124,21 +107,6 @@ public class PipelineMergeStage<T> extends AbstractStage<T> {
executor = Constraint.isNotNull(exec, "executor can not be null");
}
- /**
- * Sets the executor service used to run the selected and non-selected item pipelines.
- *
- * @param service executor service used to run the selected and non-selected item pipelines
- *
- * @deprecated
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- public synchronized void setExecutorService(@Nonnull final ExecutorService service) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setExecutorService",
- "PipelineMergeStage", "setExecutor");
- checkSetterPreconditions();
- executor = Constraint.isNotNull(service, "ExecutorService can not be null");
- }
-
/**
* Gets the unmodifiable set of pipelines used by this stage.
*
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
index b7e0c5e..bf25ce0 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
@@ -18,7 +18,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.function.Predicate;
@@ -41,8 +40,6 @@ import net.shibboleth.metadata.pipeline.impl.PipelineCallable;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.shared.primitive.LoggerFactory;
/**
@@ -128,20 +125,6 @@ public class SplitMergeStage<T> extends AbstractStage<T> {
return executor;
}
- /**
- * Gets the executor service used to run the selected and non-selected item pipelines.
- *
- * @return executor service used to run the selected and non-selected item pipelines
- *
- * @deprecated
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- @Nonnull public final synchronized Executor getExecutorService() {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "getExecutorService",
- "SplitMergeStage", "getExecutor");
- return executor;
- }
-
/**
* Sets the executor used to run the selected and non-selected item pipelines.
*
@@ -154,21 +137,6 @@ public class SplitMergeStage<T> extends AbstractStage<T> {
executor = Constraint.isNotNull(exec, "executor can not be null");
}
- /**
- * Sets the executor service used to run the selected and non-selected item pipelines.
- *
- * @param service executor service used to run the selected and non-selected item pipelines
- *
- * @deprecated
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- public synchronized void setExecutorService(@Nonnull final ExecutorService service) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setExecutorService",
- "SplitMergeStage", "setExecutor");
- checkSetterPreconditions();
- executor = Constraint.isNotNull(service, "ExecutorService can not be null");
- }
-
/**
* Gets the factory used to create the Item collection that is then given to the pipelines.
*
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidator.java
index a3c1332..6dad861 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidator.java
@@ -41,8 +41,6 @@ import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* Validator class to check RSA moduli in X.509 certificates against a list of
@@ -97,30 +95,6 @@ public class X509RSAOpenSSLKeylistValidator extends AbstractX509Validator {
keylistResource = Constraint.isNotNull(resource, "keylist resource can not be null");
}
- /**
- * Gets the resource that provides the keylist.
- *
- * @return resource that provides the keylist
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- @NonnullAfterInit public final synchronized Resource getBlacklistResource() {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "getBlacklistResource",
- "X509RSAOpenSSLKeylistValidator", "getKeylistResource");
- return getKeylistResource();
- }
-
- /**
- * Sets the resource that provides the keylist.
- *
- * @param resource resource that provides the keylist
- */
- @Deprecated(since="0.10.0", forRemoval=true)
- public synchronized void setBlacklistResource(@Nonnull final Resource resource) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setBlacklistResource",
- "X509RSAOpenSSLKeylistValidator", "setKeylistResource");
- setKeylistResource(resource);
- }
-
/**
* Sets a key size restriction for this list.
*
diff --git a/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml b/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml
index 4a218fc..068e9e2 100644
--- a/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml
+++ b/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml
@@ -461,90 +461,10 @@
<util:map id="mda.MigrationClassMap">
- <!-- MDA changes from 0.9 to 0.10 -->
- <entry key="net.shibboleth.metadata.dom.CRDetectionStage"
- value="net.shibboleth.metadata.dom.saml.CRDetectionStage"/>
- <entry key="net.shibboleth.metadata.util.PKCS11PrivateKeyFactoryBean"
- value="net.shibboleth.shared.spring.security.factory.PKCS11PrivateKeyFactoryBean"/>
- <entry key="net.shibboleth.metadata.validate.x509.X509RSAOpenSSLBlacklistValidator"
- value="net.shibboleth.metadata.validate.x509.X509RSAOpenSSLKeylistValidator"/>
-
- <!-- Classes from spring-extensions in MDA 0.9, not in MDA 0.10. -->
- <entry key="net.shibboleth.ext.spring.config.BooleanToPredicateConverter"
- value="net.shibboleth.shared.spring.config.BooleanToPredicateConverter"/>
- <entry key="net.shibboleth.ext.spring.config.DurationToLongConverter"
- value="net.shibboleth.shared.spring.config.StringToDurationConverter"/>
- <entry key="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor"
- value="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor"/>
- <entry key="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter"
- value="net.shibboleth.shared.spring.config.StringBooleanToPredicateConverter"/>
- <entry key="net.shibboleth.ext.spring.config.StringToDurationConverter"
- value="net.shibboleth.shared.spring.config.StringToDurationConverter"/>
- <entry key="net.shibboleth.ext.spring.config.StringToIPRangeConverter"
- value="net.shibboleth.shared.spring.config.StringToIPRangeConverter"/>
- <entry key="net.shibboleth.ext.spring.config.StringToResourceConverter"
- value="net.shibboleth.shared.spring.config.StringToResourceConverter"/>
- <entry key="net.shibboleth.ext.spring.factory.DOMDocumentFactoryBean"
- value="net.shibboleth.shared.spring.factory.DOMDocumentFactoryBean"/>
- <entry key="net.shibboleth.ext.spring.factory.PrivateKeyFactoryBean"
- value="net.shibboleth.shared.spring.security.factory.PrivateKeyFactoryBean"/>
- <entry key="net.shibboleth.ext.spring.factory.PublicKeyFactoryBean"
- value="net.shibboleth.shared.spring.security.factory.PublicKeyFactoryBean"/>
- <entry key="net.shibboleth.ext.spring.factory.X509CertificateChainFactoryBean"
- value="net.shibboleth.shared.spring.security.factory.X509CertificateChainFactoryBean"/>
- <entry key="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
- value="net.shibboleth.shared.spring.security.factory.X509CertificateFactoryBean"/>
- <entry key="net.shibboleth.ext.spring.resource.HTTPResource"
- value="net.shibboleth.shared.spring.httpclient.resource.HTTPResource"/>
-
- <!-- Classes from java-support in MDA 0.9, not in MDA 0.10. -->
- <entry key="net.shibboleth.utilities.java.support.collection.Pair"
- value="net.shibboleth.shared.collection.Pair"/>
- <entry key="net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder"
- value="net.shibboleth.shared.httpclient.HttpClientBuilder"/>
- <entry key="net.shibboleth.utilities.java.support.xml.BasicParserPool"
- value="net.shibboleth.shared.xml.impl.BasicParserPool"/>
- <entry key="net.shibboleth.utilities.java.support.xml.SimpleNamespaceContext"
- value="net.shibboleth.metadata.dom.SimpleNamespaceContext"/>
-
- <!-- Migration from inc-mda in MDA 0.10.0; mostly handled by bean map. -->
- <entry key="uk.org.iay.incommon.mda.dom.saml.shib.ScopeValidationStage"
- value="net.shibboleth.metadata.dom.saml.shibboleth.ScopeValidationStage"/>
</util:map>
<util:map id="mda.MigrationBeanMap">
- <!-- Changes from 0.9 to 0.10 -->
- <entry key="mda.X509RSAOpenSSLBlacklistValidator" value="mda.X509RSAOpenSSLKeylistValidator"/>
-
- <!-- Beans adopted from ukf-mda project in MDA 0.10.0. -->
- <entry key="ukf.AssuranceCertificationMatcher" value="mda.AssuranceCertificationMatcher"/>
- <entry key="ukf.DiscoFeedCollectionSerializer" value="mda.DiscoFeedCollectionSerializer"/>
- <entry key="ukf.FixedStringIdentifierGenerationStrategy"
- value="mda.FixedStringIdentifierGenerationStrategy"/>
- <entry key="ukf.IPHintValidationStage" value="mda.IPHintValidationStage"/>
- <entry key="ukf.RegexFileFilter" value="mda.RegexFileFilter"/>
- <entry key="ukf.SAMLStringElementCheckingStage" value="mda.SAMLStringElementCheckingStage"/>
- <entry key="ukf.StringElementValidationStage" value="mda.StringElementValidationStage"/>
- <entry key="ukf.X509DSADetector" value="mda.X509DSADetector"/>
- <entry key="ukf.X509ROCAValidator" value="mda.X509ROCAValidator"/>
-
- <!-- Beans adopted from inc-mda project in MDA 0.10.0. -->
- <entry key="inc.stage_parent" value="mda.stage_parent"/>
- <entry key="inc.AcceptAllValidator" value="mda.AcceptAllValidator"/>
- <entry key="inc.AsDomainNameStringValidator" value="mda.AsDomainNameStringValidator"/>
- <entry key="inc.AsLiteralTailStringValidator" value="mda.AsLiteralTailStringValidator"/>
- <entry key="inc.RejectAllValidator" value="mda.RejectAllValidator"/>
- <entry key="inc.AcceptStringRegexValidator" value="mda.AcceptStringRegexValidator"/>
- <entry key="inc.AcceptStringValueValidator" value="mda.AcceptStringValueValidator"/>
- <entry key="inc.RejectDomainNameNotUnderPublicSuffixValidator"
- value="mda.RejectDomainNameNotUnderPublicSuffixValidator"/>
- <entry key="inc.RejectDomainNamePublicSuffixValidator"
- value="mda.RejectDomainNamePublicSuffixValidator"/>
- <entry key="inc.RejectStringRegexValidator" value="mda.RejectStringRegexValidator"/>
- <entry key="inc.RejectStringValueValidator" value="mda.RejectStringValueValidator"/>
- <entry key="inc.ScopeValidationStage" value="mda.ScopeValidationStage"/>
-
</util:map>
</beans>
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/BeansFileTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/BeansFileTest.java
index 717554d..6d124b6 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/BeansFileTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/BeansFileTest.java
@@ -65,11 +65,6 @@ public class BeansFileTest {
Assert.assertEquals(def.getParentName(), "mda.stage_parent");
// Look at constructors. We should only have zero-arg ones (MDA-258)
- // Because we have only DEPRECATED the constructor on GenerateIdStage, skip that
- // class here.
- if (defName.equals("mda.GenerateIdStage")) {
- continue;
- }
final var constructors = clazz.getDeclaredConstructors();
for (final var constructor : constructors) {
Assert.assertEquals(constructor.getParameterCount(), 0,
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespacesStrippingStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespacesStrippingStageTest.java
index b5ae38a..7123975 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespacesStrippingStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/NamespacesStrippingStageTest.java
@@ -110,35 +110,6 @@ public class NamespacesStrippingStageTest extends BaseDOMTest {
assertXMLIdentical(out, item.unwrap());
}
- /**
- * Test removing (legacy API).
- *
- * @throws Exception if something goes wrong
- */
- @Deprecated(forRemoval=true, since="0.10.0")
- @Test
- public void keepingLegacy() throws Exception {
- final Element doc = readXMLData("2-in.xml");
- final Item<Element> item = new DOMElementItem(doc);
- final List<Item<Element>> items = new ArrayList<>();
- items.add(item);
-
- final NamespacesStrippingStage stage = new NamespacesStrippingStage();
- stage.setId("stripTest");
- final List<String> namespaces = new ArrayList<>();
- namespaces.add("urn:namespace:alfa"); // root element
- namespaces.add("urn:namespace:bravo");
- namespaces.add("urn:namespace:charlie");
- stage.setNamespaces(namespaces);
- stage.setWhitelisting(true);
- stage.initialize();
-
- stage.execute(items);
-
- final Element out = readXMLData("2-wl.xml");
- assertXMLIdentical(out, item.unwrap());
- }
-
@Test
public void testDestroy() throws Exception {
final var stage = new NamespacesStrippingStage();
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageSpringTestOld.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageSpringTestOld.java
deleted file mode 100644
index ab7904e..0000000
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageSpringTestOld.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.metadata.dom;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import net.shibboleth.metadata.dom.XMLSignatureSigningStage.SHAVariant;
-
- at ContextConfiguration({"XMLSignatureSigningStageSpringTestOld-config.xml"})
-public class XMLSignatureSigningStageSpringTestOld extends AbstractTestNGSpringContextTests {
-
- @Autowired
- XMLSignatureSigningStage stage;
-
- @SuppressWarnings("removal")
- @Test
- public void testSetSHAVariant() throws Exception {
- // Check use of the old deprecated getter.
- // The deprecated setter is used in the configuration file.
- // We should see deprecation warnings for both in the logs.
- Assert.assertEquals(stage.getShaVariant(), SHAVariant.SHA384);
- }
-
-}
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java
index 2d4aeff..36fce41 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java
@@ -205,70 +205,6 @@ public class XMLSignatureValidationStageTest extends BaseDOMTest {
Assert.assertTrue(message.contains("disallowed"));
}
- /**
- * Test disallowed digest algorithm.
- *
- * @throws Exception if something bad happens
- */
- @Deprecated(forRemoval=true, since="0.10.0")
- @Test
- public void testDisallowedDigestLegacy() throws Exception {
- final DOMElementItem item = makeItem("signed.xml");
-
- final List<Item<Element>> mdCol = new ArrayList<>();
- mdCol.add(item);
-
- final XMLSignatureValidationStage stage = new XMLSignatureValidationStage();
- stage.setId("test");
- stage.setVerificationCertificate(signingCert);
- stage.setBlacklistedDigests(CollectionSupport.singleton("http://www.w3.org/2001/04/xmlenc#sha256"));
- stage.initialize();
-
- stage.execute(mdCol);
- stage.destroy();
- Assert.assertEquals(mdCol.size(), 1);
-
- final Item<Element> result = mdCol.iterator().next();
-
- // There should not have been one error, mentioning that an algorithm is disallowed.
- final List<ErrorStatus> errors = result.getItemMetadata().get(ErrorStatus.class);
- Assert.assertEquals(errors.size(), 1);
- final String message = errors.get(0).getStatusMessage();
- Assert.assertTrue(message.contains("disallowed"));
- }
-
- /**
- * Test disallowed signature method.
- *
- * @throws Exception if something bad happens
- */
- @Deprecated(forRemoval=true, since="0.10.0")
- @Test
- public void testDisallowedSignatureMethodLegacy() throws Exception {
- final DOMElementItem item = makeItem("signed.xml");
-
- final List<Item<Element>> mdCol = new ArrayList<>();
- mdCol.add(item);
-
- final XMLSignatureValidationStage stage = new XMLSignatureValidationStage();
- stage.setId("test");
- stage.setVerificationCertificate(signingCert);
- stage.setBlacklistedSignatureMethods(CollectionSupport.singleton("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"));
- stage.initialize();
-
- stage.execute(mdCol);
- stage.destroy();
- Assert.assertEquals(mdCol.size(), 1);
-
- final Item<Element> result = mdCol.iterator().next();
-
- // There should not have been one error, mentioning that the algorithm is disallowed.
- final List<ErrorStatus> errors = result.getItemMetadata().get(ErrorStatus.class);
- Assert.assertEquals(errors.size(), 1);
- final String message = errors.get(0).getStatusMessage();
- Assert.assertTrue(message.contains("disallowed"));
- }
-
/**
* Test that a signature with an empty reference is permitted by default.
*
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java
index 048ec00..caf929b 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java
@@ -115,34 +115,6 @@ public class ContactPersonFilterStageTest extends BaseDOMTest {
// expected this
}
}
-
- @Test
- @Deprecated(forRemoval=true, since="0.10.0")
- public void testKeepingTypesLegacy() throws ComponentInitializationException {
- ContactPersonFilterStage stage = new ContactPersonFilterStage();
- stage.setId("foo");
- Assert.assertTrue(stage.isWhitelistingTypes());
-
- stage.setWhitelistingTypes(false);
- Assert.assertFalse(stage.isWhitelistingTypes());
-
- stage.initialize();
- try {
- stage.setWhitelistingTypes(true);
- Assert.fail();
- } catch (UnmodifiableComponentException e) {
- Assert.assertFalse(stage.isWhitelistingTypes());
- }
-
- stage = new ContactPersonFilterStage();
- stage.destroy();
- try {
- stage.setWhitelistingTypes(true);
- Assert.fail();
- } catch (DestroyedComponentException e) {
- // expected this
- }
- }
@Test
public void testKeepingContactPersons() throws Exception {
@@ -208,40 +180,6 @@ public class ContactPersonFilterStageTest extends BaseDOMTest {
Assert.assertEquals(contactPersons.size(), 0);
}
- @Test
- @Deprecated(forRemoval=true, since="0.10.0")
- public void testRemovingContactPersonsLegacy() throws Exception {
- final @Nonnull var entitiesDescriptor = readXMLData("entities.xml");
- ContactPersonFilterStage stage = new ContactPersonFilterStage();
- stage.setId("foo");
- stage.setDesignatedTypes(CollectionSupport.setOf(ContactPersonFilterStage.ADMINISTRATIVE, ContactPersonFilterStage.OTHER));
- stage.setWhitelistingTypes(false);
- stage.initialize();
-
- final ArrayList<Item<Element>> items = new ArrayList<>();
- items.add(new DOMElementItem(entitiesDescriptor));
-
- stage.execute(items);
-
- Element filteredEntitiesDescriptor = items.get(0).unwrap();
- List<Element> entityDescriptors = ElementSupport.getChildElements(filteredEntitiesDescriptor);
-
- Element idpDescriptor = entityDescriptors.get(0);
- assert idpDescriptor != null;
- List<Element> contactPersons = ElementSupport.getChildElements(idpDescriptor, contactPersonQname);
- Assert.assertEquals(contactPersons.size(), 1);
-
- Element issuesDescriptor = entityDescriptors.get(1);
- assert issuesDescriptor != null;
- contactPersons = ElementSupport.getChildElements(issuesDescriptor, contactPersonQname);
- Assert.assertEquals(contactPersons.size(), 3);
-
- Element wikiDescriptor = entityDescriptors.get(2);
- assert wikiDescriptor != null;
- contactPersons = ElementSupport.getChildElements(wikiDescriptor, contactPersonQname);
- Assert.assertEquals(contactPersons.size(), 0);
- }
-
@Test
public void mda243() throws Exception {
final var stage = new ContactPersonFilterStage();
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java
index 350c1f2..ab97e9e 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java
@@ -37,37 +37,6 @@ public class EntityFilterStageTest extends BaseDOMTest {
super(EntityFilterStage.class);
}
- @Deprecated(forRemoval=true, since="0.10.0")
- @Test public void testKeepingLegacy() throws Exception {
- final EntityFilterStage stage = new EntityFilterStage();
- stage.setId("test");
- stage.setDesignatedEntities(CollectionSupport.listOf("https://idp.shibboleth.net/idp/shibboleth"));
- stage.setWhitelistingEntities(true);
- stage.initialize();
-
- final var metadataCollection = buildMetadataCollection();
- stage.execute(metadataCollection);
- stage.destroy();
-
- Assert.assertEquals(metadataCollection.size(), 1);
- }
-
- @Deprecated(forRemoval=true, since="0.10.0")
- @Test public void testRemovingLegacy() throws Exception {
- final EntityFilterStage stage = new EntityFilterStage();
- stage.setId("test");
- stage.setDesignatedEntities(CollectionSupport.listOf("https://idp.shibboleth.net/idp/shibboleth"));
- stage.setWhitelistingEntities(false);
- stage.initialize();
-
- final var metadataCollection = buildMetadataCollection();
- stage.execute(metadataCollection);
- stage.destroy();
-
- Assert.assertEquals(metadataCollection.size(), 2);
- }
-
-
@Test public void testKeeping() throws Exception {
final EntityFilterStage stage = new EntityFilterStage();
stage.setId("test");
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java
index 2f33842..94b0a98 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java
@@ -37,50 +37,6 @@ public class EntityRoleFilterStageTest extends BaseDOMTest {
super(EntityRoleFilterStage.class);
}
- @Deprecated(forRemoval=true, since="0.10.0")
- @Test
- public void testKeepingLegacy() throws Exception {
- EntityRoleFilterStage stage = new EntityRoleFilterStage();
- stage.setId("test");
- stage.setDesignatedRoles(CollectionSupport.listOf(SAMLMetadataSupport.IDP_SSO_DESCRIPTOR_NAME));
- stage.setWhitelistingRoles(true);
- stage.initialize();
-
- List<Item<Element>> metadataCollection = buildMetadataCollection();
- stage.execute(metadataCollection);
- stage.destroy();
-
- Assert.assertEquals(metadataCollection.size(), 1);
-
- Element descriptor = metadataCollection.get(0).unwrap();
- Assert.assertEquals(ElementSupport.getChildElements(descriptor, SAMLMetadataSupport.IDP_SSO_DESCRIPTOR_NAME)
- .size(), 1);
- }
-
- @Deprecated(forRemoval=true, since="0.10.0")
- @Test
- public void testRemovingLegacy() throws Exception {
- EntityRoleFilterStage stage = new EntityRoleFilterStage();
- stage.setId("test");
- stage.setDesignatedRoles(CollectionSupport.listOf(SAMLMetadataSupport.IDP_SSO_DESCRIPTOR_NAME));
- stage.setWhitelistingRoles(false);
- stage.initialize();
-
- List<Item<Element>> metadataCollection = buildMetadataCollection();
- stage.execute(metadataCollection);
- stage.destroy();
-
- Assert.assertEquals(metadataCollection.size(), 2);
-
- Element descriptor = metadataCollection.get(0).unwrap();
- Assert.assertEquals(ElementSupport.getChildElements(descriptor, SAMLMetadataSupport.SP_SSO_DESCRIPTOR_NAME)
- .size(), 1);
-
- descriptor = metadataCollection.get(1).unwrap();
- Assert.assertEquals(ElementSupport.getChildElements(descriptor, SAMLMetadataSupport.SP_SSO_DESCRIPTOR_NAME)
- .size(), 1);
- }
-
@Test
public void testKeeping() throws Exception {
EntityRoleFilterStage stage = new EntityRoleFilterStage();
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/GenerateIdStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/GenerateIdStageTest.java
index ec50d89..6015c49 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/GenerateIdStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/GenerateIdStageTest.java
@@ -97,24 +97,6 @@ public class GenerateIdStageTest extends BaseDOMTest {
Assert.assertEquals(values.size(), howMany);
}
- @Test
- public void testExplicitConstructor() throws Exception {
- final var strat = new FixedStringIdentifierGenerationStrategy("hello");
-
- @SuppressWarnings("removal")
- final var stage = new GenerateIdStage(strat);
- stage.setId("test");
- stage.initialize();
-
- final var item = readDOMItem("in.xml");
-
- stage.execute(CollectionSupport.listOf(item));
-
- stage.destroy();
-
- Assert.assertEquals(item.unwrap().getAttribute("ID"), "hello");
- }
-
@Test
public void testNotSAMLEntity() throws Exception {
final var strat = new FixedStringIdentifierGenerationStrategy("hello");
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java
index 27afa3e..8b15c15 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStageTest.java
@@ -190,28 +190,6 @@ public class EntityAttributeFilteringStageTest extends BaseDOMTest {
assertXMLIdentical(expected, result);
}
- // Test legacy API
- @Deprecated(forRemoval=true, since="0.10.0")
- @Test
- public void testRemovingLegacy() throws Exception {
- final List<Item<Element>> items = makeInputItems();
- final List<Predicate<EntityAttributeContext>> rules = new ArrayList<>();
- rules.add(new EntityCategoryMatcher("http://www.geant.net/uri/dataprotection-code-of-conduct/v1",
- "http://ukfederation.org.uk"));
-
- final EntityAttributeFilteringStage stage = new EntityAttributeFilteringStage();
- stage.setId("id");
- stage.setWhitelisting(false);
- stage.setRules(rules);
- stage.initialize();
- stage.execute(items);
- stage.destroy();
-
- final Element result = items.get(0).unwrap();
- final Element expected = readXMLData("remove.xml");
- assertXMLIdentical(expected, result);
- }
-
// Tests for ContextImpl inner class
@Test
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStageTest.java
index 77e147d..b756be4 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStageTest.java
@@ -52,24 +52,6 @@ public class EntityRegistrationAuthorityFilterStageTest extends BaseDOMTest {
Assert.assertEquals(mdCollection.size(), 2);
}
- @Test
- @Deprecated(since="0.10.0", forRemoval=true)
- public void testKeepingLegacy() throws Exception {
- EntityRegistrationAuthorityFilterStage stage = new EntityRegistrationAuthorityFilterStage();
- stage.setId("test");
- stage.setRequiringRegistrationInformation(false);
- stage.setWhitelistingRegistrationAuthorities(true);
- stage.setDesignatedRegistrationAuthorities(CollectionSupport.listOf("urn:example.org:authority2"));
- stage.initialize();
-
- final var mdCollection = buildMetadataCollection();
- Assert.assertEquals(mdCollection.size(), 3);
-
- stage.execute(mdCollection);
- stage.destroy();
- Assert.assertEquals(mdCollection.size(), 2);
- }
-
@Test
public void testRemoving() throws Exception {
EntityRegistrationAuthorityFilterStage stage = new EntityRegistrationAuthorityFilterStage();
@@ -87,24 +69,6 @@ public class EntityRegistrationAuthorityFilterStageTest extends BaseDOMTest {
Assert.assertEquals(mdCollection.size(), 1);
}
- @Test
- @Deprecated(since="0.10.0", forRemoval=true)
- public void testRemovingLegacy() throws Exception {
- EntityRegistrationAuthorityFilterStage stage = new EntityRegistrationAuthorityFilterStage();
- stage.setId("test");
- stage.setWhitelistingRegistrationAuthorities(false);
- stage.setRequiringRegistrationInformation(false);
- stage.setDesignatedRegistrationAuthorities(CollectionSupport.listOf("urn:example.org:authority2"));
- stage.initialize();
-
- final var mdCollection = buildMetadataCollection();
- Assert.assertEquals(mdCollection.size(), 3);
-
- stage.execute(mdCollection);
- stage.destroy();
- Assert.assertEquals(mdCollection.size(), 1);
- }
-
/**
* Tests filtering out Items that do not contain registration information.
*
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java
index bdfcb68..3b1f6a1 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/CompositeStageTest.java
@@ -153,20 +153,4 @@ public class CompositeStageTest {
}
}
- @SuppressWarnings("removal")
- @Test
- public void testDeprecatedMethods() throws Exception {
- final var marker = new MarkerStage<String>();
- marker.setId("marker");
- marker.initialize();
-
- final var stage = new CompositeStage<String>();
- stage.setId("test");
- Assert.assertEquals(stage.getComposedStages().size(), 0);
-
- stage.setComposedStages(CollectionSupport.listOf(marker));
- Assert.assertEquals(stage.getStages().size(), 1);
-
- stage.destroy();
- }
}
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java
index 4baf58a..945653b 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java
@@ -31,7 +31,6 @@ import net.shibboleth.metadata.testing.CountingStage;
import net.shibboleth.metadata.testing.MockItem;
import net.shibboleth.metadata.testing.TerminatingStage;
import net.shibboleth.shared.collection.CollectionSupport;
-import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.ComponentInitializationException;
/** Unit test of {@link PipelineDemultiplexerStage}. */
@@ -45,16 +44,6 @@ public class PipelineDemultiplexerStageTest {
Assert.assertEquals(stage.getCollectionFactory(), factory);
}
- @SuppressWarnings("removal")
- @Test public void testExecutorService() {
- PipelineDemultiplexerStage<Object> stage = new PipelineDemultiplexerStage<>();
-
- ExecutorService executor = Executors.newSingleThreadExecutor();
- assert executor != null;
- stage.setExecutorService(executor);
- Assert.assertEquals(stage.getExecutorService(), executor);
- }
-
@Test public void testExecutor() {
PipelineDemultiplexerStage<Object> stage = new PipelineDemultiplexerStage<>();
@@ -64,31 +53,6 @@ public class PipelineDemultiplexerStageTest {
Assert.assertEquals(stage.getExecutor(), executor);
}
- // Test deprecated property setter and getter. The internal representation is in
- // terms of the new record type, and the code is converting on the way in and back out.
- // Lets make sure that is, at least plausibly, working.
- @SuppressWarnings("removal")
- @Test public void testPipelineAndSelectionStrategies() {
- PipelineDemultiplexerStage<Object> stage = new PipelineDemultiplexerStage<>();
-
- // Test with an empty list. It should trivially compare equal to the generated empty list
- final List<Pair<Pipeline<Object>, Predicate<Item<Object>>>> pass = new ArrayList<>();
- stage.setPipelineAndSelectionStrategies(pass);
- Assert.assertEquals(stage.getPipelineAndSelectionStrategies(), pass);
-
- // A little trickier: a singleton with a couple of empty pipelines and always-boolean strategy
- // The implementation will reconstruct the original List, although
- // it will not be identical it should compare equal with what we put in.
- final Predicate<Item<Object>> truthy = x -> true;
- final Predicate<Item<Object>> falsey = x -> false;
- final List<Pair<Pipeline<Object>, Predicate<Item<Object>>>> pass2 = CollectionSupport.listOf(
- new Pair<>(new SimplePipeline<Object>(), truthy),
- new Pair<>(new SimplePipeline<Object>(), falsey)
- );
- stage.setPipelineAndSelectionStrategies(pass2);
- Assert.assertEquals(stage.getPipelineAndSelectionStrategies(), pass2);
- }
-
@Test public void testPipelinesAndStrategies() {
PipelineDemultiplexerStage<Object> stage = new PipelineDemultiplexerStage<>();
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java
index 4257f96..82fa466 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java
@@ -47,16 +47,6 @@ public class PipelineMergeStageTest {
list.add(element2);
return list;
}
-
- @SuppressWarnings("removal")
- @Test public void testExecutorService() {
- PipelineMergeStage<Object> stage = new PipelineMergeStage<>();
-
- ExecutorService executor = Executors.newSingleThreadExecutor();
- assert executor != null;
- stage.setExecutorService(executor);
- Assert.assertEquals(stage.getExecutorService(), executor);
- }
@Test public void testExecutor() {
PipelineMergeStage<Object> stage = new PipelineMergeStage<>();
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java
index e82eee5..8e1f61c 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/pipeline/SplitMergeStageTest.java
@@ -42,16 +42,6 @@ public class SplitMergeStageTest {
Assert.assertEquals(stage.getCollectionFactory(), factory);
}
- @SuppressWarnings("removal")
- @Test public void testExecutorService() {
- SplitMergeStage<Object> stage = new SplitMergeStage<>();
-
- ExecutorService executor = Executors.newSingleThreadExecutor();
- assert executor != null;
- stage.setExecutorService(executor);
- Assert.assertEquals(stage.getExecutorService(), executor);
- }
-
@Test public void testExecutor() {
SplitMergeStage<Object> stage = new SplitMergeStage<>();
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidatorTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidatorTest.java
index dea47d9..44ed4a9 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidatorTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/validate/x509/X509RSAOpenSSLKeylistValidatorTest.java
@@ -34,36 +34,6 @@ public class X509RSAOpenSSLKeylistValidatorTest extends BaseX509ValidatorTest {
super(X509RSAOpenSSLKeylistValidator.class);
}
- @Deprecated(forRemoval=true, since="0.10.0")
- @Test
- public void testNotBadLegacy() throws Exception {
- final X509RSAOpenSSLKeylistValidator val = new X509RSAOpenSSLKeylistValidator();
- val.setBlacklistResource(getClasspathResource("1024.txt"));
- val.setId("test");
- val.initialize();
- Assert.assertEquals(val.getKeySize(), 0); // no key size restriction
-
- final Item<String> item = new MockItem("foo");
- final X509Certificate cert = getCertificate("ok.pem");
- Assert.assertEquals(val.validate(cert, item, "stage"), Validator.Action.CONTINUE);
- errorsAndWarnings(item, 0, 0);
- val.destroy();
- }
-
- @Deprecated(forRemoval=true, since="0.10.0")
- @Test
- public void testGetResourceLegacy() throws Exception {
- final var val = new X509RSAOpenSSLKeylistValidator();
- val.setId("test");
- Assert.assertNull(val.getBlacklistResource());
- final var resource = getClasspathResource("1024.txt");
- Assert.assertNotNull(resource);
- val.setBlacklistResource(resource);
- Assert.assertSame(val.getBlacklistResource(), resource);
- val.initialize();
- val.destroy();
- }
-
@Test
public void testNotBad() throws Exception {
final X509RSAOpenSSLKeylistValidator val = new X509RSAOpenSSLKeylistValidator();
diff --git a/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStageSpringTestOld-config.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStageSpringTestOld-config.xml
deleted file mode 100644
index 9c08c55..0000000
--- a/mda-framework/src/test/resources/net/shibboleth/metadata/dom/XMLSignatureSigningStageSpringTestOld-config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:c="http://www.springframework.org/schema/c"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:mvc="http://www.springframework.org/schema/mvc"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-
- <import resource="classpath:net/shibboleth/metadata/beans.xml"/>
-
- <bean id="stage" parent="mda.XMLSignatureSigningStage"
- p:id="stage"
- p:shaVariant="SHA384"
- init-method="initialize"
- destroy-method="destroy"/>
-
-</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list