You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2021/07/07 15:46:36 UTC
[tika] branch main updated: TIKA-3465 -- move
FileSystemPipesIterator to o.a.t.pipes.pipesiterator.fs
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new 56308cb TIKA-3465 -- move FileSystemPipesIterator to o.a.t.pipes.pipesiterator.fs
56308cb is described below
commit 56308cbaf5e7cfbe32fd6121c6140bc1a8a2026e
Author: tallison <ta...@apache.org>
AuthorDate: Wed Jul 7 11:46:13 2021 -0400
TIKA-3465 -- move FileSystemPipesIterator to o.a.t.pipes.pipesiterator.fs
---
.../src/test/java/org/apache/tika/cli/TikaCLITest.java | 2 +-
.../pipesiterator/{ => fs}/FileSystemPipesIterator.java | 3 ++-
.../pipes/pipesiterator/FileSystemPipesIteratorTest.java | 1 +
.../org/apache/tika/config/pipes-iterator-config.xml | 2 +-
.../apache/tika/config/pipes-iterator-multiple-config.xml | 4 ++--
.../tika-pipes-opensearch-integration-tests/pom.xml | 15 +++++++++++++++
.../test/resources/opensearch/tika-config-opensearch.xml | 2 +-
tika-pipes/tika-pipes-iterators/pom.xml | 2 +-
.../src/test/resources/tika-config-simple-fs-emitter.xml | 2 +-
9 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java b/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
index c8ec19b..71a1af4 100644
--- a/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
+++ b/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
@@ -67,7 +67,7 @@ public class TikaCLITest {
"<emitter class=\"org.apache.tika.pipes.emitter.fs.FileSystemEmitter\">" +
"<params>" + "<name>fse</name>" + "<basePath>" + ASYNC_OUTPUT_DIR.toAbsolutePath() +
"</basePath>" + "</params></emitter>" + "</emitters>" + "<pipesIterator " +
- "class=\"org.apache.tika.pipes.pipesiterator.FileSystemPipesIterator\">" +
+ "class=\"org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator\">" +
"<params>" + "<basePath>" + testDataFile.getAbsolutePath() + "</basePath>" +
"<fetcherName>fsf</fetcherName>" + "<emitterName>fse</emitterName>" + "</params>" +
"</pipesIterator>" + "</properties>";
diff --git a/tika-core/src/main/java/org/apache/tika/pipes/pipesiterator/FileSystemPipesIterator.java b/tika-core/src/main/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIterator.java
similarity index 97%
rename from tika-core/src/main/java/org/apache/tika/pipes/pipesiterator/FileSystemPipesIterator.java
rename to tika-core/src/main/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIterator.java
index ce0f208..d1a1923 100644
--- a/tika-core/src/main/java/org/apache/tika/pipes/pipesiterator/FileSystemPipesIterator.java
+++ b/tika-core/src/main/java/org/apache/tika/pipes/pipesiterator/fs/FileSystemPipesIterator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tika.pipes.pipesiterator;
+package org.apache.tika.pipes.pipesiterator.fs;
import java.io.IOException;
import java.nio.file.FileVisitResult;
@@ -34,6 +34,7 @@ import org.apache.tika.metadata.Metadata;
import org.apache.tika.pipes.FetchEmitTuple;
import org.apache.tika.pipes.emitter.EmitKey;
import org.apache.tika.pipes.fetcher.FetchKey;
+import org.apache.tika.pipes.pipesiterator.PipesIterator;
public class FileSystemPipesIterator extends PipesIterator implements Initializable {
diff --git a/tika-core/src/test/java/org/apache/tika/pipes/pipesiterator/FileSystemPipesIteratorTest.java b/tika-core/src/test/java/org/apache/tika/pipes/pipesiterator/FileSystemPipesIteratorTest.java
index 7efeb8a..e8e3271 100644
--- a/tika-core/src/test/java/org/apache/tika/pipes/pipesiterator/FileSystemPipesIteratorTest.java
+++ b/tika-core/src/test/java/org/apache/tika/pipes/pipesiterator/FileSystemPipesIteratorTest.java
@@ -31,6 +31,7 @@ import java.util.stream.Stream;
import org.junit.Test;
import org.apache.tika.pipes.FetchEmitTuple;
+import org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator;
public class FileSystemPipesIteratorTest {
diff --git a/tika-core/src/test/resources/org/apache/tika/config/pipes-iterator-config.xml b/tika-core/src/test/resources/org/apache/tika/config/pipes-iterator-config.xml
index 3f3fa51..902d751 100644
--- a/tika-core/src/test/resources/org/apache/tika/config/pipes-iterator-config.xml
+++ b/tika-core/src/test/resources/org/apache/tika/config/pipes-iterator-config.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
<properties>
- <pipesIterator class="org.apache.tika.pipes.pipesiterator.FileSystemPipesIterator">
+ <pipesIterator class="org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator">
<params>
<fetcherName>fs1</fetcherName>
<basePath>/my/base/path1</basePath>
diff --git a/tika-core/src/test/resources/org/apache/tika/config/pipes-iterator-multiple-config.xml b/tika-core/src/test/resources/org/apache/tika/config/pipes-iterator-multiple-config.xml
index c43a518..eaab613 100644
--- a/tika-core/src/test/resources/org/apache/tika/config/pipes-iterator-multiple-config.xml
+++ b/tika-core/src/test/resources/org/apache/tika/config/pipes-iterator-multiple-config.xml
@@ -16,13 +16,13 @@
limitations under the License.
-->
<properties>
- <pipesIterator class="org.apache.tika.pipes.pipesiterator.FileSystemPipesIterator">
+ <pipesIterator class="org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator">
<params>
<fetcherName>fs1</fetcherName>
<basePath>/my/base/path1</basePath>
</params>
</pipesIterator>
- <pipesIterator class="org.apache.tika.pipes.pipesiterator.FileSystemPipesIterator">
+ <pipesIterator class="org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator">
<params>
<fetcherName>fs2</fetcherName>
<basePath>/my/base/path2</basePath>
diff --git a/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml b/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
index ad3d9b6..f687b59 100644
--- a/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
@@ -66,4 +66,19 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/opensearch/*.json</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+</plugins>
+ </build>
</project>
diff --git a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/opensearch/tika-config-opensearch.xml b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/opensearch/tika-config-opensearch.xml
index ccb0f8f..42a2bc3 100644
--- a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/opensearch/tika-config-opensearch.xml
+++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/opensearch/tika-config-opensearch.xml
@@ -103,7 +103,7 @@
</params>
</emitter>
</emitters>
- <pipesIterator class="org.apache.tika.pipes.pipesiterator.FileSystemPipesIterator">
+ <pipesIterator class="org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator">
<params>
<basePath>{PATH_TO_DOCS}</basePath>
<fetcherName>fsf</fetcherName>
diff --git a/tika-pipes/tika-pipes-iterators/pom.xml b/tika-pipes/tika-pipes-iterators/pom.xml
index 8d8efb1..50fa2e3 100644
--- a/tika-pipes/tika-pipes-iterators/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/pom.xml
@@ -31,7 +31,7 @@
<name>Apache Tika fetch iterators</name>
<url>https://tika.apache.org/</url>
- <!-- see also org.apache.tika.pipes.pipesiterator.FileSystemIterator
+ <!-- see also org.apache.tika.pipes.pipesiterator.fs.FileSystemIterator
in tika-core if you want a file system directory crawler -->
<modules>
<module>tika-pipes-iterator-csv</module>
diff --git a/tika-server/tika-server-client/src/test/resources/tika-config-simple-fs-emitter.xml b/tika-server/tika-server-client/src/test/resources/tika-config-simple-fs-emitter.xml
index 878db4e..3938a69 100644
--- a/tika-server/tika-server-client/src/test/resources/tika-config-simple-fs-emitter.xml
+++ b/tika-server/tika-server-client/src/test/resources/tika-config-simple-fs-emitter.xml
@@ -20,7 +20,7 @@
<properties>
<service-loader initializableProblemHandler="throw"/>
<pipesIterators>
- <pipesIterator class="org.apache.tika.pipes.pipesiterator.FileSystemPipesIterator">
+ <pipesIterator class="org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator">
<params>
<fetcherName>fs</fetcherName>
<basePath>fix</basePath>