diff options
author | Nik Everett <nik9000@gmail.com> | 2016-04-13 16:56:43 -0400 |
---|---|---|
committer | Nik Everett <nik9000@gmail.com> | 2016-04-14 10:30:31 -0400 |
commit | 8ad0070cea71aad8211ed9b55c305cb9ad5b92b8 (patch) | |
tree | 6d0f9bc2d35f091ead5b9200f6ce53b19e1cdc7f /core/src/main/java/org/elasticsearch | |
parent | c595322d90661b36716b2d4daaaa8998ce70bc91 (diff) |
Remove remaining PROTOTYPEs from org.elasticsearch.search.suggest
Diffstat (limited to 'core/src/main/java/org/elasticsearch')
4 files changed, 29 insertions, 27 deletions
diff --git a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java index 05aebb0ca4..053c4af538 100644 --- a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java @@ -252,7 +252,7 @@ public final class SearchSourceBuilder extends ToXContentToBytes implements Writ } } if (in.readBoolean()) { - suggestBuilder = SuggestBuilder.PROTOTYPE.readFrom(in); + suggestBuilder = new SuggestBuilder(in); } terminateAfter = in.readVInt(); timeoutInMillis = in.readLong(); diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java index aed44c426d..ff56f395a5 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java @@ -47,14 +47,40 @@ import java.util.Objects; * to the terms in provided text. These suggestions are based on several options described in this class. */ public class SuggestBuilder extends ToXContentToBytes implements Writeable<SuggestBuilder> { - - public static final SuggestBuilder PROTOTYPE = new SuggestBuilder(); protected static final ParseField GLOBAL_TEXT_FIELD = new ParseField("text"); private String globalText; private final Map<String, SuggestionBuilder<?>> suggestions = new HashMap<>(); /** + * Build an empty SuggestBuilder. + */ + public SuggestBuilder() { + } + + /** + * Read from a stream. + */ + public SuggestBuilder(StreamInput in) throws IOException { + globalText = in.readOptionalString(); + final int size = in.readVInt(); + for (int i = 0; i < size; i++) { + suggestions.put(in.readString(), in.readSuggestion()); + } + } + + @Override + public void writeTo(StreamOutput out) throws IOException { + out.writeOptionalString(globalText); + final int size = suggestions.size(); + out.writeVInt(size); + for (Entry<String, SuggestionBuilder<?>> suggestion : suggestions.entrySet()) { + out.writeString(suggestion.getKey()); + out.writeSuggestion(suggestion.getValue()); + } + } + + /** * Sets the text to provide suggestions for. The suggest text is a required option that needs * to be set either via this setter or via the {@link org.elasticsearch.search.suggest.SuggestionBuilder#text(String)} method. * <p> @@ -162,28 +188,6 @@ public class SuggestBuilder extends ToXContentToBytes implements Writeable<Sugge } @Override - public SuggestBuilder readFrom(StreamInput in) throws IOException { - final SuggestBuilder builder = new SuggestBuilder(); - builder.globalText = in.readOptionalString(); - final int size = in.readVInt(); - for (int i = 0; i < size; i++) { - builder.suggestions.put(in.readString(), in.readSuggestion()); - } - return builder; - } - - @Override - public void writeTo(StreamOutput out) throws IOException { - out.writeOptionalString(globalText); - final int size = suggestions.size(); - out.writeVInt(size); - for (Entry<String, SuggestionBuilder<?>> suggestion : suggestions.entrySet()) { - out.writeString(suggestion.getKey()); - out.writeSuggestion(suggestion.getValue()); - } - } - - @Override public boolean equals(Object other) { if (this == other) { return true; diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryQueryContext.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryQueryContext.java index 2e47795010..62892216c6 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryQueryContext.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/context/CategoryQueryContext.java @@ -38,7 +38,6 @@ import static org.elasticsearch.search.suggest.completion.context.CategoryContex */ public final class CategoryQueryContext implements ToXContent { public static final String NAME = "category"; - public static final CategoryQueryContext PROTOTYPE = new CategoryQueryContext("", 1, false); private final String category; private final boolean isPrefix; diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java index 43873724c0..1d27f17159 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java @@ -43,7 +43,6 @@ import static org.elasticsearch.search.suggest.completion.context.GeoContextMapp */ public final class GeoQueryContext implements ToXContent { public static final String NAME = "geo"; - public static final GeoQueryContext PROTOTYPE = new GeoQueryContext(null, 1, 12, Collections.emptyList()); private final GeoPoint geoPoint; private final int boost; |