This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-4519
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/TIKA-4519 by this push:
new cfa57d876 TIKA-4519 -- tests through tika-app work
cfa57d876 is described below
commit cfa57d87645b87bec2dd664e9c87ae3940a2edff
Author: tallison <[email protected]>
AuthorDate: Tue Nov 4 15:20:45 2025 -0500
TIKA-4519 -- tests through tika-app work
---
.../java/org/apache/tika/cli/TikaCLIAsyncTest.java | 33 +++++++++++++---------
.../test/java/org/apache/tika/cli/TikaCLITest.java | 4 +--
.../org/apache/tika/async/cli/PluginsWriter.java | 25 +++++++++-------
.../org/apache/tika/async/cli/TikaAsyncCLI.java | 1 -
.../tika/async/cli/TikaConfigAsyncWriter.java | 4 +--
.../tika/pipes/core/fetcher/FetcherManager.java | 2 ++
6 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/tika-app/src/test/java/org/apache/tika/cli/TikaCLIAsyncTest.java
b/tika-app/src/test/java/org/apache/tika/cli/TikaCLIAsyncTest.java
index 7ea7982c5..c71d51e69 100644
--- a/tika-app/src/test/java/org/apache/tika/cli/TikaCLIAsyncTest.java
+++ b/tika-app/src/test/java/org/apache/tika/cli/TikaCLIAsyncTest.java
@@ -45,21 +45,25 @@ public class TikaCLIAsyncTest {
{
"plugins" : {
"fetchers": {
- "file-system-fetcher": {
- "basePath": "FETCHER_BASE_PATH",
- "extractFileSystemMetadata": false
+ "fsf": {
+ "file-system-fetcher": {
+ "basePath": "FETCHER_BASE_PATH",
+ "extractFileSystemMetadata": false
+ }
}
},
"emitters": {
- "file-system-emitter": {
- "basePath": "EMITTER_BASE_PATH",
- "fileExtension": "jsn",
- "onExists":"EXCEPTION",
- "prettyPrint": true
+ "fse": {
+ "file-system-emitter": {
+ "basePath": "EMITTER_BASE_PATH",
+ "fileExtension": "jsn",
+ "onExists":"EXCEPTION",
+ "prettyPrint": true
+ }
}
- },
- "pf4j.pluginsDir": "PLUGINS_DIR"
- }
+ }
+ },
+ "pluginsPaths": "PLUGINS_PATHS"
}
""";
@@ -82,14 +86,17 @@ public class TikaCLIAsyncTest {
ASYNC_CONFIG = Files.createTempFile(ASYNC_OUTPUT_DIR, "async-config-",
".xml");
String xml = "<properties>" + "<async>" + "<numClients>3</numClients>"
+ "<tikaConfig>" + ASYNC_CONFIG.toAbsolutePath() + "</tikaConfig>" + "</async>"
+
"<pipesIterator
class=\"org.apache.tika.pipes.pipesiterator.fs.FileSystemPipesIterator\">" +
"<basePath>" + TEST_DATA_FILE.getAbsolutePath() + "</basePath>" +
- "<fetcherPluginId>file-system-fetcher</fetcherPluginId>" +
"<emitterPluginId>file-system-emitter</emitterPluginId>" + "</pipesIterator>" +
"</properties>";
+ "<fetcherId>fsf</fetcherId>" + "<emitterId>fse</emitterId>" +
"</pipesIterator>" + "</properties>";
Files.write(ASYNC_CONFIG, xml.getBytes(UTF_8));
ASYNC_PLUGINS_CONFIG = Files.createTempFile(ASYNC_OUTPUT_DIR,
"plugins-", ".json");
Path pluginsDir = Paths.get("target/plugins");
+ if (! Files.isDirectory(pluginsDir)) {
+ LOG.warn("CAN'T FIND PLUGINS DIR. pwd={}",
Paths.get("").toAbsolutePath().toString());
+ }
String json = JSON_TEMPLATE.replace("FETCHER_BASE_PATH",
TEST_DATA_FILE.getAbsolutePath().toString())
.replace("EMITTER_BASE_PATH",
ASYNC_OUTPUT_DIR.toAbsolutePath().toString())
- .replace("PLUGINS_DIR",
pluginsDir.toAbsolutePath().toString());
+ .replace("PLUGINS_PATHS",
pluginsDir.toAbsolutePath().toString());
Files.writeString(ASYNC_PLUGINS_CONFIG, json, UTF_8);
}
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 cd10f4566..e028d9f03 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
@@ -402,9 +402,9 @@ public class TikaCLITest {
Path asyncConfig = Files.createTempFile("async-config-", ".json");
Path pluginsDir = Paths.get("target/plugins");
- String json = JSON_TEMPLATE.replace("FETCHER_BASE_PATH",
TEST_DATA_FILE.getAbsolutePath().toString())
+ String json =
TikaCLIAsyncTest.JSON_TEMPLATE.replace("FETCHER_BASE_PATH",
TEST_DATA_FILE.getAbsolutePath().toString())
.replace("EMITTER_BASE_PATH",
extractDir.toAbsolutePath().toString())
- .replace("PLUGINS_DIR",
pluginsDir.toAbsolutePath().toString());
+ .replace("PLUGINS_PATHS",
pluginsDir.toAbsolutePath().toString());
Files.writeString(asyncConfig, json, UTF_8);
String[] params = {"-Z",
diff --git
a/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/PluginsWriter.java
b/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/PluginsWriter.java
index 308ad4ae1..f4e326800 100644
---
a/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/PluginsWriter.java
+++
b/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/PluginsWriter.java
@@ -27,19 +27,24 @@ public class PluginsWriter {
{
"plugins" : {
"fetchers": {
- "file-system-fetcher": {
- "basePath": "FETCHER_BASE_PATH",
- "extractFileSystemMetadata": false
+ "fsf" : {
+ "file-system-fetcher": {
+ "basePath": "FETCHER_BASE_PATH",
+ "extractFileSystemMetadata": false
+ }
}
},
"emitters": {
- "file-system-emitter": {
- "basePath": "EMITTER_BASE_PATH",
- "fileExtension": "json"
+ "fse": {
+ "file-system-emitter": {
+ "basePath": "EMITTER_BASE_PATH",
+ "fileExtension": "json",
+ "onExists": "EXCEPTION"
+ }
}
- },
- "pf4j.pluginsDir": "PLUGINS_DIR"
- }
+ }
+ },
+ "pluginsPaths": "PLUGINS_PATHS"
}
""";
private final SimpleAsyncConfig simpleAsyncConfig;
@@ -65,7 +70,7 @@ public class PluginsWriter {
if (Files.isDirectory(plugins)) {
pluginString = plugins.toAbsolutePath().toString();
}
- json = json.replace("PLUGINS_DIR", pluginString);
+ json = json.replace("PLUGINS_PATHS", pluginString);
Files.writeString(output, json);
} catch (Exception e) {
throw new IOException(e);
diff --git
a/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaAsyncCLI.java
b/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaAsyncCLI.java
index 40ca2b2bd..3eb29bb39 100644
---
a/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaAsyncCLI.java
+++
b/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaAsyncCLI.java
@@ -103,7 +103,6 @@ public class TikaAsyncCLI {
try {
pipesIterator = PipesIterator.build(tikaConfig);
} catch (IOException | TikaException e) {
- e.printStackTrace();
//swallow
}
}
diff --git
a/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaConfigAsyncWriter.java
b/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaConfigAsyncWriter.java
index 4fa8af1fb..104398e9d 100644
---
a/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaConfigAsyncWriter.java
+++
b/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaConfigAsyncWriter.java
@@ -49,8 +49,8 @@ class TikaConfigAsyncWriter {
private static final Logger LOG =
LoggerFactory.getLogger(TikaAsyncCLI.class);
- protected static final String FETCHER_NAME = "file-system-fetcher";
- protected static final String EMITTER_NAME = "file-system-emitter";
+ protected static final String FETCHER_NAME = "fsf";
+ protected static final String EMITTER_NAME = "fse";
private final SimpleAsyncConfig simpleAsyncConfig;
diff --git
a/tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/core/fetcher/FetcherManager.java
b/tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/core/fetcher/FetcherManager.java
index 731d4057b..065d47299 100644
---
a/tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/core/fetcher/FetcherManager.java
+++
b/tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/core/fetcher/FetcherManager.java
@@ -70,8 +70,10 @@ public class FetcherManager {
PluginConfigs fetcherPluginConfigs = fetcherPluginConfigsOpt.get();
PluginManager pluginManager = null;
if (! tikaPluginsManager.getPluginsPaths().isEmpty()) {
+ LOG.warn("LOADING WITH PLUGINS PATHS: {}",
tikaPluginsManager.getPluginsPaths());
pluginManager = new
DefaultPluginManager(tikaPluginsManager.getPluginsPaths());
} else {
+ LOG.warn("NOT LOADING WITH PLUGINS PATHS: {}",
tikaPluginsManager.getPluginsPaths());
pluginManager = new DefaultPluginManager();
}
pluginManager.loadPlugins();
