1 files changed, 29 insertions, 0 deletions
diff --git a/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpLinguistics.java b/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpLinguistics.java
index 38181261d6a..1c7c71c00b6 100644
--- a/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpLinguistics.java
+++ b/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpLinguistics.java
@@ -1,14 +1,43 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.language.opennlp;
 
+import com.google.inject.Inject;
+import com.yahoo.language.detect.Detector;
 import com.yahoo.language.process.Tokenizer;
+import com.yahoo.language.simple.SimpleDetector;
 import com.yahoo.language.simple.SimpleLinguistics;
 
+/**
+ * Returns a linguistics implementation based on OpenNlp,
+ * and (optionally, default on) Optimaize for language detection.
+ */
 public class OpenNlpLinguistics extends SimpleLinguistics {
 
+    private final Detector detector;
+
+    public OpenNlpLinguistics() {
+        this(true);
+    }
+
+    @Inject
+    public OpenNlpLinguistics(OpennlpLinguisticsConfig config) {
+        this(config.detector().enableOptimaize());
+    }
+
+    public OpenNlpLinguistics(boolean enableOptimaize) {
+        this(enableOptimaize ? new OptimaizeDetector() : new SimpleDetector());
+    }
+
+    private OpenNlpLinguistics(Detector detector) {
+        this.detector = detector;
+    }
+
     @Override
     public Tokenizer getTokenizer() {
         return new OpenNlpTokenizer(getNormalizer(), getTransformer());
     }
 
+    @Override
+    public Detector getDetector() { return detector; }
+
 }