moved to transform sub package

histream-core/src/main/java/de/sekmi/histream/io/AbstractTransformer.java

@@ -5,6 +5,7 @@ import java.util.Queue;
 import java.util.function.Consumer;
 
 import de.sekmi.histream.Observation;
+import de.sekmi.histream.io.transform.Transformation;
 
 /**
  * Abstract transformation

histream-core/src/main/java/de/sekmi/histream/io/transform/PatientVisitTransformation.java

@@ -6,8 +6,6 @@ import java.util.function.Function;
 import de.sekmi.histream.Observation;
 import de.sekmi.histream.ext.Patient;
 import de.sekmi.histream.ext.Visit;
-import de.sekmi.histream.io.Transformation;
-import de.sekmi.histream.io.TransformationException;
 
 /**
  * Replace patient and visit information for each observation.

histream-core/src/main/java/de/sekmi/histream/io/PullTransformer.java → histream-core/src/main/java/de/sekmi/histream/io/transform/PullTransformer.java

-package de.sekmi.histream.io;
+package de.sekmi.histream.io.transform;
 
 import java.io.UncheckedIOException;
 import java.util.function.Supplier;
 
 import de.sekmi.histream.Observation;
+import de.sekmi.histream.io.AbstractTransformer;
 
 /**
  * Perform transformation of {@link Observation}s for a {@link Supplier}.
@@ -24,11 +25,11 @@ public class PullTransformer extends AbstractTransformer implements Supplier<Obs
 
 	/**
 	 * Execute this transformation after another transformation
-	 * @param previousTransformation previous transformation
+	 * @param nextTransformation previous transformation
 	 * @return composite transformer which executes this transformation after the specified previous transformation
 	 */
-	public PullTransformer andThen(Transformation previousTransformation){
-		return new PullTransformer(this, previousTransformation);
+	public PullTransformer andThen(Transformation nextTransformation){
+		return new PullTransformer(this, nextTransformation);
 	}
 	@Override
 	public Observation get() {

histream-core/src/main/java/de/sekmi/histream/io/PushTransformer.java → histream-core/src/main/java/de/sekmi/histream/io/transform/PushTransformer.java

-package de.sekmi.histream.io;
+package de.sekmi.histream.io.transform;
 
 import java.io.UncheckedIOException;
 import java.util.function.Consumer;
 
 import de.sekmi.histream.Observation;
+import de.sekmi.histream.io.AbstractTransformer;
 
 public class PushTransformer extends AbstractTransformer implements Consumer<Observation>{
 	private Consumer<Observation> target;

histream-core/src/main/java/de/sekmi/histream/io/Transformation.java → histream-core/src/main/java/de/sekmi/histream/io/transform/Transformation.java

-package de.sekmi.histream.io;
+package de.sekmi.histream.io.transform;
 
 import java.util.function.Consumer;
 

histream-core/src/main/java/de/sekmi/histream/io/TransformationException.java → histream-core/src/main/java/de/sekmi/histream/io/transform/TransformationException.java

-package de.sekmi.histream.io;
+package de.sekmi.histream.io.transform;
 
 import java.io.IOException;
 

histream-core/src/test/java/de/sekmi/histream/io/TransformerTest.java

@@ -7,6 +7,9 @@ import java.io.InputStream;
 
 import org.junit.Test;
 
+import de.sekmi.histream.io.transform.PullTransformer;
+import de.sekmi.histream.io.transform.Transformation;
+
 
 public class TransformerTest {
 	@Test

histream-skos/src/main/java/de/sekmi/histream/ontology/skos/transform/RDFTransformation.java

@@ -12,8 +12,8 @@ import de.sekmi.histream.eval.Engine;
 import de.sekmi.histream.eval.ScriptException;
 import de.sekmi.histream.eval.StringValueEqualsEngine;
 import de.sekmi.histream.impl.XPathEvaluator;
-import de.sekmi.histream.io.Transformation;
-import de.sekmi.histream.io.TransformationException;
+import de.sekmi.histream.io.transform.Transformation;
+import de.sekmi.histream.io.transform.TransformationException;
 import de.sekmi.histream.ontology.OntologyException;
 import de.sekmi.histream.ontology.skos.ConceptImpl;
 import de.sekmi.histream.ontology.skos.Store;