You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2021/06/03 15:57:27 UTC
[tika] 01/02: fix steam->stream typo; begin CHANGES.txt update
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
commit 846d01120763c3852325bfce5c6ab271f343761b
Author: tballison <ta...@apache.org>
AuthorDate: Thu Jun 3 10:12:16 2021 -0400
fix steam->stream typo; begin CHANGES.txt update
---
CHANGES.txt | 1 +
.../java/org/apache/tika/server/core/DefaultInputStreamFactory.java | 2 +-
.../main/java/org/apache/tika/server/core/FetcherStreamFactory.java | 2 +-
.../src/main/java/org/apache/tika/server/core/InputStreamFactory.java | 2 +-
.../src/main/java/org/apache/tika/server/core/TikaServerProcess.java | 3 ++-
.../main/java/org/apache/tika/server/core/resource/TikaResource.java | 2 +-
6 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 2b01028..f8ae159 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@ Release 2.0.0-ALPHA - 01/13/2021
is on the user's path see (https://cwiki.apache.org/confluence/display/TIKA/TikaOCR#TikaOCR-disable-ocr)
for how to disable OCR.
* By default, when rendering a page for OCR, the PDFParser does not render glyphs/text.
+ * tika-server's "enableFileUrl" has been removed in favor of a FileSystemFetcher.
* Removed deprecated Metadata keys/properties (TIKA-1974).
* Removed dangerous calls to read an inputstream or convert to bytes
without specifying a charset
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/DefaultInputStreamFactory.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/DefaultInputStreamFactory.java
index 86df77a..155f7e2 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/DefaultInputStreamFactory.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/DefaultInputStreamFactory.java
@@ -29,7 +29,7 @@ import org.apache.tika.metadata.Metadata;
public class DefaultInputStreamFactory implements InputStreamFactory {
@Override
- public InputStream getInputSteam(InputStream is, Metadata metadata, HttpHeaders httpHeaders)
+ public InputStream getInputStream(InputStream is, Metadata metadata, HttpHeaders httpHeaders)
throws IOException {
return is;
}
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/FetcherStreamFactory.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/FetcherStreamFactory.java
index 56042c1..e145553 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/FetcherStreamFactory.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/FetcherStreamFactory.java
@@ -50,7 +50,7 @@ public class FetcherStreamFactory implements InputStreamFactory {
}
@Override
- public InputStream getInputSteam(InputStream is, Metadata metadata, HttpHeaders httpHeaders)
+ public InputStream getInputStream(InputStream is, Metadata metadata, HttpHeaders httpHeaders)
throws IOException {
String fetcherName = httpHeaders.getHeaderString("fetcherName");
String fetchKey = httpHeaders.getHeaderString("fetchKey");
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/InputStreamFactory.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/InputStreamFactory.java
index 1d3ee8a..89cfa50 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/InputStreamFactory.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/InputStreamFactory.java
@@ -31,7 +31,7 @@ import org.apache.tika.metadata.Metadata;
*/
public interface InputStreamFactory {
- InputStream getInputSteam(InputStream is, Metadata metadata, HttpHeaders httpHeaders)
+ InputStream getInputStream(InputStream is, Metadata metadata, HttpHeaders httpHeaders)
throws IOException;
}
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java
index 67d89d7..82207c4 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java
@@ -119,7 +119,8 @@ public class TikaServerProcess {
CommandLine line = cliParser.parse(options, args);
TikaServerConfig tikaServerConfig = TikaServerConfig.load(line);
LOG.debug("forked config: {}", tikaServerConfig);
- if (tikaServerConfig.isEnableUnsecureFeatures()) {
+ if (tikaServerConfig.isEnableUnsecureFeatures() &&
+ tikaServerConfig.getEndpoints().contains("async")) {
final AsyncResource localAsyncResource =
new AsyncResource(tikaServerConfig.getConfigPath());
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaResource.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaResource.java
index 6a823cf..b8042c7 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaResource.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/resource/TikaResource.java
@@ -154,7 +154,7 @@ public class TikaResource {
public static InputStream getInputStream(InputStream is, Metadata metadata,
HttpHeaders headers) {
try {
- return inputStreamFactory.getInputSteam(is, metadata, headers);
+ return inputStreamFactory.getInputStream(is, metadata, headers);
} catch (IOException e) {
throw new TikaServerParseException(e);
}