Remove deprecated apis in linguistics.

4 files changed, 0 insertions, 68 deletions

diff --git a/linguistics/src/main/java/com/yahoo/language/Linguistics.java b/linguistics/src/main/java/com/yahoo/language/Linguistics.java
index 9006d855faa..b0c5739b45e 100644
--- a/linguistics/src/main/java/com/yahoo/language/Linguistics.java
+++ b/linguistics/src/main/java/com/yahoo/language/Linguistics.java
@@ -42,15 +42,6 @@ public interface Linguistics {
     }
 
     /**
-     * The same as new com.yahoo.language.simple.SimpleLinguistics(). Prefer using that directly.
-     *
-     * @deprecated use new com.yahoo.language.simple.SimpleLinguistics()
-     */
-    @Deprecated // OK
-    // TODO: Remove this field on Vespa 7
-    Linguistics SIMPLE = new SimpleLinguistics();
-
-    /**
      * Returns a thread-unsafe stemmer or lemmatizer.
      * This is used at query time to do stemming of search terms to indexes which contains text tokenized
      * with stemming turned on
diff --git a/linguistics/src/main/java/com/yahoo/language/process/StemMode.java b/linguistics/src/main/java/com/yahoo/language/process/StemMode.java
index af486f715b0..628f6910c9e 100644
--- a/linguistics/src/main/java/com/yahoo/language/process/StemMode.java
+++ b/linguistics/src/main/java/com/yahoo/language/process/StemMode.java
@@ -22,26 +22,4 @@ public enum StemMode {
         this.value = value;
     }
 
-    /**
-     * Returns the stem mode as an int
-     *
-     * @deprecated do not use
-     */
-    // TODO: Remove on Vespa 7
-    @Deprecated // OK
-    public int getValue() {
-        return value;
-    }
-
-    @Deprecated // OK
-    // TODO: Remove on Vespa 7
-    public static StemMode valueOf(int value) {
-        for (StemMode mode : values()) {
-            if (mode.value == value) {
-                return mode;
-            }
-        }
-        return NONE;
-    }
-
 }
diff --git a/linguistics/src/main/java/com/yahoo/language/simple/kstem/CharacterUtils.java b/linguistics/src/main/java/com/yahoo/language/simple/kstem/CharacterUtils.java
index 7bb13744e20..3b7dcca3bc1 100644
--- a/linguistics/src/main/java/com/yahoo/language/simple/kstem/CharacterUtils.java
+++ b/linguistics/src/main/java/com/yahoo/language/simple/kstem/CharacterUtils.java
@@ -24,16 +24,6 @@ public abstract class CharacterUtils {
   public static CharacterUtils getInstance() {
     return JAVA_5;
   }
-  
-  /** 
-   * explicitly returns a version matching java 4 semantics 
-   * @deprecated Only for n-gram backwards compat
-   */
-  // TODO: Remove on Vespa 7
-  @Deprecated // OK
-  public static CharacterUtils getJava4Instance() {
-    return JAVA_4;
-  }
 
   /**
    * Returns the code point at the given index of the {@link CharSequence}.
diff --git a/linguistics/src/test/java/com/yahoo/language/process/StemModeTestCase.java b/linguistics/src/test/java/com/yahoo/language/process/StemModeTestCase.java
deleted file mode 100644
index 6433d0d491a..00000000000
--- a/linguistics/src/test/java/com/yahoo/language/process/StemModeTestCase.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// 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 org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author Simon Thoresen Hult
- */
-public class StemModeTestCase {
-
-    @Test
-    @SuppressWarnings("deprecation")
-    public void requireThatValueOfWorks() {
-        for (StemMode mode : StemMode.values()) {
-            assertEquals(mode, StemMode.valueOf(mode.getValue()));
-        }
-    }
-
-    @Test
-    @SuppressWarnings("deprecation")
-    public void requireThatValueOfUnknownIsNone() {
-        assertEquals(StemMode.NONE, StemMode.valueOf(-1));
-    }
-
-}