Merge remote-tracking branch 'upstream/develop' into search_improvements

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HtmlTextExtractor.java

@@ -64,7 +64,7 @@ class HtmlTextExtractor implements TextExtractor {
     );
 
     HtmlTextExtractor() {
-        ingester = Server.getIngester();
+        ingester = Ingester.getDefault();
     }
 
     @Override

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java

@@ -156,7 +156,7 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
         } catch (FileTypeDetector.FileTypeDetectorInitException ex) {
             throw new IngestModuleException(Bundle.CannotRunFileTypeDetection(), ex);
         }
-        ingester = Server.getIngester();
+        ingester = Ingester.getDefault();
         this.context = context;
 
         // increment the module reference count

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java

@@ -62,7 +62,7 @@ public final class SearchRunner {
     private Map<Long, SearchJobInfo> jobs = new HashMap<>(); //guarded by "this"
 
     SearchRunner() {
-        ingester = Server.getIngester();
+        ingester = Ingester.getDefault();
         updateTimer = new Timer(NbBundle.getMessage(this.getClass(), "SearchRunner.updateTimer.title.text"), true); // run as a daemon
     }
 

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java

@@ -1084,15 +1084,6 @@ public class Server {
         }
     }
 
-    /**
-     * Method to return ingester instance
-     *
-     * @return ingester instance
-     */
-    public static Ingester getIngester() {
-        return Ingester.getDefault();
-    }
-
     /**
      * Given file parent id and child chunk ID, return the ID string of the
      * chunk as stored in Solr, e.g. FILEID_CHUNKID

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/StringsTextExtractor.java

@@ -58,7 +58,7 @@ class StringsTextExtractor implements TextExtractor {
     //stringChunkBuf[2] = (byte) 0xBF;
     //}
     public StringsTextExtractor() {
-        ingester = Server.getIngester();
+        ingester = Ingester.getDefault();
         extractScripts.add(DEFAULT_SCRIPT);
     }
 

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TikaTextExtractor.java

@@ -72,7 +72,7 @@ class TikaTextExtractor implements TextExtractor {
     private final List<String> TIKA_SUPPORTED_TYPES = new ArrayList<>();
 
     TikaTextExtractor() {
-        ingester = Server.getIngester();
+        ingester = Ingester.getDefault();
 
         Set<MediaType> mediaTypes = new Tika().getParser().getSupportedTypes(new ParseContext());
         for (MediaType mt : mediaTypes) {