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 2020/11/19 13:11:07 UTC
[tika] branch main updated: Modify some code use try-with-resources
(#367)
This is an automated email from the ASF dual-hosted git repository.
tallison 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 6b3fb1f Modify some code use try-with-resources (#367)
6b3fb1f is described below
commit 6b3fb1fa644a93e25f640d08593c849fe24a7784
Author: Lee <55...@users.noreply.github.com>
AuthorDate: Thu Nov 19 21:11:00 2020 +0800
Modify some code use try-with-resources (#367)
---
.../java/org/apache/tika/fork/ForkParserTest.java | 50 +++++++++-------------
.../org/apache/tika/eval/ComparerBatchTest.java | 18 ++------
.../org/apache/tika/parser/epub/EpubParser.java | 5 +--
.../apache/tika/parser/netcdf/NetCDFParser.java | 7 +--
4 files changed, 25 insertions(+), 55 deletions(-)
diff --git a/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
index 170f560..e12e69b 100644
--- a/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
+++ b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTest.java
@@ -248,13 +248,11 @@ public class ForkParserTest extends TikaTest {
RecursiveParserWrapperHandler handler = new RecursiveParserWrapperHandler(
new BasicContentHandlerFactory(
BasicContentHandlerFactory.HANDLER_TYPE.TEXT, 20000));
- ForkParser fork = new ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
- Metadata metadata = new Metadata();
- ParseContext context = new ParseContext();
- try (InputStream is = getResourceAsStream("/test-documents/basic_embedded.xml")) {
+ try (ForkParser fork = new ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
+ InputStream is = getResourceAsStream("/test-documents/basic_embedded.xml")) {
+ Metadata metadata = new Metadata();
+ ParseContext context = new ParseContext();
fork.parse(is, handler, metadata, context);
- } finally {
- fork.close();
}
List<Metadata> metadataList = handler.getMetadataList();
Metadata m0 = metadataList.get(0);
@@ -275,13 +273,11 @@ public class ForkParserTest extends TikaTest {
RecursiveParserWrapperHandler handler = new RecursiveParserWrapperHandler(
new BasicContentHandlerFactory(
BasicContentHandlerFactory.HANDLER_TYPE.TEXT, 20000));
- ForkParser fork = new ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
- Metadata metadata = new Metadata();
- ParseContext context = new ParseContext();
- try (InputStream is = getResourceAsStream("/test-documents/embedded_with_npe.xml")) {
+ try (ForkParser fork = new ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
+ InputStream is = getResourceAsStream("/test-documents/embedded_with_npe.xml")) {
+ Metadata metadata = new Metadata();
+ ParseContext context = new ParseContext();
fork.parse(is, handler, metadata, context);
- } finally {
- fork.close();
}
List<Metadata> metadataList = handler.getMetadataList();
Metadata m0 = metadataList.get(0);
@@ -303,17 +299,15 @@ public class ForkParserTest extends TikaTest {
RecursiveParserWrapperHandler handler = new RecursiveParserWrapperHandler(
new BasicContentHandlerFactory(
BasicContentHandlerFactory.HANDLER_TYPE.TEXT, 20000));
- ForkParser fork = new ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
- Metadata metadata = new Metadata();
- ParseContext context = new ParseContext();
- try (InputStream is = getResourceAsStream("/test-documents/embedded_then_npe.xml")) {
+ try (ForkParser fork = new ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
+ InputStream is = getResourceAsStream("/test-documents/embedded_then_npe.xml")) {
+ Metadata metadata = new Metadata();
+ ParseContext context = new ParseContext();
fork.parse(is, handler, metadata, context);
fail();
} catch (TikaException e) {
assertTrue(e.getCause() instanceof NullPointerException);
assertContains("another", e.getCause().getMessage());
- } finally {
- fork.close();
}
List<Metadata> metadataList = handler.getMetadataList();
Metadata m0 = metadataList.get(0);
@@ -369,13 +363,11 @@ public class ForkParserTest extends TikaTest {
RecursiveParserWrapper wrapper = new RecursiveParserWrapper(parser);
BufferingHandler handler =
new BufferingHandler(new SBContentHandlerFactory());
- ForkParser fork = new ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
- Metadata metadata = new Metadata();
- ParseContext context = new ParseContext();
- try (InputStream is = getResourceAsStream("/test-documents/basic_embedded.xml")) {
+ try (ForkParser fork = new ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
+ InputStream is = getResourceAsStream("/test-documents/basic_embedded.xml")) {
+ Metadata metadata = new Metadata();
+ ParseContext context = new ParseContext();
fork.parse(is, handler, metadata, context);
- } finally {
- fork.close();
}
List<Metadata> metadataList = handler.getMetadataList();
List<ContentHandler> contentHandlers = handler.getContentHandlers();
@@ -399,17 +391,15 @@ public class ForkParserTest extends TikaTest {
RecursiveParserWrapper wrapper = new RecursiveParserWrapper(parser);
RecursiveParserWrapperHandler handler = new RecursiveParserWrapperHandler(
new NonSerializableHandlerFactory());
- ForkParser fork = new ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
- Metadata metadata = new Metadata();
- ParseContext context = new ParseContext();
- try (InputStream is = getResourceAsStream("/test-documents/embedded_then_npe.xml")) {
+ try (ForkParser fork = new ForkParser(ForkParserTest.class.getClassLoader(), wrapper);
+ InputStream is = getResourceAsStream("/test-documents/embedded_then_npe.xml")) {
+ Metadata metadata = new Metadata();
+ ParseContext context = new ParseContext();
fork.parse(is, handler, metadata, context);
fail();
} catch (TikaException e) {
assertTrue(e.getCause() instanceof NullPointerException);
assertContains("another", e.getCause().getMessage());
- } finally {
- fork.close();
}
List<Metadata> metadataList = handler.getMetadataList();
Metadata m0 = metadataList.get(0);
diff --git a/tika-eval/src/test/java/org/apache/tika/eval/ComparerBatchTest.java b/tika-eval/src/test/java/org/apache/tika/eval/ComparerBatchTest.java
index 5acbe3c..00be8b8 100644
--- a/tika-eval/src/test/java/org/apache/tika/eval/ComparerBatchTest.java
+++ b/tika-eval/src/test/java/org/apache/tika/eval/ComparerBatchTest.java
@@ -349,10 +349,8 @@ public class ComparerBatchTest extends FSBatchTestBase {
private Map<String, String> getRow(String table, String where) throws Exception {
String sql = getSql("*", table, where);
Map<String, String> results = new HashMap<String, String>();
- Statement st = null;
- try {
- st = conn.createStatement();
+ try (Statement st = conn.createStatement()) {
ResultSet rs = st.executeQuery(sql);
ResultSetMetaData m = rs.getMetaData();
int rows = 0;
@@ -365,10 +363,6 @@ public class ComparerBatchTest extends FSBatchTestBase {
}
rows++;
}
- } finally {
- if (st != null) {
- st.close();
- }
}
return results;
@@ -383,18 +377,12 @@ public class ComparerBatchTest extends FSBatchTestBase {
private List<String> getColStrings(String colName, String table, String where) throws Exception {
String sql = getSql(colName, table, where);
List<String> results = new ArrayList<>();
- Statement st = null;
- try {
- st = conn.createStatement();
- System.out.println("SQL: "+sql);
+ try (Statement st = conn.createStatement()) {
+ System.out.println("SQL: " + sql);
ResultSet rs = st.executeQuery(sql);
while (rs.next()) {
results.add(rs.getString(1));
}
- } finally {
- if (st != null) {
- st.close();
- }
}
return results;
}
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubParser.java b/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubParser.java
index 52ba1bc..4c1a246 100644
--- a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubParser.java
+++ b/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/epub/EpubParser.java
@@ -209,8 +209,7 @@ public class EpubParser extends AbstractParser {
private void trySalvage(Path brokenZip, ContentHandler bodyHandler,
XHTMLContentHandler xhtml,
Metadata metadata, ParseContext context) throws IOException, TikaException, SAXException {
- TemporaryResources resources = new TemporaryResources();
- try {
+ try (TemporaryResources resources = new TemporaryResources()) {
Path salvaged = resources.createTempFile();
ZipSalvager.salvageCopy(brokenZip.toFile(), salvaged.toFile());
boolean success = false;
@@ -222,8 +221,6 @@ public class EpubParser extends AbstractParser {
streamingParse(is, xhtml, metadata, context);
}
}
- } finally {
- resources.close();
}
}
diff --git a/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java b/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java
index 6bb36ac..125ebf8 100644
--- a/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java
+++ b/tika-parsers-extended/tika-parser-scientific-module/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java
@@ -84,9 +84,7 @@ public class NetCDFParser extends AbstractParser {
TemporaryResources tmp = TikaInputStream.isTikaInputStream(stream) ?
null : new TemporaryResources();
TikaInputStream tis = TikaInputStream.get(stream, tmp);
- NetcdfFile ncFile = null;
- try {
- ncFile = NetcdfFile.open(tis.getFile().getAbsolutePath());
+ try (NetcdfFile ncFile = NetcdfFile.open(tis.getFile().getAbsolutePath())) {
metadata.set("File-Type-Description", ncFile.getFileTypeDescription());
// first parse out the set of global attributes
for (Attribute attr : ncFile.getGlobalAttributes()) {
@@ -134,9 +132,6 @@ public class NetCDFParser extends AbstractParser {
} catch (IOException e) {
throw new TikaException("NetCDF parse error", e);
} finally {
- if (ncFile != null) {
- ncFile.close();
- }
if (tmp != null) {
tmp.dispose();
}