Create javaintegration package

cboehme · cboehme · commit 483103b8ef2a · 2016-12-25T08:36:14.000+01:00
The `javaintegration` package contains modules for integrating
Metafacture pipelines with Java.
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/Collector.java b/src/main/java/org/culturegraph/mf/javaintegration/Collector.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.javaintegration;
 
 import java.util.Collection;
 
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/EventList.java b/src/main/java/org/culturegraph/mf/javaintegration/EventList.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.javaintegration;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/MapToStream.java b/src/main/java/org/culturegraph/mf/javaintegration/MapToStream.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.javaintegration;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/NamedValueList.java b/src/main/java/org/culturegraph/mf/javaintegration/NamedValueList.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.javaintegration;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/NamedValueSet.java b/src/main/java/org/culturegraph/mf/javaintegration/NamedValueSet.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.javaintegration;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/ObjectCollector.java b/src/main/java/org/culturegraph/mf/javaintegration/ObjectCollector.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.javaintegration;
 
 import java.util.LinkedList;
 import java.util.Queue;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/SingleValue.java b/src/main/java/org/culturegraph/mf/javaintegration/SingleValue.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.javaintegration;
 
 import java.util.Collection;
 
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/StringListMap.java b/src/main/java/org/culturegraph/mf/javaintegration/StringListMap.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.javaintegration;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/StringListMapToStream.java b/src/main/java/org/culturegraph/mf/javaintegration/StringListMapToStream.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.javaintegration;
 
 import java.util.List;
 import java.util.Map.Entry;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/StringMap.java b/src/main/java/org/culturegraph/mf/javaintegration/StringMap.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.javaintegration;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/ValueSet.java b/src/main/java/org/culturegraph/mf/javaintegration/ValueSet.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.javaintegration;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/ArrayTypeDecoder.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/ArrayTypeDecoder.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import org.culturegraph.mf.framework.StreamReceiver;
 
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/CollectionTypeDecoder.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/CollectionTypeDecoder.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import java.util.Collection;
 
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/ComplexTypeDecoder.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/ComplexTypeDecoder.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/ComplexTypeEncoder.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/ComplexTypeEncoder.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/FieldValueGetter.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/FieldValueGetter.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/FieldValueSetter.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/FieldValueSetter.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/ListTypeEncoder.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/ListTypeEncoder.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/MapTypeDecoder.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/MapTypeDecoder.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/MapTypeEncoder.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/MapTypeEncoder.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/MetafactureSource.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/MetafactureSource.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import org.culturegraph.mf.framework.StreamReceiver;
 
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/MetafactureSourceTypeDecoder.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/MetafactureSourceTypeDecoder.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import org.culturegraph.mf.framework.StreamReceiver;
 
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/MethodValueGetter.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/MethodValueGetter.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import java.beans.Introspector;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/MethodValueSetter.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/MethodValueSetter.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import java.beans.Introspector;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/PojoDecoder.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/PojoDecoder.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import org.culturegraph.mf.framework.FluxCommand;
 import org.culturegraph.mf.framework.StreamReceiver;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/PojoEncoder.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/PojoEncoder.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorManager;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/SimpleTypeDecoder.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/SimpleTypeDecoder.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import org.culturegraph.mf.framework.StreamReceiver;
 
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/TypeDecoder.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/TypeDecoder.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import org.culturegraph.mf.framework.StreamReceiver;
 
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/TypeDecoderFactory.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/TypeDecoderFactory.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/TypeEncoder.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/TypeEncoder.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 /**
  * Encodes a Metafacture event stream to a new object.
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/TypeEncoderFactory.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/TypeEncoderFactory.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/ValueGetter.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/ValueGetter.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 /**
  * Retrieves a pojos's member, via getter method or field access. Used by
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/ValueSetter.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/ValueSetter.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 /**
  * Sets a pojos's member, via setter method or field access.
diff --git a/src/main/java/org/culturegraph/mf/javaintegration/pojo/ValueType.java b/src/main/java/org/culturegraph/mf/javaintegration/pojo/ValueType.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
diff --git a/src/main/java/org/culturegraph/mf/metamorph/Filter.java b/src/main/java/org/culturegraph/mf/metamorph/Filter.java
@@ -23,7 +23,7 @@
 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.SingleValue;
+import org.culturegraph.mf.javaintegration.SingleValue;
 
 /**
  * Filters a stream based on a morph definition. A record is accepted if the
diff --git a/src/main/java/org/culturegraph/mf/metamorph/Splitter.java b/src/main/java/org/culturegraph/mf/metamorph/Splitter.java
@@ -25,7 +25,7 @@
 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.stream.sink.SingleValue;
+import org.culturegraph.mf.javaintegration.SingleValue;
 
 
 
diff --git a/src/main/java/org/culturegraph/mf/test/MetamorphTestCase.java b/src/main/java/org/culturegraph/mf/test/MetamorphTestCase.java
@@ -23,8 +23,8 @@
 import org.culturegraph.mf.commons.reflection.ReflectionUtil;
 import org.culturegraph.mf.framework.StreamPipe;
 import org.culturegraph.mf.framework.StreamReceiver;
+import org.culturegraph.mf.javaintegration.EventList;
 import org.culturegraph.mf.metamorph.Metamorph;
-import org.culturegraph.mf.stream.sink.EventList;
 import org.culturegraph.mf.test.reader.MultiFormatReader;
 import org.culturegraph.mf.test.reader.Reader;
 import org.culturegraph.mf.test.validators.StreamValidator;
diff --git a/src/main/java/org/culturegraph/mf/test/validators/StreamValidator.java b/src/main/java/org/culturegraph/mf/test/validators/StreamValidator.java
@@ -23,8 +23,8 @@
 import java.util.function.Consumer;
 
 import org.culturegraph.mf.framework.StreamReceiver;
-import org.culturegraph.mf.stream.sink.EventList;
-import org.culturegraph.mf.stream.sink.EventList.Event;
+import org.culturegraph.mf.javaintegration.EventList;
+import org.culturegraph.mf.javaintegration.EventList.Event;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/resources/flux-commands.properties b/src/main/resources/flux-commands.properties
@@ -112,8 +112,8 @@ stream-count org.culturegraph.mf.stream.pipe.Counter
 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
+map-to-stream org.culturegraph.mf.javaintegration.MapToStream
+string-list-map-to-stream org.culturegraph.mf.javaintegration.StringListMapToStream
 
 merge-batch-stream org.culturegraph.mf.plumbing.StreamBatchMerger
 merge-same-ids org.culturegraph.mf.plumbing.StreamMerger
diff --git a/src/test/java/org/culturegraph/mf/javaintegration/MapToStreamTest.java b/src/test/java/org/culturegraph/mf/javaintegration/MapToStreamTest.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.javaintegration;
 
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verify;
diff --git a/src/test/java/org/culturegraph/mf/javaintegration/pojo/PojoDecoderTest.java b/src/test/java/org/culturegraph/mf/javaintegration/pojo/PojoDecoderTest.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.inOrder;
diff --git a/src/test/java/org/culturegraph/mf/javaintegration/pojo/PojoEncoderTest.java b/src/test/java/org/culturegraph/mf/javaintegration/pojo/PojoEncoderTest.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.pojo;
+package org.culturegraph.mf.javaintegration.pojo;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/src/test/java/org/culturegraph/mf/test/validators/StreamValidatorTest.java b/src/test/java/org/culturegraph/mf/test/validators/StreamValidatorTest.java
@@ -21,7 +21,7 @@
 
 import java.util.function.Consumer;
 
-import org.culturegraph.mf.stream.sink.EventList;
+import org.culturegraph.mf.javaintegration.EventList;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
