/modules/dnet-data-services/branches/saxonHE/src/main/java/eu/dnetlib/data/collector/plugins/filesystem/FileSystemIterator.java - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 51722

Reverted filesystem plugin to the first implementation that does not use FileDirectoryStream: files were left open causing Too many open files errors

     import com.google.common.collect.Iterators;
     import com.google.common.collect.Sets;
     import eu.dnetlib.data.collector.ThreadSafeIterator;
     import org.apache.commons.io.FilenameUtils;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
-...
      * Class enabling lazy & recursive iteration of a filesystem tree. The iterator iterates over file paths.
+     *
      * @author Andrea
+     *
      */
     public class FileSystemIterator extends ThreadSafeIterator {
     public class FileSystemIterator implements Iterator<String> {
     	/**
     	 * The logger
     	 */
     	/** The logger */
     	private static final Log log = LogFactory.getLog(FileSystemIterator.class);
     	private Set<String> extensions;
-...
+    	}
     	@Override
     	public boolean doHasNext() {
     	public boolean hasNext() {
     		return current != null;
+    	}
     	@Override
     	public String doNext() {
     	public synchronized String next() {
     		String pivot = new String(current);
     		current = walkTillNext();
     		log.debug("Returning: " + pivot);
     		return pivot;
+    	}
     	@Override
     	public void remove() {}
     	/**
     	 * Walk the filesystem recursively until it finds a candidate. Strategies: a) For any directory found during the walk, an iterator is
     	 * built and concat to the main one; b) Any file is checked against admitted extensions
-...
+    		}
     		return null;
+    	}
+    }
+    }

Also available in: Unified diff