[java-metadata-aggregator] 01/02: MDA-203 - Isolate non-API in impl packages

[Ian Young]

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=48879d7de1ad66cad5105ae69d38c702f17ffece

commit 48879d7de1ad66cad5105ae69d38c702f17ffece
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Wed Feb 1 12:02:27 2023 +0000

    MDA-203 -  Isolate non-API in impl packages
    
    Move FutureSupport and PipelineCallable.
    
    https://shibboleth.atlassian.net/browse/MDA-203
---
 .../net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java  | 2 ++
 .../java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java     | 2 ++
 .../main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java   | 2 ++
 .../net/shibboleth/metadata/pipeline/{ => impl}/FutureSupport.java    | 3 ++-
 .../net/shibboleth/metadata/pipeline/{ => impl}/PipelineCallable.java | 4 +++-
 5 files changed, 11 insertions(+), 2 deletions(-)

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 c13439d..0c9e71c 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
@@ -31,6 +31,8 @@ import javax.annotation.concurrent.ThreadSafe;
 
 import net.shibboleth.metadata.Item;
 import net.shibboleth.metadata.SimpleItemCollectionFactory;
+import net.shibboleth.metadata.pipeline.impl.FutureSupport;
+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.Pair;
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 b693b18..9e882bf 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
@@ -32,6 +32,8 @@ import net.shibboleth.metadata.CollectionMergeStrategy;
 import net.shibboleth.metadata.Item;
 import net.shibboleth.metadata.SimpleCollectionMergeStrategy;
 import net.shibboleth.metadata.SimpleItemCollectionFactory;
+import net.shibboleth.metadata.pipeline.impl.FutureSupport;
+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.component.ComponentInitializationException;
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 d95c04d..c712f10 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
@@ -38,6 +38,8 @@ import net.shibboleth.metadata.CollectionMergeStrategy;
 import net.shibboleth.metadata.Item;
 import net.shibboleth.metadata.SimpleCollectionMergeStrategy;
 import net.shibboleth.metadata.SimpleItemCollectionFactory;
+import net.shibboleth.metadata.pipeline.impl.FutureSupport;
+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;
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/FutureSupport.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/FutureSupport.java
similarity index 96%
rename from mda-framework/src/main/java/net/shibboleth/metadata/pipeline/FutureSupport.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/FutureSupport.java
index 520dc60..6f41519 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/FutureSupport.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/FutureSupport.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.metadata.pipeline;
+package net.shibboleth.metadata.pipeline.impl;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -28,6 +28,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import net.shibboleth.metadata.Item;
+import net.shibboleth.metadata.pipeline.StageProcessingException;
 
 /**
  * Helper class for dealing with {@link Future} values.
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineCallable.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/PipelineCallable.java
similarity index 94%
rename from mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineCallable.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/PipelineCallable.java
index 33b6deb..16ce6a5 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/PipelineCallable.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/PipelineCallable.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.metadata.pipeline;
+package net.shibboleth.metadata.pipeline.impl;
 
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -27,6 +27,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import net.shibboleth.metadata.Item;
+import net.shibboleth.metadata.pipeline.Pipeline;
+import net.shibboleth.metadata.pipeline.PipelineProcessingException;
 import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.logic.Constraint;
 

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