svn commit: r1715999 - in /lucene/dev/trunk/solr/core/src: java/org/apache/solr/util/SimplePostTool.java test/org/apache/solr/util/SimplePostToolTest.java

[eh...@apache.org]

Author: ehatcher
Date: Tue Nov 24 00:34:26 2015
New Revision: 1715999

URL: http://svn.apache.org/viewvc?rev=1715999&view=rev
Log:
SOLR-8333: fix public API from referring to inner class implementation

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java?rev=1715999&r1=1715998&r2=1715999&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/SimplePostTool.java Tue Nov 24 00:34:26 2015
@@ -111,7 +111,7 @@ public class SimplePostTool {
   private int currentDepth;
 
   static HashMap<String,String> mimeMap;
-  GlobFileFilter globFileFilter;
+  FileFilter fileFilter;
   // Backlog for crawling
   List<LinkedHashSet<URL>> backlog = new ArrayList<>();
   Set<URL> visited = new HashSet<>();
@@ -286,7 +286,7 @@ public class SimplePostTool {
     this.recursive = recursive;
     this.delay = delay;
     this.fileTypes = fileTypes;
-    this.globFileFilter = getFileFilterFromFileTypes(fileTypes);
+    this.fileFilter = getFileFilterFromFileTypes(fileTypes);
     this.out = out;
     this.commit = commit;
     this.optimize = optimize;
@@ -487,9 +487,9 @@ public class SimplePostTool {
   private int postDirectory(File dir, OutputStream out, String type) {
     if(dir.isHidden() && !dir.getName().equals("."))
       return(0);
-    info("Indexing directory "+dir.getPath()+" ("+dir.listFiles(globFileFilter).length+" files, depth="+currentDepth+")");
+    info("Indexing directory "+dir.getPath()+" ("+dir.listFiles(fileFilter).length+" files, depth="+currentDepth+")");
     int posted = 0;
-    posted += postFiles(dir.listFiles(globFileFilter), out, type);
+    posted += postFiles(dir.listFiles(fileFilter), out, type);
     if(recursive > currentDepth) {
       for(File d : dir.listFiles()) {
         if(d.isDirectory()) {
@@ -965,7 +965,7 @@ public class SimplePostTool {
     if (null != dest) dest.flush();
   }
 
-  public GlobFileFilter getFileFilterFromFileTypes(String fileTypes) {
+  public FileFilter getFileFilterFromFileTypes(String fileTypes) {
     String glob;
     if(fileTypes.equals("*"))
       glob = ".*";

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java?rev=1715999&r1=1715998&r2=1715999&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java Tue Nov 24 00:34:26 2015
@@ -117,7 +117,7 @@ public class SimplePostToolTest extends
     assertFalse(t_web.typeSupported("text/foo"));
 
     t_web.fileTypes = "doc,xls,ppt";
-    t_web.globFileFilter = t_web.getFileFilterFromFileTypes(t_web.fileTypes);
+    t_web.fileFilter = t_web.getFileFilterFromFileTypes(t_web.fileTypes);
     assertFalse(t_web.typeSupported("application/pdf"));
     assertTrue(t_web.typeSupported("application/msword"));
   }