Replace optimaize with OpenNLP language detector

1 files changed, 5 insertions, 2 deletions

diff --git a/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java b/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java
index 563c9a8bdff..11ed2157401 100644
--- a/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java
+++ b/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java
@@ -6,6 +6,7 @@ import com.google.common.base.Suppliers;
 import com.google.inject.Inject;
 import com.yahoo.container.di.componentgraph.Provider;
 import com.yahoo.language.Linguistics;
+import com.yahoo.language.opennlp.LangDetectModel;
 import com.yahoo.language.opennlp.OpenNlpLinguistics;
 
 /**
@@ -18,10 +19,12 @@ import com.yahoo.language.opennlp.OpenNlpLinguistics;
 public class DefaultLinguisticsProvider implements Provider<Linguistics> {
 
     // Use lazy initialization to avoid expensive (memory-wise) instantiation
-    private final Supplier<Linguistics> linguisticsSupplier = Suppliers.memoize(OpenNlpLinguistics::new);
+    private final Supplier<Linguistics> linguisticsSupplier;
 
     @Inject
-    public DefaultLinguisticsProvider() { }
+    public DefaultLinguisticsProvider(LangDetectModel detectorModel) {
+        linguisticsSupplier = Suppliers.memoize(() -> new OpenNlpLinguistics(detectorModel));
+    }
 
     @Override
     public Linguistics get() { return linguisticsSupplier.get(); }