diff options
author | Christoph Büscher <christoph@elastic.co> | 2016-08-10 13:27:37 +0200 |
---|---|---|
committer | Christoph Büscher <christoph@elastic.co> | 2016-08-10 16:20:34 +0200 |
commit | 9c91ced02929f9702c0276a7ccb0053aeb811546 (patch) | |
tree | b356b741d50f9b1fb9fb107f4cfe91c70bfe58ec /core/src/main/java/org/elasticsearch | |
parent | e6d57af0c59eddba74aef15f971d5ef51e671d14 (diff) |
Removing use of ParseFields where we have alternative in other classes already
Diffstat (limited to 'core/src/main/java/org/elasticsearch')
8 files changed, 84 insertions, 142 deletions
diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java b/core/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java deleted file mode 100644 index dff02f7e88..0000000000 --- a/core/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.elasticsearch.search.suggest; - -import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; -import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; -import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.BytesRefBuilder; -import org.elasticsearch.common.ParseField; - -import java.io.IOException; - -public final class SuggestUtils { - - private SuggestUtils() { - // utils!! - } - - public abstract static class TokenConsumer { - protected CharTermAttribute charTermAttr; - protected PositionIncrementAttribute posIncAttr; - protected OffsetAttribute offsetAttr; - - public void reset(TokenStream stream) { - charTermAttr = stream.addAttribute(CharTermAttribute.class); - posIncAttr = stream.addAttribute(PositionIncrementAttribute.class); - offsetAttr = stream.addAttribute(OffsetAttribute.class); - } - - protected BytesRef fillBytesRef(BytesRefBuilder spare) { - spare.copyChars(charTermAttr); - return spare.get(); - } - - public abstract void nextToken() throws IOException; - - public void end() {} - } - - public static class Fields { - public static final ParseField STRING_DISTANCE = new ParseField("string_distance"); - public static final ParseField SUGGEST_MODE = new ParseField("suggest_mode"); - public static final ParseField MAX_EDITS = new ParseField("max_edits"); - public static final ParseField MAX_INSPECTIONS = new ParseField("max_inspections"); - // TODO some of these constants are the same as MLT constants and - // could be moved to a shared class for consistency - public static final ParseField MAX_TERM_FREQ = new ParseField("max_term_freq"); - public static final ParseField PREFIX_LENGTH = new ParseField("prefix_length", "prefix_len"); - public static final ParseField MIN_WORD_LENGTH = new ParseField("min_word_length", "min_word_len"); - public static final ParseField MIN_DOC_FREQ = new ParseField("min_doc_freq"); - public static final ParseField SHARD_SIZE = new ParseField("shard_size"); - public static final ParseField ANALYZER = new ParseField("analyzer"); - public static final ParseField FIELD = new ParseField("field"); - public static final ParseField SIZE = new ParseField("size"); - public static final ParseField SORT = new ParseField("sort"); - public static final ParseField ACCURACY = new ParseField("accuracy"); - } -} diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java index 783b6536e2..5e98d7f09e 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java @@ -37,7 +37,6 @@ import org.elasticsearch.index.mapper.core.CompletionFieldMapper; import org.elasticsearch.index.mapper.core.CompletionFieldMapper2x; import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.search.suggest.SuggestUtils; import org.elasticsearch.search.suggest.SuggestionBuilder; import org.elasticsearch.search.suggest.SuggestionSearchContext.SuggestionContext; import org.elasticsearch.search.suggest.completion.context.ContextMapping; @@ -48,7 +47,6 @@ import org.elasticsearch.search.suggest.completion2x.context.GeolocationContextM import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -90,10 +88,10 @@ public class CompletionSuggestionBuilder extends SuggestionBuilder<CompletionSug TLP_PARSER.declareField((parser, completionSuggestionContext, context) -> completionSuggestionContext.regexOptions = RegexOptions.parse(parser, context), RegexOptions.REGEX_OPTIONS, ObjectParser.ValueType.OBJECT); - TLP_PARSER.declareString(CompletionSuggestionBuilder.InnerBuilder::field, SuggestUtils.Fields.FIELD); - TLP_PARSER.declareString(CompletionSuggestionBuilder.InnerBuilder::analyzer, SuggestUtils.Fields.ANALYZER); - TLP_PARSER.declareInt(CompletionSuggestionBuilder.InnerBuilder::size, SuggestUtils.Fields.SIZE); - TLP_PARSER.declareInt(CompletionSuggestionBuilder.InnerBuilder::shardSize, SuggestUtils.Fields.SHARD_SIZE); + TLP_PARSER.declareString(CompletionSuggestionBuilder.InnerBuilder::field, FIELDNAME_FIELD); + TLP_PARSER.declareString(CompletionSuggestionBuilder.InnerBuilder::analyzer, ANALYZER_FIELD); + TLP_PARSER.declareInt(CompletionSuggestionBuilder.InnerBuilder::size, SIZE_FIELD); + TLP_PARSER.declareInt(CompletionSuggestionBuilder.InnerBuilder::shardSize, SHARDSIZE_FIELD); TLP_PARSER.declareField((p, v, c) -> { // Copy the current structure. We will parse, once the mapping is provided XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON); @@ -353,7 +351,7 @@ public class CompletionSuggestionBuilder extends SuggestionBuilder<CompletionSug // now we should have field name, check and copy fields over to the suggestion builder we return if (field == null) { throw new ElasticsearchParseException( - "the required field option [" + SuggestUtils.Fields.FIELD.getPreferredName() + "] is missing"); + "the required field option [" + FIELDNAME_FIELD.getPreferredName() + "] is missing"); } return new CompletionSuggestionBuilder(field, builder); } diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java index 82ae3a02d3..f6faaaeea5 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/phrase/DirectCandidateGenerator.java @@ -20,6 +20,9 @@ package org.elasticsearch.search.suggest.phrase; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; +import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiFields; import org.apache.lucene.index.Term; @@ -34,8 +37,6 @@ import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.CharsRefBuilder; import org.apache.lucene.util.IOUtils; import org.elasticsearch.common.io.FastCharArrayReader; -import org.elasticsearch.search.suggest.SuggestUtils; -import org.elasticsearch.search.suggest.SuggestUtils.TokenConsumer; import java.io.IOException; import java.util.ArrayList; @@ -145,7 +146,7 @@ public final class DirectCandidateGenerator extends CandidateGenerator { return term; } final BytesRefBuilder result = byteSpare; - analyze(preFilter, term, field, new SuggestUtils.TokenConsumer() { + analyze(preFilter, term, field, new TokenConsumer() { @Override public void nextToken() throws IOException { @@ -161,7 +162,7 @@ public final class DirectCandidateGenerator extends CandidateGenerator { candidates.add(candidate); } else { final BytesRefBuilder result = byteSpare; - analyze(postFilter, candidate.term, field, new SuggestUtils.TokenConsumer() { + analyze(postFilter, candidate.term, field, new TokenConsumer() { @Override public void nextToken() throws IOException { this.fillBytesRef(result); @@ -194,6 +195,27 @@ public final class DirectCandidateGenerator extends CandidateGenerator { } + public abstract static class TokenConsumer { + protected CharTermAttribute charTermAttr; + protected PositionIncrementAttribute posIncAttr; + protected OffsetAttribute offsetAttr; + + public void reset(TokenStream stream) { + charTermAttr = stream.addAttribute(CharTermAttribute.class); + posIncAttr = stream.addAttribute(PositionIncrementAttribute.class); + offsetAttr = stream.addAttribute(OffsetAttribute.class); + } + + protected BytesRef fillBytesRef(BytesRefBuilder spare) { + spare.copyChars(charTermAttr); + return spare.get(); + } + + public abstract void nextToken() throws IOException; + + public void end() {} + } + public static class CandidateSet { public Candidate[] candidates; public final Candidate originalTerm; @@ -288,7 +310,8 @@ public final class DirectCandidateGenerator extends CandidateGenerator { return new Candidate(term, frequency, channelScore, score(frequency, channelScore, dictSize), userInput); } - public static int analyze(Analyzer analyzer, BytesRef toAnalyze, String field, TokenConsumer consumer, CharsRefBuilder spare) throws IOException { + public static int analyze(Analyzer analyzer, BytesRef toAnalyze, String field, TokenConsumer consumer, CharsRefBuilder spare) + throws IOException { spare.copyUTF8Bytes(toAnalyze); CharsRef charsRef = spare.get(); try (TokenStream ts = analyzer.tokenStream( 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 7c2616e0a4..9e3beb2ccf 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 @@ -51,21 +51,21 @@ public final class DirectCandidateGeneratorBuilder implements CandidateGenerator private static final String TYPE = "direct_generator"; - static final ParseField DIRECT_GENERATOR_FIELD = new ParseField(TYPE); - static final ParseField FIELDNAME_FIELD = new ParseField("field"); - static final ParseField PREFILTER_FIELD = new ParseField("pre_filter"); - static final ParseField POSTFILTER_FIELD = new ParseField("post_filter"); - static final ParseField SUGGESTMODE_FIELD = new ParseField("suggest_mode"); - static final ParseField MIN_DOC_FREQ_FIELD = new ParseField("min_doc_freq"); - static final ParseField ACCURACY_FIELD = new ParseField("accuracy"); - static final ParseField SIZE_FIELD = new ParseField("size"); - static final ParseField SORT_FIELD = new ParseField("sort"); - static final ParseField STRING_DISTANCE_FIELD = new ParseField("string_distance"); - static final ParseField MAX_EDITS_FIELD = new ParseField("max_edits"); - static final ParseField MAX_INSPECTIONS_FIELD = new ParseField("max_inspections"); - static final ParseField MAX_TERM_FREQ_FIELD = new ParseField("max_term_freq"); - static final ParseField PREFIX_LENGTH_FIELD = new ParseField("prefix_length"); - static final ParseField MIN_WORD_LENGTH_FIELD = new ParseField("min_word_length"); + public static final ParseField DIRECT_GENERATOR_FIELD = new ParseField(TYPE); + public static final ParseField FIELDNAME_FIELD = new ParseField("field"); + public static final ParseField PREFILTER_FIELD = new ParseField("pre_filter"); + public static final ParseField POSTFILTER_FIELD = new ParseField("post_filter"); + public static final ParseField SUGGESTMODE_FIELD = new ParseField("suggest_mode"); + public static final ParseField MIN_DOC_FREQ_FIELD = new ParseField("min_doc_freq"); + public static final ParseField ACCURACY_FIELD = new ParseField("accuracy"); + public static final ParseField SIZE_FIELD = new ParseField("size"); + public static final ParseField SORT_FIELD = new ParseField("sort"); + public static final ParseField STRING_DISTANCE_FIELD = new ParseField("string_distance"); + public static final ParseField MAX_EDITS_FIELD = new ParseField("max_edits"); + public static final ParseField MAX_INSPECTIONS_FIELD = new ParseField("max_inspections"); + public static final ParseField MAX_TERM_FREQ_FIELD = new ParseField("max_term_freq"); + public static final ParseField PREFIX_LENGTH_FIELD = new ParseField("prefix_length"); + public static final ParseField MIN_WORD_LENGTH_FIELD = new ParseField("min_word_length"); private final String field; private String preFilter; diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java index 223b169be6..e6e1767386 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java @@ -28,7 +28,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.CharsRefBuilder; import org.elasticsearch.common.io.FastCharArrayReader; -import org.elasticsearch.search.suggest.SuggestUtils; import org.elasticsearch.search.suggest.phrase.DirectCandidateGenerator.Candidate; import org.elasticsearch.search.suggest.phrase.DirectCandidateGenerator.CandidateSet; @@ -63,7 +62,7 @@ public final class NoisyChannelSpellChecker { float maxErrors, int numCorrections, WordScorer wordScorer, float confidence, int gramSize) throws IOException { final List<CandidateSet> candidateSetsList = new ArrayList<>(); - DirectCandidateGenerator.analyze(stream, new SuggestUtils.TokenConsumer() { + DirectCandidateGenerator.analyze(stream, new DirectCandidateGenerator.TokenConsumer() { CandidateSet currentSet = null; private TypeAttribute typeAttribute; private final BytesRefBuilder termsRef = new BytesRefBuilder(); diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java index 1e0e6680aa..94ad7b8fad 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java @@ -43,7 +43,6 @@ import org.elasticsearch.script.CompiledScript; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptContext; import org.elasticsearch.script.ScriptService; -import org.elasticsearch.search.suggest.SuggestUtils; import org.elasticsearch.search.suggest.SuggestionBuilder; import org.elasticsearch.search.suggest.SuggestionSearchContext.SuggestionContext; import org.elasticsearch.search.suggest.phrase.PhraseSuggestionContext.DirectCandidateGenerator; @@ -596,7 +595,7 @@ public class PhraseSuggestionBuilder extends SuggestionBuilder<PhraseSuggestionB // now we should have field name, check and copy fields over to the suggestion builder we return if (fieldname == null) { throw new ElasticsearchParseException( - "the required field option [" + SuggestUtils.Fields.FIELD.getPreferredName() + "] is missing"); + "the required field option [" + FIELDNAME_FIELD.getPreferredName() + "] is missing"); } return new PhraseSuggestionBuilder(fieldname, tmpSuggestion); } diff --git a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java b/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java index 6cca58286c..fc6113f16b 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggester.java @@ -30,7 +30,6 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.text.Text; import org.elasticsearch.index.query.QueryParseContext; -import org.elasticsearch.search.suggest.SuggestUtils; import org.elasticsearch.search.suggest.Suggester; import org.elasticsearch.search.suggest.SuggestionBuilder; import org.elasticsearch.search.suggest.SuggestionSearchContext.SuggestionContext; @@ -71,10 +70,11 @@ public final class TermSuggester extends Suggester<TermSuggestionContext> { return response; } - private List<Token> queryTerms(SuggestionContext suggestion, CharsRefBuilder spare) throws IOException { + private static List<Token> queryTerms(SuggestionContext suggestion, CharsRefBuilder spare) throws IOException { final List<Token> result = new ArrayList<>(); final String field = suggestion.getField(); - DirectCandidateGenerator.analyze(suggestion.getAnalyzer(), suggestion.getText(), field, new SuggestUtils.TokenConsumer() { + DirectCandidateGenerator.analyze(suggestion.getAnalyzer(), suggestion.getText(), field, + new DirectCandidateGenerator.TokenConsumer() { @Override public void nextToken() { Term term = new Term(field, BytesRef.deepCopyOf(fillBytesRef(new BytesRefBuilder()))); 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 d7ec7e6cae..31e6c3718e 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 @@ -37,7 +37,6 @@ import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.search.suggest.DirectSpellcheckerSettings; import org.elasticsearch.search.suggest.SortBy; -import org.elasticsearch.search.suggest.SuggestUtils; import org.elasticsearch.search.suggest.SuggestionBuilder; import org.elasticsearch.search.suggest.SuggestionSearchContext.SuggestionContext; @@ -52,16 +51,16 @@ import static org.elasticsearch.search.suggest.DirectSpellcheckerSettings.DEFAUL import static org.elasticsearch.search.suggest.DirectSpellcheckerSettings.DEFAULT_MIN_DOC_FREQ; import static org.elasticsearch.search.suggest.DirectSpellcheckerSettings.DEFAULT_MIN_WORD_LENGTH; import static org.elasticsearch.search.suggest.DirectSpellcheckerSettings.DEFAULT_PREFIX_LENGTH; -import static org.elasticsearch.search.suggest.SuggestUtils.Fields.ACCURACY; -import static org.elasticsearch.search.suggest.SuggestUtils.Fields.MAX_EDITS; -import static org.elasticsearch.search.suggest.SuggestUtils.Fields.MAX_INSPECTIONS; -import static org.elasticsearch.search.suggest.SuggestUtils.Fields.MAX_TERM_FREQ; -import static org.elasticsearch.search.suggest.SuggestUtils.Fields.MIN_DOC_FREQ; -import static org.elasticsearch.search.suggest.SuggestUtils.Fields.MIN_WORD_LENGTH; -import static org.elasticsearch.search.suggest.SuggestUtils.Fields.PREFIX_LENGTH; -import static org.elasticsearch.search.suggest.SuggestUtils.Fields.SORT; -import static org.elasticsearch.search.suggest.SuggestUtils.Fields.STRING_DISTANCE; -import static org.elasticsearch.search.suggest.SuggestUtils.Fields.SUGGEST_MODE; +import static org.elasticsearch.search.suggest.phrase.DirectCandidateGeneratorBuilder.ACCURACY_FIELD; +import static org.elasticsearch.search.suggest.phrase.DirectCandidateGeneratorBuilder.MAX_EDITS_FIELD; +import static org.elasticsearch.search.suggest.phrase.DirectCandidateGeneratorBuilder.MAX_INSPECTIONS_FIELD; +import static org.elasticsearch.search.suggest.phrase.DirectCandidateGeneratorBuilder.MAX_TERM_FREQ_FIELD; +import static org.elasticsearch.search.suggest.phrase.DirectCandidateGeneratorBuilder.MIN_DOC_FREQ_FIELD; +import static org.elasticsearch.search.suggest.phrase.DirectCandidateGeneratorBuilder.MIN_WORD_LENGTH_FIELD; +import static org.elasticsearch.search.suggest.phrase.DirectCandidateGeneratorBuilder.PREFIX_LENGTH_FIELD; +import static org.elasticsearch.search.suggest.phrase.DirectCandidateGeneratorBuilder.SORT_FIELD; +import static org.elasticsearch.search.suggest.phrase.DirectCandidateGeneratorBuilder.STRING_DISTANCE_FIELD; +import static org.elasticsearch.search.suggest.phrase.DirectCandidateGeneratorBuilder.SUGGESTMODE_FIELD; /** * Defines the actual suggest command. Each command uses the global options @@ -376,16 +375,16 @@ public class TermSuggestionBuilder extends SuggestionBuilder<TermSuggestionBuild @Override public XContentBuilder innerToXContent(XContentBuilder builder, Params params) throws IOException { - builder.field(SUGGEST_MODE.getPreferredName(), suggestMode); - builder.field(ACCURACY.getPreferredName(), accuracy); - builder.field(SORT.getPreferredName(), sort); - builder.field(STRING_DISTANCE.getPreferredName(), stringDistance); - builder.field(MAX_EDITS.getPreferredName(), maxEdits); - builder.field(MAX_INSPECTIONS.getPreferredName(), maxInspections); - builder.field(MAX_TERM_FREQ.getPreferredName(), maxTermFreq); - builder.field(PREFIX_LENGTH.getPreferredName(), prefixLength); - builder.field(MIN_WORD_LENGTH.getPreferredName(), minWordLength); - builder.field(MIN_DOC_FREQ.getPreferredName(), minDocFreq); + builder.field(SUGGESTMODE_FIELD.getPreferredName(), suggestMode); + builder.field(ACCURACY_FIELD.getPreferredName(), accuracy); + builder.field(SORT_FIELD.getPreferredName(), sort); + builder.field(STRING_DISTANCE_FIELD.getPreferredName(), stringDistance); + builder.field(MAX_EDITS_FIELD.getPreferredName(), maxEdits); + builder.field(MAX_INSPECTIONS_FIELD.getPreferredName(), maxInspections); + builder.field(MAX_TERM_FREQ_FIELD.getPreferredName(), maxTermFreq); + builder.field(PREFIX_LENGTH_FIELD.getPreferredName(), prefixLength); + builder.field(MIN_WORD_LENGTH_FIELD.getPreferredName(), minWordLength); + builder.field(MIN_DOC_FREQ_FIELD.getPreferredName(), minDocFreq); return builder; } @@ -408,25 +407,25 @@ public class TermSuggestionBuilder extends SuggestionBuilder<TermSuggestionBuild tmpSuggestion.size(parser.intValue()); } else if (parseFieldMatcher.match(currentFieldName, SuggestionBuilder.SHARDSIZE_FIELD)) { tmpSuggestion.shardSize(parser.intValue()); - } else if (parseFieldMatcher.match(currentFieldName, SUGGEST_MODE)) { + } else if (parseFieldMatcher.match(currentFieldName, SUGGESTMODE_FIELD)) { tmpSuggestion.suggestMode(SuggestMode.resolve(parser.text())); - } else if (parseFieldMatcher.match(currentFieldName, ACCURACY)) { + } else if (parseFieldMatcher.match(currentFieldName, ACCURACY_FIELD)) { tmpSuggestion.accuracy(parser.floatValue()); - } else if (parseFieldMatcher.match(currentFieldName, SORT)) { + } else if (parseFieldMatcher.match(currentFieldName, SORT_FIELD)) { tmpSuggestion.sort(SortBy.resolve(parser.text())); - } else if (parseFieldMatcher.match(currentFieldName, STRING_DISTANCE)) { + } else if (parseFieldMatcher.match(currentFieldName, STRING_DISTANCE_FIELD)) { tmpSuggestion.stringDistance(StringDistanceImpl.resolve(parser.text())); - } else if (parseFieldMatcher.match(currentFieldName, MAX_EDITS)) { + } else if (parseFieldMatcher.match(currentFieldName, MAX_EDITS_FIELD)) { tmpSuggestion.maxEdits(parser.intValue()); - } else if (parseFieldMatcher.match(currentFieldName, MAX_INSPECTIONS)) { + } else if (parseFieldMatcher.match(currentFieldName, MAX_INSPECTIONS_FIELD)) { tmpSuggestion.maxInspections(parser.intValue()); - } else if (parseFieldMatcher.match(currentFieldName, MAX_TERM_FREQ)) { + } else if (parseFieldMatcher.match(currentFieldName, MAX_TERM_FREQ_FIELD)) { tmpSuggestion.maxTermFreq(parser.floatValue()); - } else if (parseFieldMatcher.match(currentFieldName, PREFIX_LENGTH)) { + } else if (parseFieldMatcher.match(currentFieldName, PREFIX_LENGTH_FIELD)) { tmpSuggestion.prefixLength(parser.intValue()); - } else if (parseFieldMatcher.match(currentFieldName, MIN_WORD_LENGTH)) { + } else if (parseFieldMatcher.match(currentFieldName, MIN_WORD_LENGTH_FIELD)) { tmpSuggestion.minWordLength(parser.intValue()); - } else if (parseFieldMatcher.match(currentFieldName, MIN_DOC_FREQ)) { + } else if (parseFieldMatcher.match(currentFieldName, MIN_DOC_FREQ_FIELD)) { tmpSuggestion.minDocFreq(parser.floatValue()); } else { throw new ParsingException(parser.getTokenLocation(), @@ -440,7 +439,7 @@ public class TermSuggestionBuilder extends SuggestionBuilder<TermSuggestionBuild // now we should have field name, check and copy fields over to the suggestion builder we return if (fieldname == null) { throw new ElasticsearchParseException( - "the required field option [" + SuggestUtils.Fields.FIELD.getPreferredName() + "] is missing"); + "the required field option [" + FIELDNAME_FIELD.getPreferredName() + "] is missing"); } return new TermSuggestionBuilder(fieldname, tmpSuggestion); } |