AnalyzerGuru is actually (unfortunately) a singleton at the moment

Author: idodeclare

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/AnalyzerGuru.java

@@ -389,7 +389,7 @@ public static Map<String, String> getfileTypeDescriptions() {
         return Collections.unmodifiableMap(fileTypeDescriptions);
     }
 
-    public List<AnalyzerFactory> getAnalyzerFactories() {
+    public static List<AnalyzerFactory> getAnalyzerFactories() {
         return Collections.unmodifiableList(factories);
     }
 
@@ -575,9 +575,8 @@ public static void returnAnalyzers() {
      * @throws IOException If an exception occurs while collecting the data
      * @throws InterruptedException if a timeout occurs
      */
-    public void populateDocument(Document doc, File file, String path,
-        AbstractAnalyzer fa, Writer xrefOut) throws IOException,
-            InterruptedException {
+    public static void populateDocument(Document doc, File file, String path,
+            AbstractAnalyzer fa, Writer xrefOut) throws IOException, InterruptedException {
 
         String date = DateTools.timeToString(file.lastModified(),
                 DateTools.Resolution.MILLISECOND);
@@ -1190,4 +1189,8 @@ private static boolean factoriesDifferent(AnalyzerFactory a,
         }
         return a_name == null || !a_name.equals(b_name);
     }
+
+    /* private to enforce static */
+    private AnalyzerGuru() {
+    }
 }

opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java

@@ -129,7 +129,7 @@ public class IndexDatabase {
     private final Map<String, IndexedSymlink> indexedSymlinks = new TreeMap<>(
             Comparator.comparingInt(String::length).thenComparing(o -> o));
 
-    private Project project;
+    private final Project project;
     private FSDirectory indexDirectory;
     private IndexReader reader;
     private IndexWriter writer;
@@ -138,7 +138,6 @@ public class IndexDatabase {
     private TermsEnum uidIter;
     private PostingsEnum postsIter;
     private PathAccepter pathAccepter;
-    private AnalyzerGuru analyzerGuru;
     private File xrefDir;
     private boolean interrupted;
     private CopyOnWriteArrayList<IndexChangedListener> listeners;
@@ -307,7 +306,6 @@ private void initialize() throws IOException {
             lockfact = pickLockFactory(env);
             indexDirectory = FSDirectory.open(indexDir.toPath(), lockfact);
             pathAccepter = env.getPathAccepter();
-            analyzerGuru = new AnalyzerGuru();
             xrefDir = new File(env.getDataRootFile(), XREF_DIR);
             listeners = new CopyOnWriteArrayList<>();
             dirtyFile = new File(indexDir, "dirty");
@@ -726,7 +724,7 @@ private void addFile(File file, String path, Ctags ctags)
 
         Document doc = new Document();
         try (Writer xrefOut = newXrefWriter(fa, path)) {
-            analyzerGuru.populateDocument(doc, file, path, fa, xrefOut);
+            AnalyzerGuru.populateDocument(doc, file, path, fa, xrefOut);
         } catch (InterruptedException e) {
             LOGGER.log(Level.WARNING, "File ''{0}'' interrupted--{1}",
                 new Object[]{path, e.getMessage()});

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/LuceneCompatibilityTest.java

@@ -72,7 +72,6 @@ public static Test suite() {
         }
     }
     Analyzer testA;
-    AnalyzerGuru guru;
     Method testM;
     Object testC = null;
 
@@ -81,15 +80,14 @@ public static Test suite() {
      */
     @Override
     protected void setUp() throws Exception {
-        guru = new AnalyzerGuru();
         Class<?> c = Class.forName(LUCENE_TEST_CLASS);
         //testC = c.newInstance(); //this is static call
         Class<?>[] argTypes = {TokenStream.class, String[].class, int[].class, int[].class, String[].class, int[].class, int[].class, Integer.class, boolean.class};
         testM = c.getDeclaredMethod(LUCENE_TEST_METHOD, argTypes);
     }
 
     public void testCompatibility() throws Exception {
-        for (AnalyzerFactory fa : guru.getAnalyzerFactories()) {
+        for (AnalyzerFactory fa : AnalyzerGuru.getAnalyzerFactories()) {
             String input = "Hello world";
             String[] output = new String[]{"Hello", "world"};
             testA = fa.getAnalyzer();