From 5463d3a7191733ff24a3d1d89b5a4e77e056090d Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Sat, 7 Jan 2017 10:30:58 -0500
Subject: [PATCH] Remove kws public Server.getIngester, Ingester is not public

---
 .../autopsy/keywordsearch/HtmlTextExtractor.java         | 2 +-
 .../autopsy/keywordsearch/KeywordSearchIngestModule.java | 2 +-
 .../sleuthkit/autopsy/keywordsearch/SearchRunner.java    | 2 +-
 .../src/org/sleuthkit/autopsy/keywordsearch/Server.java  | 9 ---------
 .../autopsy/keywordsearch/StringsTextExtractor.java      | 2 +-
 .../autopsy/keywordsearch/TikaTextExtractor.java         | 2 +-
 6 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HtmlTextExtractor.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HtmlTextExtractor.java
index 27e9ccd637..44e1f3edb2 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HtmlTextExtractor.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HtmlTextExtractor.java
@@ -64,7 +64,7 @@ class HtmlTextExtractor implements TextExtractor {
     );
 
     HtmlTextExtractor() {
-        ingester = Server.getIngester();
+        ingester = Ingester.getDefault();
     }
 
     @Override
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
index c0ced07107..1f4dc31ead 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
+++ b/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
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
index e41a03554a..f80fe86404 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
+++ b/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
     }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
index 0cbe79e1ca..7c78a4c871 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
@@ -1040,15 +1040,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
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/StringsTextExtractor.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/StringsTextExtractor.java
index 3bbc97dcfc..aef5a1f69a 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/StringsTextExtractor.java
+++ b/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);
     }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TikaTextExtractor.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TikaTextExtractor.java
index 479931a754..ffa4f5dc5e 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TikaTextExtractor.java
+++ b/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) {