Add some javadoc, and no need to handle null return for model

2 files changed, 4 insertions, 2 deletions

diff --git a/linguistics/src/main/java/com/yahoo/language/opennlp/LangDetectModel.java b/linguistics/src/main/java/com/yahoo/language/opennlp/LangDetectModel.java
index 70664b8f79f..144b4612005 100644
--- a/linguistics/src/main/java/com/yahoo/language/opennlp/LangDetectModel.java
+++ b/linguistics/src/main/java/com/yahoo/language/opennlp/LangDetectModel.java
@@ -4,10 +4,13 @@ package com.yahoo.language.opennlp;
 import opennlp.tools.langdetect.LanguageDetectorModel;
 
 /**
+ * Wrapper to lazily load a langdetect model for OpenNLP.
+ *
  * @author jonmv
  */
 public interface LangDetectModel {
 
+    /** Loads a {@link LanguageDetectorModel}, or throws if this fails. */
     LanguageDetectorModel load();
 
 }
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 7ee17559d88..1f4ec4e261b 100644
--- a/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpLinguistics.java
+++ b/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpLinguistics.java
@@ -21,8 +21,7 @@ public class OpenNlpLinguistics extends SimpleLinguistics {
 
     @Inject
     public OpenNlpLinguistics(LangDetectModel model) {
-        LanguageDetectorModel loaded = model.load();
-        this.detector = loaded != null ? new OpenNlpDetector(loaded) : new SimpleDetector();
+        this.detector = new OpenNlpDetector(model.load());
     }
 
     @Override