This is an automated email from the ASF dual-hosted git repository. tballison pushed a commit to branch TIKA-4809-stage-3 in repository https://gitbox.apache.org/repos/asf/tika.git
commit ccc913db83fa8e9bc0e7d3c20afcd48d6c7d8371 Author: tallison <[email protected]> AuthorDate: Sun Aug 9 16:15:22 2026 -0400 TIKA-4809: Fix config examples that cannot start a server, and gate them --- .../test/java/org/apache/tika/server/core/ConfigExamplesTest.java | 6 ++++++ .../src/test/resources/config-examples/server-basic.json | 7 ++++++- .../src/test/resources/config-examples/server-with-parsers.json | 4 +--- .../src/test/resources/configs/cxf-test-base-template.json | 2 -- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/ConfigExamplesTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/ConfigExamplesTest.java index 43dd1391e3..7d8fb58495 100644 --- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/ConfigExamplesTest.java +++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/ConfigExamplesTest.java @@ -49,6 +49,12 @@ public class ConfigExamplesTest { Files.writeString(configFile, json, StandardCharsets.UTF_8); TikaLoader loader = TikaLoader.load(configFile); assertNotNull(loader, "TikaLoader should not be null for: " + resourceName); + // TikaLoader.load only validates top-level keys. Deserialize the server + // section too -- otherwise an example carrying a removed server key passes + // here and still fails to start a server (FAIL_ON_UNKNOWN_PROPERTIES). + TikaServerConfig serverConfig = + loader.getConfig().deserialize("server", TikaServerConfig.class); + assertNotNull(serverConfig, "'server' section should deserialize for: " + resourceName); } } diff --git a/tika-server/tika-server-core/src/test/resources/config-examples/server-basic.json b/tika-server/tika-server-core/src/test/resources/config-examples/server-basic.json index af5f016a34..044303b17c 100644 --- a/tika-server/tika-server-core/src/test/resources/config-examples/server-basic.json +++ b/tika-server/tika-server-core/src/test/resources/config-examples/server-basic.json @@ -2,10 +2,15 @@ "server": { "port": 9998, "host": "localhost", - "taskTimeoutMillis": 300000, "allowPipes": false, "allowPerRequestConfig": false }, + "parse-context": { + "timeout-limits": { + "totalTaskTimeoutMillis": 3600000, + "progressTimeoutMillis": 120000 + } + }, "parsers": [ { "default-parser": {} diff --git a/tika-server/tika-server-core/src/test/resources/config-examples/server-with-parsers.json b/tika-server/tika-server-core/src/test/resources/config-examples/server-with-parsers.json index c093108a52..dc1bc58b80 100644 --- a/tika-server/tika-server-core/src/test/resources/config-examples/server-with-parsers.json +++ b/tika-server/tika-server-core/src/test/resources/config-examples/server-with-parsers.json @@ -1,9 +1,7 @@ { "server": { "port": 9998, - "host": "0.0.0.0", - "taskTimeoutMillis": 600000, - "returnStackTrace": true + "host": "localhost" }, "parsers": [ { diff --git a/tika-server/tika-server-standard/src/test/resources/configs/cxf-test-base-template.json b/tika-server/tika-server-standard/src/test/resources/configs/cxf-test-base-template.json index f0bfba8eb0..664b2599e6 100644 --- a/tika-server/tika-server-standard/src/test/resources/configs/cxf-test-base-template.json +++ b/tika-server/tika-server-standard/src/test/resources/configs/cxf-test-base-template.json @@ -25,8 +25,6 @@ }, "server": { "port": 9999, - "taskTimeoutMillis": "TIMEOUT_MILLIS", - "taskPulseMillis": 100, "allowPipes": true, "allowPerRequestConfig": true, "endpoints": [
