diff options
| author | Arne H Juul <arnej27959@users.noreply.github.com> | 2018-10-17 08:28:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 08:28:51 +0200 |
| commit | 3b5aa2200b1f2b5efc635c249e6236976589a36b (patch) | |
| tree | 8f8d1bddf59af32f3d48c67507496c9cb476800f | |
| parent | 148a160f98556c5d50cf2411db47b7ce3f548038 (diff) | |
| parent | 4c81e805c93c504701a321d7a8f6f89306697e99 (diff) | |
Merge pull request #7330 from vespa-engine/bratseth/prepare-for-removal-2
Prepare for removal of deprecated members
3 files changed, 8 insertions, 4 deletions
diff --git a/linguistics/src/main/java/com/yahoo/language/Linguistics.java b/linguistics/src/main/java/com/yahoo/language/Linguistics.java index 035de415aa7..75cdba0ab40 100644 --- a/linguistics/src/main/java/com/yahoo/language/Linguistics.java +++ b/linguistics/src/main/java/com/yahoo/language/Linguistics.java @@ -46,7 +46,8 @@ public interface Linguistics { * * @deprecated use new com.yahoo.language.simple.SimpleLinguistics() */ - @Deprecated // TODO: Remove this field on Vespa 7 + @Deprecated // OK + // TODO: Remove this field on Vespa 7 Linguistics SIMPLE = new SimpleLinguistics(); /** 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 264cc6ec7cc..af486f715b0 100644 --- a/linguistics/src/main/java/com/yahoo/language/process/StemMode.java +++ b/linguistics/src/main/java/com/yahoo/language/process/StemMode.java @@ -27,12 +27,14 @@ public enum StemMode { * * @deprecated do not use */ - @Deprecated + // TODO: Remove on Vespa 7 + @Deprecated // OK public int getValue() { return value; } - @Deprecated + @Deprecated // OK + // TODO: Remove on Vespa 7 public static StemMode valueOf(int value) { for (StemMode mode : values()) { if (mode.value == value) { 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 dce0683125e..7bb13744e20 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 @@ -29,7 +29,8 @@ public abstract class CharacterUtils { * explicitly returns a version matching java 4 semantics * @deprecated Only for n-gram backwards compat */ - @Deprecated + // TODO: Remove on Vespa 7 + @Deprecated // OK public static CharacterUtils getJava4Instance() { return JAVA_4; } |