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 2015/10/01 15:12:24 UTC
svn commit: r1706237 - in /tika/trunk:
tika-batch/src/main/java/org/apache/tika/batch/fs/FSDirectoryCrawler.java
tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java
Author: tallison
Date: Thu Oct 1 13:12:23 2015
New Revision: 1706237
URL: http://svn.apache.org/viewvc?rev=1706237&view=rev
Log:
fix two unchecked operations
Modified:
tika/trunk/tika-batch/src/main/java/org/apache/tika/batch/fs/FSDirectoryCrawler.java
tika/trunk/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java
Modified: tika/trunk/tika-batch/src/main/java/org/apache/tika/batch/fs/FSDirectoryCrawler.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-batch/src/main/java/org/apache/tika/batch/fs/FSDirectoryCrawler.java?rev=1706237&r1=1706236&r2=1706237&view=diff
==============================================================================
--- tika/trunk/tika-batch/src/main/java/org/apache/tika/batch/fs/FSDirectoryCrawler.java (original)
+++ tika/trunk/tika-batch/src/main/java/org/apache/tika/batch/fs/FSDirectoryCrawler.java Thu Oct 1 13:12:23 2015
@@ -84,10 +84,9 @@ public class FSDirectoryCrawler extends
}
List<Path> files = new ArrayList<>();
- try (DirectoryStream ds = Files.newDirectoryStream(directory)){
- Iterator<Path> it = ds.iterator();
- while (it.hasNext()) {
- files.add(it.next());
+ try (DirectoryStream<Path> ds = Files.newDirectoryStream(directory)){
+ for (Path p : ds) {
+ files.add(p);
}
} catch (IOException e) {
logger.warn("FSFileAdder couldn't read "+directory.toAbsolutePath() +
Modified: tika/trunk/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java?rev=1706237&r1=1706236&r2=1706237&view=diff
==============================================================================
--- tika/trunk/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java (original)
+++ tika/trunk/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java Thu Oct 1 13:12:23 2015
@@ -63,7 +63,7 @@ public class RecursiveMetadataResourceTe
@Override
protected void setUpProviders(JAXRSServerFactoryBean sf) {
- List<Object> providers = new ArrayList();
+ List<Object> providers = new ArrayList<>();
providers.add(new MetadataListMessageBodyWriter());
sf.setProviders(providers);
}