diff options
author | javanna <cavannaluca@gmail.com> | 2016-12-30 20:10:50 +0100 |
---|---|---|
committer | Luca Cavanna <javanna@users.noreply.github.com> | 2016-12-31 09:24:44 +0100 |
commit | cd6b56928624743d0d66c325133c79cf2c968b11 (patch) | |
tree | 869a995c425ec49fd9d1e6967d83d78d602a43e4 /core/src/main/java/org/elasticsearch/search/suggest | |
parent | f985638bba1d49dfe07f4696ba363656978f342b (diff) |
Remove some usages of ParseFieldMatcher in favour of using ParseField directly
Relates to #19552
Relates to #22130
Diffstat (limited to 'core/src/main/java/org/elasticsearch/search/suggest')
-rw-r--r-- | core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java | 6 | ||||
-rw-r--r-- | core/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java | 6 |
2 files changed, 6 insertions, 6 deletions
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<T extends SuggestionBuilder<T>> 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 + "]"); diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java index 72802e66ea..e76868b5b3 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java @@ -143,17 +143,17 @@ public final class LinearInterpolation extends SmoothingModel { if (token == XContentParser.Token.FIELD_NAME) { fieldName = parser.currentName(); } else if (token.isValue()) { - if (matcher.match(fieldName, TRIGRAM_FIELD)) { + if (TRIGRAM_FIELD.match(fieldName)) { trigramLambda = parser.doubleValue(); if (trigramLambda < 0) { throw new IllegalArgumentException("trigram_lambda must be positive"); } - } else if (matcher.match(fieldName, BIGRAM_FIELD)) { + } else if (BIGRAM_FIELD.match(fieldName)) { bigramLambda = parser.doubleValue(); if (bigramLambda < 0) { throw new IllegalArgumentException("bigram_lambda must be positive"); } - } else if (matcher.match(fieldName, UNIGRAM_FIELD)) { + } else if (UNIGRAM_FIELD.match(fieldName)) { unigramLambda = parser.doubleValue(); if (unigramLambda < 0) { throw new IllegalArgumentException("unigram_lambda must be positive"); |