diff options
Diffstat (limited to 'core/src/main/java/org/elasticsearch/search')
39 files changed, 43 insertions, 46 deletions
diff --git a/core/src/main/java/org/elasticsearch/search/DocValueFormat.java b/core/src/main/java/org/elasticsearch/search/DocValueFormat.java index 98cb388c16..78f8460f1c 100644 --- a/core/src/main/java/org/elasticsearch/search/DocValueFormat.java +++ b/core/src/main/java/org/elasticsearch/search/DocValueFormat.java @@ -46,7 +46,7 @@ import java.util.Objects; import java.util.concurrent.Callable; /** A formatter for values as returned by the fielddata/doc-values APIs. */ -public interface DocValueFormat extends NamedWriteable<DocValueFormat> { +public interface DocValueFormat extends NamedWriteable { String format(long value); diff --git a/core/src/main/java/org/elasticsearch/search/MultiValueMode.java b/core/src/main/java/org/elasticsearch/search/MultiValueMode.java index 489ff7edc0..483426fce1 100644 --- a/core/src/main/java/org/elasticsearch/search/MultiValueMode.java +++ b/core/src/main/java/org/elasticsearch/search/MultiValueMode.java @@ -45,7 +45,7 @@ import java.util.Locale; /** * Defines what values to pick in the case a document contains multiple values for a particular field. */ -public enum MultiValueMode implements Writeable<MultiValueMode> { +public enum MultiValueMode implements Writeable { /** * Pick the sum of all the values. diff --git a/core/src/main/java/org/elasticsearch/search/SearchShardTarget.java b/core/src/main/java/org/elasticsearch/search/SearchShardTarget.java index 6c2e876f21..9fb8322718 100644 --- a/core/src/main/java/org/elasticsearch/search/SearchShardTarget.java +++ b/core/src/main/java/org/elasticsearch/search/SearchShardTarget.java @@ -33,7 +33,7 @@ import java.io.IOException; /** * The target that the search request was executed on. */ -public class SearchShardTarget implements Writeable<SearchShardTarget>, Comparable<SearchShardTarget> { +public class SearchShardTarget implements Writeable, Comparable<SearchShardTarget> { private Text nodeId; private Text index; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java index 0264120732..426f148e38 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java @@ -102,7 +102,7 @@ public abstract class Aggregator extends BucketCollector implements Releasable { public abstract InternalAggregation buildEmptyAggregation(); /** Aggregation mode for sub aggregations. */ - public enum SubAggCollectionMode implements Writeable<SubAggCollectionMode> { + public enum SubAggCollectionMode implements Writeable { /** * Creates buckets and delegates to child aggregators in a single pass over diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBuilder.java index 7b1fcba972..159ab5a8a1 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorBuilder.java @@ -36,8 +36,7 @@ import java.util.Objects; /** * A factory that knows how to create an {@link Aggregator} of a specific type. */ -public abstract class AggregatorBuilder<AB extends AggregatorBuilder<AB>> extends ToXContentToBytes - implements NamedWriteable<AB>, ToXContent { +public abstract class AggregatorBuilder<AB extends AggregatorBuilder<AB>> extends ToXContentToBytes implements NamedWriteable, ToXContent { protected String name; protected Type type; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java b/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java index 6bb2dd59db..f1236cd5cc 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/AggregatorFactories.java @@ -122,7 +122,7 @@ public class AggregatorFactories { } } - public static class Builder extends ToXContentToBytes implements Writeable<Builder> { + public static class Builder extends ToXContentToBytes implements Writeable { private final Set<String> names = new HashSet<>(); private final List<AggregatorBuilder<?>> aggregatorBuilders = new ArrayList<>(); private final List<PipelineAggregatorBuilder<?>> pipelineAggregatorBuilders = new ArrayList<>(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java index 8da2d006be..ca071d7cfc 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java @@ -57,7 +57,7 @@ public class FiltersAggregator extends BucketsAggregator { public static final ParseField OTHER_BUCKET_FIELD = new ParseField("other_bucket"); public static final ParseField OTHER_BUCKET_KEY_FIELD = new ParseField("other_bucket_key"); - public static class KeyedFilter implements Writeable<KeyedFilter>, ToXContent { + public static class KeyedFilter implements Writeable, ToXContent { private final String key; private final QueryBuilder<?> filter; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java index d1694c4a40..9310142aa9 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramInterval.java @@ -29,7 +29,7 @@ import java.util.Objects; /** * The interval the date histogram is based on. */ -public class DateHistogramInterval implements Writeable<DateHistogramInterval> { +public class DateHistogramInterval implements Writeable { public static final DateHistogramInterval SECOND = new DateHistogramInterval("1s"); public static final DateHistogramInterval MINUTE = new DateHistogramInterval("1m"); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java index 59758d8c09..1c6183c59e 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java @@ -36,7 +36,7 @@ import org.elasticsearch.search.internal.SearchContext; import java.io.IOException; import java.util.Objects; -public class ExtendedBounds implements ToXContent, Writeable<ExtendedBounds> { +public class ExtendedBounds implements ToXContent, Writeable { static final ParseField EXTENDED_BOUNDS_FIELD = new ParseField("extended_bounds"); static final ParseField MIN_FIELD = new ParseField("min"); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java index eeb37dfa99..6a99295f75 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java @@ -57,7 +57,7 @@ public class RangeAggregator extends BucketsAggregator { public static final ParseField RANGES_FIELD = new ParseField("ranges"); public static final ParseField KEYED_FIELD = new ParseField("keyed"); - public static class Range implements Writeable<Range>, ToXContent { + public static class Range implements Writeable, ToXContent { public static final ParseField KEY_FIELD = new ParseField("key"); public static final ParseField FROM_FIELD = new ParseField("from"); public static final ParseField TO_FIELD = new ParseField("to"); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java index 972696ba99..d2d085a2c0 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristic.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.internal.SearchContext; -public abstract class SignificanceHeuristic implements NamedWriteable<SignificanceHeuristic>, ToXContent { +public abstract class SignificanceHeuristic implements NamedWriteable, ToXContent { /** * @param subsetFreq The frequency of the term in the selected sample * @param subsetSize The size of the selected sample (typically number of docs) diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java index d1a8fcba01..1c59711b64 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregator.java @@ -45,7 +45,7 @@ import java.util.Set; public abstract class TermsAggregator extends BucketsAggregator { - public static class BucketCountThresholds implements Writeable<BucketCountThresholds>, ToXContent { + public static class BucketCountThresholds implements Writeable, ToXContent { private long minDocCount; private long shardMinDocCount; private int requiredSize; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java index 9b21844834..101291d01e 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java @@ -58,7 +58,7 @@ import java.util.TreeSet; * Defines the include/exclude regular expression filtering for string terms aggregation. In this filtering logic, * exclusion has precedence, where the {@code include} is evaluated first and then the {@code exclude}. */ -public class IncludeExclude implements Writeable<IncludeExclude>, ToXContent { +public class IncludeExclude implements Writeable, ToXContent { private static final ParseField INCLUDE_FIELD = new ParseField("include"); private static final ParseField EXCLUDE_FIELD = new ParseField("exclude"); private static final ParseField PATTERN_FIELD = new ParseField("pattern"); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java index 45e106d192..97b8a727be 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java @@ -28,7 +28,7 @@ import java.io.IOException; /** * An enum representing the methods for calculating percentiles */ -public enum PercentilesMethod implements Writeable<PercentilesMethod> { +public enum PercentilesMethod implements Writeable { /** * The TDigest method for calculating percentiles */ diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilder.java index 6e9a191942..bdcefa054f 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregatorBuilder.java @@ -37,7 +37,7 @@ import java.util.Objects; * specific type. */ public abstract class PipelineAggregatorBuilder<PAB extends PipelineAggregatorBuilder<PAB>> extends ToXContentToBytes - implements NamedWriteable<PipelineAggregatorBuilder<PAB>> { + implements NamedWriteable { /** * Field shared by many parsers. diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java index cacda969ba..0837eca38b 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java @@ -31,7 +31,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Map; -public abstract class MovAvgModel implements NamedWriteable<MovAvgModel>, ToXContent { +public abstract class MovAvgModel implements NamedWriteable, ToXContent { /** * Should this model be fit to the data via a cost minimizing algorithm by default? diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java index 1eb2376fac..021cdfb3a0 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java @@ -34,7 +34,7 @@ import java.io.IOException; /** * */ -public enum ValueType implements Writeable<ValueType> { +public enum ValueType implements Writeable { STRING((byte) 1, "string", "string", ValuesSourceType.BYTES, IndexFieldData.class, DocValueFormat.RAW), @@ -96,8 +96,8 @@ public enum ValueType implements Writeable<ValueType> { private final byte id; private String preferredName; - private ValueType(byte id, String description, String preferredName, ValuesSourceType valuesSourceType, Class<? extends IndexFieldData> fieldDataType, - DocValueFormat defaultFormat) { + private ValueType(byte id, String description, String preferredName, ValuesSourceType valuesSourceType, + Class<? extends IndexFieldData> fieldDataType, DocValueFormat defaultFormat) { this.id = id; this.description = description; this.preferredName = preferredName; 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 e02b508f88..d834c251e1 100644 --- a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java @@ -71,7 +71,7 @@ import java.util.Objects; * * @see org.elasticsearch.action.search.SearchRequest#source(SearchSourceBuilder) */ -public final class SearchSourceBuilder extends ToXContentToBytes implements Writeable<SearchSourceBuilder> { +public final class SearchSourceBuilder extends ToXContentToBytes implements Writeable { public static final ParseField FROM_FIELD = new ParseField("from"); public static final ParseField SIZE_FIELD = new ParseField("size"); @@ -1264,7 +1264,7 @@ public final class SearchSourceBuilder extends ToXContentToBytes implements Writ } } - public static class ScriptField implements Writeable<ScriptField>, ToXContent { + public static class ScriptField implements Writeable, ToXContent { private final boolean ignoreFailure; private final String fieldName; diff --git a/core/src/main/java/org/elasticsearch/search/highlight/AbstractHighlighterBuilder.java b/core/src/main/java/org/elasticsearch/search/highlight/AbstractHighlighterBuilder.java index 225403d941..e19dd33efc 100644 --- a/core/src/main/java/org/elasticsearch/search/highlight/AbstractHighlighterBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/highlight/AbstractHighlighterBuilder.java @@ -46,8 +46,7 @@ import static org.elasticsearch.common.xcontent.ObjectParser.fromList; * This abstract class holds parameters shared by {@link HighlightBuilder} and {@link HighlightBuilder.Field} * and provides the common setters, equality, hashCode calculation and common serialization */ -public abstract class AbstractHighlighterBuilder<HB extends AbstractHighlighterBuilder<?>> extends ToXContentToBytes - implements Writeable<HB> { +public abstract class AbstractHighlighterBuilder<HB extends AbstractHighlighterBuilder<?>> extends ToXContentToBytes implements Writeable { public static final ParseField PRE_TAGS_FIELD = new ParseField("pre_tags"); public static final ParseField POST_TAGS_FIELD = new ParseField("post_tags"); public static final ParseField FIELDS_FIELD = new ParseField("fields"); diff --git a/core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java b/core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java index d24d3f67a5..046bea64c9 100644 --- a/core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java @@ -494,7 +494,7 @@ public class HighlightBuilder extends AbstractHighlighterBuilder<HighlightBuilde } } - public enum Order implements Writeable<Order> { + public enum Order implements Writeable { NONE, SCORE; public static Order readFromStream(StreamInput in) throws IOException { diff --git a/core/src/main/java/org/elasticsearch/search/profile/InternalProfileShardResults.java b/core/src/main/java/org/elasticsearch/search/profile/InternalProfileShardResults.java index 20471c2fb6..5aa42c45da 100644 --- a/core/src/main/java/org/elasticsearch/search/profile/InternalProfileShardResults.java +++ b/core/src/main/java/org/elasticsearch/search/profile/InternalProfileShardResults.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; * A container class to hold all the profile results across all shards. Internally * holds a map of shard ID -> Profiled results */ -public final class InternalProfileShardResults implements Writeable<InternalProfileShardResults>, ToXContent{ +public final class InternalProfileShardResults implements Writeable, ToXContent{ private Map<String, List<ProfileShardResult>> shardResults; diff --git a/core/src/main/java/org/elasticsearch/search/profile/ProfileResult.java b/core/src/main/java/org/elasticsearch/search/profile/ProfileResult.java index c756cfbaf1..dc47f982a3 100644 --- a/core/src/main/java/org/elasticsearch/search/profile/ProfileResult.java +++ b/core/src/main/java/org/elasticsearch/search/profile/ProfileResult.java @@ -43,7 +43,7 @@ import java.util.Map; * Each InternalProfileResult has a List of InternalProfileResults, which will contain * "children" queries if applicable */ -final class ProfileResult implements Writeable<ProfileResult>, ToXContent { +final class ProfileResult implements Writeable, ToXContent { private static final ParseField QUERY_TYPE = new ParseField("query_type"); private static final ParseField LUCENE_DESCRIPTION = new ParseField("lucene"); diff --git a/core/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java b/core/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java index 06fe2164a1..1353bb505e 100644 --- a/core/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java +++ b/core/src/main/java/org/elasticsearch/search/profile/ProfileShardResult.java @@ -34,7 +34,7 @@ import java.util.List; * A container class to hold the profile results for a single shard in the request. * Contains a list of query profiles, a collector tree and a total rewrite tree. */ -public final class ProfileShardResult implements Writeable<ProfileShardResult>, ToXContent { +public final class ProfileShardResult implements Writeable, ToXContent { private final List<ProfileResult> profileResults; diff --git a/core/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java b/core/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java index 959bd51270..70718b56c0 100644 --- a/core/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java +++ b/core/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.io.stream.Writeable; import java.io.IOException; import java.util.Locale; -public enum QueryRescoreMode implements Writeable<QueryRescoreMode> { +public enum QueryRescoreMode implements Writeable { Avg { @Override public float combine(float primary, float secondary) { diff --git a/core/src/main/java/org/elasticsearch/search/rescore/RescoreBuilder.java b/core/src/main/java/org/elasticsearch/search/rescore/RescoreBuilder.java index 5b33769af4..e29e7dcd6e 100644 --- a/core/src/main/java/org/elasticsearch/search/rescore/RescoreBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/rescore/RescoreBuilder.java @@ -38,7 +38,7 @@ import java.util.Objects; /** * The abstract base builder for instances of {@link RescoreBuilder}. */ -public abstract class RescoreBuilder<RB extends RescoreBuilder<RB>> extends ToXContentToBytes implements NamedWriteable<RB> { +public abstract class RescoreBuilder<RB extends RescoreBuilder<RB>> extends ToXContentToBytes implements NamedWriteable { protected Integer windowSize; diff --git a/core/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java b/core/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java index 70e9600e5d..6d72efdf36 100644 --- a/core/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java @@ -46,7 +46,7 @@ import java.util.Objects; /** * */ -public class SearchAfterBuilder implements ToXContent, Writeable<SearchAfterBuilder> { +public class SearchAfterBuilder implements ToXContent, Writeable { public static final ParseField SEARCH_AFTER = new ParseField("search_after"); private static final Object[] EMPTY_SORT_VALUES = new Object[0]; diff --git a/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java index 5c58d10b67..e6a1242133 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java @@ -396,7 +396,7 @@ public class ScriptSortBuilder extends SortBuilder<ScriptSortBuilder> { return NAME; } - public enum ScriptSortType implements Writeable<ScriptSortType> { + public enum ScriptSortType implements Writeable { /** script sort for a string value **/ STRING, /** script sort for a numeric value **/ diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/SortBuilder.java index 4bd708d9af..805d6e90c4 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/SortBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/sort/SortBuilder.java @@ -48,7 +48,7 @@ import static java.util.Collections.unmodifiableMap; /** * */ -public abstract class SortBuilder<T extends SortBuilder<?>> extends ToXContentToBytes implements NamedWriteable<T> { +public abstract class SortBuilder<T extends SortBuilder<T>> extends ToXContentToBytes implements NamedWriteable { protected SortOrder order = SortOrder.ASC; public static final ParseField ORDER_FIELD = new ParseField("order"); diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortMode.java b/core/src/main/java/org/elasticsearch/search/sort/SortMode.java index c6b3e1b10b..21495798a8 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/SortMode.java +++ b/core/src/main/java/org/elasticsearch/search/sort/SortMode.java @@ -38,7 +38,7 @@ import java.util.Objects; * <li>median - Use the median of all values as sort value. Only applicable for number based array fields.</li> * </ul> */ -public enum SortMode implements Writeable<SortMode> { +public enum SortMode implements Writeable { /** pick the lowest value **/ MIN, /** pick the highest value **/ diff --git a/core/src/main/java/org/elasticsearch/search/sort/SortOrder.java b/core/src/main/java/org/elasticsearch/search/sort/SortOrder.java index a84a456775..cd0a3bb6d4 100644 --- a/core/src/main/java/org/elasticsearch/search/sort/SortOrder.java +++ b/core/src/main/java/org/elasticsearch/search/sort/SortOrder.java @@ -31,7 +31,7 @@ import java.util.Locale; * * */ -public enum SortOrder implements Writeable<SortOrder> { +public enum SortOrder implements Writeable { /** * Ascending order. */ 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 bab2b1ce61..3cd19c5c2f 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/SortBy.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/SortBy.java @@ -30,7 +30,7 @@ import java.util.Objects; /** * An enum representing the valid sorting options */ -public enum SortBy implements Writeable<SortBy> { +public enum SortBy implements Writeable { /** Sort should first be based on score, then document frequency and then the term itself. */ SCORE, /** Sort should first be based on document frequency, then score and then the term itself. */ 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 6095a4de70..332d18f256 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/SuggestBuilder.java @@ -46,7 +46,7 @@ import java.util.Objects; * Suggesting works by suggesting terms/phrases that appear in the suggest text that are similar compared * 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 class SuggestBuilder extends ToXContentToBytes implements Writeable { protected static final ParseField GLOBAL_TEXT_FIELD = new ParseField("text"); private String globalText; 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 c38febab32..59555e049c 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/SuggestionBuilder.java @@ -43,7 +43,7 @@ import java.util.Objects; /** * Base class for the different suggestion implementations. */ -public abstract class SuggestionBuilder<T extends SuggestionBuilder<T>> extends ToXContentToBytes implements NamedWriteable<T> { +public abstract class SuggestionBuilder<T extends SuggestionBuilder<T>> extends ToXContentToBytes implements NamedWriteable { protected final String field; protected String text; diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java index 2977e8ad9a..1187754d15 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/FuzzyOptions.java @@ -39,7 +39,7 @@ import java.util.Objects; /** * Fuzzy options for completion suggester */ -public class FuzzyOptions implements ToXContent, Writeable<FuzzyOptions> { +public class FuzzyOptions implements ToXContent, Writeable { static final ParseField FUZZY_OPTIONS = new ParseField("fuzzy"); private static final ParseField TRANSPOSITION_FIELD = new ParseField("transpositions"); private static final ParseField MIN_LENGTH_FIELD = new ParseField("min_length"); diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java index 59ca2a6da1..a9209044c8 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/RegexOptions.java @@ -38,7 +38,7 @@ import java.io.IOException; /** * Regular expression options for completion suggester */ -public class RegexOptions implements ToXContent, Writeable<RegexOptions> { +public class RegexOptions implements ToXContent, Writeable { static final ParseField REGEX_OPTIONS = new ParseField("regex"); private static final ParseField FLAGS_VALUE = new ParseField("flags", "flags_value"); private static final ParseField MAX_DETERMINIZED_STATES = new ParseField("max_determinized_states"); 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 0d4e269a5c..fb59f2eddb 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 @@ -40,8 +40,7 @@ import java.util.Objects; import java.util.Set; import java.util.function.Consumer; -public final class DirectCandidateGeneratorBuilder - implements CandidateGenerator { +public final class DirectCandidateGeneratorBuilder implements CandidateGenerator { private static final String TYPE = "direct_generator"; 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 2d625e3e5d..ce9dc74600 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 @@ -708,7 +708,7 @@ public class PhraseSuggestionBuilder extends SuggestionBuilder<PhraseSuggestionB /** * {@link CandidateGenerator} interface. */ - public interface CandidateGenerator extends Writeable<CandidateGenerator>, ToXContent { + public interface CandidateGenerator extends Writeable, ToXContent { String getType(); PhraseSuggestionContext.DirectCandidateGenerator build(MapperService mapperService) throws IOException; diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java index f20d498d0d..0f55c9ed8f 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/phrase/SmoothingModel.java @@ -30,7 +30,7 @@ import org.elasticsearch.search.suggest.phrase.WordScorer.WordScorerFactory; import java.io.IOException; -public abstract class SmoothingModel implements NamedWriteable<SmoothingModel>, ToXContent { +public abstract class SmoothingModel implements NamedWriteable, ToXContent { @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { 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 41a6e61301..d7ec7e6cae 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 @@ -491,7 +491,7 @@ public class TermSuggestionBuilder extends SuggestionBuilder<TermSuggestionBuild } /** An enum representing the valid suggest modes. */ - public enum SuggestMode implements Writeable<SuggestMode> { + public enum SuggestMode implements Writeable { /** Only suggest terms in the suggest text that aren't in the index. This is the default. */ MISSING { @Override @@ -536,7 +536,7 @@ public class TermSuggestionBuilder extends SuggestionBuilder<TermSuggestionBuild } /** An enum representing the valid string edit distance algorithms for determining suggestions. */ - public enum StringDistanceImpl implements Writeable<StringDistanceImpl> { + public enum StringDistanceImpl implements Writeable { /** This is the default and is based on <code>damerau_levenshtein</code>, but highly optimized * for comparing string distance for terms inside the index. */ INTERNAL { |