Create triples package

cboehme · cboehme · commit 8852fd43249f · 2016-12-25T08:36:14.000+01:00
The `triples` package contains modules for working with `Triple`s.
diff --git a/src/main/java/org/culturegraph/mf/triples/AbstractTripleSort.java b/src/main/java/org/culturegraph/mf/triples/AbstractTripleSort.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.sort;
+package org.culturegraph.mf.triples;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -29,13 +29,12 @@
 import org.culturegraph.mf.framework.ObjectReceiver;
 import org.culturegraph.mf.framework.helpers.DefaultObjectPipe;
 import org.culturegraph.mf.framework.objects.Triple;
-import org.culturegraph.mf.stream.pipe.sort.MemoryWarningSystem.Listener;
 
 /**
  * @author markus geipel
  *
  */
-public abstract class AbstractTripleSort extends DefaultObjectPipe<Triple, ObjectReceiver<Triple>> implements Listener {
+public abstract class AbstractTripleSort extends DefaultObjectPipe<Triple, ObjectReceiver<Triple>> implements MemoryWarningSystem.Listener {
 	/**
 	 * specifies the comparator
 	 */
diff --git a/src/main/java/org/culturegraph/mf/triples/MemoryWarningSystem.java b/src/main/java/org/culturegraph/mf/triples/MemoryWarningSystem.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.
@@ -17,7 +16,7 @@
 /*
  *  Code based on http://www.javaspecialists.eu/archive/Issue092.html
  */
-package org.culturegraph.mf.stream.pipe.sort;
+package org.culturegraph.mf.triples;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
diff --git a/src/main/java/org/culturegraph/mf/triples/SortedTripleFileFacade.java b/src/main/java/org/culturegraph/mf/triples/SortedTripleFileFacade.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.sort;
+package org.culturegraph.mf.triples;
 
 import java.io.BufferedInputStream;
 import java.io.EOFException;
diff --git a/src/main/java/org/culturegraph/mf/triples/StreamToTriples.java b/src/main/java/org/culturegraph/mf/triples/StreamToTriples.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.triples;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/culturegraph/mf/triples/TripleCollect.java b/src/main/java/org/culturegraph/mf/triples/TripleCollect.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.sort;
+package org.culturegraph.mf.triples;
 
 import org.culturegraph.mf.formeta.parser.FormetaParser;
 import org.culturegraph.mf.formeta.parser.PartialRecordEmitter;
diff --git a/src/main/java/org/culturegraph/mf/triples/TripleCount.java b/src/main/java/org/culturegraph/mf/triples/TripleCount.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.sort;
+package org.culturegraph.mf.triples;
 
 import java.util.Comparator;
 
diff --git a/src/main/java/org/culturegraph/mf/triples/TripleFilter.java b/src/main/java/org/culturegraph/mf/triples/TripleFilter.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.triples;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/main/java/org/culturegraph/mf/triples/TripleObjectRetriever.java b/src/main/java/org/culturegraph/mf/triples/TripleObjectRetriever.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.triples;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/culturegraph/mf/triples/TripleObjectWriter.java b/src/main/java/org/culturegraph/mf/triples/TripleObjectWriter.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.triples;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/main/java/org/culturegraph/mf/triples/TripleReader.java b/src/main/java/org/culturegraph/mf/triples/TripleReader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.source;
+package org.culturegraph.mf.triples;
 
 import java.io.BufferedInputStream;
 import java.io.EOFException;
diff --git a/src/main/java/org/culturegraph/mf/triples/TripleReorder.java b/src/main/java/org/culturegraph/mf/triples/TripleReorder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, 2014 Christoph Böhme
+ * 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.
@@ -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.triples;
 
 import org.culturegraph.mf.framework.FluxCommand;
 import org.culturegraph.mf.framework.ObjectReceiver;
diff --git a/src/main/java/org/culturegraph/mf/triples/TripleSort.java b/src/main/java/org/culturegraph/mf/triples/TripleSort.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.sort;
+package org.culturegraph.mf.triples;
 
 import org.culturegraph.mf.framework.FluxCommand;
 import org.culturegraph.mf.framework.annotations.Description;
diff --git a/src/main/java/org/culturegraph/mf/triples/TripleWriter.java b/src/main/java/org/culturegraph/mf/triples/TripleWriter.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.triples;
 
 import java.io.BufferedOutputStream;
 import java.io.FileOutputStream;
diff --git a/src/main/java/org/culturegraph/mf/triples/TriplesToStream.java b/src/main/java/org/culturegraph/mf/triples/TriplesToStream.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.converter;
+package org.culturegraph.mf.triples;
 
 import org.culturegraph.mf.formeta.parser.FormetaParser;
 import org.culturegraph.mf.formeta.parser.PartialRecordEmitter;
diff --git a/src/main/resources/flux-commands.properties b/src/main/resources/flux-commands.properties
@@ -22,16 +22,16 @@ open-tar org.culturegraph.mf.io.TarReader
 
 read-string org.culturegraph.mf.strings.StringReader
 read-dir	org.culturegraph.mf.files.DirReader
-read-triples	org.culturegraph.mf.stream.source.TripleReader
+read-triples	org.culturegraph.mf.triples.TripleReader
 
-retrieve-triple-objects org.culturegraph.mf.stream.pipe.TripleObjectRetriever
+retrieve-triple-objects org.culturegraph.mf.triples.TripleObjectRetriever
 
-sort-triples org.culturegraph.mf.stream.pipe.sort.TripleSort
-count-triples org.culturegraph.mf.stream.pipe.sort.TripleCount
-collect-triples org.culturegraph.mf.stream.pipe.sort.TripleCollect
-stream-to-triples org.culturegraph.mf.stream.converter.StreamToTriples
-filter-triples org.culturegraph.mf.stream.pipe.TripleFilter
-triples-to-stream org.culturegraph.mf.stream.converter.TriplesToStream
+sort-triples org.culturegraph.mf.triples.TripleSort
+count-triples org.culturegraph.mf.triples.TripleCount
+collect-triples org.culturegraph.mf.triples.TripleCollect
+stream-to-triples org.culturegraph.mf.triples.StreamToTriples
+filter-triples org.culturegraph.mf.triples.TripleFilter
+triples-to-stream org.culturegraph.mf.triples.TriplesToStream
 calculate-metrics org.culturegraph.mf.stream.pipe.stat.CooccurrenceMetricCalculator
 
 jscript org.culturegraph.mf.scripting.JScriptObjectPipe
@@ -70,8 +70,8 @@ to-jdom-document org.culturegraph.mf.stream.converter.StreamToJDomDocument
 from-jdom-document org.culturegraph.mf.stream.converter.JDomDocumentToStream
 
 write	org.culturegraph.mf.io.ObjectWriter
-write-triples	org.culturegraph.mf.stream.sink.TripleWriter
-write-triple-objects org.culturegraph.mf.stream.sink.TripleObjectWriter
+write-triples	org.culturegraph.mf.triples.TripleWriter
+write-triple-objects org.culturegraph.mf.triples.TripleObjectWriter
 write-xml-files org.culturegraph.mf.stream.sink.XmlFilenameWriter
 write-files org.culturegraph.mf.io.ObjectFileWriter
 print org.culturegraph.mf.io.ObjectStdoutWriter
@@ -135,7 +135,7 @@ morph	org.culturegraph.mf.metamorph.Metamorph
 filter	org.culturegraph.mf.metamorph.Filter
 add-oreaggregation	org.culturegraph.mf.stream.pipe.OreAggregationAdder
 digest-file	org.culturegraph.mf.files.FileDigestCalculator
-reorder-triple	org.culturegraph.mf.stream.pipe.TripleReorder
+reorder-triple	org.culturegraph.mf.triples.TripleReorder
 
 json-to-elasticsearch-bulk org.culturegraph.mf.stream.converter.JsonToElasticsearchBulk
 
diff --git a/src/test/java/org/culturegraph/mf/triples/AbstractTripleSortTest.java b/src/test/java/org/culturegraph/mf/triples/AbstractTripleSortTest.java
@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.pipe.sort;
+package org.culturegraph.mf.triples;
 
 import static org.junit.Assert.assertTrue;
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 
 import org.culturegraph.mf.framework.objects.Triple;
+import org.culturegraph.mf.triples.AbstractTripleSort;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/org/culturegraph/mf/triples/StreamToTriplesTest.java b/src/test/java/org/culturegraph/mf/triples/StreamToTriplesTest.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,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.culturegraph.mf.stream.converter;
+package org.culturegraph.mf.triples;
 
 import org.culturegraph.mf.framework.ObjectReceiver;
 import org.culturegraph.mf.framework.StandardEventNames;
 import org.culturegraph.mf.framework.objects.Triple;
 import org.culturegraph.mf.framework.objects.Triple.ObjectType;
+import org.culturegraph.mf.triples.StreamToTriples;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/src/test/java/org/culturegraph/mf/triples/TripleCollectTest.java b/src/test/java/org/culturegraph/mf/triples/TripleCollectTest.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.sort;
+package org.culturegraph.mf.triples;
 
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -22,6 +22,7 @@
 import org.culturegraph.mf.framework.StreamReceiver;
 import org.culturegraph.mf.framework.objects.Triple;
 import org.culturegraph.mf.framework.objects.Triple.ObjectType;
+import org.culturegraph.mf.triples.TripleCollect;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InOrder;
diff --git a/src/test/java/org/culturegraph/mf/triples/TripleFilterTest.java b/src/test/java/org/culturegraph/mf/triples/TripleFilterTest.java
@@ -13,13 +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.triples;
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import org.culturegraph.mf.framework.ObjectReceiver;
 import org.culturegraph.mf.framework.objects.Triple;
+import org.culturegraph.mf.triples.TripleFilter;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/culturegraph/mf/triples/TripleObjectRetrieverTest.java b/src/test/java/org/culturegraph/mf/triples/TripleObjectRetrieverTest.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.triples;
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
@@ -26,6 +26,7 @@
 import org.culturegraph.mf.framework.ObjectReceiver;
 import org.culturegraph.mf.framework.objects.Triple;
 import org.culturegraph.mf.framework.objects.Triple.ObjectType;
+import org.culturegraph.mf.triples.TripleObjectRetriever;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/src/test/java/org/culturegraph/mf/triples/TripleObjectWriterTest.java b/src/test/java/org/culturegraph/mf/triples/TripleObjectWriterTest.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.sink;
+package org.culturegraph.mf.triples;
 
 import static org.junit.Assert.assertEquals;
 
@@ -24,6 +23,7 @@
 import java.nio.file.Paths;
 
 import org.culturegraph.mf.framework.objects.Triple;
+import org.culturegraph.mf.triples.TripleObjectWriter;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/src/test/java/org/culturegraph/mf/triples/TripleReaderWriterTest.java b/src/test/java/org/culturegraph/mf/triples/TripleReaderWriterTest.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.triples;
 
 import static org.mockito.Mockito.verify;
 
@@ -23,7 +23,8 @@
 import org.culturegraph.mf.framework.ObjectReceiver;
 import org.culturegraph.mf.framework.objects.Triple;
 import org.culturegraph.mf.framework.objects.Triple.ObjectType;
-import org.culturegraph.mf.stream.source.TripleReader;
+import org.culturegraph.mf.triples.TripleReader;
+import org.culturegraph.mf.triples.TripleWriter;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
