This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch branch_2x in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/branch_2x by this push: new bf0006163 TIKA-4215 -- avoid loading all the tika resources just to get the version (#1672) bf0006163 is described below commit bf0006163b0d053abb8a79c6146aae30fcfcc46d Author: Tim Allison <talli...@apache.org> AuthorDate: Thu Mar 21 10:06:57 2024 -0400 TIKA-4215 -- avoid loading all the tika resources just to get the version (#1672) (cherry picked from commit 85d713a9a671d1e8c31bb4a78c830616c0b3eab5) --- 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 eac0e4f9b..3be3da0f9 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 a6ba72e81..94b285025 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 @@ -123,7 +123,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 aadf86f30..868af43dc 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 e4e623fd3..f10948243 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 590080116..aaa46d477 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);