diff options
author | javanna <cavannaluca@gmail.com> | 2016-12-31 11:57:47 +0100 |
---|---|---|
committer | Luca Cavanna <javanna@users.noreply.github.com> | 2017-01-03 15:52:32 +0100 |
commit | 648ed46f01e98f8d67bbab207f7dbf8d6287e29a (patch) | |
tree | 3310e7c5738efee14ea26a75f59a4cc87d40e6db /core/src/main/java/org | |
parent | c06d00dce1812586652c71d4b0412ba7ca4177d1 (diff) |
Remove ParseFieldMatcher usages from MoreLikeThisQueryBuilder & MultiMatchQueryBuilder
Diffstat (limited to 'core/src/main/java/org')
-rw-r--r-- | core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java | 7 | ||||
-rw-r--r-- | core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java index 1166a0d678..bfb579e0c3 100644 --- a/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java @@ -36,7 +36,6 @@ import org.elasticsearch.action.termvectors.TermVectorsResponse; import org.elasticsearch.client.Client; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; @@ -352,7 +351,7 @@ public class MoreLikeThisQueryBuilder extends AbstractQueryBuilder<MoreLikeThisQ /** * Parses and returns the given item. */ - public static Item parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher, Item item) throws IOException { + public static Item parse(XContentParser parser, Item item) throws IOException { XContentParser.Token token; String currentFieldName = null; while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) { @@ -895,7 +894,7 @@ public class MoreLikeThisQueryBuilder extends AbstractQueryBuilder<MoreLikeThisQ if (token != XContentParser.Token.START_OBJECT) { throw new IllegalArgumentException("docs array element should include an object"); } - likeItems.add(Item.parse(parser, parseContext.getParseFieldMatcher(), new Item())); + likeItems.add(Item.parse(parser, new Item())); } } else if (Field.STOP_WORDS.match(currentFieldName)) { stopWords = new ArrayList<>(); @@ -956,7 +955,7 @@ public class MoreLikeThisQueryBuilder extends AbstractQueryBuilder<MoreLikeThisQ if (parser.currentToken().isValue()) { texts.add(parser.text()); } else if (parser.currentToken() == XContentParser.Token.START_OBJECT) { - items.add(Item.parse(parser, parseContext.getParseFieldMatcher(), new Item())); + items.add(Item.parse(parser, new Item())); } else { throw new IllegalArgumentException("Content of 'like' parameter should either be a string or an object"); } diff --git a/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java index 1b06c953a1..706ad71752 100644 --- a/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java @@ -23,7 +23,6 @@ import org.apache.lucene.search.FuzzyQuery; import org.apache.lucene.search.Query; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -147,7 +146,7 @@ public class MultiMatchQueryBuilder extends AbstractQueryBuilder<MultiMatchQuery return parseField; } - public static Type parse(String value, ParseFieldMatcher parseFieldMatcher) { + public static Type parse(String value) { MultiMatchQueryBuilder.Type[] values = MultiMatchQueryBuilder.Type.values(); Type type = null; for (MultiMatchQueryBuilder.Type t : values) { @@ -303,7 +302,7 @@ public class MultiMatchQueryBuilder extends AbstractQueryBuilder<MultiMatchQuery if (type == null) { throw new IllegalArgumentException("[" + NAME + "] requires type to be non-null"); } - this.type = Type.parse(type.toString().toLowerCase(Locale.ROOT), ParseFieldMatcher.EMPTY); + this.type = Type.parse(type.toString().toLowerCase(Locale.ROOT)); return this; } @@ -598,7 +597,7 @@ public class MultiMatchQueryBuilder extends AbstractQueryBuilder<MultiMatchQuery if (QUERY_FIELD.match(currentFieldName)) { value = parser.objectText(); } else if (TYPE_FIELD.match(currentFieldName)) { - type = MultiMatchQueryBuilder.Type.parse(parser.text(), parseContext.getParseFieldMatcher()); + type = MultiMatchQueryBuilder.Type.parse(parser.text()); } else if (ANALYZER_FIELD.match(currentFieldName)) { analyzer = parser.text(); } else if (AbstractQueryBuilder.BOOST_FIELD.match(currentFieldName)) { |