[java-metadata-aggregator] branch master updated: MDA-131 correct identifier vs. identification strategy terminology

[Ian Young]

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

iay pushed a commit to branch master
in repository java-metadata-aggregator.

The following commit(s) were added to refs/heads/master by this push:
       new  5280ad1   MDA-131 correct identifier vs. identification strategy terminology
5280ad1 is described below

commit 5280ad1c4e7211bf85249873b06f7cfe9096e0f3
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Wed Dec 2 10:47:30 2015 +0100

    MDA-131 correct identifier vs. identification strategy terminology
---
 .../pipeline/AbstractItemMetadataSelectionStage.java         | 12 ++++++------
 .../metadata/pipeline/ItemMetadataFilterStage.java           |  2 +-
 .../metadata/pipeline/ItemMetadataTerminationStage.java      |  2 +-
 .../metadata/pipeline/StatusMetadataLoggingStage.java        |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

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 5ed6d62..27d3346 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
@@ -55,7 +55,7 @@ public abstract class AbstractItemMetadataSelectionStage<T> extends BaseStage<T>
     private Collection<Class<? extends ItemMetadata>> selectionRequirements = Collections.emptyList();
 
     /** Strategy used to generate item identifiers for logging purposes. */
-    private ItemIdentificationStrategy identifierStrategy = new FirstItemIdItemIdentificationStrategy();
+    private ItemIdentificationStrategy identificationStrategy = new FirstItemIdItemIdentificationStrategy();
 
     /**
      * Gets the {@link ItemMetadata} classes that, if the an item contains, will cause the {@link Item} to be
@@ -93,8 +93,8 @@ public abstract class AbstractItemMetadataSelectionStage<T> extends BaseStage<T>
      * 
      * @return strategy used to generate {@link Item} identifiers for logging purposes
      */
-    @Nonnull public ItemIdentificationStrategy getItemIdentifierStrategy() {
-        return identifierStrategy;
+    @Nonnull public ItemIdentificationStrategy getItemIdentificationStrategy() {
+        return identificationStrategy;
     }
 
     /**
@@ -102,11 +102,11 @@ public abstract class AbstractItemMetadataSelectionStage<T> extends BaseStage<T>
      * 
      * @param strategy strategy used to generate {@link Item} identifiers for logging purposes, can not be null
      */
-    public synchronized void setIdentifierStrategy(@Nonnull final ItemIdentificationStrategy strategy) {
+    public synchronized void setIdentificationStrategy(@Nonnull final ItemIdentificationStrategy strategy) {
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
 
-        identifierStrategy = Constraint.isNotNull(strategy, "Item identification strategy can not be null");
+        identificationStrategy = Constraint.isNotNull(strategy, "Item identification strategy can not be null");
     }
 
     /** {@inheritDoc} */
@@ -134,7 +134,7 @@ public abstract class AbstractItemMetadataSelectionStage<T> extends BaseStage<T>
     /** {@inheritDoc} */
     @Override protected void doDestroy() {
         selectionRequirements = null;
-        identifierStrategy = null;
+        identificationStrategy = null;
 
         super.doDestroy();
     }
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStage.java
index 0204366..3a8a13a 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStage.java
@@ -51,7 +51,7 @@ public class ItemMetadataFilterStage<T> extends AbstractItemMetadataSelectionSta
             Map<Class<? extends ItemMetadata>, List<? extends ItemMetadata>> matchingMetadata)
             throws StageProcessingException {
 
-        final String itemId = getItemIdentifierStrategy().getItemIdentifier(matchingItem);
+        final String itemId = getItemIdentificationStrategy().getItemIdentifier(matchingItem);
         log.debug("Item {} was removed because it was marked with {}", itemId, matchingMetadata.keySet());
 
         itemCollection.remove(matchingItem);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStage.java
index 2544811..bfd5b6d 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStage.java
@@ -49,7 +49,7 @@ public class ItemMetadataTerminationStage<T> extends AbstractItemMetadataSelecti
             Map<Class<? extends ItemMetadata>, List<? extends ItemMetadata>> matchingMetadata)
             throws TerminationException {
 
-        final String itemId = getItemIdentifierStrategy().getItemIdentifier(matchingItem);
+        final String itemId = getItemIdentificationStrategy().getItemIdentifier(matchingItem);
         log.error("Item {} caused processing to terminate because it was marked with a {}", itemId,
                 matchingMetadata.keySet());
 
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStage.java
index 4f96bf5..8dd9bd1 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStage.java
@@ -54,7 +54,7 @@ public class StatusMetadataLoggingStage<T> extends AbstractItemMetadataSelection
                         List<? extends ItemMetadata>> matchingMetadata)
                     throws StageProcessingException {
 
-        final String itemId = getItemIdentifierStrategy().getItemIdentifier(matchingItem);
+        final String itemId = getItemIdentificationStrategy().getItemIdentifier(matchingItem);
 
         logInfos(itemId, matchingMetadata.get(InfoStatus.class));
         logWarnings(itemId, matchingMetadata.get(WarningStatus.class));

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