Adding fromXContent to Suggestion.Entry and subclasses #23202
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cbuescher
added
:Search/Search
tlrx
requested changes
Feb 16, 2017
| } | ||
| protected static final String TEXT = "text"; | ||
| protected static final String OFFSET = "offset"; | ||
| protected static final String LENGTH = "length"; |
There was a problem hiding this comment.
I think some of them could be private
| @@ -551,6 +553,24 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws | |||
| return builder; | |||
| } | |||
|
|
|||
| private static ObjectParser<Entry<Option>, Void> PARSER = new ObjectParser<>("SuggestionEntryParser", | |||
| true, Entry::new); | |||
| @@ -100,6 +103,18 @@ public void addOption(Suggestion.Entry.Option option) { | |||
| } | |||
| } | |||
|
|
|||
| private static ObjectParser<Entry, Void> PARSER = new ObjectParser<>("PhraseSuggestionEntryParser", true, | |||
| Entry::new); | |||
| @@ -154,6 +155,18 @@ protected Option newOption() { | |||
| return new Option(); | |||
| } | |||
|
|
|||
| private static ObjectParser<Entry, Void> PARSER = new ObjectParser<>("TermSuggestionEntryParser", true, | |||
|
|
||
| @SuppressWarnings("rawtypes") | ||
| private static final Map<Class<? extends Entry>, Function<XContentParser, ? extends Entry>> ENTRY_PARSERS = new HashMap<>(); | ||
| { |
| /** | ||
| * Create a randomized Suggestion.Entry, determined by the type argument. | ||
| * @param type determines the entry type for this test. Valid arguments are 0 for {@link TermSuggestion.Entry}, | ||
| * 1 for {@link PhraseSuggestion.Entry} and 2 for {@link CompletionSuggestion.Entry} |
| entry = new Suggestion.Entry<>(entryText, offset, length); | ||
| supplier = SuggestionOptionTests::createTestItem; | ||
| } else if (entryType == TermSuggestion.Entry.class) { | ||
| entry = new TermSuggestion.Entry(entryText, offset, length); |
| @SuppressWarnings("unchecked") | ||
| public void testFromXContent() throws IOException { | ||
| for (Class<? extends Entry> entryType : ENTRY_PARSERS.keySet()) { | ||
| Entry<Option> entry = createTestItem(entryType); |
There was a problem hiding this comment.
Wrong formating, or maybe you didn't want to iterate over each entry type and randomize it instead?
|
@tlrx thanks for the review, I addressed all of your comments, re-running also locally because CI seems stuck currently. |
tlrx
approved these changes
Feb 16, 2017
cbuescher
added a commit
that referenced
this pull request
Feb 16, 2017
This adds parsing from xContent to Suggestion.Entry and its subclasses for Terms-, Phrase- and CompletionSuggestion.Entry.
|
Merged to 5.x with 7c229ce |
cbuescher
added a commit
that referenced
this pull request
Feb 20, 2017
A follow up to #23202, this adds parsing from xContent and tests to the four Suggestion implementations and the top level suggest element to be used later when parsing the entire SearchResponse.
cbuescher
added a commit
that referenced
this pull request
Feb 21, 2017
A follow up to #23202, this adds parsing from xContent and tests to the four Suggestion implementations and the top level suggest element to be used later when parsing the entire SearchResponse.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds parsing from xContent to Suggestion.Entry and its subclasses for Terms-, Phrase-
and CompletionSuggestion.Entry.