Skip to content

Commit eab3739

Browse files
cboehmecboehme
committed
Create strings package
The `strings` package contains modules which modify strings.
1 parent b92035f commit eab3739

16 files changed

+26
-29
lines changed

‎src/main/java/org/culturegraph/mf/stream/pipe/LineSplitter.java renamed to ‎src/main/java/org/culturegraph/mf/strings/LineSplitter.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.strings;
1717

1818
import java.util.regex.Pattern;
1919

‎src/main/java/org/culturegraph/mf/stream/converter/RegexDecoder.java renamed to ‎src/main/java/org/culturegraph/mf/strings/RegexDecoder.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.converter;
16+
package org.culturegraph.mf.strings;
1817

1918
import java.util.ArrayList;
2019
import java.util.List;

‎src/main/java/org/culturegraph/mf/stream/pipe/StreamUnicodeNormalizer.java renamed to ‎src/main/java/org/culturegraph/mf/strings/StreamUnicodeNormalizer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015, 2016 Christoph Böhme
2+
* Copyright 2016 Christoph Böhme
33
*
44
* Licensed under the Apache License, Version 2.0 the "License";
55
* you may not use this file except in compliance with the License.
@@ -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.strings;
1717

1818
import java.text.Normalizer;
1919
import java.text.Normalizer.Form;

‎src/main/java/org/culturegraph/mf/stream/sink/StringConcatenator.java renamed to ‎src/main/java/org/culturegraph/mf/strings/StringConcatenator.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.sink;
16+
package org.culturegraph.mf.strings;
1717

1818
import org.culturegraph.mf.framework.ObjectReceiver;
1919

‎src/main/java/org/culturegraph/mf/stream/pipe/StringDecoder.java renamed to ‎src/main/java/org/culturegraph/mf/strings/StringDecoder.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.strings;
1717

1818
import java.util.regex.Matcher;
1919
import java.util.regex.Pattern;

‎src/main/java/org/culturegraph/mf/stream/pipe/StringFilter.java renamed to ‎src/main/java/org/culturegraph/mf/strings/StringFilter.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.strings;
1717

1818
import java.util.regex.Matcher;
1919
import java.util.regex.Pattern;

‎src/main/java/org/culturegraph/mf/stream/pipe/StringMatcher.java renamed to ‎src/main/java/org/culturegraph/mf/strings/StringMatcher.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.strings;
1717

1818
import java.util.regex.Matcher;
1919
import java.util.regex.Pattern;

‎src/main/java/org/culturegraph/mf/stream/source/StringReader.java renamed to ‎src/main/java/org/culturegraph/mf/strings/StringReader.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.source;
16+
package org.culturegraph.mf.strings;
1717

1818
import java.io.Reader;
1919

‎src/main/java/org/culturegraph/mf/stream/pipe/UnicodeNormalizer.java renamed to ‎src/main/java/org/culturegraph/mf/strings/UnicodeNormalizer.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.strings;
1817

1918
import java.text.Normalizer;
2019
import java.text.Normalizer.Form;

‎src/main/resources/flux-commands.properties

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ open-http org.culturegraph.mf.stream.source.HttpOpener
2020
open-resource org.culturegraph.mf.stream.source.ResourceOpener
2121
open-tar org.culturegraph.mf.stream.source.TarReader
2222

23-
read-string org.culturegraph.mf.stream.source.StringReader
23+
read-string org.culturegraph.mf.strings.StringReader
2424
read-dir org.culturegraph.mf.stream.source.DirReader
2525
read-triples org.culturegraph.mf.stream.source.TripleReader
2626

@@ -47,8 +47,8 @@ decode-formeta org.culturegraph.mf.formeta.FormetaDecoder
4747
decode-csv org.culturegraph.mf.stream.converter.CsvDecoder
4848
decode-marc21 org.culturegraph.mf.stream.converter.bib.Marc21Decoder
4949
decode-xml org.culturegraph.mf.stream.converter.xml.XmlDecoder
50-
decode-string org.culturegraph.mf.stream.pipe.StringDecoder
51-
regex-decode org.culturegraph.mf.stream.converter.RegexDecoder
50+
decode-string org.culturegraph.mf.strings.StringDecoder
51+
regex-decode org.culturegraph.mf.strings.RegexDecoder
5252

5353
read-beacon org.culturegraph.mf.stream.converter.BeaconReader
5454

@@ -105,7 +105,7 @@ batch-reset org.culturegraph.mf.flowcontrol.StreamBatchResetter
105105

106106
pass-through org.culturegraph.mf.plumbing.IdentityStreamPipe
107107

108-
match org.culturegraph.mf.stream.pipe.StringMatcher
108+
match org.culturegraph.mf.strings.StringMatcher
109109

110110
stream-count org.culturegraph.mf.stream.pipe.Counter
111111

@@ -118,17 +118,17 @@ string-list-map-to-stream org.culturegraph.mf.javaintegration.StringListMapToStr
118118
merge-batch-stream org.culturegraph.mf.plumbing.StreamBatchMerger
119119
merge-same-ids org.culturegraph.mf.plumbing.StreamMerger
120120

121-
filter-strings org.culturegraph.mf.stream.pipe.StringFilter
121+
filter-strings org.culturegraph.mf.strings.StringFilter
122122
discard-events org.culturegraph.mf.mangling.StreamEventDiscarder
123123

124124
draw-uniform-sample org.culturegraph.mf.stream.pipe.UniformSampler
125125

126126
catch-object-exception org.culturegraph.mf.flowcontrol.ObjectExceptionCatcher
127127
catch-stream-exception org.culturegraph.mf.flowcontrol.StreamExceptionCatcher
128128

129-
normalize-unicode-string org.culturegraph.mf.stream.pipe.UnicodeNormalizer
130-
normalize-unicode-stream org.culturegraph.mf.stream.pipe.StreamUnicodeNormalizer
131-
split-lines org.culturegraph.mf.stream.pipe.LineSplitter
129+
normalize-unicode-string org.culturegraph.mf.strings.UnicodeNormalizer
130+
normalize-unicode-stream org.culturegraph.mf.strings.StreamUnicodeNormalizer
131+
split-lines org.culturegraph.mf.strings.LineSplitter
132132
split-xml-elements org.culturegraph.mf.stream.pipe.XmlElementSplitter
133133

134134
morph org.culturegraph.mf.metamorph.Metamorph

0 commit comments

Comments
 (0)