Create mangling package

cboehme · cboehme · commit 32e0a106f267 · 2016-12-25T08:36:14.000+01:00
The `mangling` package contains modules that modify the object or event
stream.
diff --git a/src/main/java/org/culturegraph/mf/mangling/DuplicateObjectFilter.java b/src/main/java/org/culturegraph/mf/mangling/DuplicateObjectFilter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.pipe;
+package org.culturegraph.mf.mangling;
 
 import org.culturegraph.mf.framework.FluxCommand;
 import org.culturegraph.mf.framework.ObjectReceiver;
diff --git a/src/main/java/org/culturegraph/mf/mangling/EntityPathTracker.java b/src/main/java/org/culturegraph/mf/mangling/EntityPathTracker.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.sink;
+package org.culturegraph.mf.mangling;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
@@ -35,7 +35,7 @@
  * <p>The current path is returned from {@link #getCurrentPath()}.
  *
  * @author Christoph Böhme
- * @see org.culturegraph.mf.stream.pipe.StreamFlattener
+ * @see StreamFlattener
  */
 public class EntityPathTracker extends DefaultStreamReceiver {
 
diff --git a/src/main/java/org/culturegraph/mf/mangling/LiteralToObject.java b/src/main/java/org/culturegraph/mf/mangling/LiteralToObject.java
@@ -1,6 +1,5 @@
 /*
  * Copyright 2016 Christoph Böhme
- * Copyright 2013, 2014 Deutsche Nationalbibliothek
  *
  * Licensed under the Apache License, Version 2.0 the "License";
  * you may not use this file except in compliance with the License.
@@ -14,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.converter;
+package org.culturegraph.mf.mangling;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/main/java/org/culturegraph/mf/mangling/ObjectToLiteral.java b/src/main/java/org/culturegraph/mf/mangling/ObjectToLiteral.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.converter;
+package org.culturegraph.mf.mangling;
 
 import org.culturegraph.mf.framework.FluxCommand;
 import org.culturegraph.mf.framework.StreamReceiver;
diff --git a/src/main/java/org/culturegraph/mf/mangling/RecordIdChanger.java b/src/main/java/org/culturegraph/mf/mangling/RecordIdChanger.java
@@ -1,6 +1,5 @@
 /*
  * Copyright 2016 Christoph Böhme
- * Copyright 2013, 2014 Deutsche Nationalbibliothek
  *
  * Licensed under the Apache License, Version 2.0 the "License";
  * you may not use this file except in compliance with the License.
@@ -14,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.pipe;
+package org.culturegraph.mf.mangling;
 
 import org.culturegraph.mf.flowcontrol.StreamBuffer;
 import org.culturegraph.mf.framework.FluxCommand;
@@ -24,7 +23,6 @@
 import org.culturegraph.mf.framework.annotations.In;
 import org.culturegraph.mf.framework.annotations.Out;
 import org.culturegraph.mf.framework.helpers.DefaultStreamPipe;
-import org.culturegraph.mf.stream.sink.EntityPathTracker;
 
 /**
  * Replaces the record id with the value of a literal from the record. The name
diff --git a/src/main/java/org/culturegraph/mf/mangling/RecordToEntity.java b/src/main/java/org/culturegraph/mf/mangling/RecordToEntity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.pipe;
+package org.culturegraph.mf.mangling;
 
 import org.culturegraph.mf.framework.FluxCommand;
 import org.culturegraph.mf.framework.StreamReceiver;
diff --git a/src/main/java/org/culturegraph/mf/mangling/StreamEventDiscarder.java b/src/main/java/org/culturegraph/mf/mangling/StreamEventDiscarder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.pipe;
+package org.culturegraph.mf.mangling;
 
 import java.util.EnumSet;
 
diff --git a/src/main/java/org/culturegraph/mf/mangling/StreamFlattener.java b/src/main/java/org/culturegraph/mf/mangling/StreamFlattener.java
@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.pipe;
+package org.culturegraph.mf.mangling;
 
 import org.culturegraph.mf.framework.FluxCommand;
 import org.culturegraph.mf.framework.StreamReceiver;
 import org.culturegraph.mf.framework.annotations.Description;
 import org.culturegraph.mf.framework.annotations.In;
 import org.culturegraph.mf.framework.annotations.Out;
 import org.culturegraph.mf.framework.helpers.DefaultStreamPipe;
-import org.culturegraph.mf.stream.sink.EntityPathTracker;
 
 /**
  * Flattens all entities in a stream by prefixing the literals with the entity
diff --git a/src/main/java/org/culturegraph/mf/metamorph/Metamorph.java b/src/main/java/org/culturegraph/mf/metamorph/Metamorph.java
@@ -38,6 +38,7 @@
 import org.culturegraph.mf.framework.annotations.In;
 import org.culturegraph.mf.framework.annotations.Out;
 import org.culturegraph.mf.framework.helpers.DefaultStreamReceiver;
+import org.culturegraph.mf.mangling.StreamFlattener;
 import org.culturegraph.mf.metamorph.api.FlushListener;
 import org.culturegraph.mf.metamorph.api.InterceptorFactory;
 import org.culturegraph.mf.metamorph.api.Maps;
@@ -47,7 +48,6 @@
 import org.culturegraph.mf.metamorph.api.NamedValueReceiver;
 import org.culturegraph.mf.metamorph.api.NamedValueSource;
 import org.culturegraph.mf.metamorph.api.SourceLocation;
-import org.culturegraph.mf.stream.pipe.StreamFlattener;
 import org.xml.sax.InputSource;
 
 /**
diff --git a/src/main/resources/flux-commands.properties b/src/main/resources/flux-commands.properties
@@ -81,14 +81,14 @@ log-object	org.culturegraph.mf.stream.pipe.ObjectLogger
 log-time	org.culturegraph.mf.stream.pipe.ObjectTimer
 log-stream-time org.culturegraph.mf.stream.pipe.StreamTimer
 
-change-id	org.culturegraph.mf.stream.pipe.RecordIdChanger
-flatten	org.culturegraph.mf.stream.pipe.StreamFlattener
-record-to-entity org.culturegraph.mf.stream.pipe.RecordToEntity
+change-id	org.culturegraph.mf.mangling.RecordIdChanger
+flatten	org.culturegraph.mf.mangling.StreamFlattener
+record-to-entity org.culturegraph.mf.mangling.RecordToEntity
 
 template org.culturegraph.mf.stream.converter.ObjectTemplate
 add-preamble-epilogue org.culturegraph.mf.stream.converter.PreambleEpilogueAdder
 
-filter-duplicate-objects org.culturegraph.mf.stream.pipe.DuplicateObjectFilter
+filter-duplicate-objects org.culturegraph.mf.mangling.DuplicateObjectFilter
 
 object-tee org.culturegraph.mf.plumbing.ObjectTee
 stream-tee org.culturegraph.mf.plumbing.StreamTee
@@ -109,8 +109,8 @@ match org.culturegraph.mf.stream.pipe.StringMatcher
 
 stream-count org.culturegraph.mf.stream.pipe.Counter
 
-literal-to-object org.culturegraph.mf.stream.converter.LiteralToObject
-object-to-literal org.culturegraph.mf.stream.converter.ObjectToLiteral
+literal-to-object org.culturegraph.mf.mangling.LiteralToObject
+object-to-literal org.culturegraph.mf.mangling.ObjectToLiteral
 
 map-to-stream org.culturegraph.mf.stream.converter.MapToStream
 string-list-map-to-stream org.culturegraph.mf.stream.converter.StringListMapToStream
@@ -119,7 +119,7 @@ merge-batch-stream org.culturegraph.mf.plumbing.StreamBatchMerger
 merge-same-ids org.culturegraph.mf.plumbing.StreamMerger
 
 filter-strings org.culturegraph.mf.stream.pipe.StringFilter
-discard-events org.culturegraph.mf.stream.pipe.StreamEventDiscarder
+discard-events org.culturegraph.mf.mangling.StreamEventDiscarder
 
 draw-uniform-sample org.culturegraph.mf.stream.pipe.UniformSampler
 
diff --git a/src/test/java/org/culturegraph/mf/mangling/DuplicateObjectFilterTest.java b/src/test/java/org/culturegraph/mf/mangling/DuplicateObjectFilterTest.java
@@ -1,7 +1,23 @@
+/*
+ * Copyright 2016 Christoph Böhme
+ *
+ * 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 org.culturegraph.mf.stream.pipe;
+package org.culturegraph.mf.mangling;
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/src/test/java/org/culturegraph/mf/mangling/EntityPathTrackerTest.java b/src/test/java/org/culturegraph/mf/mangling/EntityPathTrackerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.sink;
+package org.culturegraph.mf.mangling;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
diff --git a/src/test/java/org/culturegraph/mf/mangling/LiteralToObjectTest.java b/src/test/java/org/culturegraph/mf/mangling/LiteralToObjectTest.java
@@ -1,6 +1,5 @@
 /*
  * Copyright 2016 Christoph Böhme
- * Copyright 2013, 2014 Deutsche Nationalbibliothek
  *
  * Licensed under the Apache License, Version 2.0 the "License";
  * you may not use this file except in compliance with the License.
@@ -14,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.converter;
+package org.culturegraph.mf.mangling;
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/src/test/java/org/culturegraph/mf/mangling/ObjectToLiteralTest.java b/src/test/java/org/culturegraph/mf/mangling/ObjectToLiteralTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.converter;
+package org.culturegraph.mf.mangling;
 
 import static org.mockito.Mockito.inOrder;
 
diff --git a/src/test/java/org/culturegraph/mf/mangling/RecordIdChangerTest.java b/src/test/java/org/culturegraph/mf/mangling/RecordIdChangerTest.java
@@ -1,6 +1,5 @@
 /*
  * Copyright 2016 Christoph Böhme
- * Copyright 2013, 2014 Deutsche Nationalbibliothek
  *
  * Licensed under the Apache License, Version 2.0 the "License";
  * you may not use this file except in compliance with the License.
@@ -14,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.pipe;
+package org.culturegraph.mf.mangling;
 
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/src/test/java/org/culturegraph/mf/mangling/RecordToEntityTest.java b/src/test/java/org/culturegraph/mf/mangling/RecordToEntityTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.pipe;
+package org.culturegraph.mf.mangling;
 
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.times;
diff --git a/src/test/java/org/culturegraph/mf/mangling/StreamEventDiscarderTest.java b/src/test/java/org/culturegraph/mf/mangling/StreamEventDiscarderTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.pipe;
+package org.culturegraph.mf.mangling;
 
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verify;
@@ -22,7 +22,7 @@
 import java.util.EnumSet;
 
 import org.culturegraph.mf.framework.StreamReceiver;
-import org.culturegraph.mf.stream.pipe.StreamEventDiscarder.EventType;
+import org.culturegraph.mf.mangling.StreamEventDiscarder.EventType;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InOrder;
diff --git a/src/test/java/org/culturegraph/mf/mangling/StreamFlattenerTest.java b/src/test/java/org/culturegraph/mf/mangling/StreamFlattenerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.pipe;
+package org.culturegraph.mf.mangling;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
