diff options
author | Tanguy Leroux <tlrx.dev@gmail.com> | 2017-05-05 21:54:37 +0200 |
---|---|---|
committer | Tanguy Leroux <tlrx.dev@gmail.com> | 2017-05-05 21:54:37 +0200 |
commit | c7c524dd3fef6c3afe6225cbe600bf5096f94ce4 (patch) | |
tree | 8229aea123220cfefaaf0feff88ff5c142f69af1 /core/src/main/java/org/elasticsearch/search/suggest | |
parent | 62c37339b83ad6d8f4af6946c85c28e62a667550 (diff) | |
parent | 7bd2abe48af5a651b54bcd5bcb41c88e29390be0 (diff) |
Merge remote-tracking branch 'origin/master' into feature/client_aggs_parsing
Diffstat (limited to 'core/src/main/java/org/elasticsearch/search/suggest')
-rw-r--r-- | core/src/main/java/org/elasticsearch/search/suggest/SortBy.java | 8 | ||||
-rw-r--r-- | core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java | 16 |
2 files changed, 6 insertions, 18 deletions
diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SortBy.java b/core/src/main/java/org/elasticsearch/search/suggest/SortBy.java index 3cd19c5c2f..328fc4e821 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/SortBy.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/SortBy.java @@ -38,15 +38,11 @@ public enum SortBy implements Writeable { @Override public void writeTo(final StreamOutput out) throws IOException { - out.writeVInt(ordinal()); + out.writeEnum(this); } public static SortBy readFromStream(final StreamInput in) throws IOException { - int ordinal = in.readVInt(); - if (ordinal < 0 || ordinal >= values().length) { - throw new IOException("Unknown SortBy ordinal [" + ordinal + "]"); - } - return values()[ordinal]; + return in.readEnum(SortBy.class); } public static SortBy resolve(final String str) { 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 72fd41dc5b..f701ff3642 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 @@ -511,15 +511,11 @@ public class TermSuggestionBuilder extends SuggestionBuilder<TermSuggestionBuild @Override public void writeTo(final StreamOutput out) throws IOException { - out.writeVInt(ordinal()); + out.writeEnum(this); } public static SuggestMode readFromStream(final StreamInput in) throws IOException { - int ordinal = in.readVInt(); - if (ordinal < 0 || ordinal >= values().length) { - throw new IOException("Unknown SuggestMode ordinal [" + ordinal + "]"); - } - return values()[ordinal]; + return in.readEnum(SuggestMode.class); } public static SuggestMode resolve(final String str) { @@ -571,15 +567,11 @@ public class TermSuggestionBuilder extends SuggestionBuilder<TermSuggestionBuild @Override public void writeTo(final StreamOutput out) throws IOException { - out.writeVInt(ordinal()); + out.writeEnum(this); } public static StringDistanceImpl readFromStream(final StreamInput in) throws IOException { - int ordinal = in.readVInt(); - if (ordinal < 0 || ordinal >= values().length) { - throw new IOException("Unknown StringDistanceImpl ordinal [" + ordinal + "]"); - } - return values()[ordinal]; + return in.readEnum(StringDistanceImpl.class); } public static StringDistanceImpl resolve(final String str) { |