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 2024/03/21 13:26:00 UTC
(tika) branch TIKA-4215 created (now f819cbb43)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch TIKA-4215
in repository https://gitbox.apache.org/repos/asf/tika.git
at f819cbb43 TIKA-4215 -- avoid loading all the tika resources just to get the version
This branch includes the following new commits:
new f819cbb43 TIKA-4215 -- avoid loading all the tika resources just to get the version
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(tika) 01/01: TIKA-4215 -- avoid loading all the tika resources just to get the version
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-4215
in repository https://gitbox.apache.org/repos/asf/tika.git
commit f819cbb431646baebc68e07a1771e768ca54a04a
Author: tallison <ta...@apache.org>
AuthorDate: Thu Mar 21 09:25:41 2024 -0400
TIKA-4215 -- avoid loading all the tika resources just to get the version
---
tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java | 2 +-
tika-core/src/main/java/org/apache/tika/Tika.java | 4 ++++
.../src/main/java/org/apache/tika/server/core/TikaServerProcess.java | 2 +-
.../main/java/org/apache/tika/server/core/resource/TikaResource.java | 2 +-
.../src/test/java/org/apache/tika/server/core/TikaVersionTest.java | 2 +-
.../src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java | 4 ++--
6 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java b/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
index 6ae0f8ca7..bd78d4338 100644
--- a/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
+++ b/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
@@ -657,7 +657,7 @@ public class TikaCLI {
}
private void version() {
- System.out.println(new Tika().toString());
+ System.out.println(Tika.getString());
}
private boolean testForHelp(String[] args) {
diff --git a/tika-core/src/main/java/org/apache/tika/Tika.java b/tika-core/src/main/java/org/apache/tika/Tika.java
index 601703e43..22811f9c0 100644
--- a/tika-core/src/main/java/org/apache/tika/Tika.java
+++ b/tika-core/src/main/java/org/apache/tika/Tika.java
@@ -672,6 +672,10 @@ public class Tika {
//--------------------------------------------------------------< Object >
public String toString() {
+ return getString();
+ }
+
+ public static String getString() {
String version = null;
try (InputStream stream = Tika.class
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 f5c3cca3a..10fb951e0 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
@@ -120,7 +120,7 @@ public class TikaServerProcess {
}
public static void main(String[] args) throws Exception {
- LOG.info("Starting {} server", new Tika());
+ LOG.info("Starting {} server", Tika.getString());
try {
Options options = getOptions();
CommandLineParser cliParser = new DefaultParser();
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 857692750..5f0e76ec8 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
@@ -91,7 +91,7 @@ import org.apache.tika.utils.ExceptionUtils;
public class TikaResource {
public static final String GREETING =
- "This is Tika Server (" + new Tika().toString() + "). Please PUT\n";
+ "This is Tika Server (" + Tika.getString() + "). Please PUT\n";
private static final String META_PREFIX = "meta_";
private static final Logger LOG = LoggerFactory.getLogger(TikaResource.class);
private static Pattern ALLOWABLE_HEADER_CHARS = Pattern.compile("(?i)^[-/_+\\.A-Z0-9 ]+$");
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java
index b1a81f230..ed7471f50 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaVersionTest.java
@@ -49,7 +49,7 @@ public class TikaVersionTest extends CXFTestBase {
WebClient.create(endPoint + VERSION_PATH).type("text/plain").accept("text/plain")
.get();
- assertEquals(new Tika().toString(),
+ assertEquals(Tika.getString(),
getStringFromInputStream((InputStream) response.getEntity()));
}
}
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java
index 3c97d329c..428ec71f0 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaWelcomeTest.java
@@ -62,7 +62,7 @@ public class TikaWelcomeTest extends CXFTestBase {
.get(String.class);
- assertContains(new Tika().toString(), html);
+ assertContains(Tika.getString(), html);
assertContains("href=\"http", html);
// Check our details were found
@@ -81,7 +81,7 @@ public class TikaWelcomeTest extends CXFTestBase {
.get();
String text = getStringFromInputStream((InputStream) response.getEntity());
- assertContains(new Tika().toString(), text);
+ assertContains(Tika.getString(), text);
// Check our details were found
assertContains("GET " + WELCOME_PATH, text);