[tika] branch main updated: TIKA-3287 -- add comments...

[tallison]

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 12effe1  TIKA-3287 -- add comments...
12effe1 is described below

commit 12effe10215d6903ba6c1fafaaa9b578d13b17c9
Author: tballison <talli...@apache.org>
AuthorDate: Fri Jan 29 16:54:54 2021 -0500

    TIKA-3287 -- add comments...
---
 .../src/main/java/org/apache/tika/pipes/emitter/Emitter.java  | 10 +++++++++-
 .../main/java/org/apache/tika/client/HttpClientFactory.java   |  7 +++++++
 .../java/org/apache/tika/server/client/TikaClientCLI.java     | 11 +++++------
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/tika-core/src/main/java/org/apache/tika/pipes/emitter/Emitter.java 
b/tika-core/src/main/java/org/apache/tika/pipes/emitter/Emitter.java
index 4dc2291..4f6bdae 100644
--- a/tika-core/src/main/java/org/apache/tika/pipes/emitter/Emitter.java
+++ b/tika-core/src/main/java/org/apache/tika/pipes/emitter/Emitter.java
@@ -26,7 +26,15 @@ public interface Emitter {
     String getName();
 
     void emit(String emitKey, List<Metadata> metadataList) throws IOException, 
TikaEmitterException;
-    //TODO we can add this later?
+
     //void emit(String txt, Metadata metadata) throws IOException, 
TikaException;
 
+   /*
+    TODO we can add this later?
+    void addBatch(String emitKey, List<Metadata> metadataList) throws 
IOException, TikaEmitterException;
+
+    void executeBatch() throws IOException, TikaEmitterException;
+
+    */
+
 }
diff --git 
a/tika-pipes/tika-httpclient-commons/src/main/java/org/apache/tika/client/HttpClientFactory.java
 
b/tika-pipes/tika-httpclient-commons/src/main/java/org/apache/tika/client/HttpClientFactory.java
index e74dcb9..eacb461 100644
--- 
a/tika-pipes/tika-httpclient-commons/src/main/java/org/apache/tika/client/HttpClientFactory.java
+++ 
b/tika-pipes/tika-httpclient-commons/src/main/java/org/apache/tika/client/HttpClientFactory.java
@@ -78,6 +78,12 @@ import java.util.Base64;
 import java.util.HashSet;
 import java.util.Set;
 
+/**
+ * This holds quite a bit of state and is not thread safe.  Beware!
+ *
+ * Also, we're currently ignoring the SSL checks.  Please open a ticket/PR
+ * if you need robust SSL.
+ */
 public class HttpClientFactory {
 
     private static final Logger LOG = 
LoggerFactory.getLogger(HttpClientFactory.class);
@@ -391,6 +397,7 @@ public class HttpClientFactory {
         private byte[] key;
 
         private AES() throws TikaConfigException {
+            //TODO: clean this up -- potential race condition, etc...
             secretKey = setKey(System.getenv("AES_KEY"));
         }
 
diff --git 
a/tika-server/tika-server-client/src/main/java/org/apache/tika/server/client/TikaClientCLI.java
 
b/tika-server/tika-server-client/src/main/java/org/apache/tika/server/client/TikaClientCLI.java
index 1274d1f..4b438e2 100644
--- 
a/tika-server/tika-server-client/src/main/java/org/apache/tika/server/client/TikaClientCLI.java
+++ 
b/tika-server/tika-server-client/src/main/java/org/apache/tika/server/client/TikaClientCLI.java
@@ -44,19 +44,18 @@ public class TikaClientCLI {
 
     private static final Logger LOGGER = 
LoggerFactory.getLogger(TikaClientCLI.class);
 
-    //make these configurable
-    private int numThreads = 1;
     private long maxWaitMs = 300000;
 
     public static void main(String[] args) throws Exception {
-        //TODO -- add an actual commandline
+        //TODO -- add an actual commandline,
         Path tikaConfigPath = Paths.get(args[0]);
-        List<String> tikaServerUrls = Arrays.asList(args[1].split(","));
+        int numThreads = Integer.parseInt(args[1]);
+        List<String> tikaServerUrls = Arrays.asList(args[2].split(","));
         TikaClientCLI cli = new TikaClientCLI();
-        cli.execute(tikaConfigPath, tikaServerUrls);
+        cli.execute(tikaConfigPath, tikaServerUrls, numThreads);
     }
 
-    private void execute(Path tikaConfigPath, List<String> tikaServerUrls)
+    private void execute(Path tikaConfigPath, List<String> tikaServerUrls, int 
numThreads)
             throws TikaException, IOException, SAXException {
         TikaConfig config = new TikaConfig(tikaConfigPath);