[java-metadata-aggregator] 02/03: MDA-182 - refactor Stage implementation class hierarchy
Ian Young
ian at iay.org.uk
Thu Jun 29 12:52:53 EDT 2017
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch master
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=cc41db015f2292e514d0b3d344feb8b8e1b06cfb
commit cc41db015f2292e514d0b3d344feb8b8e1b06cfb
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Jun 29 14:54:37 2017 +0100
MDA-182 - refactor Stage implementation class hierarchy
Phase 2: rename "Base" classes to "Abstract" to match project conventions.
---
.../src/test/java/net/shibboleth/metadata/cli/MDA137Stage.java | 4 ++--
.../java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java | 6 +++---
.../net/shibboleth/metadata/dom/AbstractDOMValidationStage.java | 2 +-
.../shibboleth/metadata/dom/AbstractNamespacesStrippingStage.java | 4 ++--
.../net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java | 6 +++---
.../java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java | 4 ++--
.../java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java | 4 ++--
.../java/net/shibboleth/metadata/dom/ElementStrippingStage.java | 4 ++--
.../net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java | 4 ++--
.../java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java | 4 ++--
.../java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java | 4 ++--
.../net/shibboleth/metadata/dom/XMLSignatureValidationStage.java | 4 ++--
.../main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java | 4 ++--
.../net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java | 4 ++--
.../metadata/dom/saml/EntitiesDescriptorAssemblerStage.java | 4 ++--
.../metadata/dom/saml/EntitiesDescriptorDisassemblerStage.java | 4 ++--
.../metadata/dom/saml/EntityDescriptorItemIdPopulationStage.java | 4 ++--
.../java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java | 4 ++--
.../net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java | 4 ++--
.../main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java | 4 ++--
.../net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java | 4 ++--
.../net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java | 4 ++--
.../net/shibboleth/metadata/dom/saml/RemoveOrganizationStage.java | 4 ++--
.../net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java | 4 ++--
.../java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java | 4 ++--
.../net/shibboleth/metadata/dom/saml/ValidateValidUntilStage.java | 4 ++--
.../metadata/dom/saml/mdattr/EntityAttributeAddingStage.java | 4 ++--
.../metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java | 4 ++--
.../dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java | 4 ++--
.../dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java | 4 ++--
.../{BaseFilteringStage.java => AbstractFilteringStage.java} | 2 +-
.../metadata/pipeline/AbstractItemMetadataSelectionStage.java | 6 +++---
.../{BaseIteratingStage.java => AbstractIteratingStage.java} | 2 +-
.../metadata/pipeline/{BaseStage.java => AbstractStage.java} | 2 +-
.../main/java/net/shibboleth/metadata/pipeline/CompositeStage.java | 2 +-
.../java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java | 2 +-
.../net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java | 2 +-
.../shibboleth/metadata/pipeline/MultiOutputSerializationStage.java | 2 +-
.../shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java | 2 +-
.../java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java | 2 +-
.../main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java | 2 +-
.../java/net/shibboleth/metadata/pipeline/SerializationStage.java | 2 +-
.../main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java | 2 +-
.../net/shibboleth/metadata/pipeline/StaticItemSourceStage.java | 2 +-
.../pipeline/{BaseStageTest.java => AbstractStageTest.java} | 2 +-
.../test/java/net/shibboleth/metadata/pipeline/CountingStage.java | 2 +-
.../java/net/shibboleth/metadata/pipeline/TerminatingStage.java | 2 +-
47 files changed, 80 insertions(+), 80 deletions(-)
diff --git a/aggregator-cli/src/test/java/net/shibboleth/metadata/cli/MDA137Stage.java b/aggregator-cli/src/test/java/net/shibboleth/metadata/cli/MDA137Stage.java
index 11ba140..1a791e8 100644
--- a/aggregator-cli/src/test/java/net/shibboleth/metadata/cli/MDA137Stage.java
+++ b/aggregator-cli/src/test/java/net/shibboleth/metadata/cli/MDA137Stage.java
@@ -23,13 +23,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseStage;
+import net.shibboleth.metadata.pipeline.AbstractStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
/**
* A stage which does nothing except be created and destroyed.
*/
-public class MDA137Stage<T> extends BaseStage<T> {
+public class MDA137Stage<T> extends AbstractStage<T> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(MDA137Stage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java
index f96bfaf..34537f9 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java
@@ -30,16 +30,16 @@ import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemMetadata;
import net.shibboleth.metadata.dom.saml.SAMLMetadataSupport;
-import net.shibboleth.metadata.pipeline.BaseStage;
+import net.shibboleth.metadata.pipeline.AbstractStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.collection.ClassToInstanceMultiMap;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
- * A DOM traversal class using the template method pattern.
+ * An abstract DOM traversal class using the template method pattern.
*/
@ThreadSafe
-public abstract class AbstractDOMTraversalStage extends BaseStage<Element> {
+public abstract class AbstractDOMTraversalStage extends AbstractStage<Element> {
/** Context for a particular traversal. */
protected class TraversalContext {
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java
index 0655268..985a8ae 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMValidationStage.java
@@ -32,7 +32,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
/**
- * Base stage to apply a collection of validators to each object from each item.
+ * An abstract stage to apply a collection of validators to each object from each item.
*
* @param <V> type of the object to be validated
*/
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractNamespacesStrippingStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractNamespacesStrippingStage.java
index 87d5755..d5baf3a 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractNamespacesStrippingStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractNamespacesStrippingStage.java
@@ -36,7 +36,7 @@ import org.w3c.dom.NodeList;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemMetadata;
-import net.shibboleth.metadata.pipeline.BaseStage;
+import net.shibboleth.metadata.pipeline.AbstractStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.collection.ClassToInstanceMultiMap;
@@ -52,7 +52,7 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
* Attributes without an explicit namespace prefix will never be removed.
*/
@ThreadSafe
-public abstract class AbstractNamespacesStrippingStage extends BaseStage<Element> {
+public abstract class AbstractNamespacesStrippingStage extends AbstractStage<Element> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(AbstractNamespacesStrippingStage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java
index 6be2ce3..8a1e36f 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractXSLProcessingStage.java
@@ -40,7 +40,7 @@ import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.InfoStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.WarningStatus;
-import net.shibboleth.metadata.pipeline.BaseStage;
+import net.shibboleth.metadata.pipeline.AbstractStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
@@ -56,7 +56,7 @@ import org.springframework.core.io.Resource;
import org.w3c.dom.Element;
/**
- * A pipeline stage which applies and XSLT to each element in the {@link DOMElementItem} collection.
+ * An abstract stage which applies an XSL transformation to each element in the {@link DOMElementItem} collection.
*
* <p>
* This stage requires the following properties be set prior to initialization:
@@ -65,7 +65,7 @@ import org.w3c.dom.Element;
* </ul>
*/
@ThreadSafe
-public abstract class AbstractXSLProcessingStage extends BaseStage<Element> {
+public abstract class AbstractXSLProcessingStage extends AbstractStage<Element> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(AbstractXSLProcessingStage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
index 8fdc60a..6cb1975 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
@@ -30,7 +30,7 @@ import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseStage;
+import net.shibboleth.metadata.pipeline.AbstractStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.annotation.constraint.Live;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
@@ -54,7 +54,7 @@ import org.w3c.dom.Element;
* </ul>
*/
@ThreadSafe
-public class DOMFilesystemSourceStage extends BaseStage<Element> {
+public class DOMFilesystemSourceStage extends AbstractStage<Element> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(DOMFilesystemSourceStage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
index f7a903f..b8aa204 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
@@ -26,7 +26,7 @@ import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseStage;
+import net.shibboleth.metadata.pipeline.AbstractStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -51,7 +51,7 @@ import org.w3c.dom.Element;
* </ul>
*/
@ThreadSafe
-public class DOMResourceSourceStage extends BaseStage<Element> {
+public class DOMResourceSourceStage extends AbstractStage<Element> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(DOMResourceSourceStage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java
index 299c321..ce8b93a 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementStrippingStage.java
@@ -26,7 +26,7 @@ import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseStage;
+import net.shibboleth.metadata.pipeline.AbstractStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -42,7 +42,7 @@ import org.w3c.dom.NodeList;
* A stage which removes all instances of the specified element from DOM metadata.
*/
@ThreadSafe
-public class ElementStrippingStage extends BaseStage<Element> {
+public class ElementStrippingStage extends AbstractStage<Element> {
/** Namespace of the element to strip. */
private String elementNamespace;
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java
index 8b33cd1..48fee77 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/EmptyContainerStrippingStage.java
@@ -24,7 +24,7 @@ import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseStage;
+import net.shibboleth.metadata.pipeline.AbstractStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -42,7 +42,7 @@ import org.w3c.dom.NodeList;
* A stage which removes all empty instances of the named container element from DOM metadata.
*/
@ThreadSafe
-public class EmptyContainerStrippingStage extends BaseStage<Element> {
+public class EmptyContainerStrippingStage extends AbstractStage<Element> {
/** Namespace of the element to strip. */
private String elementNamespace;
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
index dd15244..54c0bdb 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSchemaValidationStage.java
@@ -42,7 +42,7 @@ import com.google.common.collect.Iterables;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.WarningStatus;
-import net.shibboleth.metadata.pipeline.BaseIteratingStage;
+import net.shibboleth.metadata.pipeline.AbstractIteratingStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
@@ -66,7 +66,7 @@ import net.shibboleth.utilities.java.support.xml.SerializeSupport;
* an Element is found to be invalid than an {@link WarningStatus} is set on the Element.
*/
@ThreadSafe
-public class XMLSchemaValidationStage extends BaseIteratingStage<Element> {
+public class XMLSchemaValidationStage extends AbstractIteratingStage<Element> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(XMLSchemaValidationStage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
index ed55614..0af7986 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
@@ -63,7 +63,7 @@ import com.google.common.collect.Iterables;
import com.google.common.io.CharStreams;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseIteratingStage;
+import net.shibboleth.metadata.pipeline.AbstractIteratingStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.annotation.constraint.Live;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
@@ -86,7 +86,7 @@ import net.shibboleth.utilities.java.support.xml.QNameSupport;
* </ul>
*/
@ThreadSafe
-public class XMLSignatureSigningStage extends BaseIteratingStage<Element> {
+public class XMLSignatureSigningStage extends AbstractIteratingStage<Element> {
/** The variant of SHA to use in the various signature algorithms. */
public static enum ShaVariant {
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
index fa8668b..320b947 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidationStage.java
@@ -38,7 +38,7 @@ import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.WarningStatus;
import net.shibboleth.metadata.dom.XMLSignatureValidator.ValidationException;
-import net.shibboleth.metadata.pipeline.BaseIteratingStage;
+import net.shibboleth.metadata.pipeline.AbstractIteratingStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -63,7 +63,7 @@ import net.shibboleth.utilities.java.support.xml.SerializeSupport;
* valid and an Element signature is found to be invalid than an {@link WarningStatus} is set on the Element.
*/
@ThreadSafe
-public class XMLSignatureValidationStage extends BaseIteratingStage<Element> {
+public class XMLSignatureValidationStage extends AbstractIteratingStage<Element> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(XMLSignatureValidationStage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java
index 9723151..0a8c1bd 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XPathFilteringStage.java
@@ -31,7 +31,7 @@ import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseStage;
+import net.shibboleth.metadata.pipeline.AbstractStage;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -56,7 +56,7 @@ import org.w3c.dom.Element;
* </ul>
*/
@ThreadSafe
-public class XPathFilteringStage extends BaseStage<Element> {
+public class XPathFilteringStage extends AbstractStage<Element> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(XPathFilteringStage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
index 0c8e0bb..8c6f8f1 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStage.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Element;
import com.google.common.collect.ImmutableSet;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseIteratingStage;
+import net.shibboleth.metadata.pipeline.AbstractIteratingStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
@@ -60,7 +60,7 @@ import net.shibboleth.utilities.java.support.xml.SerializeSupport;
* </p>
*/
@ThreadSafe
-public class ContactPersonFilterStage extends BaseIteratingStage<Element> {
+public class ContactPersonFilterStage extends AbstractIteratingStage<Element> {
/** 'technical' person type constant. */
public static final String TECHNICAL = "technical";
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java
index 11cfe9c..19b3dd4 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorAssemblerStage.java
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.dom.DOMElementItem;
-import net.shibboleth.metadata.pipeline.BaseStage;
+import net.shibboleth.metadata.pipeline.AbstractStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -50,7 +50,7 @@ import org.w3c.dom.Element;
* to a single EntitiesDescriptor element.
*/
@ThreadSafe
-public class EntitiesDescriptorAssemblerStage extends BaseStage<Element> {
+public class EntitiesDescriptorAssemblerStage extends AbstractStage<Element> {
/** Name of the EntitiesDescriptor's Name attribute. */
public static final QName NAME_ATTRIB_NAME = new QName("Name");
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStage.java
index ffc14e1..311d7be 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntitiesDescriptorDisassemblerStage.java
@@ -26,7 +26,7 @@ import javax.annotation.concurrent.ThreadSafe;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.dom.DOMElementItem;
-import net.shibboleth.metadata.pipeline.BaseStage;
+import net.shibboleth.metadata.pipeline.AbstractStage;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
import net.shibboleth.utilities.java.support.xml.QNameSupport;
@@ -40,7 +40,7 @@ import org.w3c.dom.Element;
* elements contained therein.
*/
@ThreadSafe
-public class EntitiesDescriptorDisassemblerStage extends BaseStage<Element> {
+public class EntitiesDescriptorDisassemblerStage extends AbstractStage<Element> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(EntitiesDescriptorDisassemblerStage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage.java
index a673e9f..3b5f696 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityDescriptorItemIdPopulationStage.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Element;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemId;
-import net.shibboleth.metadata.pipeline.BaseIteratingStage;
+import net.shibboleth.metadata.pipeline.AbstractIteratingStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.xml.AttributeSupport;
@@ -33,7 +33,7 @@ import net.shibboleth.utilities.java.support.xml.AttributeSupport;
* the metadata item.
*/
@ThreadSafe
-public class EntityDescriptorItemIdPopulationStage extends BaseIteratingStage<Element> {
+public class EntityDescriptorItemIdPopulationStage extends AbstractIteratingStage<Element> {
@Override
protected void doExecute(@Nonnull final Item<Element> item) throws StageProcessingException {
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
index cd50341..4933da2 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityFilterStage.java
@@ -27,7 +27,7 @@ import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseFilteringStage;
+import net.shibboleth.metadata.pipeline.AbstractFilteringStage;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
@@ -44,7 +44,7 @@ import com.google.common.collect.Iterables;
/** A pipeline stage that will remove SAML EntityDescriptior elements which do meet specified filtering criteria. */
@ThreadSafe
-public class EntityFilterStage extends BaseFilteringStage<Element> {
+public class EntityFilterStage extends AbstractFilteringStage<Element> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(EntityFilterStage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
index 8dddaa4..ecd7e97 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
@@ -30,7 +30,7 @@ import javax.annotation.concurrent.ThreadSafe;
import javax.xml.namespace.QName;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseFilteringStage;
+import net.shibboleth.metadata.pipeline.AbstractFilteringStage;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
@@ -55,7 +55,7 @@ import com.google.common.collect.Iterables;
* EntitiesDescriptors the role filter will effect all descendant EntityDescriptors.
*/
@ThreadSafe
-public class EntityRoleFilterStage extends BaseFilteringStage<Element> {
+public class EntityRoleFilterStage extends AbstractFilteringStage<Element> {
/** QName of the RoleDescriptor element. */
public static final QName ROLE_DESCRIPTOR_NAME = new QName(SAMLMetadataSupport.MD_NS, "RoleDescriptor");
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java
index fc8c646..e661022 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/GenerateIdStage.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseIteratingStage;
+import net.shibboleth.metadata.pipeline.AbstractIteratingStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
@@ -32,7 +32,7 @@ import net.shibboleth.utilities.java.support.security.Type4UUIDIdentifierGenerat
import net.shibboleth.utilities.java.support.xml.AttributeSupport;
/** A stage that populates the ID attribute of an EntitiesDescriptor or EntityDescriptor. */
-public class GenerateIdStage extends BaseIteratingStage<Element> {
+public class GenerateIdStage extends AbstractIteratingStage<Element> {
/** QName of the ID attribute added to the descriptor. */
public static final QName ID_ATTRIB = new QName("ID");
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java
index 3d5b7f6..2bb2e02 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStage.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseIteratingStage;
+import net.shibboleth.metadata.pipeline.AbstractIteratingStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -40,7 +40,7 @@ import net.shibboleth.utilities.java.support.xml.ElementSupport;
* EntitiesDescriptor and remove the cache duration from all descendants.
*/
@ThreadSafe
-public class PullUpCacheDurationStage extends BaseIteratingStage<Element> {
+public class PullUpCacheDurationStage extends AbstractIteratingStage<Element> {
/** The minimum cache duration in milliseconds. Default value: <code>0</code> */
private long minCacheDuration;
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java
index 63e3164..be5a978 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStage.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseIteratingStage;
+import net.shibboleth.metadata.pipeline.AbstractIteratingStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -40,7 +40,7 @@ import net.shibboleth.utilities.java.support.xml.ElementSupport;
* EntitiesDescriptor and remove the valid until dates from all descendants.
*/
@ThreadSafe
-public class PullUpValidUntilStage extends BaseIteratingStage<Element> {
+public class PullUpValidUntilStage extends AbstractIteratingStage<Element> {
/** The minimum amount of time, in milliseconds, a descriptor may be valid . Default value: 0 */
private long minValidityDuration;
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage.java
index 5415366..9a0b9a9 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/RemoveOrganizationStage.java
@@ -27,13 +27,13 @@ import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseIteratingStage;
+import net.shibboleth.metadata.pipeline.AbstractIteratingStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
/** Filtering stage that removes Organization elements from EntityDescriptors. */
@ThreadSafe
-public class RemoveOrganizationStage extends BaseIteratingStage<Element> {
+public class RemoveOrganizationStage extends AbstractIteratingStage<Element> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(ContactPersonFilterStage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java
index 091934d..aea8e61 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java
@@ -23,7 +23,7 @@ import javax.annotation.concurrent.ThreadSafe;
import org.w3c.dom.Element;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseIteratingStage;
+import net.shibboleth.metadata.pipeline.AbstractIteratingStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.annotation.Duration;
import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
@@ -42,7 +42,7 @@ import net.shibboleth.utilities.java.support.xml.AttributeSupport;
* </ul>
*/
@ThreadSafe
-public class SetCacheDurationStage extends BaseIteratingStage<Element> {
+public class SetCacheDurationStage extends AbstractIteratingStage<Element> {
/** Cache duration, in milliseconds, that will be set on each metadata element. */
@Duration
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java
index 30cf608..b5d4ad5 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java
@@ -23,7 +23,7 @@ import javax.annotation.concurrent.ThreadSafe;
import org.w3c.dom.Element;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseIteratingStage;
+import net.shibboleth.metadata.pipeline.AbstractIteratingStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.annotation.Duration;
import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
@@ -42,7 +42,7 @@ import net.shibboleth.utilities.java.support.xml.AttributeSupport;
* </ul>
*/
@ThreadSafe
-public class SetValidUntilStage extends BaseIteratingStage<Element> {
+public class SetValidUntilStage extends AbstractIteratingStage<Element> {
/** Amount of time the descriptors will be valid, expressed in milliseconds. */
@Duration
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage.java
index 3701040..017ef26 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Element;
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.pipeline.BaseIteratingStage;
+import net.shibboleth.metadata.pipeline.AbstractIteratingStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -35,7 +35,7 @@ import net.shibboleth.utilities.java.support.xml.AttributeSupport;
* range. Items which are not a SAML EntitiesDescriptor or EntityDescriptor are ignored.
*/
@ThreadSafe
-public class ValidateValidUntilStage extends BaseIteratingStage<Element> {
+public class ValidateValidUntilStage extends AbstractIteratingStage<Element> {
/** Whether the item is required to have a validUntil attribute. Default value: <code>true</code> */
private boolean requireValidUntil = true;
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java
index 5812383..efeee3e 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeAddingStage.java
@@ -30,7 +30,7 @@ import net.shibboleth.metadata.dom.saml.AttributeValueElementMaker;
import net.shibboleth.metadata.dom.saml.AttributeValueElementMatcher;
import net.shibboleth.metadata.dom.saml.SAMLMetadataSupport;
import net.shibboleth.metadata.dom.saml.SAMLSupport;
-import net.shibboleth.metadata.pipeline.BaseStage;
+import net.shibboleth.metadata.pipeline.AbstractStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -47,7 +47,7 @@ import com.google.common.base.Predicate;
/**
* A stage which adds entity attribute values to entity definitions.
*/
-public class EntityAttributeAddingStage extends BaseStage<Element> {
+public class EntityAttributeAddingStage extends AbstractStage<Element> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(EntityAttributeAddingStage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
index 4b63bd7..96409a2 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
@@ -29,7 +29,7 @@ import net.shibboleth.metadata.WarningStatus;
import net.shibboleth.metadata.dom.saml.SAMLMetadataSupport;
import net.shibboleth.metadata.dom.saml.SAMLSupport;
import net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthority;
-import net.shibboleth.metadata.pipeline.BaseStage;
+import net.shibboleth.metadata.pipeline.AbstractStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -56,7 +56,7 @@ import com.google.common.base.Predicate;
* The stage can be operated in a whitelisting mode (the default) or in a blacklisting mode
* by setting the <code>whitelisting</code> property to <code>false</code>.
*/
-public class EntityAttributeFilteringStage extends BaseStage<Element> {
+public class EntityAttributeFilteringStage extends AbstractStage<Element> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(EntityAttributeFilteringStage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
index 3979e20..0f5f14d 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/EntityRegistrationAuthorityFilterStage.java
@@ -36,7 +36,7 @@ import com.google.common.collect.Iterables;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.dom.saml.SAMLMetadataSupport;
-import net.shibboleth.metadata.pipeline.BaseFilteringStage;
+import net.shibboleth.metadata.pipeline.AbstractFilteringStage;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
@@ -46,7 +46,7 @@ import net.shibboleth.utilities.java.support.xml.ElementSupport;
/** A pipeline stage that will filter EntityDescriptor or EntityDescriptors based on their registration authority. */
@ThreadSafe
-public class EntityRegistrationAuthorityFilterStage extends BaseFilteringStage<Element> {
+public class EntityRegistrationAuthorityFilterStage extends AbstractFilteringStage<Element> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(EntityRegistrationAuthorityFilterStage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java
index d3f2519..b111360 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java
@@ -26,7 +26,7 @@ import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemMetadata;
import net.shibboleth.metadata.dom.saml.SAMLMetadataSupport;
-import net.shibboleth.metadata.pipeline.BaseStage;
+import net.shibboleth.metadata.pipeline.AbstractStage;
import net.shibboleth.metadata.pipeline.StageProcessingException;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.collection.ClassToInstanceMultiMap;
@@ -41,7 +41,7 @@ import com.google.common.base.Strings;
* the entity's registration authority, to the item metadata.
*/
@ThreadSafe
-public class RegistrationAuthorityPopulationStage extends BaseStage<Element> {
+public class RegistrationAuthorityPopulationStage extends AbstractStage<Element> {
/** {@inheritDoc} */
@Override protected void doExecute(@Nonnull @NonnullElements final Collection<Item<Element>> items)
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseFilteringStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractFilteringStage.java
similarity index 97%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseFilteringStage.java
rename to aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractFilteringStage.java
index b9416b3..88b57d3 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseFilteringStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractFilteringStage.java
@@ -33,7 +33,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElemen
* @param <T> type of metadata this stage operates upon
*/
@ThreadSafe
-public abstract class BaseFilteringStage<T> extends BaseStage<T> {
+public abstract class AbstractFilteringStage<T> extends AbstractStage<T> {
/**
* Iterates over each element of the Item collection and delegates the processing of that element to
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
index 3e6a431..4e4a05e 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
@@ -43,13 +43,13 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
/**
- * A {@link Stage} that selects Items for further processing if they have a specific type of {@link ItemMetadata}
- * attached to them.
+ * An abstract {@link Stage} that selects {@link Item}s for further processing if they have a specific
+ * type of {@link ItemMetadata} attached to them.
*
* @param <T> the type of data included in the items being processed
*/
@ThreadSafe
-public abstract class AbstractItemMetadataSelectionStage<T> extends BaseStage<T> {
+public abstract class AbstractItemMetadataSelectionStage<T> extends AbstractStage<T> {
/** {@link ItemMetadata} classes that, if the an item contains, will cause the {@link Item} to be selected. */
private Collection<Class<? extends ItemMetadata>> selectionRequirements = Collections.emptyList();
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseIteratingStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractIteratingStage.java
similarity index 96%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseIteratingStage.java
rename to aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractIteratingStage.java
index f8dd17a..5737712 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseIteratingStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractIteratingStage.java
@@ -31,7 +31,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElemen
* @param <T> type of metadata this stage operates upon
*/
@ThreadSafe
-public abstract class BaseIteratingStage<T> extends BaseStage<T> {
+public abstract class AbstractIteratingStage<T> extends AbstractStage<T> {
/**
* Iterates over each element of the Item collection and delegates the processing of that element to
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractStage.java
similarity index 97%
rename from aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseStage.java
rename to aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractStage.java
index fe91d01..01b5aad 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/BaseStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractStage.java
@@ -39,7 +39,7 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
* @param <T> type of item this stage operates upon
*/
@ThreadSafe
-public abstract class BaseStage<T> extends AbstractIdentifiableInitializableComponent implements Stage<T> {
+public abstract class AbstractStage<T> extends AbstractIdentifiableInitializableComponent implements Stage<T> {
/**
* The {@link Predicate} applied to the supplied item collection to determine whether the stage will be executed.
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
index aa039c6..55f4500 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/CompositeStage.java
@@ -39,7 +39,7 @@ import net.shibboleth.utilities.java.support.component.ComponentSupport;
* @param <T> type of metadata this stage, and its composed stages, operate upon
*/
@ThreadSafe
-public class CompositeStage<T> extends BaseStage<T> {
+public class CompositeStage<T> extends AbstractStage<T> {
/** Stages which compose this stage. */
private List<Stage<T>> composedStages = Collections.emptyList();
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
index fccb40e..9f2fb61 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemIdTransformStage.java
@@ -41,7 +41,7 @@ import net.shibboleth.utilities.java.support.component.ComponentSupport;
* @param <T> type of {@link Item} this stage operates upon
*/
@ThreadSafe
-public class ItemIdTransformStage<T> extends BaseFilteringStage<T> {
+public class ItemIdTransformStage<T> extends AbstractFilteringStage<T> {
/** Transformers used on IDs. */
private Collection<Function<String, String>> idTransformers = new LazyList<>();
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java
index 7c377e4..1245da8 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataAddingStage.java
@@ -37,7 +37,7 @@ import com.google.common.base.Predicates;
* @param <T> type of {@link Item} this stage operates upon
*/
@ThreadSafe
-public class ItemMetadataAddingStage<T> extends BaseFilteringStage<T> {
+public class ItemMetadataAddingStage<T> extends AbstractFilteringStage<T> {
/** {@link ItemMetadata} objects to add to each {@link Item}'s item metadata. */
private Collection<ItemMetadata> additionalItemMetadata = new LazyList<>();
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
index 2eca212..4ec1e9b 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
@@ -49,7 +49,7 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
* @param <T> type of items upon which this stage operates
*/
@ThreadSafe
-public class MultiOutputSerializationStage<T> extends BaseStage<T> {
+public class MultiOutputSerializationStage<T> extends AbstractStage<T> {
/**
* Interface implemented by destination objects created by an {@link OutputStrategy}.
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
index 7fa39eb..0c26c0e 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
@@ -62,7 +62,7 @@ import com.google.common.collect.ImmutableList.Builder;
* @param <T> type of items upon which this stage operates
*/
@ThreadSafe
-public class PipelineDemultiplexerStage<T> extends BaseStage<T> {
+public class PipelineDemultiplexerStage<T> extends AbstractStage<T> {
/** Service used to execute the selected and/or non-selected item pipelines. */
private ExecutorService executorService = Executors.newSingleThreadExecutor();
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
index f37fdc7..55b0e20 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
@@ -57,7 +57,7 @@ import com.google.common.collect.Iterables;
* @param <T> the type of items processed by the stage
*/
@ThreadSafe
-public class PipelineMergeStage<T> extends BaseStage<T> {
+public class PipelineMergeStage<T> extends AbstractStage<T> {
/** Service used to execute the pipelines whose results will be merged. */
private ExecutorService executorService = Executors.newSingleThreadExecutor();
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
index 1e3e9a7..77399be 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
* @param <T> type of item the stage operates on
*/
@ThreadSafe
-public class ScriptletStage<T> extends BaseStage<T> {
+public class ScriptletStage<T> extends AbstractStage<T> {
/** Name of the scriptlet attribute, {@value} , containing the Item collection to be transformed. */
public static final String ITEMS = "items";
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
index 8d27800..68f15db 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
* @param <T> type of items upon which this stage operates
*/
@ThreadSafe
-public class SerializationStage<T> extends BaseStage<T> {
+public class SerializationStage<T> extends AbstractStage<T> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(SerializationStage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
index 3d36238..965f835 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
@@ -66,7 +66,7 @@ import com.google.common.base.Supplier;
* @param <T> type of items upon which this stage operates
*/
@ThreadSafe
-public class SplitMergeStage<T> extends BaseStage<T> {
+public class SplitMergeStage<T> extends AbstractStage<T> {
/** Class logger. */
private final Logger log = LoggerFactory.getLogger(SplitMergeStage.class);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java
index c2a41dc..8f5dfbd 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java
@@ -40,7 +40,7 @@ import com.google.common.collect.Iterables;
* @param <T> the type of item produced by this source
*/
@ThreadSafe
-public class StaticItemSourceStage<T> extends BaseStage<T> {
+public class StaticItemSourceStage<T> extends AbstractStage<T> {
/** Collection of static Items added to each Item collection by {@link #execute(Collection)}. */
private Collection<Item<T>> source = Collections.emptyList();
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/BaseStageTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/AbstractStageTest.java
similarity index 98%
rename from aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/BaseStageTest.java
rename to aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/AbstractStageTest.java
index 0f0291b..3a27038 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/BaseStageTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/AbstractStageTest.java
@@ -31,7 +31,7 @@ import org.testng.annotations.Test;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
-public class BaseStageTest {
+public class AbstractStageTest {
@Test
public void getSetCollectionPredicate() {
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/CountingStage.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/CountingStage.java
index 21075ba..2a02de2 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/CountingStage.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/CountingStage.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import net.shibboleth.metadata.Item;
/** Stage that counts the number of times it was invoked and the number of items it has observed. */
-public class CountingStage<T> extends BaseStage<T> {
+public class CountingStage<T> extends AbstractStage<T> {
/** Number of times the stage was invoked. */
private int invocationCount;
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java
index 8e4e607..d8d0acd 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/TerminatingStage.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import net.shibboleth.metadata.Item;
/** Stage that throws a TerminationException when it is called. */
-class TerminatingStage<T> extends BaseStage<T> {
+class TerminatingStage<T> extends AbstractStage<T> {
/** Constructor. */
public TerminatingStage() {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list