diff options
author | Daniel Mitterdorfer <daniel.mitterdorfer@elastic.co> | 2016-01-25 15:24:10 +0100 |
---|---|---|
committer | Daniel Mitterdorfer <daniel.mitterdorfer@elastic.co> | 2016-01-25 15:24:10 +0100 |
commit | b676583ba57d7eb87c91d107c8b9dc6d536a50d6 (patch) | |
tree | 601d0c5975e48a7f2184d3f963175d65391afdb1 /core/src/test/java/org/elasticsearch | |
parent | 4c1e93bd89cfbf97c25e84e0cdcf9818e9cd97f6 (diff) |
Deprecate fuzzy query
With this commit we deprecate the widely misunderstood
fuzzy query but will still allow the fuzziness
parameter in match queries and suggesters.
Relates to #15760
Diffstat (limited to 'core/src/test/java/org/elasticsearch')
6 files changed, 8 insertions, 0 deletions
diff --git a/core/src/test/java/org/elasticsearch/index/query/QueryDSLDocumentationTests.java b/core/src/test/java/org/elasticsearch/index/query/QueryDSLDocumentationTests.java index 3e89949821..cb9177369c 100644 --- a/core/src/test/java/org/elasticsearch/index/query/QueryDSLDocumentationTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/QueryDSLDocumentationTests.java @@ -138,6 +138,7 @@ public class QueryDSLDocumentationTests extends ESTestCase { functionScoreQuery(functions); } + @SuppressWarnings("deprecation") // fuzzy queries will be removed in 4.0 public void testFuzzy() { fuzzyQuery("name", "kimchy"); } diff --git a/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java b/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java index 6f9ef10128..10c7c54b83 100644 --- a/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java @@ -2378,6 +2378,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { } + @SuppressWarnings("deprecation") // fuzzy queries will be removed in 4.0 public void testPostingsHighlighterFuzzyQuery() throws Exception { assertAcked(prepareCreate("test").addMapping("type1", type1PostingsffsetsMapping())); ensureGreen(); diff --git a/core/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesIT.java b/core/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesIT.java index d8c16282e1..4daa45fe39 100644 --- a/core/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesIT.java +++ b/core/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesIT.java @@ -250,6 +250,7 @@ public class MatchedQueriesIT extends ESIntegTestCase { } } + @SuppressWarnings("deprecation") // fuzzy queries will be removed in 4.0 public void testFuzzyQuerySupportsName() { createIndex("test1"); ensureGreen(); diff --git a/core/src/test/java/org/elasticsearch/search/profile/RandomQueryGenerator.java b/core/src/test/java/org/elasticsearch/search/profile/RandomQueryGenerator.java index 9eb41086be..fff0b99c4d 100644 --- a/core/src/test/java/org/elasticsearch/search/profile/RandomQueryGenerator.java +++ b/core/src/test/java/org/elasticsearch/search/profile/RandomQueryGenerator.java @@ -72,6 +72,7 @@ public class RandomQueryGenerator { } } + @SuppressWarnings("deprecation") // fuzzy queries will be removed in 4.0 private static QueryBuilder randomTerminalQuery(List<String> stringFields, List<String> numericFields, int numDocs) { switch (randomIntBetween(0,6)) { case 0: @@ -195,6 +196,8 @@ public class RandomQueryGenerator { return q; } + @SuppressWarnings("deprecation") // fuzzy queries will be removed in 4.0 + @Deprecated private static QueryBuilder randomFuzzyQuery(List<String> fields) { QueryBuilder q = QueryBuilders.fuzzyQuery(randomField(fields), randomQueryString(1)); diff --git a/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java b/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java index ad9ab044ad..d723c88535 100644 --- a/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java +++ b/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java @@ -1451,6 +1451,7 @@ public class SearchQueryIT extends ESIntegTestCase { assertHitCount(searchResponse, 3l); } + @SuppressWarnings("deprecation") // fuzzy queries will be removed in 4.0 public void testSpanMultiTermQuery() throws IOException { createIndex("test"); diff --git a/core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java b/core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java index 1657116991..d937d5bade 100644 --- a/core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java +++ b/core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java @@ -212,6 +212,7 @@ public class SimpleValidateQueryIT extends ESIntegTestCase { assertThat(validateQueryResponse.getQueryExplanation().get(0).getExplanation(), containsString("field:\"foo (one* two*)\"")); } + @SuppressWarnings("deprecation") // fuzzy queries will be removed in 4.0 public void testExplainWithRewriteValidateQuery() throws Exception { client().admin().indices().prepareCreate("test") .addMapping("type1", "field", "type=string,analyzer=whitespace") |