Reduce code duplication

2 files changed, 14 insertions, 15 deletions

diff --git a/linguistics/src/main/java/com/yahoo/language/process/GramSplitter.java b/linguistics/src/main/java/com/yahoo/language/process/GramSplitter.java
index 3a4558b3cb9..94fd0e08493 100644
--- a/linguistics/src/main/java/com/yahoo/language/process/GramSplitter.java
+++ b/linguistics/src/main/java/com/yahoo/language/process/GramSplitter.java
@@ -1,7 +1,12 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.language.process;
 
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
 
 /**
  * A class which splits consecutive word character sequences into overlapping character n-grams.
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 d7246db6041..8cbbdeeae1d 100644
--- a/linguistics/src/main/java/com/yahoo/language/simple/SimpleLinguistics.java
+++ b/linguistics/src/main/java/com/yahoo/language/simple/SimpleLinguistics.java
@@ -33,27 +33,21 @@ public class SimpleLinguistics implements Linguistics {
 
     @Inject
     public SimpleLinguistics() {
-        CharacterClasses characterClasses = new CharacterClasses();
-        this.normalizer = new SimpleNormalizer();
-        this.transformer = new SimpleTransformer();
-        this.detector = new SimpleDetector();
-        this.characterClasses = new CharacterClasses();
-        this.gramSplitter = new GramSplitter(characterClasses);
+        this(true);
+
     }
     public SimpleLinguistics(boolean enableOptimaize) {
-        CharacterClasses characterClasses = new CharacterClasses();
-        this.normalizer = new SimpleNormalizer();
-        this.transformer = new SimpleTransformer();
-        this.detector = new SimpleDetector(enableOptimaize);
-        this.characterClasses = new CharacterClasses();
-        this.gramSplitter = new GramSplitter(characterClasses);
+        this(new SimpleDetector(enableOptimaize));
     }
 
     public SimpleLinguistics(SimpleLinguisticsConfig config) {
-        CharacterClasses characterClasses = new CharacterClasses();
+        this(new SimpleDetector(config.detector()));
+    }
+
+    private SimpleLinguistics(Detector detector) {
         this.normalizer = new SimpleNormalizer();
         this.transformer = new SimpleTransformer();
-        this.detector = new SimpleDetector(config.detector());
+        this.detector = detector;
         this.characterClasses = new CharacterClasses();
         this.gramSplitter = new GramSplitter(characterClasses);
     }