TIKA-4809: Purge dead keys from the server config section

Author: tballison

docs/modules/ROOT/pages/using-tika/server/index.adoc

@@ -322,23 +322,18 @@ Server behavior beyond host/port is controlled by a JSON config file passed via
 |`false`
 |Include parser stack traces in error responses. Useful in dev, dangerous in production (leaks internals).
 
-|`digest`
-|`""` (off)
-|Compute a digest of the parsed bytes. Comma-separated algorithm names: `md5`, `sha1`, `sha256`, `sha384`, `sha512`.
-
-|`digestMarkLimit`
-|`20971520` (20 MiB)
-|Max bytes buffered for digest computation.
-
 |`logLevel`
 |_inherited_
 |`debug` or `info` to override the runtime log level.
 
-|`idBase`
+|`id`
 |random UUID
-|Override the auto-generated server ID (the `-i` CLI flag is the same setting).
+|Override the auto-generated server ID, which is written to the startup log (the `-i` CLI flag is the same setting).
 |===
 
+NOTE: Digests are configured in `parse-context`, not in the `server` section. See
+xref:configuration/digesters.adoc[Digesters].
+
 For the full Pipes-related sections (`pipes`, `fetchers`, `emitters`, `parse-context`)
 that tika-server 4.x requires, see
 xref:migration-to-4x/migrating-tika-server-4x.adoc#_configuration_changes[Configuration Changes].

tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerConfig.java

@@ -41,7 +41,6 @@ public class TikaServerConfig {
     public static final String DEFAULT_HOST = "localhost";
     public static final Set<String> LOG_LEVELS = new HashSet<>(Arrays.asList("debug", "info"));
     private static final Logger LOG = LoggerFactory.getLogger(TikaServerConfig.class);
-    private static final int DEFAULT_DIGEST_MARK_LIMIT = 20 * 1024 * 1024;
     /**
      * Endpoints that expose the pipes/fetch machinery (process-isolated pipes
      * parsing and async batch processing). Selecting any of these requires
@@ -71,20 +70,16 @@ public class TikaServerConfig {
     private boolean allowPerRequestConfig = false;
     private String cors = "";
     private boolean returnStackTrace = false;
-    private String idBase = UUID
+    private String id = UUID
             .randomUUID()
             .toString();
     private int port = DEFAULT_PORT;
     private String host = DEFAULT_HOST;
-    private int digestMarkLimit = DEFAULT_DIGEST_MARK_LIMIT;
-    private String digest = "";
     //debug or info only
     private String logLevel = "";
     private Path configPath;
     private ArrayList<String> endpoints = new ArrayList<>();
 
-    private boolean preventStopMethod = false;
-
     private TlsConfig tlsConfig = new TlsConfig();
 
     /**
@@ -144,10 +139,6 @@ public void setPort(int port) {
         this.port = port;
     }
 
-    public String getIdBase() {
-        return idBase;
-    }
-
     /**
      * Whether the pipes/fetch endpoints ({@code pipes}, {@code async}) may be
      * enabled. Off by default; selecting one of those endpoints without this set
@@ -237,37 +228,17 @@ public boolean hasConfigFile() {
         return configPath != null;
     }
 
+    @com.fasterxml.jackson.annotation.JsonIgnore
     public Path getConfigPath() {
         return configPath;
     }
 
+    /** Set from the -c argument at load time; not a user-settable config key. */
+    @com.fasterxml.jackson.annotation.JsonIgnore
     public void setConfigPath(String path) {
         this.configPath = Paths.get(path);
     }
 
-    public int getDigestMarkLimit() {
-        return digestMarkLimit;
-    }
-
-    public void setDigestMarkLimit(int digestMarkLimit) {
-        this.digestMarkLimit = digestMarkLimit;
-    }
-
-    /**
-     * digest configuration string, e.g. md5 or sha256, alternately w 16 or 32 encoding,
-     * e.g. md5:32,sha256:16 would result in two digests per file
-     *
-     * @return
-     */
-    public String getDigest() {
-        return digest;
-    }
-
-    public void setDigest(String digest) {
-        LOG.info("As of Tika 2.5.0, you can set the digester via the AutoDetectParserConfig in " + "tika-config.xml. We plan to remove this commandline option in 2.8.0");
-        this.digest = digest;
-    }
-
     public boolean isReturnStackTrace() {
         return returnStackTrace;
     }
@@ -292,13 +263,15 @@ public void setEndpoints(ArrayList<String> endpoints) {
         this.endpoints = endpoints;
     }
 
+    /**
+     * Identifier for this server, surfaced in the startup log. Defaults to a random UUID.
+     */
     public String getId() {
-        //TODO fix this
-        return idBase;
+        return id;
     }
 
     public void setId(String id) {
-        this.idBase = id;
+        this.id = id;
     }
 
     private void addEndPoints(List<String> endPoints) {

tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java

@@ -232,6 +232,7 @@ private static ServerDetails initServer(TikaServerConfig tikaServerConfig) throw
         ServerDetails details = new ServerDetails();
         details.sf = sf;
         details.url = url;
+        details.serverId = tikaServerConfig.getId();
         details.serverStatus = serverStatus;
         return details;
     }