This is an automated email from the ASF dual-hosted git repository. tilman pushed a commit to branch branch_3x in repository https://gitbox.apache.org/repos/asf/tika.git
commit 86a817640e54295096ab41ad15fa37ffc5f543bc Author: Tilman Hausherr <[email protected]> AuthorDate: Wed Jul 2 12:29:07 2025 +0200 TIKA-4440: replace deprecated, fix annotations --- .../src/main/java/org/apache/tika/embedder/ExternalEmbedder.java | 6 ++++-- .../java/org/apache/tika/extractor/ParserContainerExtractor.java | 6 +++++- .../java/org/apache/tika/example/PickBestTextEncodingParser.java | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java b/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java index b2411d7a8..26cef4473 100644 --- a/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java +++ b/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java @@ -146,6 +146,7 @@ public class ExternalEmbedder implements Embedder { } } + @Override public Set<MediaType> getSupportedEmbedTypes(ParseContext context) { return getSupportedEmbedTypes(); } @@ -330,6 +331,7 @@ public class ExternalEmbedder implements Embedder { * Metadata is only extracted if {@link #setMetadataCommandArguments(Map)} * has been called to set arguments. */ + @Override public void embed(final Metadata metadata, final InputStream inputStream, final OutputStream outputStream, final ParseContext context) throws IOException, TikaException { @@ -399,9 +401,9 @@ public class ExternalEmbedder implements Embedder { // Execute Process process; if (cmd.toArray().length == 1) { - process = Runtime.getRuntime().exec(cmd.toArray(new String[]{})[0]); + process = Runtime.getRuntime().exec(cmd.toArray(String[]::new)[0]); } else { - process = Runtime.getRuntime().exec(cmd.toArray(new String[]{})); + process = Runtime.getRuntime().exec(cmd.toArray(String[]::new)); } UnsynchronizedByteArrayOutputStream stdErrOutputStream = UnsynchronizedByteArrayOutputStream.builder().get(); diff --git a/tika-core/src/main/java/org/apache/tika/extractor/ParserContainerExtractor.java b/tika-core/src/main/java/org/apache/tika/extractor/ParserContainerExtractor.java index b2e9cd169..caa4636ee 100644 --- a/tika-core/src/main/java/org/apache/tika/extractor/ParserContainerExtractor.java +++ b/tika-core/src/main/java/org/apache/tika/extractor/ParserContainerExtractor.java @@ -69,11 +69,13 @@ public class ParserContainerExtractor implements ContainerExtractor { this.detector = detector; } + @Override public boolean isSupported(TikaInputStream input) throws IOException { MediaType type = detector.detect(input, new Metadata()); return parser.getSupportedTypes(new ParseContext()).contains(type); } + @Override public void extract( TikaInputStream stream, ContainerExtractor recurseExtractor, EmbeddedResourceHandler handler) @@ -101,10 +103,12 @@ public class ParserContainerExtractor implements ContainerExtractor { this.handler = handler; } + @Override public Set<MediaType> getSupportedTypes(ParseContext context) { return parser.getSupportedTypes(context); } + @Override public void parse( InputStream stream, ContentHandler ignored, Metadata metadata, ParseContext context) @@ -125,7 +129,7 @@ public class ParserContainerExtractor implements ContainerExtractor { File file = tis.getFile(); // Let the handler process the embedded resource - try (InputStream input = TikaInputStream.get(file)) { + try (InputStream input = TikaInputStream.get(file.toPath())) { handler.handle(filename, type, input); } diff --git a/tika-example/src/main/java/org/apache/tika/example/PickBestTextEncodingParser.java b/tika-example/src/main/java/org/apache/tika/example/PickBestTextEncodingParser.java index 8f925d3d4..b5ddffdb3 100644 --- a/tika-example/src/main/java/org/apache/tika/example/PickBestTextEncodingParser.java +++ b/tika-example/src/main/java/org/apache/tika/example/PickBestTextEncodingParser.java @@ -55,6 +55,7 @@ import org.apache.tika.sax.ContentHandlerFactory; * * @deprecated Currently not suitable for real use, more a demo / prototype! */ +@Deprecated public class PickBestTextEncodingParser extends AbstractMultipleParser { /** * Serial version UID.
