Author: jukka
Date: Thu Aug 27 09:19:37 2015
New Revision: 1698100
URL: http://svn.apache.org/r1698100
Log:
TIKA-1722: Tika methods that accept a File needlessly convert it to a URL
Patch by Yaniv Kunda
Modified:
tika/trunk/tika-core/src/main/java/org/apache/tika/Tika.java
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/Tika.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/Tika.java?rev=1698100&r1=1698099&r2=1698100&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/Tika.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/Tika.java Thu Aug 27
09:19:37 2015
@@ -267,7 +267,10 @@ public class Tika {
* @throws IOException if the file can not be read
*/
public String detect(File file) throws IOException {
- return detect(file.toURI().toURL());
+ Metadata metadata = new Metadata();
+ try (InputStream stream = TikaInputStream.get(file, metadata)) {
+ return detect(stream, metadata);
+ }
}
/**
@@ -418,7 +421,9 @@ public class Tika {
* @throws IOException if the file can not be read or parsed
*/
public Reader parse(File file) throws IOException {
- return parse(file.toURI().toURL());
+ Metadata metadata = new Metadata();
+ InputStream stream = TikaInputStream.get(file, metadata);
+ return parse(stream, metadata);
}
/**
@@ -554,7 +559,9 @@ public class Tika {
* @throws TikaException if the file can not be parsed
*/
public String parseToString(File file) throws IOException, TikaException {
- return parseToString(file.toURI().toURL());
+ Metadata metadata = new Metadata();
+ InputStream stream = TikaInputStream.get(file, metadata);
+ return parseToString(stream, metadata);
}
/**
