diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java index 9631b37e2cd..5e0ed7749f7 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java @@ -464,19 +464,13 @@ public final class DirectCandidateGeneratorBuilder implements CandidateGenerator } static StringDistance resolveDistance(String distanceVal) { - distanceVal = distanceVal.toLowerCase(Locale.US); + distanceVal = distanceVal.toLowerCase(Locale.ROOT); if ("internal".equals(distanceVal)) { return DirectSpellChecker.INTERNAL_LEVENSHTEIN; - } else if ("damerau_levenshtein".equals(distanceVal) || "damerauLevenshtein".equals(distanceVal)) { + } else if ("damerau_levenshtein".equals(distanceVal)) { return new LuceneLevenshteinDistance(); - } else if ("levenstein".equals(distanceVal)) { - DEPRECATION_LOGGER.deprecated("Deprecated distance [levenstein] used, replaced by [levenshtein]"); - return new LevensteinDistance(); } else if ("levenshtein".equals(distanceVal)) { return new LevensteinDistance(); - } else if ("jarowinkler".equals(distanceVal)) { - DEPRECATION_LOGGER.deprecated("Deprecated distance [jarowinkler] used, replaced by [jaro_winkler]"); - return new JaroWinklerDistance(); } else if ("jaro_winkler".equals(distanceVal)) { return new JaroWinklerDistance(); } else if ("ngram".equals(distanceVal)) { diff --git a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java index dfaf77d2337..1833bb5a90e 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java @@ -581,23 +581,16 @@ public class TermSuggestionBuilder extends SuggestionBuilder DirectCandidateGeneratorBuilder.resolveDistance(null)); } - public void testLevensteinDeprecation() { - assertThat(DirectCandidateGeneratorBuilder.resolveDistance("levenstein"), instanceOf(LevensteinDistance.class)); - assertWarnings("Deprecated distance [levenstein] used, replaced by [levenshtein]"); - } - - public void testJaroWinklerDeprecation() { - assertThat(DirectCandidateGeneratorBuilder.resolveDistance("jaroWinkler"), instanceOf(JaroWinklerDistance.class)); - assertWarnings("Deprecated distance [jarowinkler] used, replaced by [jaro_winkler]"); - } - private static DirectCandidateGeneratorBuilder mutate(DirectCandidateGeneratorBuilder original) throws IOException { DirectCandidateGeneratorBuilder mutation = copy(original); List> mutators = new ArrayList<>(); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/term/StringDistanceImplTests.java b/core/src/test/java/org/elasticsearch/search/suggest/term/StringDistanceImplTests.java index ff71c469651..8ab3fadb52b 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/term/StringDistanceImplTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/term/StringDistanceImplTests.java @@ -58,16 +58,6 @@ public class StringDistanceImplTests extends AbstractWriteableEnumTestCase { assertThat(e.getMessage(), equalTo("Input string is null")); } - public void testLevensteinDeprecation() { - assertThat(StringDistanceImpl.resolve("levenstein"), equalTo(StringDistanceImpl.LEVENSHTEIN)); - assertWarnings("Deprecated distance [levenstein] used, replaced by [levenshtein]"); - } - - public void testJaroWinklerDeprecation() { - assertThat(StringDistanceImpl.resolve("jaroWinkler"), equalTo(StringDistanceImpl.JARO_WINKLER)); - assertWarnings("Deprecated distance [jarowinkler] used, replaced by [jaro_winkler]"); - } - @Override public void testWriteTo() throws IOException { assertWriteToStream(StringDistanceImpl.INTERNAL, 0); @@ -85,5 +75,4 @@ public class StringDistanceImplTests extends AbstractWriteableEnumTestCase { assertReadFromStream(3, StringDistanceImpl.JARO_WINKLER); assertReadFromStream(4, StringDistanceImpl.NGRAM); } - } diff --git a/docs/reference/migration/migrate_7_0/search.asciidoc b/docs/reference/migration/migrate_7_0/search.asciidoc index 12847354cf8..aed87771b0b 100644 --- a/docs/reference/migration/migrate_7_0/search.asciidoc +++ b/docs/reference/migration/migrate_7_0/search.asciidoc @@ -35,8 +35,17 @@ The Search API returns `400 - Bad request` while it would previously return * number of filters in the adjacency matrix aggregation is too large -==== Scroll queries cannot use the request_cache anymore +==== Scroll queries cannot use the `request_cache` anymore -Setting `request_cache:true` on a query that creates a scroll ('scroll=1m`) +Setting `request_cache:true` on a query that creates a scroll (`scroll=1m`) has been deprecated in 6 and will now return a `400 - Bad request`. Scroll queries are not meant to be cached. + +==== Term Suggesters supported distance algorithms + +The following string distance algorithms were given additional names in 6.2 and +their existing names were deprecated. The deprecated names have now been +removed. + +* `levenstein` - replaced by `levenshtein` +* `jarowinkler` - replaced by `jaro_winkler`