TIKA-4556

tika-app/src/test/resources/configs/config-template.json

@@ -43,7 +43,7 @@
     "queueSize": 10000,
     "numEmitters": 1,
     "emitIntermediateResults": false,
-    "maxForEmitBatchBytes": 100000,
+    "directEmitThresholdBytes": 100000,
     "timeoutMillis": 60000,
     "startupTimeoutMillis": 240000,
     "sleepOnStartupTimeoutMillis": 240000,
@@ -53,7 +53,6 @@
     "staleFetcherTimeoutSeconds": 600,
     "staleFetcherDelaySeconds": 60,
     "forkedJvmArgs": ["-Xmx1g", "-XX:+UseG1GC"],
-    "tikaConfig": "TIKA_CONFIG",
     "javaPath": "java"
   },
   "plugin-roots": "PLUGIN_ROOTS"

tika-grpc/src/main/java/org/apache/tika/pipes/grpc/TikaGrpcServerImpl.java

@@ -244,7 +244,7 @@ private void fetchAndParseImpl(FetchAndParseRequest request,
                     FetchAndParseReply.newBuilder()
                                       .setFetchKey(request.getFetchKey())
                             .setStatus(pipesResult.status().name());
-            if (pipesResult.status().equals(PipesResult.STATUS.FETCH_EXCEPTION)) {
+            if (pipesResult.status().equals(PipesResult.RESULT_STATUS.FETCH_EXCEPTION)) {
                 fetchReplyBuilder.setErrorMessage(pipesResult.message());
             }
             if (pipesResult.emitData() != null && pipesResult.emitData().getMetadataList() != null) {

tika-grpc/src/test/java/org/apache/tika/pipes/grpc/TikaGrpcServerTest.java

@@ -236,7 +236,7 @@ public void testBiStream(Resources resources) throws Exception {
             @Override
             public void onNext(FetchAndParseReply fetchAndParseReply) {
                 LOG.debug("Fetched {} with metadata {}", fetchAndParseReply.getFetchKey(), fetchAndParseReply.getFieldsMap());
-                if (PipesResult.STATUS.FETCH_EXCEPTION.name().equals(fetchAndParseReply.getStatus())) {
+                if (PipesResult.RESULT_STATUS.FETCH_EXCEPTION.name().equals(fetchAndParseReply.getStatus())) {
                     errors.add(fetchAndParseReply);
                 } else {
                     successes.add(fetchAndParseReply);

tika-grpc/src/test/resources/tika-pipes-test-config.xml

@@ -27,7 +27,7 @@
         <arg>-XX:ParallelGCThreads=2</arg>
       </forkedJvmArgs>
       <timeoutMillis>60000</timeoutMillis>
-      <maxForEmitBatchBytes>-1</maxForEmitBatchBytes> <!-- disable emit -->
+      <directEmitThresholdBytes>-1</directEmitThresholdBytes> <!-- disable emit -->
     </params>
   </pipes>
   <fetchers>

tika-integration-tests/tika-pipes-kafka-integration-tests/src/test/resources/kafka/plugins-template.json

@@ -94,12 +94,11 @@
     }
   },
   "pipes": {
-    "maxForEmitBatchBytes": 10000,
+    "directEmitThresholdBytes": 10000,
     "emitMaxEstimatedBytes": 100000,
     "emitWithinMillis": 10,
     "numEmitters": 1,
     "numClients": 1,
-    "tikaConfig": "TIKA_CONFIG",
     "forkedJvmArgs": [
       "-Xmx1g",
       "-XX:ParallelGCThreads=2",

tika-integration-tests/tika-pipes-kafka-integration-tests/src/test/resources/tika-config-kafka.xml

@@ -66,7 +66,7 @@
   </metadataFilters>
   <async>
     <params>
-      <maxForEmitBatchBytes>10000</maxForEmitBatchBytes>
+      <directEmitThresholdBytes>10000</directEmitThresholdBytes>
       <emitMaxEstimatedBytes>100000</emitMaxEstimatedBytes>
       <emitWithinMillis>10</emitWithinMillis>
       <numEmitters>1</numEmitters>

tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/opensearch/plugins-template.json

@@ -60,12 +60,11 @@
     }
   },
   "pipes": {
-    "maxForEmitBatchBytes": 10000,
+    "directEmitThresholdBytes": 10000,
     "emitMaxEstimatedBytes": 100000,
     "emitWithinMillis": 60000,
     "numEmitters": 1,
     "numClients": 3,
-    "tikaConfig": "TIKA_CONFIG",
     "forkedJvmArgs": [
       "-Xmx512m",
       "-XX:ParallelGCThreads=2",

tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/resources/opensearch/tika-config-opensearch.json

@@ -101,13 +101,11 @@
     }
   },
   "pipes": {
-    "maxForEmitBatchBytes": 10000,
+    "directEmitThresholdBytes": 10000,
     "emitMaxEstimatedBytes": 100000,
     "emitWithinMillis": 60000,
     "numEmitters": 1,
     "numClients": 3,
-    "tikaConfig": "TIKA_CONFIG",
-    "pipesPluginsConfig": "PLUGINS_CONFIG",
     "forkedJvmArgs": [
       "-Xmx512m",
       "-XX:ParallelGCThreads=2",

tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/s3/plugins-template.json

@@ -56,12 +56,11 @@
     }
   },
   "pipes": {
-    "maxForEmitBatchBytes": 10000,
+    "directEmitThresholdBytes": 10000,
     "emitMaxEstimatedBytes": 100000,
     "emitWithinMillis": 10,
     "numEmitters": 1,
     "numClients": 1,
-    "tikaConfig": "{TIKA_CONFIG}",
     "forkedJvmArgs": [
       "-Xmx1g",
       "-XX:ParallelGCThreads=2",

tika-integration-tests/tika-pipes-s3-integration-tests/src/test/resources/tika-config-s3-integration-test.xml

@@ -63,7 +63,7 @@
     </metadataFilter>
   </metadataFilters>
   <async>
-    <maxForEmitBatchBytes>10000</maxForEmitBatchBytes>
+    <directEmitThresholdBytes>10000</directEmitThresholdBytes>
     <emitMaxEstimatedBytes>100000</emitMaxEstimatedBytes>
     <emitWithinMillis>10</emitWithinMillis>
     <numEmitters>1</numEmitters>

tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/solr/plugins-template.json

@@ -91,12 +91,11 @@
     }
   },
   "pipes": {
-    "maxForEmitBatchBytes": 10000,
+    "directEmitThresholdBytes": 10000,
     "emitMaxEstimatedBytes": 100000,
     "emitWithinMillis": 10,
     "numEmitters": 1,
     "numClients": 1,
-    "tikaConfig": "TIKA_CONFIG",
     "forkedJvmArgs": [
       "-Xmx1g",
       "-XX:ParallelGCThreads=2",

tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/tika-config-solr-urls.json

@@ -41,12 +41,11 @@
     }
   ],
   "pipes": {
-    "maxForEmitBatchBytes": 10000,
+    "directEmitThresholdBytes": 10000,
     "emitMaxEstimatedBytes": 100000,
     "emitWithinMillis": 10,
     "numEmitters": 1,
     "numClients": 1,
-    "tikaConfig": "{TIKA_CONFIG}",
     "forkedJvmArgs": [
       "-Xmx1g",
       "-XX:ParallelGCThreads=2",

tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/tika-config-solr-urls.xml

@@ -63,7 +63,7 @@
     </metadataFilter>
   </metadataFilters>
   <async>
-    <maxForEmitBatchBytes>10000</maxForEmitBatchBytes>
+    <directEmitThresholdBytes>10000</directEmitThresholdBytes>
     <emitMaxEstimatedBytes>100000</emitMaxEstimatedBytes>
     <emitWithinMillis>10</emitWithinMillis>
     <numEmitters>1</numEmitters>

tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/PluginsWriter.java

@@ -64,7 +64,6 @@ void write(Path output) throws IOException {
             PipesConfig pipesConfig = new PipesConfig();
 
             pipesConfig.setNumClients(simpleAsyncConfig.getNumClients() == null ? 2 : simpleAsyncConfig.getNumClients());
-            pipesConfig.setTikaConfig(output.toAbsolutePath().toString());
 
             if (simpleAsyncConfig.getXmx() != null) {
                 pipesConfig.setForkedJvmArgs(new ArrayList<>(List.of(simpleAsyncConfig.getXmx())));

tika-pipes/tika-async-cli/src/test/java/org/apache/tika/async/cli/TikaConfigAsyncWriterTest.java

@@ -45,7 +45,7 @@ public void testBasic(@TempDir Path dir) throws Exception {
         Path tmp = Files.createTempFile(dir, "plugins-",".json");
         pluginsWriter.write(tmp);
         TikaJsonConfig tikaJsonConfig = TikaJsonConfig.load(tmp);
-        PipesConfig pipesConfig = PipesConfig.load(tikaJsonConfig);
+        PipesConfig pipesConfig = PipesConfig.load(tikaJsonConfig, tmp);
         assertEquals("-Xmx1g", pipesConfig.getForkedJvmArgs().get(0));
     }
 

tika-pipes/tika-async-cli/src/test/resources/configs/config-template.json

@@ -27,7 +27,7 @@
     "queueSize": 10000,
     "numEmitters": 1,
     "emitIntermediateResults": false,
-    "maxForEmitBatchBytes": 100000,
+    "directEmitThresholdBytes": 100000,
     "timeoutMillis": 60000,
     "startupTimeoutMillis": 240000,
     "sleepOnStartupTimeoutMillis": 240000,
@@ -37,7 +37,6 @@
     "staleFetcherTimeoutSeconds": 600,
     "staleFetcherDelaySeconds": 60,
     "forkedJvmArgs": ["-Xmx1g", "-XX:+UseG1GC"],
-    "tikaConfig": "TIKA_CONFIG",
     "javaPath": "java"
   },
   "plugin-roots": "PLUGIN_ROOTS"