(tika) branch branch_3x updated: TIKA-4531: use jdk9 try-with-resources

[tilman]

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


The following commit(s) were added to refs/heads/branch_3x by this push:
     new ee3e3e52d TIKA-4531: use jdk9 try-with-resources
ee3e3e52d is described below

commit ee3e3e52d17dce01398aa286641474d493d203e2
Author: Tilman Hausherr <til...@apache.org>
AuthorDate: Wed Oct 29 13:42:06 2025 +0100

    TIKA-4531: use jdk9 try-with-resources
---
 .../java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java | 4 +---
 .../java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java
 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java
index 8910b1c00..db5898ec8 100644
--- 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java
+++ 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java
@@ -118,7 +118,7 @@ abstract class AbstractPOIFSExtractor {
                                           XHTMLContentHandler xhtml, boolean 
outputHtml)
             throws IOException, SAXException, TikaException {
 
-        try {
+        try (resource) {
             if (filename != null) {
                 embeddedMetadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, 
filename);
             }
@@ -136,8 +136,6 @@ abstract class AbstractPOIFSExtractor {
             if (embeddedDocumentUtil.shouldParseEmbedded(embeddedMetadata)) {
                 embeddedDocumentUtil.parseEmbedded(resource, xhtml, 
embeddedMetadata, outputHtml);
             }
-        } finally {
-            resource.close();
         }
     }
 
diff --git 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java
 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java
index 2c9109b06..1908fe125 100644
--- 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java
+++ 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java
@@ -73,12 +73,10 @@ public class TestChmExtraction extends 
MultiThreadedTikaTest {
     }
 
     private void testingChm(InputStream stream) throws IOException, 
SAXException, TikaException {
-        try {
+        try (stream) {
             BodyContentHandler handler = new BodyContentHandler(-1);
             parser.parse(stream, handler, new Metadata(), new ParseContext());
             assertTrue(!handler.toString().isEmpty());
-        } finally {
-            stream.close();
         }
     }