Make SimpleLinguistics simple again

- Remove SimpleLinguistics config and optional use of Optimaize
- Add Optimaize to OpennlpLinguistics; on by default and config to disable

1 files changed, 3 insertions, 19 deletions

diff --git a/linguistics/src/main/java/com/yahoo/language/simple/SimpleLinguistics.java b/linguistics/src/main/java/com/yahoo/language/simple/SimpleLinguistics.java
index b7bf0215ca4..3c2e70b6677 100644
--- a/linguistics/src/main/java/com/yahoo/language/simple/SimpleLinguistics.java
+++ b/linguistics/src/main/java/com/yahoo/language/simple/SimpleLinguistics.java
@@ -17,7 +17,8 @@ import com.yahoo.language.process.Tokenizer;
 import com.yahoo.language.process.Transformer;
 
 /**
- * Factory of pure Java linguistic processor implementations.
+ * Factory of simple linguistic processor implementations.
+ * Useful for testing and english-only use cases.
  *
  * @author bratseth
  * @author bjorncs
@@ -34,26 +35,9 @@ public class SimpleLinguistics implements Linguistics {
     @Inject
     @SuppressWarnings("deprecation")
     public SimpleLinguistics() {
-        this(true);
-
-    }
-
-    /** @deprecated use OpenNlpLinguistics to get optimaize */
-    @Deprecated // OK
-    public SimpleLinguistics(boolean enableOptimaize) {
-        this(new SimpleDetector(enableOptimaize));
-    }
-
-    /** @deprecated use OpenNlpLinguistics to get optimaize */
-    @Deprecated // OK
-    public SimpleLinguistics(SimpleLinguisticsConfig config) {
-        this(new SimpleDetector(config.detector()));
-    }
-
-    private SimpleLinguistics(Detector detector) {
         this.normalizer = new SimpleNormalizer();
         this.transformer = new SimpleTransformer();
-        this.detector = detector;
+        this.detector = new SimpleDetector();
         this.characterClasses = new CharacterClasses();
         this.gramSplitter = new GramSplitter(characterClasses);
     }