diff options
Diffstat (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java index b5a0ecfbe3d..8a7ee78ea91 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java @@ -17,10 +17,6 @@ public enum Stemming { /** No stemming */ NONE("none"), - /** @deprecated incorrectly don't stem at all */ - @Deprecated - ALL("all"), - /** select shortest possible stem */ SHORTEST("shortest"), @@ -43,12 +39,7 @@ public enum Stemming { @SuppressWarnings("deprecation") public static Stemming get(String stemmingName) { try { - Stemming stemming = Stemming.valueOf(stemmingName.toUpperCase()); - if (stemming.equals(ALL)) { - log.warning("note: stemming ALL is the same as stemming mode SHORTEST"); - stemming = SHORTEST; - } - return stemming; + return Stemming.valueOf(stemmingName.toUpperCase()); } catch (IllegalArgumentException e) { throw new IllegalArgumentException("'" + stemmingName + "' is not a valid stemming setting"); } @@ -71,7 +62,6 @@ public enum Stemming { case MULTIPLE: return StemMode.ALL; case BEST : return StemMode.BEST; case NONE: return StemMode.NONE; - case ALL: return StemMode.SHORTEST; // Intentional; preserve historic behavior default: throw new IllegalStateException("Inconvertible stem mode " + this); } } |