diff options
| author | Tanguy Leroux <tlrx.dev@gmail.com> | 2016-07-01 16:28:59 +0200 |
|---|---|---|
| committer | Tanguy Leroux <tlrx.dev@gmail.com> | 2016-07-01 16:57:14 +0200 |
| commit | 8c40b2b54eac3e3ab3c41ece5c758be75173191b (patch) | |
| tree | cbb17a82da3647a64ea802a756446fa05c30036f /core/src/main/java/org/elasticsearch/search | |
| parent | 93b42b8e69c2c23cb3cc6b380a33776ce05370d5 (diff) | |
Fix order of modifiers
Diffstat (limited to 'core/src/main/java/org/elasticsearch/search')
82 files changed, 138 insertions, 138 deletions
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java b/core/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java index c1c1bff1ad..2de6ae0cf9 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/BucketCollector.java @@ -34,7 +34,7 @@ import java.util.stream.StreamSupport; */ public abstract class BucketCollector implements Collector { - public final static BucketCollector NO_OP_COLLECTOR = new BucketCollector() { + public static final BucketCollector NO_OP_COLLECTOR = new BucketCollector() { @Override public LeafBucketCollector getLeafCollector(LeafReaderContext reader) { diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java b/core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java index 75223dcc47..3628133580 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregations.java @@ -43,7 +43,7 @@ import static java.util.Collections.unmodifiableMap; */ public class InternalAggregations implements Aggregations, ToXContent, Streamable { - public final static InternalAggregations EMPTY = new InternalAggregations(); + public static final InternalAggregations EMPTY = new InternalAggregations(); private List<InternalAggregation> aggregations = Collections.emptyList(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java b/core/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java index e46f24c242..c579f349b6 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregation.java @@ -71,7 +71,7 @@ public abstract class InternalMultiBucketAggregation<A extends InternalMultiBuck } } - public static abstract class InternalBucket implements Bucket { + public abstract static class InternalBucket implements Bucket { @Override public Object getProperty(String containingAggName, List<String> path) { if (path.isEmpty()) { diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/InternalChildren.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/InternalChildren.java index 324f32a381..a1febde438 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/InternalChildren.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/children/InternalChildren.java @@ -35,7 +35,7 @@ public class InternalChildren extends InternalSingleBucketAggregation implements public static final Type TYPE = new Type("children"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalChildren readResult(StreamInput in) throws IOException { InternalChildren result = new InternalChildren(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java index 19f3b5a7e9..b7896b4eb1 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/InternalFilter.java @@ -33,9 +33,9 @@ import java.util.Map; */ public class InternalFilter extends InternalSingleBucketAggregation implements Filter { - public final static Type TYPE = new Type("filter"); + public static final Type TYPE = new Type("filter"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalFilter readResult(StreamInput in) throws IOException { InternalFilter result = new InternalFilter(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/InternalFilters.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/InternalFilters.java index aed398d51d..4cace0a50d 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/InternalFilters.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/InternalFilters.java @@ -42,9 +42,9 @@ import java.util.Map; */ public class InternalFilters extends InternalMultiBucketAggregation<InternalFilters, InternalFilters.InternalBucket> implements Filters { - public final static Type TYPE = new Type("filters"); + public static final Type TYPE = new Type("filters"); - private final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + private static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalFilters readResult(StreamInput in) throws IOException { InternalFilters filters = new InternalFilters(); @@ -53,7 +53,7 @@ public class InternalFilters extends InternalMultiBucketAggregation<InternalFilt } }; - private final static BucketStreams.Stream<InternalBucket> BUCKET_STREAM = new BucketStreams.Stream<InternalBucket>() { + private static final BucketStreams.Stream<InternalBucket> BUCKET_STREAM = new BucketStreams.Stream<InternalBucket>() { @Override public InternalBucket readResult(StreamInput in, BucketStreamContext context) throws IOException { InternalBucket filters = new InternalBucket(context.keyed()); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java index abd5479ba4..e8d4d6fd84 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/global/InternalGlobal.java @@ -34,9 +34,9 @@ import java.util.Map; */ public class InternalGlobal extends InternalSingleBucketAggregation implements Global { - public final static Type TYPE = new Type("global"); + public static final Type TYPE = new Type("global"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalGlobal readResult(StreamInput in) throws IOException { InternalGlobal result = new InternalGlobal(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java index 0c12694719..6e6ac05820 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/Histogram.java @@ -46,7 +46,7 @@ public interface Histogram extends MultiBucketsAggregation { /** * A strategy defining the order in which the buckets in this histogram are ordered. */ - static abstract class Order implements ToXContent { + abstract static class Order implements ToXContent { public static final Order KEY_ASC = new InternalOrder((byte) 1, "_key", true, new Comparator<InternalHistogram.Bucket>() { @Override diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java index 84cc98515d..6f359708f5 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java @@ -32,7 +32,7 @@ import org.joda.time.DateTimeZone; public class InternalDateHistogram { public static final Factory HISTOGRAM_FACTORY = new Factory(); - final static Type TYPE = new Type("date_histogram", "dhisto"); + static final Type TYPE = new Type("date_histogram", "dhisto"); static class Bucket extends InternalHistogram.Bucket { diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java index a5ee0728b4..2ea2eaecde 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalHistogram.java @@ -52,9 +52,9 @@ public class InternalHistogram<B extends InternalHistogram.Bucket> extends Inter Histogram { public static final Factory<Bucket> HISTOGRAM_FACTORY = new Factory<Bucket>(); - final static Type TYPE = new Type("histogram", "histo"); + static final Type TYPE = new Type("histogram", "histo"); - private final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + private static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @SuppressWarnings("rawtypes") @Override public InternalHistogram readResult(StreamInput in) throws IOException { @@ -64,7 +64,7 @@ public class InternalHistogram<B extends InternalHistogram.Bucket> extends Inter } }; - private final static BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { + private static final BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { @Override public Bucket readResult(StreamInput in, BucketStreamContext context) throws IOException { Factory<?> factory = (Factory<?>) context.attributes().get("factory"); @@ -96,8 +96,8 @@ public class InternalHistogram<B extends InternalHistogram.Bucket> extends Inter long key; long docCount; InternalAggregations aggregations; - private transient final boolean keyed; - protected transient final DocValueFormat format; + private final transient boolean keyed; + protected final transient DocValueFormat format; private Factory<?> factory; public Bucket(boolean keyed, DocValueFormat formatter, Factory<?> factory) { diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java index 9931f29613..78293dd583 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/missing/InternalMissing.java @@ -33,9 +33,9 @@ import java.util.Map; */ public class InternalMissing extends InternalSingleBucketAggregation implements Missing { - public final static Type TYPE = new Type("missing"); + public static final Type TYPE = new Type("missing"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalMissing readResult(StreamInput in) throws IOException { InternalMissing missing = new InternalMissing(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java index badd63eb2c..cdceade65a 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalNested.java @@ -35,7 +35,7 @@ public class InternalNested extends InternalSingleBucketAggregation implements N public static final Type TYPE = new Type("nested"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalNested readResult(StreamInput in) throws IOException { InternalNested result = new InternalNested(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java index 78fb6ecab5..60d4920e17 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/InternalReverseNested.java @@ -35,7 +35,7 @@ public class InternalReverseNested extends InternalSingleBucketAggregation imple public static final Type TYPE = new Type("reverse_nested"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalReverseNested readResult(StreamInput in) throws IOException { InternalReverseNested result = new InternalReverseNested(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorFactory.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorFactory.java index 5a8f47c0f2..b09e3d4d40 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorFactory.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorFactory.java @@ -60,7 +60,7 @@ public class NestedAggregatorFactory extends AggregatorFactory<NestedAggregatorF return new NestedAggregator(name, factories, objectMapper, context, parent, pipelineAggregators, metaData); } - private final static class Unmapped extends NonCollectingAggregator { + private static final class Unmapped extends NonCollectingAggregator { public Unmapped(String name, AggregationContext context, Aggregator parent, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) throws IOException { diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorFactory.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorFactory.java index b1a4ce799b..b8be647943 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorFactory.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregatorFactory.java @@ -79,7 +79,7 @@ public class ReverseNestedAggregatorFactory extends AggregatorFactory<ReverseNes return null; } - private final static class Unmapped extends NonCollectingAggregator { + private static final class Unmapped extends NonCollectingAggregator { public Unmapped(String name, AggregationContext context, Aggregator parent, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) throws IOException { diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregator.java index 9909d6eca0..1928a1c0c7 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregator.java @@ -117,7 +117,7 @@ public final class BinaryRangeAggregator extends BucketsAggregator { } } - static abstract class SortedSetRangeLeafCollector extends LeafBucketCollectorBase { + abstract static class SortedSetRangeLeafCollector extends LeafBucketCollectorBase { final long[] froms, tos, maxTos; final SortedSetDocValues values; @@ -223,7 +223,7 @@ public final class BinaryRangeAggregator extends BucketsAggregator { protected abstract void doCollect(LeafBucketCollector sub, int doc, long bucket) throws IOException; } - static abstract class SortedBinaryRangeLeafCollector extends LeafBucketCollectorBase { + abstract static class SortedBinaryRangeLeafCollector extends LeafBucketCollectorBase { final Range[] ranges; final BytesRef[] maxTos; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java index f3f1763113..568033d2fe 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java @@ -44,7 +44,7 @@ public final class InternalBinaryRange public static final Type TYPE = new Type("binary_range"); - private final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + private static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalBinaryRange readResult(StreamInput in) throws IOException { InternalBinaryRange range = new InternalBinaryRange(); @@ -53,7 +53,7 @@ public final class InternalBinaryRange } }; - private final static BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { + private static final BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { @Override public Bucket readResult(StreamInput in, BucketStreamContext context) throws IOException { Bucket bucket = new Bucket(context.format(), context.keyed()); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java index 0eebd6df15..a6c1dc91b5 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java @@ -46,9 +46,9 @@ public class InternalRange<B extends InternalRange.Bucket, R extends InternalRan static final Factory FACTORY = new Factory(); - public final static Type TYPE = new Type("range"); + public static final Type TYPE = new Type("range"); - private final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + private static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalRange readResult(StreamInput in) throws IOException { InternalRange ranges = new InternalRange(); @@ -57,7 +57,7 @@ public class InternalRange<B extends InternalRange.Bucket, R extends InternalRan } }; - private final static BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { + private static final BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { @Override public Bucket readResult(StreamInput in, BucketStreamContext context) throws IOException { Bucket buckets = new Bucket(context.keyed(), context.format()); @@ -81,8 +81,8 @@ public class InternalRange<B extends InternalRange.Bucket, R extends InternalRan public static class Bucket extends InternalMultiBucketAggregation.InternalBucket implements Range.Bucket { - protected transient final boolean keyed; - protected transient final DocValueFormat format; + protected final transient boolean keyed; + protected final transient DocValueFormat format; protected double from; protected double to; private long docCount; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/InternalDateRange.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/InternalDateRange.java index 80411c5904..550e49797d 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/InternalDateRange.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/InternalDateRange.java @@ -40,9 +40,9 @@ import java.util.Map; */ public class InternalDateRange extends InternalRange<InternalDateRange.Bucket, InternalDateRange> { - public final static Type TYPE = new Type("date_range", "drange"); + public static final Type TYPE = new Type("date_range", "drange"); - private final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + private static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalDateRange readResult(StreamInput in) throws IOException { InternalDateRange ranges = new InternalDateRange(); @@ -51,7 +51,7 @@ public class InternalDateRange extends InternalRange<InternalDateRange.Bucket, I } }; - private final static BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { + private static final BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { @Override public Bucket readResult(StreamInput in, BucketStreamContext context) throws IOException { Bucket buckets = new Bucket(context.keyed(), context.format()); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/InternalGeoDistance.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/InternalGeoDistance.java index 13ed3a44fb..54244ca65b 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/InternalGeoDistance.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/InternalGeoDistance.java @@ -50,7 +50,7 @@ public class InternalGeoDistance extends InternalRange<InternalGeoDistance.Bucke } }; - private final static BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { + private static final BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { @Override public Bucket readResult(StreamInput in, BucketStreamContext context) throws IOException { Bucket buckets = new Bucket(context.keyed()); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java index f33cdb5f84..c7bbeba38e 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java @@ -33,9 +33,9 @@ import java.util.Map; */ public class InternalSampler extends InternalSingleBucketAggregation implements Sampler { - public final static Type TYPE = new Type("sampler"); + public static final Type TYPE = new Type("sampler"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalSampler readResult(StreamInput in) throws IOException { InternalSampler result = new InternalSampler(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java index d42aa73188..d76f46b45b 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/InternalSignificantTerms.java @@ -53,12 +53,12 @@ public abstract class InternalSignificantTerms<A extends InternalSignificantTerm protected InternalSignificantTerms() {} // for serialization @SuppressWarnings("PMD.ConstructorCallsOverridableMethod") - public static abstract class Bucket extends SignificantTerms.Bucket { + public abstract static class Bucket extends SignificantTerms.Bucket { long bucketOrd; protected InternalAggregations aggregations; double score; - transient final DocValueFormat format; + final transient DocValueFormat format; protected Bucket(long subsetSize, long supersetSize, DocValueFormat format) { // for serialization diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java index f2172082ae..b8dca9cd38 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantLongTerms.java @@ -52,7 +52,7 @@ public class SignificantLongTerms extends InternalSignificantTerms<SignificantLo } }; - private final static BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { + private static final BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { @Override public Bucket readResult(StreamInput in, BucketStreamContext context) throws IOException { Bucket buckets = new Bucket((long) context.attributes().get("subsetSize"), (long) context.attributes().get("supersetSize"), diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java index b951c35170..616a6e163f 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantStringTerms.java @@ -53,7 +53,7 @@ public class SignificantStringTerms extends InternalSignificantTerms<Significant } }; - private final static BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { + private static final BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { @Override public Bucket readResult(StreamInput in, BucketStreamContext context) throws IOException { Bucket buckets = new Bucket((long) context.attributes().get("subsetSize"), diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java index ef0a4f2d46..80d2ed070b 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTerms.java @@ -29,7 +29,7 @@ import java.util.List; public interface SignificantTerms extends MultiBucketsAggregation, Iterable<SignificantTerms.Bucket> { - static abstract class Bucket extends InternalMultiBucketAggregation.InternalBucket { + abstract static class Bucket extends InternalMultiBucketAggregation.InternalBucket { long subsetDf; long subsetSize; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java index 9b2a26fa00..3036c57865 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/NXYSignificanceHeuristic.java @@ -149,7 +149,7 @@ public abstract class NXYSignificanceHeuristic extends SignificanceHeuristic { backgroundIsSuperset); } - public static abstract class NXYParser implements SignificanceHeuristicParser { + public abstract static class NXYParser implements SignificanceHeuristicParser { @Override public SignificanceHeuristic parse(XContentParser parser, ParseFieldMatcher parseFieldMatcher) diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java index 425f877caf..fa7ff8345c 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/DoubleTerms.java @@ -50,7 +50,7 @@ public class DoubleTerms extends InternalTerms<DoubleTerms, DoubleTerms.Bucket> } }; - private final static BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { + private static final BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { @Override public Bucket readResult(StreamInput in, BucketStreamContext context) throws IOException { Bucket buckets = new Bucket(context.format(), (boolean) context.attributes().get("showDocCountError")); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java index fcbd66dced..e134595c59 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java @@ -44,7 +44,7 @@ public abstract class InternalTerms<A extends InternalTerms, B extends InternalT protected static final String DOC_COUNT_ERROR_UPPER_BOUND_FIELD_NAME = "doc_count_error_upper_bound"; protected static final String SUM_OF_OTHER_DOC_COUNTS = "sum_other_doc_count"; - public static abstract class Bucket extends Terms.Bucket { + public abstract static class Bucket extends Terms.Bucket { long bucketOrd; @@ -52,7 +52,7 @@ public abstract class InternalTerms<A extends InternalTerms, B extends InternalT protected long docCountError; protected InternalAggregations aggregations; protected boolean showDocCountError; - transient final DocValueFormat format; + final transient DocValueFormat format; protected Bucket(DocValueFormat formatter, boolean showDocCountError) { // for serialization diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java index 91aec24529..a893fef385 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/LongTerms.java @@ -50,7 +50,7 @@ public class LongTerms extends InternalTerms<LongTerms, LongTerms.Bucket> { } }; - private final static BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { + private static final BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { @Override public Bucket readResult(StreamInput in, BucketStreamContext context) throws IOException { Bucket buckets = new Bucket(context.format(), (boolean) context.attributes().get("showDocCountError")); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java index ddaaebe899..9f646aefe1 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTerms.java @@ -52,7 +52,7 @@ public class StringTerms extends InternalTerms<StringTerms, StringTerms.Bucket> } }; - private final static BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { + private static final BucketStreams.Stream<Bucket> BUCKET_STREAM = new BucketStreams.Stream<Bucket>() { @Override public Bucket readResult(StreamInput in, BucketStreamContext context) throws IOException { Bucket buckets = new Bucket( diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java index 16fb7f1d81..aa70309da9 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/Terms.java @@ -62,7 +62,7 @@ public interface Terms extends MultiBucketsAggregation { /** * A bucket that is associated with a single term */ - static abstract class Bucket extends InternalMultiBucketAggregation.InternalBucket { + abstract static class Bucket extends InternalMultiBucketAggregation.InternalBucket { public abstract Number getKeyAsNumber(); @@ -97,7 +97,7 @@ public interface Terms extends MultiBucketsAggregation { /** * Determines the order by which the term buckets will be sorted */ - static abstract class Order implements ToXContent { + abstract static class Order implements ToXContent { /** * @return a bucket ordering strategy that sorts buckets by their document counts (ascending or descending) 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 209700b86d..f9ef22f236 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 @@ -135,7 +135,7 @@ public class IncludeExclude implements Writeable, ToXContent { } } - public static abstract class OrdinalsFilter { + public abstract static class OrdinalsFilter { public abstract LongBitSet acceptedGlobalOrdinals(RandomAccessOrds globalOrdinals, ValuesSource.Bytes.WithOrdinals valueSource) throws IOException; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java index 15c9d7ed59..ffa41a9ed8 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/InternalNumericMetricsAggregation.java @@ -35,7 +35,7 @@ public abstract class InternalNumericMetricsAggregation extends InternalMetricsA protected DocValueFormat format = DEFAULT_FORMAT; - public static abstract class SingleValue extends InternalNumericMetricsAggregation implements NumericMetricsAggregation.SingleValue { + public abstract static class SingleValue extends InternalNumericMetricsAggregation implements NumericMetricsAggregation.SingleValue { protected SingleValue() {} @@ -68,7 +68,7 @@ public abstract class InternalNumericMetricsAggregation extends InternalMetricsA } - public static abstract class MultiValue extends InternalNumericMetricsAggregation implements NumericMetricsAggregation.MultiValue { + public abstract static class MultiValue extends InternalNumericMetricsAggregation implements NumericMetricsAggregation.MultiValue { protected MultiValue() {} diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java index e7306e9667..3ffd7f7975 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java @@ -36,7 +36,7 @@ public abstract class NumericMetricsAggregator extends MetricsAggregator { super(name, context, parent, pipelineAggregators, metaData); } - public static abstract class SingleValue extends NumericMetricsAggregator { + public abstract static class SingleValue extends NumericMetricsAggregator { protected SingleValue(String name, AggregationContext context, Aggregator parent, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) throws IOException { @@ -46,7 +46,7 @@ public abstract class NumericMetricsAggregator extends MetricsAggregator { public abstract double metric(long owningBucketOrd); } - public static abstract class MultiValue extends NumericMetricsAggregator { + public abstract static class MultiValue extends NumericMetricsAggregator { protected MultiValue(String name, AggregationContext context, Aggregator parent, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) throws IOException { diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregationBuilder.java index 830ce35fde..287b437f13 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregationBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/AvgAggregationBuilder.java @@ -38,7 +38,7 @@ import java.io.IOException; public class AvgAggregationBuilder extends ValuesSourceAggregationBuilder.LeafOnly<ValuesSource.Numeric, AvgAggregationBuilder> { public static final String NAME = "avg"; - private final static Type TYPE = new Type(NAME); + private static final Type TYPE = new Type(NAME); public static final ParseField AGGREGATION_NAME_FIELD = new ParseField(NAME); public AvgAggregationBuilder(String name) { diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java index 0793bacf72..99922cc6ae 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/CardinalityAggregator.java @@ -156,7 +156,7 @@ public class CardinalityAggregator extends NumericMetricsAggregator.SingleValue Releasables.close(counts, collector); } - private static abstract class Collector extends LeafBucketCollector implements Releasable { + private abstract static class Collector extends LeafBucketCollector implements Releasable { public abstract void postCollect(); @@ -293,7 +293,7 @@ public class CardinalityAggregator extends NumericMetricsAggregator.SingleValue /** * Representation of a list of hash values. There might be dups and there is no guarantee on the order. */ - static abstract class MurmurHash3Values { + abstract static class MurmurHash3Values { public abstract void setDocument(int docId); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java index 2d320eda81..02fe800adf 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/InternalCardinality.java @@ -35,9 +35,9 @@ import java.util.Map; public final class InternalCardinality extends InternalNumericMetricsAggregation.SingleValue implements Cardinality { - public final static Type TYPE = new Type("cardinality"); + public static final Type TYPE = new Type("cardinality"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalCardinality readResult(StreamInput in) throws IOException { InternalCardinality result = new InternalCardinality(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java index c3bd5deb5b..0b41d5d493 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geobounds/InternalGeoBounds.java @@ -34,8 +34,8 @@ import java.util.Map; public class InternalGeoBounds extends InternalMetricsAggregation implements GeoBounds { - public final static Type TYPE = new Type("geo_bounds"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final Type TYPE = new Type("geo_bounds"); + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalGeoBounds readResult(StreamInput in) throws IOException { InternalGeoBounds result = new InternalGeoBounds(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java index 2bb3056ca6..6b15aab814 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/InternalGeoCentroid.java @@ -38,8 +38,8 @@ import java.util.Map; */ public class InternalGeoCentroid extends InternalMetricsAggregation implements GeoCentroid { - public final static Type TYPE = new Type("geo_centroid"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final Type TYPE = new Type("geo_centroid"); + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalGeoCentroid readResult(StreamInput in) throws IOException { InternalGeoCentroid result = new InternalGeoCentroid(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregationBuilder.java index 7158a065ac..cb45e73db4 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregationBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/MaxAggregationBuilder.java @@ -38,7 +38,7 @@ import java.io.IOException; public class MaxAggregationBuilder extends ValuesSourceAggregationBuilder.LeafOnly<ValuesSource.Numeric, MaxAggregationBuilder> { public static final String NAME = "max"; - public final static Type TYPE = new Type(NAME); + public static final Type TYPE = new Type(NAME); public static final ParseField AGGREGATION_NAME_FIELD = new ParseField(NAME); public MaxAggregationBuilder(String name) { diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregationBuilder.java index b8a6f7ed90..10edbe9d3e 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregationBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/MinAggregationBuilder.java @@ -38,7 +38,7 @@ import java.io.IOException; public class MinAggregationBuilder extends ValuesSourceAggregationBuilder.LeafOnly<ValuesSource.Numeric, MinAggregationBuilder> { public static final String NAME = "min"; - private final static Type TYPE = new Type(NAME); + private static final Type TYPE = new Type(NAME); public static final ParseField AGGREGATION_NAME_FIELD = new ParseField(NAME); public MinAggregationBuilder(String name) { diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesParser.java index ffdc4d9a63..806fb26cd3 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesParser.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesParser.java @@ -33,7 +33,7 @@ public class PercentilesParser extends AbstractPercentilesParser { super(true); } - public final static double[] DEFAULT_PERCENTS = new double[] { 1, 5, 25, 50, 75, 95, 99 }; + public static final double[] DEFAULT_PERCENTS = new double[] { 1, 5, 25, 50, 75, 95, 99 }; @Override protected ParseField keysField() { diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java index 6e072c0838..0bd6b0322a 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentileRanks.java @@ -37,9 +37,9 @@ import java.util.Map; */ public class InternalHDRPercentileRanks extends AbstractInternalHDRPercentiles implements PercentileRanks { - public final static Type TYPE = new Type(PercentileRanks.TYPE_NAME, "hdr_percentile_ranks"); + public static final Type TYPE = new Type(PercentileRanks.TYPE_NAME, "hdr_percentile_ranks"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalHDRPercentileRanks readResult(StreamInput in) throws IOException { InternalHDRPercentileRanks result = new InternalHDRPercentileRanks(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java index b8ecade437..62fe2cdc95 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/InternalHDRPercentiles.java @@ -37,9 +37,9 @@ import java.util.Map; */ public class InternalHDRPercentiles extends AbstractInternalHDRPercentiles implements Percentiles { - public final static Type TYPE = new Type(Percentiles.TYPE_NAME, "hdr_percentiles"); + public static final Type TYPE = new Type(Percentiles.TYPE_NAME, "hdr_percentiles"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalHDRPercentiles readResult(StreamInput in) throws IOException { InternalHDRPercentiles result = new InternalHDRPercentiles(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java index a293d773c8..f6622e0ab2 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentileRanks.java @@ -36,9 +36,9 @@ import java.util.Map; */ public class InternalTDigestPercentileRanks extends AbstractInternalTDigestPercentiles implements PercentileRanks { - public final static Type TYPE = new Type(PercentileRanks.TYPE_NAME, "t_digest_percentile_ranks"); + public static final Type TYPE = new Type(PercentileRanks.TYPE_NAME, "t_digest_percentile_ranks"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalTDigestPercentileRanks readResult(StreamInput in) throws IOException { InternalTDigestPercentileRanks result = new InternalTDigestPercentileRanks(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java index 999c85df0c..ce299d4d90 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentiles.java @@ -36,9 +36,9 @@ import java.util.Map; */ public class InternalTDigestPercentiles extends AbstractInternalTDigestPercentiles implements Percentiles { - public final static Type TYPE = new Type(Percentiles.TYPE_NAME, "t_digest_percentiles"); + public static final Type TYPE = new Type(Percentiles.TYPE_NAME, "t_digest_percentiles"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalTDigestPercentiles readResult(StreamInput in) throws IOException { InternalTDigestPercentiles result = new InternalTDigestPercentiles(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java index 2c09d58afd..3bcbc0cf84 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java @@ -40,9 +40,9 @@ import java.util.Map; public class InternalScriptedMetric extends InternalMetricsAggregation implements ScriptedMetric { - public final static Type TYPE = new Type("scripted_metric"); + public static final Type TYPE = new Type("scripted_metric"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalScriptedMetric readResult(StreamInput in) throws IOException { InternalScriptedMetric result = new InternalScriptedMetric(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregationBuilder.java index cac1d92101..e1ecc8d4f7 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregationBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/StatsAggregationBuilder.java @@ -38,7 +38,7 @@ import java.io.IOException; public class StatsAggregationBuilder extends ValuesSourceAggregationBuilder.LeafOnly<ValuesSource.Numeric, StatsAggregationBuilder> { public static final String NAME = "stats"; - private final static Type TYPE = new Type(NAME); + private static final Type TYPE = new Type(NAME); public static final ParseField AGGREGATION_NAME_FIELD = new ParseField(NAME); public StatsAggregationBuilder(String name) { diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregationBuilder.java index a28508c217..ca90fe17f5 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregationBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStatsAggregationBuilder.java @@ -40,7 +40,7 @@ import java.util.Objects; public class ExtendedStatsAggregationBuilder extends ValuesSourceAggregationBuilder.LeafOnly<ValuesSource.Numeric, ExtendedStatsAggregationBuilder> { public static final String NAME = "extended_stats"; - public final static Type TYPE = new Type(NAME); + public static final Type TYPE = new Type(NAME); public static final ParseField AGGREGATION_NAME_FIELD = new ParseField(NAME); private double sigma = 2.0; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregationBuilder.java index 8eafb22b6d..04422ed813 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregationBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/SumAggregationBuilder.java @@ -38,7 +38,7 @@ import java.io.IOException; public class SumAggregationBuilder extends ValuesSourceAggregationBuilder.LeafOnly<ValuesSource.Numeric, SumAggregationBuilder> { public static final String NAME = "sum"; - private final static Type TYPE = new Type(NAME); + private static final Type TYPE = new Type(NAME); public static final ParseField AGGREGATION_NAME_FIELD = new ParseField(NAME); public SumAggregationBuilder(String name) { diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java index 13cfd9487c..24f2b88b95 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/InternalSimpleValue.java @@ -34,9 +34,9 @@ import java.util.Map; public class InternalSimpleValue extends InternalNumericMetricsAggregation.SingleValue implements SimpleValue { - public final static Type TYPE = new Type("simple_value"); + public static final Type TYPE = new Type("simple_value"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalSimpleValue readResult(StreamInput in) throws IOException { InternalSimpleValue result = new InternalSimpleValue(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java index dab7235e9d..683620b672 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValue.java @@ -34,9 +34,9 @@ import java.util.Map; public class InternalBucketMetricValue extends InternalNumericMetricsAggregation.SingleValue { - public final static Type TYPE = new Type("bucket_metric_value"); + public static final Type TYPE = new Type("bucket_metric_value"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalBucketMetricValue readResult(StreamInput in) throws IOException { InternalBucketMetricValue result = new InternalBucketMetricValue(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java index 74ae732505..56d4ed4170 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/avg/AvgBucketPipelineAggregator.java @@ -35,9 +35,9 @@ import java.util.Map; public class AvgBucketPipelineAggregator extends BucketMetricsPipelineAggregator { - public final static Type TYPE = new Type("avg_bucket"); + public static final Type TYPE = new Type("avg_bucket"); - public final static PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { + public static final PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { @Override public AvgBucketPipelineAggregator readResult(StreamInput in) throws IOException { AvgBucketPipelineAggregator result = new AvgBucketPipelineAggregator(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java index fa10de557a..ac3cd06958 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/max/MaxBucketPipelineAggregator.java @@ -37,9 +37,9 @@ import java.util.Map; public class MaxBucketPipelineAggregator extends BucketMetricsPipelineAggregator { - public final static Type TYPE = new Type("max_bucket"); + public static final Type TYPE = new Type("max_bucket"); - public final static PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { + public static final PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { @Override public MaxBucketPipelineAggregator readResult(StreamInput in) throws IOException { MaxBucketPipelineAggregator result = new MaxBucketPipelineAggregator(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java index 37e4a89f7c..e4b86ee9f8 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/min/MinBucketPipelineAggregator.java @@ -37,9 +37,9 @@ import java.util.Map; public class MinBucketPipelineAggregator extends BucketMetricsPipelineAggregator { - public final static Type TYPE = new Type("min_bucket"); + public static final Type TYPE = new Type("min_bucket"); - public final static PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { + public static final PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { @Override public MinBucketPipelineAggregator readResult(StreamInput in) throws IOException { MinBucketPipelineAggregator result = new MinBucketPipelineAggregator(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucket.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucket.java index 65d04ee12a..badbb9411a 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucket.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/InternalPercentilesBucket.java @@ -39,9 +39,9 @@ import java.util.Map; public class InternalPercentilesBucket extends InternalNumericMetricsAggregation.MultiValue implements PercentilesBucket { - public final static Type TYPE = new Type("percentiles_bucket"); + public static final Type TYPE = new Type("percentiles_bucket"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalPercentilesBucket readResult(StreamInput in) throws IOException { InternalPercentilesBucket result = new InternalPercentilesBucket(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregator.java index d21fa53b73..12769680e9 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketPipelineAggregator.java @@ -38,10 +38,10 @@ import java.util.Map; public class PercentilesBucketPipelineAggregator extends BucketMetricsPipelineAggregator { - public final static Type TYPE = new Type("percentiles_bucket"); + public static final Type TYPE = new Type("percentiles_bucket"); public final ParseField PERCENTS_FIELD = new ParseField("percents"); - public final static PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { + public static final PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { @Override public PercentilesBucketPipelineAggregator readResult(StreamInput in) throws IOException { PercentilesBucketPipelineAggregator result = new PercentilesBucketPipelineAggregator(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java index edd912ee8f..89d0ca9ccf 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/sum/SumBucketPipelineAggregator.java @@ -35,9 +35,9 @@ import java.util.Map; public class SumBucketPipelineAggregator extends BucketMetricsPipelineAggregator { - public final static Type TYPE = new Type("sum_bucket"); + public static final Type TYPE = new Type("sum_bucket"); - public final static PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { + public static final PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { @Override public SumBucketPipelineAggregator readResult(StreamInput in) throws IOException { SumBucketPipelineAggregator result = new SumBucketPipelineAggregator(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java index 719f2c2ffe..35893c7d09 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketscript/BucketScriptPipelineAggregator.java @@ -51,9 +51,9 @@ import static org.elasticsearch.search.aggregations.pipeline.BucketHelpers.resol public class BucketScriptPipelineAggregator extends PipelineAggregator { - public final static Type TYPE = new Type("bucket_script"); + public static final Type TYPE = new Type("bucket_script"); - public final static PipelineAggregatorStreams.Stream STREAM = in -> { + public static final PipelineAggregatorStreams.Stream STREAM = in -> { BucketScriptPipelineAggregator result = new BucketScriptPipelineAggregator(); result.readFrom(in); return result; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java index 28fded6f55..7fff7f04db 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketselector/BucketSelectorPipelineAggregator.java @@ -46,9 +46,9 @@ import static org.elasticsearch.search.aggregations.pipeline.BucketHelpers.resol public class BucketSelectorPipelineAggregator extends PipelineAggregator { - public final static Type TYPE = new Type("bucket_selector"); + public static final Type TYPE = new Type("bucket_selector"); - public final static PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { + public static final PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { @Override public BucketSelectorPipelineAggregator readResult(StreamInput in) throws IOException { BucketSelectorPipelineAggregator result = new BucketSelectorPipelineAggregator(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregator.java index 5f003481f1..9ba381f2a5 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/cumulativesum/CumulativeSumPipelineAggregator.java @@ -43,9 +43,9 @@ import static org.elasticsearch.search.aggregations.pipeline.BucketHelpers.resol public class CumulativeSumPipelineAggregator extends PipelineAggregator { - public final static Type TYPE = new Type("cumulative_sum"); + public static final Type TYPE = new Type("cumulative_sum"); - public final static PipelineAggregatorStreams.Stream STREAM = in -> { + public static final PipelineAggregatorStreams.Stream STREAM = in -> { CumulativeSumPipelineAggregator result = new CumulativeSumPipelineAggregator(); result.readFrom(in); return result; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java index 964c82a4d9..b40666128c 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/DerivativePipelineAggregator.java @@ -44,9 +44,9 @@ import static org.elasticsearch.search.aggregations.pipeline.BucketHelpers.resol public class DerivativePipelineAggregator extends PipelineAggregator { - public final static Type TYPE = new Type("derivative"); + public static final Type TYPE = new Type("derivative"); - public final static PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { + public static final PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { @Override public DerivativePipelineAggregator readResult(StreamInput in) throws IOException { DerivativePipelineAggregator result = new DerivativePipelineAggregator(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java index 24579d65a3..dea181ff25 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/InternalDerivative.java @@ -33,9 +33,9 @@ import java.util.Map; public class InternalDerivative extends InternalSimpleValue implements Derivative { - public final static Type TYPE = new Type("derivative"); + public static final Type TYPE = new Type("derivative"); - public final static AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { + public static final AggregationStreams.Stream STREAM = new AggregationStreams.Stream() { @Override public InternalDerivative readResult(StreamInput in) throws IOException { InternalDerivative result = new InternalDerivative(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java index 586424de53..880b4e4e6a 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java @@ -48,9 +48,9 @@ import static org.elasticsearch.search.aggregations.pipeline.BucketHelpers.resol public class MovAvgPipelineAggregator extends PipelineAggregator { - public final static Type TYPE = new Type("moving_avg"); + public static final Type TYPE = new Type("moving_avg"); - public final static PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { + public static final PipelineAggregatorStreams.Stream STREAM = new PipelineAggregatorStreams.Stream() { @Override public MovAvgPipelineAggregator readResult(StreamInput in) throws IOException { MovAvgPipelineAggregator result = new MovAvgPipelineAggregator(); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregator.java index 2ebf740bb6..e18a06e2b2 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffPipelineAggregator.java @@ -45,9 +45,9 @@ import static org.elasticsearch.search.aggregations.pipeline.BucketHelpers.resol public class SerialDiffPipelineAggregator extends PipelineAggregator { - public final static Type TYPE = new Type("serial_diff"); + public static final Type TYPE = new Type("serial_diff"); - public final static PipelineAggregatorStreams.Stream STREAM = in -> { + public static final PipelineAggregatorStreams.Stream STREAM = in -> { SerialDiffPipelineAggregator result = new SerialDiffPipelineAggregator(); result.readFrom(in); return result; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java index 84fd26a74f..746e0e5e16 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java @@ -63,7 +63,7 @@ import java.util.List; */ public class AggregationPath { - private final static String AGG_DELIM = ">"; + private static final String AGG_DELIM = ">"; public static AggregationPath parse(String path) { String[] elements = Strings.tokenizeToStringArray(path, AGG_DELIM); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java index 70262096cb..36999e6127 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java @@ -67,7 +67,7 @@ public abstract class ValuesSource { return false; } - public static abstract class Bytes extends ValuesSource { + public abstract static class Bytes extends ValuesSource { public static final WithOrdinals EMPTY = new WithOrdinals() { @@ -98,7 +98,7 @@ public abstract class ValuesSource { } } - public static abstract class WithOrdinals extends Bytes { + public abstract static class WithOrdinals extends Bytes { @Override public Bits docsWithValue(LeafReaderContext context) { @@ -224,7 +224,7 @@ public abstract class ValuesSource { } - public static abstract class Numeric extends ValuesSource { + public abstract static class Numeric extends ValuesSource { public static final Numeric EMPTY = new Numeric() { @@ -487,7 +487,7 @@ public abstract class ValuesSource { } } - public static abstract class GeoPoint extends ValuesSource { + public abstract static class GeoPoint extends ValuesSource { public static final GeoPoint EMPTY = new GeoPoint() { diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java index a55b9035c0..8f14a1ffaf 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceAggregationBuilder.java @@ -49,7 +49,7 @@ import java.util.Objects; public abstract class ValuesSourceAggregationBuilder<VS extends ValuesSource, AB extends ValuesSourceAggregationBuilder<VS, AB>> extends AbstractAggregationBuilder<AB> { - public static abstract class LeafOnly<VS extends ValuesSource, AB extends ValuesSourceAggregationBuilder<VS, AB>> + public abstract static class LeafOnly<VS extends ValuesSource, AB extends ValuesSourceAggregationBuilder<VS, AB>> extends ValuesSourceAggregationBuilder<VS, AB> { protected LeafOnly(String name, Type type, ValuesSourceType valuesSourceType, ValueType targetValueType) { diff --git a/core/src/main/java/org/elasticsearch/search/fetch/FetchSubPhaseParseElement.java b/core/src/main/java/org/elasticsearch/search/fetch/FetchSubPhaseParseElement.java index f43ed68d76..752aeecf04 100644 --- a/core/src/main/java/org/elasticsearch/search/fetch/FetchSubPhaseParseElement.java +++ b/core/src/main/java/org/elasticsearch/search/fetch/FetchSubPhaseParseElement.java @@ -29,7 +29,7 @@ import org.elasticsearch.search.internal.SearchContext; public abstract class FetchSubPhaseParseElement<SubPhaseContext extends FetchSubPhaseContext> implements SearchParseElement { @Override - final public void parse(XContentParser parser, SearchContext context) throws Exception { + public final void parse(XContentParser parser, SearchContext context) throws Exception { SubPhaseContext fetchSubPhaseContext = context.getFetchSubPhaseContext(getContextFactory()); // this is to make sure that the SubFetchPhase knows it should execute fetchSubPhaseContext.setHitExecutionNeeded(true); diff --git a/core/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsContext.java b/core/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsContext.java index f34da5301d..577d2d6494 100644 --- a/core/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsContext.java +++ b/core/src/main/java/org/elasticsearch/search/fetch/innerhits/InnerHitsContext.java @@ -86,7 +86,7 @@ public final class InnerHitsContext { innerHits.put(innerHit.getName(), innerHit); } - public static abstract class BaseInnerHits extends SubSearchContext { + public abstract static class BaseInnerHits extends SubSearchContext { private final String name; private InnerHitsContext childInnerHits; 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 046bea64c9..92bdf6e8aa 100644 --- a/core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/highlight/HighlightBuilder.java @@ -91,7 +91,7 @@ public class HighlightBuilder extends AbstractHighlighterBuilder<HighlightBuilde /** * a {@link FieldOptions} with default settings */ - final static FieldOptions defaultOptions = new SearchContextHighlight.FieldOptions.Builder() + static final FieldOptions defaultOptions = new SearchContextHighlight.FieldOptions.Builder() .preTags(DEFAULT_PRE_TAGS).postTags(DEFAULT_POST_TAGS).scoreOrdered(DEFAULT_SCORE_ORDERED) .highlightFilter(DEFAULT_HIGHLIGHT_FILTER).requireFieldMatch(DEFAULT_REQUIRE_FIELD_MATCH) .forceSource(DEFAULT_FORCE_SOURCE).fragmentCharSize(DEFAULT_FRAGMENT_CHAR_SIZE) diff --git a/core/src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java b/core/src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java index e52bfba234..191537b4de 100644 --- a/core/src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java +++ b/core/src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java @@ -762,7 +762,7 @@ public class InternalSearchHit implements SearchHit { } } - public final static class InternalNestedIdentity implements NestedIdentity, Streamable, ToXContent { + public static final class InternalNestedIdentity implements NestedIdentity, Streamable, ToXContent { private Text field; private int offset; diff --git a/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java b/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java index 7b29cabdf1..b711748b7a 100644 --- a/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java +++ b/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java @@ -70,7 +70,7 @@ import java.util.concurrent.atomic.AtomicBoolean; public abstract class SearchContext implements Releasable { private static ThreadLocal<SearchContext> current = new ThreadLocal<>(); - public final static int DEFAULT_TERMINATE_AFTER = 0; + public static final int DEFAULT_TERMINATE_AFTER = 0; public static void setCurrent(SearchContext value) { current.set(value); diff --git a/core/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java b/core/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java index 363b6ad076..9276e86edd 100644 --- a/core/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java +++ b/core/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java @@ -43,7 +43,7 @@ public class SubSearchContext extends FilteredSearchContext { // By default return 3 hits per bucket. A higher default would make the response really large by default, since // the to hits are returned per bucket. - private final static int DEFAULT_SIZE = 3; + private static final int DEFAULT_SIZE = 3; private int from; private int size = DEFAULT_SIZE; diff --git a/core/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java b/core/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java index 4fc814a044..772f91a525 100644 --- a/core/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java +++ b/core/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java @@ -143,7 +143,7 @@ public class QuerySearchResult extends QuerySearchResultProvider { * Returns the profiled results for this search, or potentially null if result was empty * @return The profiled results, or null */ - public @Nullable ProfileShardResult profileResults() { + @Nullable public ProfileShardResult profileResults() { return profileShardResults; } diff --git a/core/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java b/core/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java index 29d62f3c7d..2a57e41cfa 100644 --- a/core/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java +++ b/core/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java @@ -120,7 +120,7 @@ public final class QueryRescorer implements Rescorer { } } - private final static Comparator<ScoreDoc> SCORE_DOC_COMPARATOR = new Comparator<ScoreDoc>() { + private static final Comparator<ScoreDoc> SCORE_DOC_COMPARATOR = new Comparator<ScoreDoc>() { @Override public int compare(ScoreDoc o1, ScoreDoc o2) { int cmp = Float.compare(o2.score, o1.score); diff --git a/core/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java b/core/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java index 97c79aefa7..b6b3a4613d 100644 --- a/core/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java @@ -55,7 +55,7 @@ public class SliceBuilder extends ToXContentToBytes implements Writeable { public static final ParseField FIELD_FIELD = new ParseField("field"); public static final ParseField ID_FIELD = new ParseField("id"); public static final ParseField MAX_FIELD = new ParseField("max"); - private final static ObjectParser<SliceBuilder, QueryParseContext> PARSER = + private static final ObjectParser<SliceBuilder, QueryParseContext> PARSER = new ObjectParser<>("slice", SliceBuilder::new); static { diff --git a/core/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java b/core/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java index 5cf599beda..5b4dcafe38 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java @@ -99,7 +99,7 @@ public final class SuggestUtils { return result.get(); } - public static abstract class TokenConsumer { + public abstract static class TokenConsumer { protected CharTermAttribute charTermAttr; protected PositionIncrementAttribute posIncAttr; protected OffsetAttribute offsetAttr; diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java index 16a2804b37..759ab8d206 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggester.java @@ -201,12 +201,12 @@ public class CompletionSuggester extends Suggester<CompletionSuggestionContext> // TODO: this should be refactored and moved to lucene // see https://issues.apache.org/jira/browse/LUCENE-6880 - private final static class TopDocumentsCollector extends TopSuggestDocsCollector { + private static final class TopDocumentsCollector extends TopSuggestDocsCollector { /** * Holds a list of suggest meta data for a doc */ - private final static class SuggestDoc extends TopSuggestDocs.SuggestScoreDoc { + private static final class SuggestDoc extends TopSuggestDocs.SuggestScoreDoc { private List<TopSuggestDocs.SuggestScoreDoc> suggestScoreDocs; @@ -252,7 +252,7 @@ public class CompletionSuggester extends Suggester<CompletionSuggestionContext> } } - private final static class SuggestDocPriorityQueue extends PriorityQueue<SuggestDoc> { + private static final class SuggestDocPriorityQueue extends PriorityQueue<SuggestDoc> { public SuggestDocPriorityQueue(int maxSize) { super(maxSize); diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java index ed3ebead7f..2d10a5b703 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java @@ -128,7 +128,7 @@ public final class CompletionSuggestion extends Suggest.Suggestion<CompletionSug return new Entry(); } - public final static class Entry extends Suggest.Suggestion.Entry<CompletionSuggestion.Entry.Option> { + public static final class Entry extends Suggest.Suggestion.Entry<CompletionSuggestion.Entry.Option> { public Entry(Text text, int offset, int length) { super(text, offset, length); diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion2x/Completion090PostingsFormat.java b/core/src/main/java/org/elasticsearch/search/suggest/completion2x/Completion090PostingsFormat.java index 8e9e51597d..b3b73306f9 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion2x/Completion090PostingsFormat.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion2x/Completion090PostingsFormat.java @@ -74,9 +74,9 @@ public class Completion090PostingsFormat extends PostingsFormat { public static final int SUGGEST_VERSION_CURRENT = SUGGEST_CODEC_VERSION; public static final String EXTENSION = "cmp"; - private final static ESLogger logger = Loggers.getLogger(Completion090PostingsFormat.class); + private static final ESLogger logger = Loggers.getLogger(Completion090PostingsFormat.class); private PostingsFormat delegatePostingsFormat; - private final static Map<String, CompletionLookupProvider> providers; + private static final Map<String, CompletionLookupProvider> providers; private CompletionLookupProvider writeProvider; @@ -267,7 +267,7 @@ public class Completion090PostingsFormat extends PostingsFormat { } } - public static abstract class CompletionLookupProvider implements PayloadProcessor, CompletionTokenStream.ToFiniteStrings { + public abstract static class CompletionLookupProvider implements PayloadProcessor, CompletionTokenStream.ToFiniteStrings { public static final char UNIT_SEPARATOR = '\u001f'; @@ -344,7 +344,7 @@ public class Completion090PostingsFormat extends PostingsFormat { return completionStats; } - public static abstract class LookupFactory implements Accountable { + public abstract static class LookupFactory implements Accountable { public abstract Lookup getLookup(CompletionFieldMapper2x.CompletionFieldType fieldType, CompletionSuggestionContext suggestionContext); public abstract CompletionStats stats(String ... fields); diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion2x/context/ContextMapping.java b/core/src/main/java/org/elasticsearch/search/suggest/completion2x/context/ContextMapping.java index dd23bdecb0..b92d2e1b61 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion2x/context/ContextMapping.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion2x/context/ContextMapping.java @@ -204,7 +204,7 @@ public abstract class ContextMapping implements ToXContent { * form a {@link ContextConfig} which is used to build the underlying {@link FST}. This class hold * a simple method wrapping a {@link TokenStream} by provided document informations. */ - public static abstract class ContextConfig { + public abstract static class ContextConfig { /** * Wrap a {@link TokenStream} for building suggestions to use context informations @@ -225,7 +225,7 @@ public abstract class ContextMapping implements ToXContent { * {@link ContextMapping} such a query is used to wrap the {@link TokenStream} of the actual * suggestion request into a {@link TokenStream} with the context settings */ - public static abstract class ContextQuery implements ToXContent { + public abstract static class ContextQuery implements ToXContent { protected final String name; |