Create xml package

The `xml` package contains modules for working with xml data.
metafacture · Dec 25, 2016 · 47956d4 · 47956d4
1 parent 8852fd4
commit 47956d4
Show file tree

Hide file tree

Showing 24 changed files with 21 additions and 32 deletions.
diff --git a/src/main/java/org/culturegraph/mf/test/reader/CGXmlReader.java b/src/main/java/org/culturegraph/mf/test/reader/CGXmlReader.java
@@ -15,7 +15,7 @@
  */
 package org.culturegraph.mf.test.reader;
 
-import org.culturegraph.mf.stream.converter.xml.CGXmlHandler;
+import org.culturegraph.mf.xml.CGXmlHandler;
 
 /**
  * Reads and decodes a <i>Culturegraph XML</i> document.

diff --git a/src/main/java/org/culturegraph/mf/test/reader/XmlReaderBase.java b/src/main/java/org/culturegraph/mf/test/reader/XmlReaderBase.java
@@ -17,7 +17,7 @@
 
 import org.culturegraph.mf.framework.StreamReceiver;
 import org.culturegraph.mf.framework.XmlPipe;
-import org.culturegraph.mf.stream.converter.xml.XmlDecoder;
+import org.culturegraph.mf.xml.XmlDecoder;
 
 
 /**

diff --git a/...mf/stream/converter/xml/CGXmlHandler.java → ...org/culturegraph/mf/xml/CGXmlHandler.java b/...mf/stream/converter/xml/CGXmlHandler.java → ...org/culturegraph/mf/xml/CGXmlHandler.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.xml;
+package org.culturegraph.mf.xml;
 
 import org.culturegraph.mf.framework.FluxCommand;
 import org.culturegraph.mf.framework.FormatException;

diff --git a/...aph/mf/stream/sink/FilenameExtractor.java → ...ulturegraph/mf/xml/FilenameExtractor.java b/...aph/mf/stream/sink/FilenameExtractor.java → ...ulturegraph/mf/xml/FilenameExtractor.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.xml;
 
 import java.io.File;
 

diff --git a/...ream/converter/xml/GenericXmlHandler.java → ...ulturegraph/mf/xml/GenericXmlHandler.java b/...ream/converter/xml/GenericXmlHandler.java → ...ulturegraph/mf/xml/GenericXmlHandler.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.xml;
+package org.culturegraph.mf.xml;
 
 import java.util.regex.Pattern;
 

diff --git a/...raph/mf/stream/sink/RecordIdentifier.java → ...culturegraph/mf/xml/RecordIdentifier.java b/...raph/mf/stream/sink/RecordIdentifier.java → ...culturegraph/mf/xml/RecordIdentifier.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.xml;
 
 /**
  * This interface declares methods for setting variables used by all record

diff --git a/...tream/converter/xml/SimpleXmlEncoder.java → ...culturegraph/mf/xml/SimpleXmlEncoder.java b/...tream/converter/xml/SimpleXmlEncoder.java → ...culturegraph/mf/xml/SimpleXmlEncoder.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.xml;
+package org.culturegraph.mf.xml;
 
 import java.io.IOException;
 import java.net.URL;

diff --git a/...h/mf/stream/converter/xml/XmlDecoder.java → ...a/org/culturegraph/mf/xml/XmlDecoder.java b/...h/mf/stream/converter/xml/XmlDecoder.java → ...a/org/culturegraph/mf/xml/XmlDecoder.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.xml;
+package org.culturegraph.mf.xml;
 
 import java.io.IOException;
 import java.io.Reader;

diff --git a/...ph/mf/stream/pipe/XmlElementSplitter.java → ...lturegraph/mf/xml/XmlElementSplitter.java b/...ph/mf/stream/pipe/XmlElementSplitter.java → ...lturegraph/mf/xml/XmlElementSplitter.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.xml;
 
 import java.util.HashSet;
 

diff --git a/...aph/mf/stream/sink/XmlFilenameWriter.java → ...ulturegraph/mf/xml/XmlFilenameWriter.java b/...aph/mf/stream/sink/XmlFilenameWriter.java → ...ulturegraph/mf/xml/XmlFilenameWriter.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.xml;
 
 import java.io.File;
 import java.io.FileOutputStream;

diff --git a/src/main/resources/flux-commands.properties b/src/main/resources/flux-commands.properties
@@ -46,15 +46,15 @@ decode-mab org.culturegraph.mf.stream.converter.bib.MabDecoder
 decode-formeta org.culturegraph.mf.formeta.FormetaDecoder
 decode-csv org.culturegraph.mf.stream.converter.CsvDecoder
 decode-marc21 org.culturegraph.mf.stream.converter.bib.Marc21Decoder
-decode-xml org.culturegraph.mf.stream.converter.xml.XmlDecoder
+decode-xml org.culturegraph.mf.xml.XmlDecoder
 decode-string org.culturegraph.mf.strings.StringDecoder
 regex-decode org.culturegraph.mf.strings.RegexDecoder
 
 read-beacon org.culturegraph.mf.stream.converter.BeaconReader
 
 # XML-Handler:
-handle-cg-xml org.culturegraph.mf.stream.converter.xml.CGXmlHandler
-handle-generic-xml org.culturegraph.mf.stream.converter.xml.GenericXmlHandler
+handle-cg-xml org.culturegraph.mf.xml.CGXmlHandler
+handle-generic-xml org.culturegraph.mf.xml.GenericXmlHandler
 handle-marcxml org.culturegraph.mf.stream.converter.xml.MarcXmlHandler
 handle-picaxml	org.culturegraph.mf.stream.converter.xml.PicaXmlHandler
 handle-mabxml org.culturegraph.mf.stream.converter.xml.AlephMabXmlHandler
@@ -72,7 +72,7 @@ from-jdom-document org.culturegraph.mf.stream.converter.JDomDocumentToStream
 write	org.culturegraph.mf.io.ObjectWriter
 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-xml-files org.culturegraph.mf.xml.XmlFilenameWriter
 write-files org.culturegraph.mf.io.ObjectFileWriter
 print org.culturegraph.mf.io.ObjectStdoutWriter
 
@@ -96,7 +96,7 @@ wait-for-inputs	org.culturegraph.mf.flowcontrol.CloseSuppressor
 defer-stream org.culturegraph.mf.flowcontrol.StreamDeferrer
 xml-tee	org.culturegraph.mf.plumbing.XmlTee
 
-stream-to-xml	org.culturegraph.mf.stream.converter.xml.SimpleXmlEncoder
+stream-to-xml	org.culturegraph.mf.xml.SimpleXmlEncoder
 rdf-macros	org.culturegraph.mf.stream.pipe.RdfMacroPipe
 
 batch-log	org.culturegraph.mf.stream.pipe.StreamBatchLogger
@@ -129,7 +129,7 @@ catch-stream-exception org.culturegraph.mf.flowcontrol.StreamExceptionCatcher
 normalize-unicode-string org.culturegraph.mf.strings.UnicodeNormalizer
 normalize-unicode-stream org.culturegraph.mf.strings.StreamUnicodeNormalizer
 split-lines org.culturegraph.mf.strings.LineSplitter
-split-xml-elements	org.culturegraph.mf.stream.pipe.XmlElementSplitter
+split-xml-elements	org.culturegraph.mf.xml.XmlElementSplitter
 
 morph	org.culturegraph.mf.metamorph.Metamorph
 filter	org.culturegraph.mf.metamorph.Filter

diff --git a/src/test/java/org/culturegraph/mf/io/RecordReaderTest.java b/src/test/java/org/culturegraph/mf/io/RecordReaderTest.java
@@ -23,7 +23,6 @@
 import java.io.StringReader;
 
 import org.culturegraph.mf.framework.ObjectReceiver;
-import org.culturegraph.mf.io.RecordReader;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/java/org/culturegraph/mf/triples/AbstractTripleSortTest.java b/src/test/java/org/culturegraph/mf/triples/AbstractTripleSortTest.java
@@ -21,7 +21,6 @@
 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
@@ -19,7 +19,6 @@
 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
@@ -22,7 +22,6 @@
 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
@@ -20,7 +20,6 @@
 
 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
@@ -26,7 +26,6 @@
 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
@@ -23,7 +23,6 @@
 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
@@ -23,8 +23,6 @@
 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.TripleReader;
-import org.culturegraph.mf.triples.TripleWriter;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;

diff --git a/...tream/converter/xml/CGXmlHandlerTest.java → ...culturegraph/mf/xml/CGXmlHandlerTest.java b/...tream/converter/xml/CGXmlHandlerTest.java → ...culturegraph/mf/xml/CGXmlHandlerTest.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.xml;
+package org.culturegraph.mf.xml;
 
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verify;

diff --git a/.../converter/xml/GenericXMLHandlerTest.java → ...regraph/mf/xml/GenericXMLHandlerTest.java b/.../converter/xml/GenericXMLHandlerTest.java → ...regraph/mf/xml/GenericXMLHandlerTest.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.xml;
+package org.culturegraph.mf.xml;
 
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verify;

diff --git a/...m/converter/xml/SimpleXmlEncoderTest.java → ...uregraph/mf/xml/SimpleXmlEncoderTest.java b/...m/converter/xml/SimpleXmlEncoderTest.java → ...uregraph/mf/xml/SimpleXmlEncoderTest.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.xml;
+package org.culturegraph.mf.xml;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

diff --git a/...f/stream/pipe/XmlElementSplitterTest.java → ...egraph/mf/xml/XmlElementSplitterTest.java b/...f/stream/pipe/XmlElementSplitterTest.java → ...egraph/mf/xml/XmlElementSplitterTest.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.xml;
 
 import static org.mockito.Mockito.inOrder;
 

diff --git a/...mf/stream/sink/XmlFilenameWriterTest.java → ...regraph/mf/xml/XmlFilenameWriterTest.java b/...mf/stream/sink/XmlFilenameWriterTest.java → ...regraph/mf/xml/XmlFilenameWriterTest.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.xml;
 
 import static org.junit.Assert.assertEquals;