From cd6b56928624743d0d66c325133c79cf2c968b11 Mon Sep 17 00:00:00 2001 From: javanna Date: Fri, 30 Dec 2016 20:10:50 +0100 Subject: Remove some usages of ParseFieldMatcher in favour of using ParseField directly Relates to #19552 Relates to #22130 --- .../java/org/elasticsearch/search/suggest/SuggestionBuilder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java') diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java index 0028767c36..5f99cb4364 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java @@ -269,11 +269,11 @@ public abstract class SuggestionBuilder> implemen if (token == XContentParser.Token.FIELD_NAME) { currentFieldName = parser.currentName(); } else if (token.isValue()) { - if (parsefieldMatcher.match(currentFieldName, TEXT_FIELD)) { + if (TEXT_FIELD.match(currentFieldName)) { suggestText = parser.text(); - } else if (parsefieldMatcher.match(currentFieldName, PREFIX_FIELD)) { + } else if (PREFIX_FIELD.match(currentFieldName)) { prefix = parser.text(); - } else if (parsefieldMatcher.match(currentFieldName, REGEX_FIELD)) { + } else if (PREFIX_FIELD.match(currentFieldName)) { regex = parser.text(); } else { throw new ParsingException(parser.getTokenLocation(), "suggestion does not support [" + currentFieldName + "]"); -- cgit v1.2.3