You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2015/08/31 06:21:05 UTC
svn commit: r1700195 [4/4] - in /tika/trunk:
tika-app/src/main/java/org/apache/tika/cli/
tika-app/src/main/java/org/apache/tika/gui/
tika-bundle/src/test/java/org/apache/tika/bundle/
tika-core/src/main/java/org/apache/tika/ tika-core/src/main/java/org/...
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZipParserTest.java Mon Aug 31 04:21:04 2015
@@ -50,12 +50,9 @@ public class ZipParserTest extends Abstr
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = ZipParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.zip");
- try {
+ try (InputStream stream = ZipParserTest.class.getResourceAsStream(
+ "/test-documents/test-documents.zip")) {
parser.parse(stream, handler, metadata, recursingContext);
- } finally {
- stream.close();
}
assertEquals("application/zip", metadata.get(Metadata.CONTENT_TYPE));
@@ -90,13 +87,10 @@ public class ZipParserTest extends Abstr
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = ZipParserTest.class.getResourceAsStream(
- "/test-documents/test-documents.zip");
- try {
- parser.parse(stream, handler, metadata, trackingContext);
- } finally {
- stream.close();
- }
+ try (InputStream stream = ZipParserTest.class.getResourceAsStream(
+ "/test-documents/test-documents.zip")) {
+ parser.parse(stream, handler, metadata, trackingContext);
+ }
// Should have found all 9 documents
assertEquals(9, tracker.filenames.size());
@@ -171,14 +165,11 @@ public class ZipParserTest extends Abstr
context.set(Parser.class, parser);
GatherRelIDsDocumentExtractor relIDs = new GatherRelIDsDocumentExtractor();
context.set(EmbeddedDocumentExtractor.class, relIDs);
- InputStream input = getResourceAsStream("/test-documents/testEmbedded.zip");
- try {
- parser.parse(input,
- new BodyContentHandler(),
- new Metadata(),
- context);
- } finally {
- input.close();
+ try (InputStream input = getResourceAsStream("/test-documents/testEmbedded.zip")) {
+ parser.parse(input,
+ new BodyContentHandler(),
+ new Metadata(),
+ context);
}
assertTrue(relIDs.allRelIDs.contains("test1.txt"));
@@ -191,17 +182,14 @@ public class ZipParserTest extends Abstr
factory.setEntryEncoding("SJIS");
trackingContext.set(ArchiveStreamFactory.class, factory);
- InputStream stream = TikaInputStream.get(Base64.decodeBase64(
+ try (InputStream stream = TikaInputStream.get(Base64.decodeBase64(
"UEsDBBQAAAAIAI+CvUCDo3+zIgAAACgAAAAOAAAAk/qWe4zqg4GDgi50"
- + "eHRr2tj0qulsc2pzRHN609Gm7Y1OvFxNYLHJv6ZV97yCiQEAUEsBAh"
- + "QLFAAAAAgAj4K9QIOjf7MiAAAAKAAAAA4AAAAAAAAAAAAgAAAAAAAA"
- + "AJP6lnuM6oOBg4IudHh0UEsFBgAAAAABAAEAPAAAAE4AAAAAAA=="));
- try {
+ + "eHRr2tj0qulsc2pzRHN609Gm7Y1OvFxNYLHJv6ZV97yCiQEAUEsBAh"
+ + "QLFAAAAAgAj4K9QIOjf7MiAAAAKAAAAA4AAAAAAAAAAAAgAAAAAAAA"
+ + "AJP6lnuM6oOBg4IudHh0UEsFBgAAAAABAAEAPAAAAE4AAAAAAA=="))) {
autoDetectParser.parse(
stream, new DefaultHandler(),
new Metadata(), trackingContext);
- } finally {
- stream.close();
}
assertEquals(1, tracker.filenames.size());
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/ZlibParserTest.java Mon Aug 31 04:21:04 2015
@@ -37,12 +37,9 @@ public class ZlibParserTest extends Abst
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = ZipParserTest.class.getResourceAsStream(
- "/test-documents/testTXT.zlib");
- try {
+ try (InputStream stream = ZipParserTest.class.getResourceAsStream(
+ "/test-documents/testTXT.zlib")) {
parser.parse(stream, handler, metadata, recursingContext);
- } finally {
- stream.close();
}
assertEquals("application/zlib", metadata.get(Metadata.CONTENT_TYPE));
@@ -61,13 +58,10 @@ public class ZlibParserTest extends Abst
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
- InputStream stream = ZipParserTest.class.getResourceAsStream(
- "/test-documents/testTXT.zlib");
- try {
- parser.parse(stream, handler, metadata, trackingContext);
- } finally {
- stream.close();
- }
+ try (InputStream stream = ZipParserTest.class.getResourceAsStream(
+ "/test-documents/testTXT.zlib")) {
+ parser.parse(stream, handler, metadata, trackingContext);
+ }
// Should have found a single text document inside
assertEquals(1, tracker.filenames.size());
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/prt/PRTParserTest.java Mon Aug 31 04:21:04 2015
@@ -33,8 +33,7 @@ public class PRTParserTest extends TikaT
*/
@Test
public void testPRTParserBasics() throws Exception {
- InputStream input = getResourceAsStream("/test-documents/testCADKEY.prt");
- try {
+ try (InputStream input = getResourceAsStream("/test-documents/testCADKEY.prt")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new PRTParser().parse(input, handler, metadata);
@@ -43,14 +42,14 @@ public class PRTParserTest extends TikaT
// This file has a date
assertEquals("2011-06-20T16:54:00",
- metadata.get(TikaCoreProperties.CREATED));
+ metadata.get(TikaCoreProperties.CREATED));
assertEquals("2011-06-20T16:54:00",
- metadata.get(Metadata.CREATION_DATE));
+ metadata.get(Metadata.CREATION_DATE));
// But no description
assertEquals(null, metadata.get(TikaCoreProperties.DESCRIPTION));
String contents = handler.toString();
-
+
assertContains("Front View", contents);
assertContains("Back View", contents);
assertContains("Bottom View", contents);
@@ -62,8 +61,6 @@ public class PRTParserTest extends TikaT
assertContains("You've managed to extract all the text!", contents);
assertContains("This is more text", contents);
assertContains("Text Inside a PRT file", contents);
- } finally {
- input.close();
}
}
@@ -72,8 +69,7 @@ public class PRTParserTest extends TikaT
*/
@Test
public void testPRTParserComplex() throws Exception {
- InputStream input = getResourceAsStream("/test-documents/testCADKEY2.prt");
- try {
+ try (InputStream input = getResourceAsStream("/test-documents/testCADKEY2.prt")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new PRTParser().parse(input, handler, metadata);
@@ -82,14 +78,14 @@ public class PRTParserTest extends TikaT
// File has both a date and a description
assertEquals("1997-04-01T08:59:00",
- metadata.get(Metadata.DATE));
+ metadata.get(Metadata.DATE));
assertEquals("1997-04-01T08:59:00",
- metadata.get(Metadata.CREATION_DATE));
+ metadata.get(Metadata.CREATION_DATE));
assertEquals("TIKA TEST PART DESCRIPTION INFORMATION\r\n",
- metadata.get(TikaCoreProperties.DESCRIPTION));
+ metadata.get(TikaCoreProperties.DESCRIPTION));
String contents = handler.toString();
-
+
assertContains("ITEM", contents);
assertContains("REQ.", contents);
assertContains("DESCRIPTION", contents);
@@ -106,14 +102,12 @@ public class PRTParserTest extends TikaT
assertContains("TIKA TEST DRAWING", contents);
assertContains("TIKA LETTERS", contents);
assertContains("5.82", contents);
- assertContains("112"+'\u00b0', contents); // Degrees
+ assertContains("112" + '\u00b0', contents); // Degrees
assertContains("TIKA TEST LETTER", contents);
assertContains("17.11", contents);
- assertContains('\u00d8'+"\ufffd2.000", contents); // Diameter
+ assertContains('\u00d8' + "\ufffd2.000", contents); // Diameter
assertContains("Diameter", contents);
assertContains("The Apache Tika toolkit", contents);
- } finally {
- input.close();
}
}
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/rtf/RTFParserTest.java Mon Aug 31 04:21:04 2015
@@ -365,14 +365,10 @@ public class RTFParserTest extends TikaT
@Test
public void testBinControlWord() throws Exception {
ByteCopyingHandler embHandler = new ByteCopyingHandler();
- TikaInputStream tis = null;
- try {
+ try (TikaInputStream tis = TikaInputStream.get(getResourceAsStream("/test-documents/testBinControlWord.rtf"))) {
ContainerExtractor ex = new ParserContainerExtractor();
- tis = TikaInputStream.get(getResourceAsStream("/test-documents/testBinControlWord.rtf"));
assertEquals(true, ex.isSupported(tis));
ex.extract(tis, ex, embHandler);
- } finally {
- tis.close();
}
assertEquals(1, embHandler.bytes.size());
@@ -459,15 +455,10 @@ public class RTFParserTest extends TikaT
trueTypes.add("image/jpeg");
TrackingHandler tracker = new TrackingHandler(skipTypes);
- TikaInputStream tis = null;
- try {
+ try (TikaInputStream tis = TikaInputStream.get(getResourceAsStream("/test-documents/testRTFEmbeddedFiles.rtf"))) {
ContainerExtractor ex = new ParserContainerExtractor();
- tis = TikaInputStream.get(getResourceAsStream("/test-documents/testRTFEmbeddedFiles.rtf"));
assertEquals(true, ex.isSupported(tis));
ex.extract(tis, ex, tracker);
-
- } finally {
- tis.close();
}
assertEquals(trueNames.size(), tracker.filenames.size());
@@ -487,15 +478,10 @@ public class RTFParserTest extends TikaT
}
tracker = new TrackingHandler();
- tis = null;
- try {
+ try (TikaInputStream tis = TikaInputStream.get(getResourceAsStream("/test-documents/testRTFEmbeddedFiles.rtf"))) {
ContainerExtractor ex = new ParserContainerExtractor();
- tis = TikaInputStream.get(getResourceAsStream("/test-documents/testRTFEmbeddedFiles.rtf"));
assertEquals(true, ex.isSupported(tis));
ex.extract(tis, ex, tracker);
-
- } finally {
- tis.close();
}
assertEquals(47, tracker.filenames.size());
assertEquals("thumbnail_26.emf", tracker.filenames.get(45));
@@ -509,15 +495,11 @@ public class RTFParserTest extends TikaT
RecursiveParserWrapper parser = new RecursiveParserWrapper(base,
new BasicContentHandlerFactory(BasicContentHandlerFactory.HANDLER_TYPE.IGNORE, -1));
ctx.set(org.apache.tika.parser.Parser.class, parser);
- TikaInputStream tis = null;
ContentHandler handler = new BodyContentHandler();
Metadata rootMetadata = new Metadata();
rootMetadata.add(Metadata.RESOURCE_NAME_KEY, "testRTFRegularImages.rtf");
- try {
- tis = TikaInputStream.get(getResourceAsStream("/test-documents/testRTFRegularImages.rtf"));
+ try (TikaInputStream tis = TikaInputStream.get(getResourceAsStream("/test-documents/testRTFRegularImages.rtf"))) {
parser.parse(tis, handler, rootMetadata, ctx);
- } finally {
- tis.close();
}
List<Metadata> metadatas = parser.getMetadata();
@@ -561,28 +543,19 @@ public class RTFParserTest extends TikaT
skipTypes.add(MediaType.parse("application/x-msmetafile"));
TrackingHandler tracker = new TrackingHandler(skipTypes);
- TikaInputStream tis = null;
- try {
+ try (TikaInputStream tis = TikaInputStream.get(getResourceAsStream("/test-documents/testRTFEmbeddedLink.rtf"))) {
ContainerExtractor ex = new ParserContainerExtractor();
- tis = TikaInputStream.get(getResourceAsStream("/test-documents/testRTFEmbeddedLink.rtf"));
assertEquals(true, ex.isSupported(tis));
ex.extract(tis, ex, tracker);
-
- } finally {
- tis.close();
}
//should gracefully skip link and not throw NPE, IOEx, etc
assertEquals(0, tracker.filenames.size());
tracker = new TrackingHandler();
- tis = null;
- try {
+ try (TikaInputStream tis = TikaInputStream.get(getResourceAsStream("/test-documents/testRTFEmbeddedLink.rtf"))) {
ContainerExtractor ex = new ParserContainerExtractor();
- tis = TikaInputStream.get(getResourceAsStream("/test-documents/testRTFEmbeddedLink.rtf"));
assertEquals(true, ex.isSupported(tis));
ex.extract(tis, ex, tracker);
- } finally {
- tis.close();
}
//should gracefully skip link and not throw NPE, IOEx, etc
assertEquals(2, tracker.filenames.size());
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/solidworks/SolidworksParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/solidworks/SolidworksParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/solidworks/SolidworksParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/solidworks/SolidworksParserTest.java Mon Aug 31 04:21:04 2015
@@ -36,16 +36,15 @@ public class SolidworksParserTest extend
*/
@Test
public void testPart2013SP2Parser() throws Exception {
- InputStream input = SolidworksParserTest.class.getResourceAsStream(
- "/test-documents/testsolidworksPart2013SP2.SLDPRT");
- try {
+ try (InputStream input = SolidworksParserTest.class.getResourceAsStream(
+ "/test-documents/testsolidworksPart2013SP2.SLDPRT")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new ParseContext());
//Check content type
assertEquals("application/sldworks",metadata.get(Metadata.CONTENT_TYPE));
-
+
//Check properties
assertEquals("2012-04-18T10:27:29Z", metadata.get(TikaCoreProperties.CREATED));
assertEquals(null, metadata.get(TikaCoreProperties.CONTRIBUTOR));
@@ -56,8 +55,6 @@ public class SolidworksParserTest extend
assertEquals(null, metadata.get(TikaCoreProperties.SOURCE));
assertEquals("", metadata.get(TikaCoreProperties.TITLE));
assertEquals("", metadata.get(TikaCoreProperties.KEYWORDS));
- } finally {
- input.close();
}
}
@@ -66,16 +63,15 @@ public class SolidworksParserTest extend
*/
@Test
public void testPart2014SP0Parser() throws Exception {
- InputStream input = SolidworksParserTest.class.getResourceAsStream(
- "/test-documents/testsolidworksPart2014SP0.SLDPRT");
- try {
+ try (InputStream input = SolidworksParserTest.class.getResourceAsStream(
+ "/test-documents/testsolidworksPart2014SP0.SLDPRT")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new ParseContext());
//Check content type
assertEquals("application/sldworks",metadata.get(Metadata.CONTENT_TYPE));
-
+
//Check properties
assertEquals("2012-04-18T10:27:29Z", metadata.get(TikaCoreProperties.CREATED));
assertEquals(null, metadata.get(TikaCoreProperties.CONTRIBUTOR));
@@ -86,8 +82,6 @@ public class SolidworksParserTest extend
assertEquals(null, metadata.get(TikaCoreProperties.SOURCE));
assertEquals("", metadata.get(TikaCoreProperties.TITLE));
assertEquals("", metadata.get(TikaCoreProperties.KEYWORDS));
- } finally {
- input.close();
}
}
@@ -96,16 +90,15 @@ public class SolidworksParserTest extend
*/
@Test
public void testAssembly2013SP2Parser() throws Exception {
- InputStream input = SolidworksParserTest.class.getResourceAsStream(
- "/test-documents/testsolidworksAssembly2013SP2.SLDASM");
- try {
+ try (InputStream input = SolidworksParserTest.class.getResourceAsStream(
+ "/test-documents/testsolidworksAssembly2013SP2.SLDASM")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new ParseContext());
//Check content type
assertEquals("application/sldworks",metadata.get(Metadata.CONTENT_TYPE));
-
+
//Check properties
assertEquals("2012-04-25T09:51:38Z", metadata.get(TikaCoreProperties.CREATED));
assertEquals(null, metadata.get(TikaCoreProperties.CONTRIBUTOR));
@@ -116,8 +109,6 @@ public class SolidworksParserTest extend
assertEquals(null, metadata.get(TikaCoreProperties.SOURCE));
assertEquals("", metadata.get(TikaCoreProperties.TITLE));
assertEquals("", metadata.get(TikaCoreProperties.KEYWORDS));
- } finally {
- input.close();
}
}
@@ -156,16 +147,15 @@ public class SolidworksParserTest extend
*/
@Test
public void testDrawing2013SP2Parser() throws Exception {
- InputStream input = SolidworksParserTest.class.getResourceAsStream(
- "/test-documents/testsolidworksDrawing2013SP2.SLDDRW");
- try {
+ try (InputStream input = SolidworksParserTest.class.getResourceAsStream(
+ "/test-documents/testsolidworksDrawing2013SP2.SLDDRW")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new ParseContext());
//Check content type
assertEquals("application/sldworks",metadata.get(Metadata.CONTENT_TYPE));
-
+
//Check properties
assertEquals("2012-07-03T12:05:29Z", metadata.get(TikaCoreProperties.CREATED));
assertEquals(null, metadata.get(TikaCoreProperties.CONTRIBUTOR));
@@ -176,8 +166,6 @@ public class SolidworksParserTest extend
assertEquals(null, metadata.get(TikaCoreProperties.SOURCE));
assertEquals("", metadata.get(TikaCoreProperties.TITLE));
assertEquals("", metadata.get(TikaCoreProperties.KEYWORDS));
- } finally {
- input.close();
}
}
@@ -186,16 +174,15 @@ public class SolidworksParserTest extend
*/
@Test
public void testDrawing2014SP0Parser() throws Exception {
- InputStream input = SolidworksParserTest.class.getResourceAsStream(
- "/test-documents/testsolidworksDrawing2014SP0.SLDDRW");
- try {
+ try (InputStream input = SolidworksParserTest.class.getResourceAsStream(
+ "/test-documents/testsolidworksDrawing2014SP0.SLDDRW")) {
ContentHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata();
new OfficeParser().parse(input, handler, metadata, new ParseContext());
//Check content type
assertEquals("application/sldworks",metadata.get(Metadata.CONTENT_TYPE));
-
+
//Check properties
assertEquals("2012-07-03T12:05:29Z", metadata.get(TikaCoreProperties.CREATED));
assertEquals(null, metadata.get(TikaCoreProperties.CONTRIBUTOR));
@@ -206,8 +193,6 @@ public class SolidworksParserTest extend
assertEquals(null, metadata.get(TikaCoreProperties.SOURCE));
assertEquals("", metadata.get(TikaCoreProperties.TITLE));
assertEquals("", metadata.get(TikaCoreProperties.KEYWORDS));
- } finally {
- input.close();
}
}
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/strings/Latin1StringsParserTest.java Mon Aug 31 04:21:04 2015
@@ -56,12 +56,8 @@ public class Latin1StringsParserTest {
Parser parser = new Latin1StringsParser();
ContentHandler handler = new BodyContentHandler();
- InputStream stream = new ByteArrayInputStream(baos.toByteArray());
-
- try {
+ try (InputStream stream = new ByteArrayInputStream(baos.toByteArray())) {
parser.parse(stream, handler, new Metadata(), new ParseContext());
- } finally {
- stream.close();
}
String result = handler.toString();
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/strings/StringsParserTest.java Mon Aug 31 04:21:04 2015
@@ -57,14 +57,10 @@ public class StringsParserTest {
context.set(StringsConfig.class, stringsConfig);
context.set(FileConfig.class, fileConfig);
- InputStream stream = StringsParserTest.class.getResourceAsStream(resource);
-
- try {
+ try (InputStream stream = StringsParserTest.class.getResourceAsStream(resource)) {
parser.parse(stream, handler, metadata, context);
} catch (Exception e) {
e.printStackTrace();
- } finally {
- stream.close();
}
// Content
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/txt/CharsetDetectorTest.java Mon Aug 31 04:21:04 2015
@@ -29,9 +29,7 @@ public class CharsetDetectorTest {
@Test
public void testTagDropper() throws IOException {
- InputStream in = CharsetDetectorTest.class.getResourceAsStream("/test-documents/resume.html");
-
- try {
+ try (InputStream in = CharsetDetectorTest.class.getResourceAsStream("/test-documents/resume.html")) {
CharsetDetector detector = new CharsetDetector();
detector.enableInputFilter(true);
detector.setText(in);
@@ -44,8 +42,6 @@ public class CharsetDetectorTest {
}
assertTrue(mm != null);
assertEquals("UTF-8", mm.getName());
- } finally {
- in.close();
}
}
@@ -56,17 +52,13 @@ public class CharsetDetectorTest {
@Test
public void testEmptyOrNullDeclaredCharset() throws IOException {
- InputStream in = CharsetDetectorTest.class.getResourceAsStream("/test-documents/resume.html");
-
- try {
+ try (InputStream in = CharsetDetectorTest.class.getResourceAsStream("/test-documents/resume.html")) {
CharsetDetector detector = new CharsetDetector();
Reader reader = detector.getReader(in, null);
assertTrue(reader.ready());
reader = detector.getReader(in, "");
assertTrue(reader.ready());
- } finally {
- in.close();
}
}
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/DcXMLParserTest.java Mon Aug 31 04:21:04 2015
@@ -34,9 +34,8 @@ public class DcXMLParserTest extends Tik
@Test
public void testXMLParserAsciiChars() throws Exception {
- InputStream input = DcXMLParserTest.class.getResourceAsStream(
- "/test-documents/testXML.xml");
- try {
+ try (InputStream input = DcXMLParserTest.class.getResourceAsStream(
+ "/test-documents/testXML.xml")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new DcXMLParser().parse(input, handler, metadata);
@@ -46,20 +45,20 @@ public class DcXMLParserTest extends Tik
metadata.get(Metadata.CONTENT_TYPE));
assertEquals("Tika test document", metadata.get(TikaCoreProperties.TITLE));
assertEquals("Rida Benjelloun", metadata.get(TikaCoreProperties.CREATOR));
-
+
// The file contains 5 dc:subject tags, which come through as
// a multi-valued Tika Metadata entry in file order
assertEquals(true, metadata.isMultiValued(TikaCoreProperties.KEYWORDS));
- assertEquals(5, metadata.getValues(TikaCoreProperties.KEYWORDS).length);
+ assertEquals(5, metadata.getValues(TikaCoreProperties.KEYWORDS).length);
assertEquals("Java", metadata.getValues(TikaCoreProperties.KEYWORDS)[0]);
- assertEquals("XML", metadata.getValues(TikaCoreProperties.KEYWORDS)[1]);
+ assertEquals("XML", metadata.getValues(TikaCoreProperties.KEYWORDS)[1]);
assertEquals("XSLT", metadata.getValues(TikaCoreProperties.KEYWORDS)[2]);
assertEquals("JDOM", metadata.getValues(TikaCoreProperties.KEYWORDS)[3]);
assertEquals("Indexation", metadata.getValues(TikaCoreProperties.KEYWORDS)[4]);
assertEquals(true, metadata.isMultiValued(Metadata.SUBJECT));
- assertEquals(5, metadata.getValues(Metadata.SUBJECT).length);
+ assertEquals(5, metadata.getValues(Metadata.SUBJECT).length);
assertEquals("Java", metadata.getValues(Metadata.SUBJECT)[0]);
- assertEquals("XML", metadata.getValues(Metadata.SUBJECT)[1]);
+ assertEquals("XML", metadata.getValues(Metadata.SUBJECT)[1]);
assertEquals("XSLT", metadata.getValues(Metadata.SUBJECT)[2]);
assertEquals("JDOM", metadata.getValues(Metadata.SUBJECT)[3]);
assertEquals("Indexation", metadata.getValues(Metadata.SUBJECT)[4]);
@@ -77,24 +76,19 @@ public class DcXMLParserTest extends Tik
String content = handler.toString();
assertContains("Tika test document", content);
-
+
assertEquals("2000-12-01T00:00:00.000Z", metadata.get(TikaCoreProperties.CREATED));
- } finally {
- input.close();
}
}
@Test
public void testXMLParserNonAsciiChars() throws Exception {
- InputStream input = DcXMLParserTest.class.getResourceAsStream("/test-documents/testXML.xml");
- try {
+ try (InputStream input = DcXMLParserTest.class.getResourceAsStream("/test-documents/testXML.xml")) {
Metadata metadata = new Metadata();
new DcXMLParser().parse(input, new DefaultHandler(), metadata);
-
+
final String expected = "Archim\u00E8de et Lius \u00E0 Ch\u00E2teauneuf testing chars en \u00E9t\u00E9";
- assertEquals(expected,metadata.get(TikaCoreProperties.RIGHTS));
- } finally {
- input.close();
+ assertEquals(expected, metadata.get(TikaCoreProperties.RIGHTS));
}
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/EmptyAndDuplicateElementsXMLParserTest.java Mon Aug 31 04:21:04 2015
@@ -38,57 +38,51 @@ public class EmptyAndDuplicateElementsXM
@Test
public void testDefaultBehavior() throws Exception {
- InputStream input = EmptyAndDuplicateElementsXMLParserTest.class.getResourceAsStream(
- "/test-documents/testXML3.xml");
- try {
+ try (InputStream input = EmptyAndDuplicateElementsXMLParserTest.class.getResourceAsStream(
+ "/test-documents/testXML3.xml")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new DefaultCustomXMLTestParser().parse(input, handler, metadata, new ParseContext());
-
+
assertEquals(4, metadata.getValues(FIRST_NAME).length);
assertEquals(2, metadata.getValues(LAST_NAME).length);
-
+
assertEquals("John", metadata.getValues(FIRST_NAME)[0]);
assertEquals("Smith", metadata.getValues(LAST_NAME)[0]);
-
+
assertEquals("Jane", metadata.getValues(FIRST_NAME)[1]);
assertEquals("Doe", metadata.getValues(LAST_NAME)[1]);
-
+
// We didn't know Bob's last name, but now we don't know an entry existed
assertEquals("Bob", metadata.getValues(FIRST_NAME)[2]);
-
+
// We don't know Kate's last name because it was a duplicate
assertEquals("Kate", metadata.getValues(FIRST_NAME)[3]);
- } finally {
- input.close();
}
}
@Test
public void testEmptiesAndRepeats() throws Exception {
- InputStream input = EmptyAndDuplicateElementsXMLParserTest.class.getResourceAsStream(
- "/test-documents/testXML3.xml");
- try {
+ try (InputStream input = EmptyAndDuplicateElementsXMLParserTest.class.getResourceAsStream(
+ "/test-documents/testXML3.xml")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new AllowEmptiesAndDuplicatesCustomXMLTestParser().parse(input, handler, metadata, new ParseContext());
-
+
assertEquals(4, metadata.getValues(FIRST_NAME).length);
assertEquals(4, metadata.getValues(LAST_NAME).length);
-
+
assertEquals("John", metadata.getValues(FIRST_NAME)[0]);
assertEquals("Smith", metadata.getValues(LAST_NAME)[0]);
-
+
assertEquals("Jane", metadata.getValues(FIRST_NAME)[1]);
assertEquals("Doe", metadata.getValues(LAST_NAME)[1]);
-
+
assertEquals("Bob", metadata.getValues(FIRST_NAME)[2]);
assertEquals("", metadata.getValues(LAST_NAME)[2]);
-
+
assertEquals("Kate", metadata.getValues(FIRST_NAME)[3]);
assertEquals("Smith", metadata.getValues(LAST_NAME)[3]);
- } finally {
- input.close();
}
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/xml/FictionBookParserTest.java Mon Aug 31 04:21:04 2015
@@ -35,23 +35,19 @@ public class FictionBookParserTest {
@Test
public void testFB2() throws Exception {
- InputStream input = FictionBookParserTest.class.getResourceAsStream("/test-documents/test.fb2");
- try {
+ try (InputStream input = FictionBookParserTest.class.getResourceAsStream("/test-documents/test.fb2")) {
Metadata metadata = new Metadata();
ContentHandler handler = new BodyContentHandler();
new FictionBookParser().parse(input, handler, metadata, new ParseContext());
String content = handler.toString();
assertContains("1812", content);
- } finally {
- input.close();
}
}
@Test
public void testEmbedded() throws Exception {
- InputStream input = FictionBookParserTest.class.getResourceAsStream("/test-documents/test.fb2");
- try {
+ try (InputStream input = FictionBookParserTest.class.getResourceAsStream("/test-documents/test.fb2")) {
ContainerExtractor extractor = new ParserContainerExtractor();
TikaInputStream stream = TikaInputStream.get(input);
@@ -62,8 +58,6 @@ public class FictionBookParserTest {
extractor.extract(stream, null, handler);
assertEquals(2, handler.filenames.size());
- } finally {
- input.close();
}
}
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/sax/PhoneExtractingContentHandlerTest.java Mon Aug 31 04:21:04 2015
@@ -43,13 +43,9 @@ public class PhoneExtractingContentHandl
// The PhoneExtractingContentHandler will examine any characters for phone numbers before passing them
// to the underlying Handler.
PhoneExtractingContentHandler handler = new PhoneExtractingContentHandler(new BodyContentHandler(), metadata);
- InputStream stream = PhoneExtractingContentHandlerTest.class.getResourceAsStream("/test-documents/testPhoneNumberExtractor.odt");
- try {
+ try (InputStream stream = PhoneExtractingContentHandlerTest.class.getResourceAsStream("/test-documents/testPhoneNumberExtractor.odt")) {
parser.parse(stream, handler, metadata, new ParseContext());
}
- finally {
- stream.close();
- }
String[] phoneNumbers = metadata.getValues("phonenumbers");
assertContains("9498888888", phoneNumbers[0]);
assertContains("9497777777", phoneNumbers[1]);
Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java (original)
+++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java Mon Aug 31 04:21:04 2015
@@ -277,9 +277,8 @@ public class TikaResource {
public static void parse(Parser parser, Log logger, String path, InputStream inputStream,
ContentHandler handler, Metadata metadata, ParseContext parseContext) throws IOException {
- inputStream = TikaInputStream.get(inputStream);
- try {
- parser.parse(inputStream, handler, metadata, parseContext);
+ try (TikaInputStream tikaInputStream = TikaInputStream.get(inputStream)) {
+ parser.parse(tikaInputStream, handler, metadata, parseContext);
} catch (SAXException e) {
throw new TikaServerParseException(e);
} catch (EncryptedDocumentException e) {
@@ -296,8 +295,6 @@ public class TikaResource {
path
), e);
throw new TikaServerParseException(e);
- } finally {
- inputStream.close();
}
}
@@ -355,10 +352,8 @@ public class TikaResource {
BodyContentHandler body = new BodyContentHandler(new RichTextContentHandler(writer));
- try {
- parse(parser, logger, info.getPath(), is, body, metadata, context);
- } finally {
- is.close();
+ try (InputStream inputStream = is) {
+ parse(parser, logger, info.getPath(), inputStream, body, metadata, context);
}
}
};
Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java?rev=1700195&r1=1700194&r2=1700195&view=diff
==============================================================================
--- tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java (original)
+++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/resource/UnpackerResource.java Mon Aug 31 04:21:04 2015
@@ -251,11 +251,8 @@ public class UnpackerResource {
copy((DirectoryEntry) entry, newDir);
} else {
// Copy entry
- InputStream contents = new DocumentInputStream((DocumentEntry) entry);
- try {
+ try (InputStream contents = new DocumentInputStream((DocumentEntry) entry)) {
destDir.createDocument(entry.getName(), contents);
- } finally {
- contents.close();
}
}
}