Skip to content

Commit 5926120

Browse files
committed
Create flowcontrol package
The `flowcontrol` package contains modules for controlling the flow of stream events and objects in a Metafacture pipeline.
1 parent 50402af commit 5926120

17 files changed

+38
-22
lines changed

src/main/java/org/culturegraph/mf/stream/pipe/CloseSuppressor.java renamed to src/main/java/org/culturegraph/mf/flowcontrol/CloseSuppressor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.culturegraph.mf.stream.pipe;
16+
package org.culturegraph.mf.flowcontrol;
1717

1818
import org.culturegraph.mf.framework.FluxCommand;
1919
import org.culturegraph.mf.framework.ObjectPipe;

src/main/java/org/culturegraph/mf/stream/pipe/ObjectExceptionCatcher.java renamed to src/main/java/org/culturegraph/mf/flowcontrol/ObjectExceptionCatcher.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
22
* Copyright 2016 Christoph Böhme
3-
* Copyright 2013, 2014 Deutsche Nationalbibliothek
43
*
54
* Licensed under the Apache License, Version 2.0 the "License";
65
* you may not use this file except in compliance with the License.
@@ -14,7 +13,7 @@
1413
* See the License for the specific language governing permissions and
1514
* limitations under the License.
1615
*/
17-
package org.culturegraph.mf.stream.pipe;
16+
package org.culturegraph.mf.flowcontrol;
1817

1918
import java.io.PrintWriter;
2019
import java.io.StringWriter;

src/main/java/org/culturegraph/mf/stream/pipe/ObjectPipeDecoupler.java renamed to src/main/java/org/culturegraph/mf/flowcontrol/ObjectPipeDecoupler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.culturegraph.mf.stream.pipe;
16+
package org.culturegraph.mf.flowcontrol;
1717

1818
import java.util.concurrent.BlockingQueue;
1919
import java.util.concurrent.LinkedBlockingQueue;

src/main/java/org/culturegraph/mf/stream/pipe/StreamBatchResetter.java renamed to src/main/java/org/culturegraph/mf/flowcontrol/StreamBatchResetter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.culturegraph.mf.stream.pipe;
16+
package org.culturegraph.mf.flowcontrol;
1717

1818
import org.culturegraph.mf.framework.FluxCommand;
1919
import org.culturegraph.mf.framework.StreamReceiver;

src/main/java/org/culturegraph/mf/stream/pipe/StreamBuffer.java renamed to src/main/java/org/culturegraph/mf/flowcontrol/StreamBuffer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.culturegraph.mf.stream.pipe;
16+
package org.culturegraph.mf.flowcontrol;
1717

1818
import java.util.ArrayList;
1919
import java.util.List;

src/main/java/org/culturegraph/mf/stream/pipe/StreamDeferrer.java renamed to src/main/java/org/culturegraph/mf/flowcontrol/StreamDeferrer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.culturegraph.mf.stream.pipe;
16+
package org.culturegraph.mf.flowcontrol;
1717

1818
import org.culturegraph.mf.framework.FluxCommand;
1919
import org.culturegraph.mf.framework.StreamReceiver;

src/main/java/org/culturegraph/mf/stream/pipe/StreamExceptionCatcher.java renamed to src/main/java/org/culturegraph/mf/flowcontrol/StreamExceptionCatcher.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
1+
/*
2+
* Copyright 2016 Christoph Böhme
3+
*
4+
* Licensed under the Apache License, Version 2.0 the "License";
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
/**
218
*
319
*/
4-
package org.culturegraph.mf.stream.pipe;
20+
package org.culturegraph.mf.flowcontrol;
521

622
import org.culturegraph.mf.framework.FluxCommand;
723
import org.culturegraph.mf.framework.StreamReceiver;

src/main/java/org/culturegraph/mf/metamorph/Entity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import java.util.Set;
2222

2323
import org.culturegraph.mf.commons.StringUtil;
24+
import org.culturegraph.mf.flowcontrol.StreamBuffer;
2425
import org.culturegraph.mf.framework.StreamReceiver;
2526
import org.culturegraph.mf.metamorph.api.NamedValueReceiver;
2627
import org.culturegraph.mf.metamorph.api.NamedValueSource;
2728
import org.culturegraph.mf.metamorph.api.helpers.AbstractFlushingCollect;
28-
import org.culturegraph.mf.stream.pipe.StreamBuffer;
2929

3030
/**
3131
* Corresponds to the <code>&lt;entity&gt;</code> tag.

src/main/java/org/culturegraph/mf/metamorph/Filter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
package org.culturegraph.mf.metamorph;
1717

1818

19+
import org.culturegraph.mf.flowcontrol.StreamBuffer;
1920
import org.culturegraph.mf.framework.FluxCommand;
2021
import org.culturegraph.mf.framework.StreamReceiver;
2122
import org.culturegraph.mf.framework.annotations.Description;
2223
import org.culturegraph.mf.framework.annotations.In;
2324
import org.culturegraph.mf.framework.annotations.Out;
2425
import org.culturegraph.mf.framework.helpers.DefaultStreamPipe;
25-
import org.culturegraph.mf.stream.pipe.StreamBuffer;
2626
import org.culturegraph.mf.stream.sink.SingleValue;
2727

2828
/**

src/main/java/org/culturegraph/mf/metamorph/Splitter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import java.util.HashMap;
2020
import java.util.Map;
2121

22+
import org.culturegraph.mf.flowcontrol.StreamBuffer;
2223
import org.culturegraph.mf.framework.StreamPipe;
2324
import org.culturegraph.mf.framework.StreamReceiver;
2425
import org.culturegraph.mf.framework.annotations.Description;
2526
import org.culturegraph.mf.framework.annotations.In;
2627
import org.culturegraph.mf.framework.annotations.Out;
27-
import org.culturegraph.mf.stream.pipe.StreamBuffer;
2828
import org.culturegraph.mf.stream.sink.SingleValue;
2929

3030

0 commit comments

Comments
 (0)