No need for a singleton

2 files changed, 2 insertions, 14 deletions

diff --git a/lucene-linguistics/src/main/java/com/yahoo/language/lucene/AnalyzerFactory.java b/lucene-linguistics/src/main/java/com/yahoo/language/lucene/AnalyzerFactory.java
index f4d3b482363..45cd4d4f186 100644
--- a/lucene-linguistics/src/main/java/com/yahoo/language/lucene/AnalyzerFactory.java
+++ b/lucene-linguistics/src/main/java/com/yahoo/language/lucene/AnalyzerFactory.java
@@ -46,7 +46,7 @@ class AnalyzerFactory {
         this.config = config;
         this.configDir = config.configDir();
         this.analyzerComponents = analyzers;
-        this.defaultAnalyzers = DefaultAnalyzers.getInstance();
+        this.defaultAnalyzers = new DefaultAnalyzers();
         log.config("Available in classpath char filters: " + CharFilterFactory.availableCharFilters());
         log.config("Available in classpath tokenizers: " + TokenizerFactory.availableTokenizers());
         log.config("Available in classpath token filters: " + TokenFilterFactory.availableTokenFilters());
diff --git a/lucene-linguistics/src/main/java/com/yahoo/language/lucene/DefaultAnalyzers.java b/lucene-linguistics/src/main/java/com/yahoo/language/lucene/DefaultAnalyzers.java
index 858b71b7fae..95b11301d47 100644
--- a/lucene-linguistics/src/main/java/com/yahoo/language/lucene/DefaultAnalyzers.java
+++ b/lucene-linguistics/src/main/java/com/yahoo/language/lucene/DefaultAnalyzers.java
@@ -49,10 +49,9 @@ import static java.util.Map.entry;
  */
 class DefaultAnalyzers {
 
-    private static DefaultAnalyzers INSTANCE;
     private final Map<Language, Analyzer> analyzerClasses;
 
-    private DefaultAnalyzers() {
+    public DefaultAnalyzers() {
         analyzerClasses = Map.ofEntries(
                 entry(Language.ARABIC, new ArabicAnalyzer()),
                 entry(Language.BULGARIAN, new BulgarianAnalyzer()),
@@ -96,19 +95,8 @@ class DefaultAnalyzers {
         );
     }
 
-    public static DefaultAnalyzers getInstance() {
-        if (INSTANCE == null) {
-            INSTANCE = new DefaultAnalyzers();
-        }
-        return INSTANCE;
-    }
-
     public Analyzer get(Language language) {
         return analyzerClasses.get(language);
     }
 
-    public Analyzer get(String languageCode) {
-        return analyzerClasses.get(Language.fromLanguageTag(languageCode));
-    }
-
 }