This is an automated email from the ASF dual-hosted git repository.
tilman 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 b01244135 TIKA-4327: replace deprecated
b01244135 is described below
commit b0124413510710c5ac20e8ae898a7cbf7579d3ac
Author: Tilman Hausherr <[email protected]>
AuthorDate: Sat Aug 16 18:14:48 2025 +0200
TIKA-4327: replace deprecated
---
.../org/apache/tika/eval/app/ExtractComparer.java | 15 ++++++++-------
.../apache/tika/eval/app/ExtractComparerRunner.java | 12 ++++++------
.../apache/tika/eval/app/ExtractProfileRunner.java | 20 ++++++++++----------
.../tika/eval/app/reports/ResultsReporter.java | 11 +++++------
.../java/org/apache/tika/async/cli/TikaAsyncCLI.java | 10 +++++-----
.../org/apache/tika/server/core/TikaServerCli.java | 9 +++++----
6 files changed, 39 insertions(+), 38 deletions(-)
diff --git
a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparer.java
b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparer.java
index b9fa3c59e..e4fb0f8a7 100644
---
a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparer.java
+++
b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparer.java
@@ -25,8 +25,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
+import org.apache.commons.cli.help.HelpFormatter;
import org.apache.commons.io.FilenameUtils;
import org.apache.tika.eval.app.db.ColInfo;
@@ -91,10 +91,11 @@ public class ExtractComparer extends ProfilerBase {
this.extractReader = extractReader;
}
- public static void USAGE() {
- HelpFormatter helpFormatter = new HelpFormatter();
- helpFormatter.printHelp(80, "java -jar tika-eval-x.y.jar Compare
-extractsA extractsA -extractsB extractsB -db mydb", "Tool: Compare",
ExtractComparer.OPTIONS,
- "Note: for the default h2 db, do not include the .mv.db at the
end of the db name.");
+ public static void USAGE() throws IOException {
+ HelpFormatter helpFormatter = HelpFormatter.builder().get();
+ helpFormatter.printHelp("java -jar tika-eval-x.y.jar Compare
-extractsA extractsA -extractsB extractsB -db mydb",
+ "Tool: Compare", ExtractComparer.OPTIONS,
+ "Note: for the default h2 db, do not include the .mv.db at the
end of the db name.", true);
}
@Override
@@ -281,11 +282,11 @@ public class ExtractComparer extends ProfilerBase {
* @return
*/
private String findSharedDigestKey(List<Metadata> metadataListA,
List<Metadata> metadataListB) {
- if (metadataListB == null || metadataListB.size() == 0) {
+ if (metadataListB == null || metadataListB.isEmpty()) {
return null;
}
Set<String> digestA = new HashSet<>();
- if (metadataListA != null && metadataListA.size() > 0) {
+ if (metadataListA != null && !metadataListA.isEmpty()) {
for (String n : metadataListA
.get(0)
.names()) {
diff --git
a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparerRunner.java
b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparerRunner.java
index ebc1e56a6..a06c07c3a 100644
---
a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparerRunner.java
+++
b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractComparerRunner.java
@@ -40,9 +40,9 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
+import org.apache.commons.cli.help.HelpFormatter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -182,13 +182,13 @@ public class ExtractComparerRunner {
return new MimeBuffer(jdbcUtil.getConnection(),
builder.getMimeTable(), TikaConfig.getDefaultConfig());
}
- private static void USAGE() {
- HelpFormatter helpFormatter = new HelpFormatter();
- helpFormatter.printHelp(80, "java -jar tika-eval-app-x.y.z.jar
FileProfiler -e docs -d mydb [-i inputDir, -c config.json]",
- "Tool: Profile", OPTIONS, "");
+ private static void USAGE() throws IOException {
+ HelpFormatter helpFormatter = HelpFormatter.builder().get();
+ helpFormatter.printHelp("java -jar tika-eval-app-x.y.z.jar
FileProfiler -e docs -d mydb [-i inputDir, -c config.json]",
+ "Tool: Profile", OPTIONS, null, true);
}
- private static String USAGE_FAIL(String msg) {
+ private static String USAGE_FAIL(String msg) throws IOException {
USAGE();
throw new IllegalArgumentException(msg);
}
diff --git
a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractProfileRunner.java
b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractProfileRunner.java
index a2e4fb712..e8c955c21 100644
---
a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractProfileRunner.java
+++
b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/ExtractProfileRunner.java
@@ -40,9 +40,9 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
+import org.apache.commons.cli.help.HelpFormatter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,11 +71,11 @@ public class ExtractProfileRunner {
static {
OPTIONS = new Options()
-
.addOption(Option.builder("e").longOpt("extracts").hasArg().desc("required:
directory of extracts").build())
+
.addOption(Option.builder("e").longOpt("extracts").hasArg().desc("required:
directory of extracts").get())
.addOption(Option.builder("i").longOpt("inputDir").hasArg().desc("optional:
directory for original binary input documents."
- + " If not specified, -extracts is crawled as
is.").build())
-
.addOption(Option.builder("d").longOpt("db").hasArg().desc("optional: db
path").build())
-
.addOption(Option.builder("c").longOpt("config").hasArg().desc("tika-eval json
config file").build())
+ + " If not specified, -extracts is crawled as
is.").get())
+
.addOption(Option.builder("d").longOpt("db").hasArg().desc("optional: db
path").get())
+
.addOption(Option.builder("c").longOpt("config").hasArg().desc("tika-eval json
config file").get())
;
}
public static void main(String[] args) throws Exception {
@@ -178,13 +178,13 @@ public class ExtractProfileRunner {
return new MimeBuffer(jdbcUtil.getConnection(),
builder.getMimeTable(), TikaConfig.getDefaultConfig());
}
- private static void USAGE() {
- HelpFormatter helpFormatter = new HelpFormatter();
- helpFormatter.printHelp(80, "java -jar tika-eval-app-x.y.z.jar
FileProfiler -e docs -d mydb [-i inputDir, -c config.json]",
- "Tool: Profile", OPTIONS, "");
+ private static void USAGE() throws IOException {
+ HelpFormatter helpFormatter = HelpFormatter.builder().get();
+ helpFormatter.printHelp("java -jar tika-eval-app-x.y.z.jar
FileProfiler -e docs -d mydb [-i inputDir, -c config.json]",
+ "Tool: Profile", OPTIONS, null, true);
}
- private static String USAGE_FAIL(String msg) {
+ private static String USAGE_FAIL(String msg) throws IOException {
USAGE();
throw new IllegalArgumentException(msg);
}
diff --git
a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/reports/ResultsReporter.java
b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/reports/ResultsReporter.java
index 0abee4c35..bf8359302 100644
---
a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/reports/ResultsReporter.java
+++
b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/reports/ResultsReporter.java
@@ -36,9 +36,9 @@ import javax.xml.parsers.DocumentBuilder;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.help.HelpFormatter;
import org.apache.poi.common.usermodel.HyperlinkType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -76,11 +76,10 @@ public class ResultsReporter {
List<String> after = new ArrayList<>();
List<Report> reports = new ArrayList<>();
- public static void USAGE() {
- HelpFormatter helpFormatter = new HelpFormatter();
- helpFormatter.printHelp(80, "java -jar tika-eval-x.y.jar Report -db
mydb [-rd myreports] [-rf myreports.xml]", "Tool: Report",
ResultsReporter.OPTIONS,
- "Note: for h2 db, do not include the .mv.db at the end of the
db name.");
-
+ public static void USAGE() throws IOException {
+ HelpFormatter helpFormatter = HelpFormatter.builder().get();
+ helpFormatter.printHelp("java -jar tika-eval-x.y.jar Report -db mydb
[-rd myreports] [-rf myreports.xml]", "Tool: Report", ResultsReporter.OPTIONS,
+ "Note: for h2 db, do not include the .mv.db at the end of the
db name.", true);
}
public static ResultsReporter build(Path p) throws Exception {
diff --git
a/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaAsyncCLI.java
b/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaAsyncCLI.java
index 93b83ddda..3f0d6a0e2 100644
---
a/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaAsyncCLI.java
+++
b/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaAsyncCLI.java
@@ -16,6 +16,7 @@
*/
package org.apache.tika.async.cli;
+import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -24,7 +25,6 @@ import java.util.concurrent.TimeoutException;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.slf4j.Logger;
@@ -81,7 +81,7 @@ public class TikaAsyncCLI {
}
//not private for testing purposes
- static SimpleAsyncConfig parseCommandLine(String[] args) throws
ParseException {
+ static SimpleAsyncConfig parseCommandLine(String[] args) throws
ParseException, IOException {
if (args.length == 2 && ! args[0].startsWith("-")) {
return new SimpleAsyncConfig(args[0], args[1], null, null, null,
null);
}
@@ -148,12 +148,12 @@ public class TikaAsyncCLI {
}
}
- private static void usage(Options options) {
+ private static void usage(Options options) throws IOException {
System.out.println("Two primary options:");
System.out.println("\t1. Specify a tika-config.xml on the commandline
that includes the definitions for async");
System.out.println("\t2. Commandline:");
- HelpFormatter helpFormatter = new HelpFormatter();
- helpFormatter.printHelp("tikaAsynCli", options);
+ org.apache.commons.cli.help.HelpFormatter helpFormatter =
org.apache.commons.cli.help.HelpFormatter.builder().get();
+ helpFormatter.printHelp("tikaAsynCli", null, options, null, true);
System.exit(1);
}
}
diff --git
a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerCli.java
b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerCli.java
index e818d04e1..b09f6af21 100644
---
a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerCli.java
+++
b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerCli.java
@@ -19,6 +19,7 @@ package org.apache.tika.server.core;
import static org.apache.tika.server.core.TikaServerConfig.DEFAULT_HOST;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutorCompletionService;
@@ -30,8 +31,8 @@ import java.util.concurrent.TimeUnit;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
+import org.apache.commons.cli.help.HelpFormatter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -180,9 +181,9 @@ public class TikaServerCli {
TikaServerProcess.main(args.toArray(new String[0]));
}
- private static void usage(Options options) {
- HelpFormatter helpFormatter = new HelpFormatter();
- helpFormatter.printHelp("tikaserver", options);
+ private static void usage(Options options) throws IOException {
+ HelpFormatter helpFormatter = HelpFormatter.builder().get();
+ helpFormatter.printHelp("tikaserver", null, options, null, true);
System.exit(-1);
}
