diff options
Diffstat (limited to 'core/src/main/java/org/elasticsearch/search/aggregations')
14 files changed, 16 insertions, 17 deletions
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; |