diff options
Diffstat (limited to 'core/src/main/java/org/elasticsearch')
209 files changed, 425 insertions, 422 deletions
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/NodeExplanation.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/NodeExplanation.java index 8f467402bc..e564711d41 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/NodeExplanation.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/NodeExplanation.java @@ -43,7 +43,7 @@ public class NodeExplanation implements Writeable, ToXContent { private final String finalExplanation; public NodeExplanation(final DiscoveryNode node, final Decision nodeDecision, final Float nodeWeight, - final @Nullable IndicesShardStoresResponse.StoreStatus storeStatus, + @Nullable final IndicesShardStoresResponse.StoreStatus storeStatus, final ClusterAllocationExplanation.FinalDecision finalDecision, final String finalExplanation, final ClusterAllocationExplanation.StoreCopy storeCopy) { diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java index e886af25fb..864c6703c4 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java @@ -130,7 +130,7 @@ public class TransportGetFieldMappingsIndexAction extends TransportSingleShardAc private static final ToXContent.Params includeDefaultsParams = new ToXContent.Params() { - final static String INCLUDE_DEFAULTS = "include_defaults"; + static final String INCLUDE_DEFAULTS = "include_defaults"; @Override public String param(String key) { diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java index ee0641bbe1..9208193c98 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxAgeCondition.java @@ -30,7 +30,7 @@ import java.io.IOException; * when the index is at least {@link #value} old */ public class MaxAgeCondition extends Condition<TimeValue> { - public final static String NAME = "max_age"; + public static final String NAME = "max_age"; public MaxAgeCondition(TimeValue value) { super(NAME); diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java index 8b32792912..7c1f802389 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/MaxDocsCondition.java @@ -29,7 +29,7 @@ import java.io.IOException; * when the index has at least {@link #value} docs */ public class MaxDocsCondition extends Condition<Long> { - public final static String NAME = "max_docs"; + public static final String NAME = "max_docs"; public MaxDocsCondition(Long value) { super(NAME); diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java b/core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java index 3be3de00f6..a9af50b249 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java @@ -31,8 +31,8 @@ import java.util.EnumSet; */ public class CommonStatsFlags implements Streamable, Cloneable { - public final static CommonStatsFlags ALL = new CommonStatsFlags().all(); - public final static CommonStatsFlags NONE = new CommonStatsFlags().clear(); + public static final CommonStatsFlags ALL = new CommonStatsFlags().all(); + public static final CommonStatsFlags NONE = new CommonStatsFlags().clear(); private EnumSet<Flag> flags = EnumSet.allOf(Flag.class); private String[] types = null; diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java b/core/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java index cd93735b64..e214f87ddb 100644 --- a/core/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java +++ b/core/src/main/java/org/elasticsearch/action/bulk/BulkResponse.java @@ -35,7 +35,7 @@ import java.util.Iterator; */ public class BulkResponse extends ActionResponse implements Iterable<BulkItemResponse> { - public final static long NO_INGEST_TOOK = -1L; + public static final long NO_INGEST_TOOK = -1L; private BulkItemResponse[] responses; private long tookInMillis; diff --git a/core/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java b/core/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java index 4ad1136e66..a9ec11eec4 100644 --- a/core/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java +++ b/core/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java @@ -71,8 +71,8 @@ import static org.elasticsearch.action.support.replication.ReplicationOperation. */ public class TransportShardBulkAction extends TransportWriteAction<BulkShardRequest, BulkShardResponse> { - private final static String OP_TYPE_UPDATE = "update"; - private final static String OP_TYPE_DELETE = "delete"; + private static final String OP_TYPE_UPDATE = "update"; + private static final String OP_TYPE_DELETE = "delete"; public static final String ACTION_NAME = BulkAction.NAME + "[s]"; diff --git a/core/src/main/java/org/elasticsearch/action/fieldstats/FieldStats.java b/core/src/main/java/org/elasticsearch/action/fieldstats/FieldStats.java index a6978ad2a3..2c6f2539b9 100644 --- a/core/src/main/java/org/elasticsearch/action/fieldstats/FieldStats.java +++ b/core/src/main/java/org/elasticsearch/action/fieldstats/FieldStats.java @@ -615,17 +615,17 @@ public abstract class FieldStats<T> implements Writeable, ToXContent { } } - private final static class Fields { - final static String MAX_DOC = new String("max_doc"); - final static String DOC_COUNT = new String("doc_count"); - final static String DENSITY = new String("density"); - final static String SUM_DOC_FREQ = new String("sum_doc_freq"); - final static String SUM_TOTAL_TERM_FREQ = new String("sum_total_term_freq"); - final static String SEARCHABLE = new String("searchable"); - final static String AGGREGATABLE = new String("aggregatable"); - final static String MIN_VALUE = new String("min_value"); - final static String MIN_VALUE_AS_STRING = new String("min_value_as_string"); - final static String MAX_VALUE = new String("max_value"); - final static String MAX_VALUE_AS_STRING = new String("max_value_as_string"); + private static final class Fields { + static final String MAX_DOC = new String("max_doc"); + static final String DOC_COUNT = new String("doc_count"); + static final String DENSITY = new String("density"); + static final String SUM_DOC_FREQ = new String("sum_doc_freq"); + static final String SUM_TOTAL_TERM_FREQ = new String("sum_total_term_freq"); + static final String SEARCHABLE = new String("searchable"); + static final String AGGREGATABLE = new String("aggregatable"); + static final String MIN_VALUE = new String("min_value"); + static final String MIN_VALUE_AS_STRING = new String("min_value_as_string"); + static final String MAX_VALUE = new String("max_value"); + static final String MAX_VALUE_AS_STRING = new String("max_value_as_string"); } } diff --git a/core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java b/core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java index af5fface7d..310af30d25 100644 --- a/core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java +++ b/core/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java @@ -39,7 +39,7 @@ import java.util.List; */ public class FieldStatsRequest extends BroadcastRequest<FieldStatsRequest> { - public final static String DEFAULT_LEVEL = "cluster"; + public static final String DEFAULT_LEVEL = "cluster"; private String[] fields = Strings.EMPTY_ARRAY; private String level = DEFAULT_LEVEL; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/IngestActionFilter.java b/core/src/main/java/org/elasticsearch/action/ingest/IngestActionFilter.java index 850cac040d..31c5ec43bd 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/IngestActionFilter.java +++ b/core/src/main/java/org/elasticsearch/action/ingest/IngestActionFilter.java @@ -132,7 +132,7 @@ public final class IngestActionFilter extends AbstractComponent implements Actio return Integer.MAX_VALUE; } - final static class BulkRequestModifier implements Iterator<ActionRequest<?>> { + static final class BulkRequestModifier implements Iterator<ActionRequest<?>> { final BulkRequest bulkRequest; final Set<Integer> failedSlots; @@ -210,7 +210,7 @@ public final class IngestActionFilter extends AbstractComponent implements Actio } - final static class IngestBulkResponseListener implements ActionListener<BulkResponse> { + static final class IngestBulkResponseListener implements ActionListener<BulkResponse> { private final long ingestTookInMillis; private final int[] originalSlots; diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchResponse.java b/core/src/main/java/org/elasticsearch/action/search/SearchResponse.java index 8e144537c8..98d63b07b5 100644 --- a/core/src/main/java/org/elasticsearch/action/search/SearchResponse.java +++ b/core/src/main/java/org/elasticsearch/action/search/SearchResponse.java @@ -168,7 +168,7 @@ public class SearchResponse extends ActionResponse implements StatusToXContent { * * @return The profile results or an empty map */ - public @Nullable Map<String, ProfileShardResult> getProfileResults() { + @Nullable public Map<String, ProfileShardResult> getProfileResults() { return internalResponse.profile(); } diff --git a/core/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java b/core/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java index bd1751856b..4d2d8695c8 100644 --- a/core/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java +++ b/core/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java @@ -134,7 +134,7 @@ public class TransportMultiSearchAction extends HandledTransportAction<MultiSear }); } - final static class SearchRequestSlot { + static final class SearchRequestSlot { final SearchRequest request; final int responseSlot; diff --git a/core/src/main/java/org/elasticsearch/action/support/AbstractListenableActionFuture.java b/core/src/main/java/org/elasticsearch/action/support/AbstractListenableActionFuture.java index 790689b420..d0c5af0659 100644 --- a/core/src/main/java/org/elasticsearch/action/support/AbstractListenableActionFuture.java +++ b/core/src/main/java/org/elasticsearch/action/support/AbstractListenableActionFuture.java @@ -33,7 +33,7 @@ import java.util.List; */ public abstract class AbstractListenableActionFuture<T, L> extends AdapterActionFuture<T, L> implements ListenableActionFuture<T> { - private final static ESLogger logger = Loggers.getLogger(AbstractListenableActionFuture.class); + private static final ESLogger logger = Loggers.getLogger(AbstractListenableActionFuture.class); final ThreadPool threadPool; volatile Object listeners; diff --git a/core/src/main/java/org/elasticsearch/action/support/ActionFilter.java b/core/src/main/java/org/elasticsearch/action/support/ActionFilter.java index d753eda4c6..f536d9e0ce 100644 --- a/core/src/main/java/org/elasticsearch/action/support/ActionFilter.java +++ b/core/src/main/java/org/elasticsearch/action/support/ActionFilter.java @@ -55,7 +55,7 @@ public interface ActionFilter { * filter chain. This base class should serve any action filter implementations that doesn't require * to apply async filtering logic. */ - public static abstract class Simple extends AbstractComponent implements ActionFilter { + public abstract static class Simple extends AbstractComponent implements ActionFilter { protected Simple(Settings settings) { super(settings); diff --git a/core/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java b/core/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java index 3356d18914..12184d57cd 100644 --- a/core/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java +++ b/core/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java @@ -590,7 +590,7 @@ public abstract class TransportBroadcastByNodeAction<Request extends BroadcastRe * Can be used for implementations of {@link #shardOperation(BroadcastRequest, ShardRouting) shardOperation} for * which there is no shard-level return value. */ - public final static class EmptyResult implements Streamable { + public static final class EmptyResult implements Streamable { public static EmptyResult INSTANCE = new EmptyResult(); private EmptyResult() { diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java b/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java index 830f092178..1dbe543ff2 100644 --- a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java +++ b/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java @@ -50,11 +50,11 @@ public class ReplicationOperation< ReplicaRequest extends ReplicationRequest<ReplicaRequest>, PrimaryResultT extends ReplicationOperation.PrimaryResult<ReplicaRequest> > { - final private ESLogger logger; - final private Request request; - final private Supplier<ClusterState> clusterStateSupplier; - final private String opType; - final private AtomicInteger totalShards = new AtomicInteger(); + private final ESLogger logger; + private final Request request; + private final Supplier<ClusterState> clusterStateSupplier; + private final String opType; + private final AtomicInteger totalShards = new AtomicInteger(); /** * The number of pending sub-operations in this operation. This is incremented when the following operations start and decremented when * they complete: @@ -65,14 +65,14 @@ public class ReplicationOperation< * operations and the primary finishes.</li> * </ul> */ - final private AtomicInteger pendingShards = new AtomicInteger(); - final private AtomicInteger successfulShards = new AtomicInteger(); - final private boolean executeOnReplicas; - final private boolean checkWriteConsistency; - final private Primary<Request, ReplicaRequest, PrimaryResultT> primary; - final private Replicas<ReplicaRequest> replicasProxy; - final private AtomicBoolean finished = new AtomicBoolean(); - final protected ActionListener<PrimaryResultT> resultListener; + private final AtomicInteger pendingShards = new AtomicInteger(); + private final AtomicInteger successfulShards = new AtomicInteger(); + private final boolean executeOnReplicas; + private final boolean checkWriteConsistency; + private final Primary<Request, ReplicaRequest, PrimaryResultT> primary; + private final Replicas<ReplicaRequest> replicasProxy; + private final AtomicBoolean finished = new AtomicBoolean(); + protected final ActionListener<PrimaryResultT> resultListener; private volatile PrimaryResultT primaryResult = null; diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java b/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java index c444fd2cf3..adb44dd496 100644 --- a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java +++ b/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java @@ -124,9 +124,8 @@ public abstract class ReplicationRequest<Request extends ReplicationRequest<Requ * @return the shardId of the shard where this operation should be executed on. * can be null if the shardID has not yet been resolved */ - public @Nullable - ShardId shardId() { + public ShardId shardId() { return shardId; } diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java b/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java index 181e0e0ea7..f04e5604a6 100644 --- a/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java +++ b/core/src/main/java/org/elasticsearch/action/support/replication/ReplicationResponse.java @@ -40,7 +40,7 @@ import java.io.IOException; */ public class ReplicationResponse extends ActionResponse { - public final static ReplicationResponse.ShardInfo.Failure[] EMPTY = new ReplicationResponse.ShardInfo.Failure[0]; + public static final ReplicationResponse.ShardInfo.Failure[] EMPTY = new ReplicationResponse.ShardInfo.Failure[0]; private ShardInfo shardInfo; diff --git a/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java b/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java index 87e602bf42..80aa23032c 100644 --- a/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java +++ b/core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java @@ -85,17 +85,17 @@ public abstract class TransportReplicationAction< Response extends ReplicationResponse > extends TransportAction<Request, Response> { - final protected TransportService transportService; - final protected ClusterService clusterService; - final protected IndicesService indicesService; - final private ShardStateAction shardStateAction; - final private WriteConsistencyLevel defaultWriteConsistencyLevel; - final private TransportRequestOptions transportOptions; + protected final TransportService transportService; + protected final ClusterService clusterService; + protected final IndicesService indicesService; + private final ShardStateAction shardStateAction; + private final WriteConsistencyLevel defaultWriteConsistencyLevel; + private final TransportRequestOptions transportOptions; // package private for testing final String transportReplicaAction; final String transportPrimaryAction; - final private ReplicasProxy replicasProxy; + private final ReplicasProxy replicasProxy; protected TransportReplicationAction(Settings settings, String actionName, TransportService transportService, ClusterService clusterService, IndicesService indicesService, diff --git a/core/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java b/core/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java index 847eee195e..760b77469d 100644 --- a/core/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java +++ b/core/src/main/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationAction.java @@ -205,7 +205,7 @@ public abstract class TransportInstanceSingleOperationAction<Request extends Ins }); } - void retry(final @Nullable Throwable failure) { + void retry(@Nullable final Throwable failure) { if (observer.isTimedOut()) { // we running as a last attempt after a timeout has happened. don't retry Throwable listenFailure = failure; diff --git a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapCheck.java b/core/src/main/java/org/elasticsearch/bootstrap/BootstrapCheck.java index fc36e4fb67..db74e4b373 100644 --- a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapCheck.java +++ b/core/src/main/java/org/elasticsearch/bootstrap/BootstrapCheck.java @@ -508,7 +508,7 @@ final class BootstrapCheck { } - static abstract class MightForkCheck implements BootstrapCheck.Check { + abstract static class MightForkCheck implements BootstrapCheck.Check { @Override public boolean check() { diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java b/core/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java index fbd6857d36..50dab6888b 100644 --- a/core/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java +++ b/core/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java @@ -47,8 +47,8 @@ final class JNAKernel32Library { private List<NativeHandlerCallback> callbacks = new ArrayList<>(); // Native library instance must be kept around for the same reason. - private final static class Holder { - private final static JNAKernel32Library instance = new JNAKernel32Library(); + private static final class Holder { + private static final JNAKernel32Library instance = new JNAKernel32Library(); } private JNAKernel32Library() { diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java b/core/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java index 4a434ebe6b..63de83d88d 100644 --- a/core/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java +++ b/core/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java @@ -62,7 +62,7 @@ public class JavaVersion implements Comparable<JavaVersion> { return value.matches("^0*[0-9]+(\\.[0-9]+)*$"); } - private final static JavaVersion CURRENT = parse(System.getProperty("java.specification.version")); + private static final JavaVersion CURRENT = parse(System.getProperty("java.specification.version")); public static JavaVersion current() { return CURRENT; diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterState.java b/core/src/main/java/org/elasticsearch/cluster/ClusterState.java index 3350169a65..abad2e9a8e 100644 --- a/core/src/main/java/org/elasticsearch/cluster/ClusterState.java +++ b/core/src/main/java/org/elasticsearch/cluster/ClusterState.java @@ -115,7 +115,7 @@ public class ClusterState implements ToXContent, Diffable<ClusterState> { String type(); } - private final static Map<String, Custom> customPrototypes = new HashMap<>(); + private static final Map<String, Custom> customPrototypes = new HashMap<>(); /** * Register a custom index meta data factory. Make sure to call it from a static block. diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java b/core/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java index d79a00dc3f..228ac3f41b 100644 --- a/core/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java +++ b/core/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java @@ -274,7 +274,7 @@ public class ClusterStateObserver { } - public static abstract class ValidationPredicate implements ChangePredicate { + public abstract static class ValidationPredicate implements ChangePredicate { @Override public boolean apply(ClusterState previousState, ClusterState.ClusterStateStatus previousStatus, ClusterState newState, ClusterState.ClusterStateStatus newStatus) { @@ -289,7 +289,7 @@ public class ClusterStateObserver { } } - public static abstract class EventPredicate implements ChangePredicate { + public abstract static class EventPredicate implements ChangePredicate { @Override public boolean apply(ClusterState previousState, ClusterState.ClusterStateStatus previousStatus, ClusterState newState, ClusterState.ClusterStateStatus newStatus) { return previousState != newState || previousStatus != newStatus; @@ -298,8 +298,8 @@ public class ClusterStateObserver { } static class ObservingContext { - final public Listener listener; - final public ChangePredicate changePredicate; + public final Listener listener; + public final ChangePredicate changePredicate; public ObservingContext(Listener listener, ChangePredicate changePredicate) { this.listener = listener; @@ -308,8 +308,8 @@ public class ClusterStateObserver { } static class ObservedState { - final public ClusterState clusterState; - final public ClusterState.ClusterStateStatus status; + public final ClusterState clusterState; + public final ClusterState.ClusterStateStatus status; public ObservedState(ClusterState clusterState) { this.clusterState = clusterState; @@ -322,7 +322,7 @@ public class ClusterStateObserver { } } - private final static class ContextPreservingListener implements Listener { + private static final class ContextPreservingListener implements Listener { private final Listener delegate; private final ThreadContext.StoredContext tempContext; diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskExecutor.java b/core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskExecutor.java index ced8dd0098..633fce1ac9 100644 --- a/core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskExecutor.java +++ b/core/src/main/java/org/elasticsearch/cluster/ClusterStateTaskExecutor.java @@ -51,8 +51,8 @@ public interface ClusterStateTaskExecutor<T> { * @param <T> the type of the cluster state update task */ class BatchResult<T> { - final public ClusterState resultingState; - final public Map<T, TaskResult> executionResults; + public final ClusterState resultingState; + public final Map<T, TaskResult> executionResults; /** * Construct an execution result instance with a correspondence between the tasks and their execution result diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java b/core/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java index 3e2881134f..c6988bbb8c 100644 --- a/core/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java +++ b/core/src/main/java/org/elasticsearch/cluster/ClusterStateUpdateTask.java @@ -28,9 +28,9 @@ import java.util.List; /** * A task that can update the cluster state. */ -abstract public class ClusterStateUpdateTask implements ClusterStateTaskConfig, ClusterStateTaskExecutor<ClusterStateUpdateTask>, ClusterStateTaskListener { +public abstract class ClusterStateUpdateTask implements ClusterStateTaskConfig, ClusterStateTaskExecutor<ClusterStateUpdateTask>, ClusterStateTaskListener { - final private Priority priority; + private final Priority priority; public ClusterStateUpdateTask() { this(Priority.NORMAL); @@ -41,7 +41,7 @@ abstract public class ClusterStateUpdateTask implements ClusterStateTaskConfig, } @Override - final public BatchResult<ClusterStateUpdateTask> execute(ClusterState currentState, List<ClusterStateUpdateTask> tasks) throws Exception { + public final BatchResult<ClusterStateUpdateTask> execute(ClusterState currentState, List<ClusterStateUpdateTask> tasks) throws Exception { ClusterState result = execute(currentState); return BatchResult.<ClusterStateUpdateTask>builder().successes(tasks).build(result); } @@ -50,12 +50,12 @@ abstract public class ClusterStateUpdateTask implements ClusterStateTaskConfig, * Update the cluster state based on the current state. Return the *same instance* if no state * should be changed. */ - abstract public ClusterState execute(ClusterState currentState) throws Exception; + public abstract ClusterState execute(ClusterState currentState) throws Exception; /** * A callback called when execute fails. */ - abstract public void onFailure(String source, Throwable t); + public abstract void onFailure(String source, Throwable t); /** * If the cluster state update task wasn't processed by the provided timeout, call diff --git a/core/src/main/java/org/elasticsearch/cluster/DiffableUtils.java b/core/src/main/java/org/elasticsearch/cluster/DiffableUtils.java index fb9d715910..1a3557890d 100644 --- a/core/src/main/java/org/elasticsearch/cluster/DiffableUtils.java +++ b/core/src/main/java/org/elasticsearch/cluster/DiffableUtils.java @@ -330,7 +330,7 @@ public final class DiffableUtils { * @param <T> the type of map values * @param <M> the map implementation type */ - public static abstract class MapDiff<K, T, M> implements Diff<M> { + public abstract static class MapDiff<K, T, M> implements Diff<M> { protected final List<K> deletes; protected final Map<K, Diff<T>> diffs; // incremental updates @@ -534,7 +534,7 @@ public final class DiffableUtils { * @param <K> type of map keys * @param <V> type of map values */ - public static abstract class DiffableValueSerializer<K, V extends Diffable<V>> implements ValueSerializer<K, V> { + public abstract static class DiffableValueSerializer<K, V extends Diffable<V>> implements ValueSerializer<K, V> { private static final DiffableValueSerializer WRITE_ONLY_INSTANCE = new DiffableValueSerializer() { @Override public Object read(StreamInput in, Object key) throws IOException { @@ -577,7 +577,7 @@ public final class DiffableUtils { * @param <K> type of map keys * @param <V> type of map values */ - public static abstract class NonDiffableValueSerializer<K, V> implements ValueSerializer<K, V> { + public abstract static class NonDiffableValueSerializer<K, V> implements ValueSerializer<K, V> { @Override public boolean supportsDiffableValues() { return false; diff --git a/core/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java b/core/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java index cc65106946..b552508532 100644 --- a/core/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java +++ b/core/src/main/java/org/elasticsearch/cluster/EmptyClusterInfoService.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.settings.Settings; * ClusterInfoService that provides empty maps for disk usage and shard sizes */ public class EmptyClusterInfoService extends AbstractComponent implements ClusterInfoService { - public final static EmptyClusterInfoService INSTANCE = new EmptyClusterInfoService(); + public static final EmptyClusterInfoService INSTANCE = new EmptyClusterInfoService(); private EmptyClusterInfoService() { super(Settings.EMPTY); diff --git a/core/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java b/core/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java index 404ae57d5f..5fe42a7b16 100644 --- a/core/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java +++ b/core/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java @@ -57,7 +57,7 @@ public class NodeConnectionsService extends AbstractLifecycleComponent<NodeConne // if a node doesn't appear in this list it shouldn't be monitored private ConcurrentMap<DiscoveryNode, Integer> nodes = ConcurrentCollections.newConcurrentMap(); - final private KeyedLock<DiscoveryNode> nodeLocks = new KeyedLock<>(); + private final KeyedLock<DiscoveryNode> nodeLocks = new KeyedLock<>(); private final TimeValue reconnectInterval; diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java index 6130ed2317..94dd3c63da 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java @@ -54,7 +54,7 @@ import java.util.function.BiFunction; * tombstones remain in the cluster state for a fixed period of time, after which * they are purged. */ -final public class IndexGraveyard implements MetaData.Custom { +public final class IndexGraveyard implements MetaData.Custom { /** * Setting for the maximum tombstones allowed in the cluster state; @@ -188,7 +188,7 @@ final public class IndexGraveyard implements MetaData.Custom { /** * A class to build an IndexGraveyard. */ - final public static class Builder { + public static final class Builder { private List<Tombstone> tombstones; private int numPurged = -1; private final long currentTime = System.currentTimeMillis(); @@ -273,7 +273,7 @@ final public class IndexGraveyard implements MetaData.Custom { /** * A class representing a diff of two IndexGraveyard objects. */ - final public static class IndexGraveyardDiff implements Diff<MetaData.Custom> { + public static final class IndexGraveyardDiff implements Diff<MetaData.Custom> { private final List<Tombstone> added; private final int removedCount; @@ -354,7 +354,7 @@ final public class IndexGraveyard implements MetaData.Custom { /** * An individual tombstone entry for representing a deleted index. */ - final public static class Tombstone implements ToXContent, Writeable { + public static final class Tombstone implements ToXContent, Writeable { private static final String INDEX_KEY = "index"; private static final String DELETE_DATE_IN_MILLIS_KEY = "delete_date_in_millis"; @@ -449,7 +449,7 @@ final public class IndexGraveyard implements MetaData.Custom { /** * A builder for building tombstone entries. */ - final private static class Builder { + private static final class Builder { private Index index; private long deleteDateInMillis = -1L; diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java index 14d00d3fc6..b49b893f23 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java @@ -255,7 +255,7 @@ public class IndexMetaData implements Diffable<IndexMetaData>, FromXContentBuild private final ImmutableOpenIntMap<Set<String>> activeAllocationIds; - private transient final int totalNumberOfShards; + private final transient int totalNumberOfShards; private final DiscoveryNodeFilters requireFilters; private final DiscoveryNodeFilters includeFilters; diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java index 4eefac0f17..df53395fe2 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java @@ -488,7 +488,7 @@ public class IndexNameExpressionResolver extends AbstractComponent { return false; } - final static class Context { + static final class Context { private final ClusterState state; private final IndicesOptions options; @@ -551,7 +551,7 @@ public class IndexNameExpressionResolver extends AbstractComponent { /** * Resolves alias/index name expressions with wildcards into the corresponding concrete indices/aliases */ - final static class WildcardExpressionResolver implements ExpressionResolver { + static final class WildcardExpressionResolver implements ExpressionResolver { @Override public List<String> resolve(Context context, List<String> expressions) { @@ -738,7 +738,7 @@ public class IndexNameExpressionResolver extends AbstractComponent { } } - final static class DateMathExpressionResolver implements ExpressionResolver { + static final class DateMathExpressionResolver implements ExpressionResolver { private static final String EXPRESSION_LEFT_BOUND = "<"; private static final String EXPRESSION_RIGHT_BOUND = ">"; diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java index a8a9e1e125..6fdecf542f 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java @@ -1187,7 +1187,7 @@ public class MetaData implements Iterable<IndexMetaData>, Diffable<MetaData>, Fr } } - private final static ToXContent.Params FORMAT_PARAMS; + private static final ToXContent.Params FORMAT_PARAMS; static { Map<String, String> params = new HashMap<>(2); params.put("binary", "true"); @@ -1198,7 +1198,7 @@ public class MetaData implements Iterable<IndexMetaData>, Diffable<MetaData>, Fr /** * State format for {@link MetaData} to write to and load from disk */ - public final static MetaDataStateFormat<MetaData> FORMAT = new MetaDataStateFormat<MetaData>(XContentType.SMILE, GLOBAL_STATE_FILE_PREFIX) { + public static final MetaDataStateFormat<MetaData> FORMAT = new MetaDataStateFormat<MetaData>(XContentType.SMILE, GLOBAL_STATE_FILE_PREFIX) { @Override public void toXContent(XContentBuilder builder, MetaData state) throws IOException { diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java index 456675abcf..4f7aa68d7d 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java @@ -97,7 +97,7 @@ import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_VERSION_C */ public class MetaDataCreateIndexService extends AbstractComponent { - public final static int MAX_INDEX_NAME_BYTES = 255; + public static final int MAX_INDEX_NAME_BYTES = 255; private static final DefaultIndexTemplateFilter DEFAULT_INDEX_TEMPLATE_FILTER = new DefaultIndexTemplateFilter(); private final ClusterService clusterService; diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java b/core/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java index be09f17f86..cddf6f98a5 100644 --- a/core/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java +++ b/core/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java @@ -60,7 +60,7 @@ public class IndexShardRoutingTable implements Iterable<ShardRouting> { final List<ShardRouting> shards; final List<ShardRouting> activeShards; final List<ShardRouting> assignedShards; - final static List<ShardRouting> NO_SHARDS = Collections.emptyList(); + static final List<ShardRouting> NO_SHARDS = Collections.emptyList(); final boolean allShardsStarted; private volatile Map<AttributesKey, AttributesRoutings> activeShardsByAttributes = emptyMap(); diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java b/core/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java index b4a04e4d10..8403f45a55 100644 --- a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java +++ b/core/src/main/java/org/elasticsearch/cluster/routing/RoutingNode.java @@ -80,7 +80,8 @@ public class RoutingNode implements Iterable<ShardRouting> { return this.node; } - public @Nullable ShardRouting getByShardId(ShardId id) { + @Nullable + public ShardRouting getByShardId(ShardId id) { return shards.get(id); } diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java index 0fb27a8015..4ed8c48774 100644 --- a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java +++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java @@ -62,7 +62,7 @@ public abstract class AbstractAllocateAllocationCommand implements AllocationCom /** * Works around ObjectParser not supporting constructor arguments. */ - protected static abstract class Builder<T extends AbstractAllocateAllocationCommand> { + protected abstract static class Builder<T extends AbstractAllocateAllocationCommand> { protected String index; protected int shard = -1; protected String node; diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/BasePrimaryAllocationCommand.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/BasePrimaryAllocationCommand.java index 2eb3af9d4f..f4dc4fba4b 100644 --- a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/BasePrimaryAllocationCommand.java +++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/BasePrimaryAllocationCommand.java @@ -71,7 +71,7 @@ public abstract class BasePrimaryAllocationCommand extends AbstractAllocateAlloc return acceptDataLoss; } - protected static abstract class Builder<T extends BasePrimaryAllocationCommand> extends AbstractAllocateAllocationCommand.Builder<T> { + protected abstract static class Builder<T extends BasePrimaryAllocationCommand> extends AbstractAllocateAllocationCommand.Builder<T> { protected boolean acceptDataLoss; public void setAcceptDataLoss(boolean acceptDataLoss) { diff --git a/core/src/main/java/org/elasticsearch/cluster/service/ClusterService.java b/core/src/main/java/org/elasticsearch/cluster/service/ClusterService.java index 50c9166548..1480ef9a50 100644 --- a/core/src/main/java/org/elasticsearch/cluster/service/ClusterService.java +++ b/core/src/main/java/org/elasticsearch/cluster/service/ClusterService.java @@ -154,17 +154,17 @@ public class ClusterService extends AbstractLifecycleComponent<ClusterService> { this.slowTaskLoggingThreshold = slowTaskLoggingThreshold; } - synchronized public void setClusterStatePublisher(BiConsumer<ClusterChangedEvent, Discovery.AckListener> publisher) { + public synchronized void setClusterStatePublisher(BiConsumer<ClusterChangedEvent, Discovery.AckListener> publisher) { clusterStatePublisher = publisher; } - synchronized public void setLocalNode(DiscoveryNode localNode) { + public synchronized void setLocalNode(DiscoveryNode localNode) { assert clusterState.nodes().getLocalNodeId() == null : "local node is already set"; DiscoveryNodes.Builder nodeBuilder = DiscoveryNodes.builder(clusterState.nodes()).put(localNode).localNodeId(localNode.getId()); this.clusterState = ClusterState.builder(clusterState).nodes(nodeBuilder).build(); } - synchronized public void setNodeConnectionsService(NodeConnectionsService nodeConnectionsService) { + public synchronized void setNodeConnectionsService(NodeConnectionsService nodeConnectionsService) { assert this.nodeConnectionsService == null : "nodeConnectionsService is already set"; this.nodeConnectionsService = nodeConnectionsService; } @@ -172,7 +172,7 @@ public class ClusterService extends AbstractLifecycleComponent<ClusterService> { /** * Adds an initial block to be set on the first cluster state created. */ - synchronized public void addInitialStateBlock(ClusterBlock block) throws IllegalStateException { + public synchronized void addInitialStateBlock(ClusterBlock block) throws IllegalStateException { if (lifecycle.started()) { throw new IllegalStateException("can't set initial block when started"); } @@ -182,14 +182,14 @@ public class ClusterService extends AbstractLifecycleComponent<ClusterService> { /** * Remove an initial block to be set on the first cluster state created. */ - synchronized public void removeInitialStateBlock(ClusterBlock block) throws IllegalStateException { + public synchronized void removeInitialStateBlock(ClusterBlock block) throws IllegalStateException { removeInitialStateBlock(block.id()); } /** * Remove an initial block to be set on the first cluster state created. */ - synchronized public void removeInitialStateBlock(int blockId) throws IllegalStateException { + public synchronized void removeInitialStateBlock(int blockId) throws IllegalStateException { if (lifecycle.started()) { throw new IllegalStateException("can't set initial block when started"); } @@ -197,7 +197,7 @@ public class ClusterService extends AbstractLifecycleComponent<ClusterService> { } @Override - synchronized protected void doStart() { + protected synchronized void doStart() { Objects.requireNonNull(clusterStatePublisher, "please set a cluster state publisher before starting"); Objects.requireNonNull(clusterState.nodes().getLocalNode(), "please set the local node before starting"); Objects.requireNonNull(nodeConnectionsService, "please set the node connection service before starting"); @@ -209,7 +209,7 @@ public class ClusterService extends AbstractLifecycleComponent<ClusterService> { } @Override - synchronized protected void doStop() { + protected synchronized void doStop() { for (NotifyTimeout onGoingTimeout : onGoingTimeouts) { onGoingTimeout.cancel(); try { @@ -230,7 +230,7 @@ public class ClusterService extends AbstractLifecycleComponent<ClusterService> { } @Override - synchronized protected void doClose() { + protected synchronized void doClose() { } /** @@ -497,7 +497,7 @@ public class ClusterService extends AbstractLifecycleComponent<ClusterService> { return clusterName; } - static abstract class SourcePrioritizedRunnable extends PrioritizedRunnable { + abstract static class SourcePrioritizedRunnable extends PrioritizedRunnable { protected final String source; public SourcePrioritizedRunnable(Priority priority, String source) { @@ -959,7 +959,7 @@ public class ClusterService extends AbstractLifecycleComponent<ClusterService> { private static class DelegetingAckListener implements Discovery.AckListener { - final private List<Discovery.AckListener> listeners; + private final List<Discovery.AckListener> listeners; private DelegetingAckListener(List<Discovery.AckListener> listeners) { this.listeners = listeners; diff --git a/core/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java b/core/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java index 3c0579c87e..5316768673 100644 --- a/core/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java +++ b/core/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java @@ -75,7 +75,7 @@ public final class CopyOnWriteHashMap<K, V> extends AbstractMap<K, V> { /** * Abstraction of a node, implemented by both inner and leaf nodes. */ - private static abstract class Node<K, V> { + private abstract static class Node<K, V> { /** * Recursively get the key with the given hash. diff --git a/core/src/main/java/org/elasticsearch/common/collect/HppcMaps.java b/core/src/main/java/org/elasticsearch/common/collect/HppcMaps.java index 5dc17bedb3..55fc67831e 100644 --- a/core/src/main/java/org/elasticsearch/common/collect/HppcMaps.java +++ b/core/src/main/java/org/elasticsearch/common/collect/HppcMaps.java @@ -132,8 +132,8 @@ public final class HppcMaps { }; } - public final static class Object { - public final static class Integer { + public static final class Object { + public static final class Integer { public static <V> ObjectIntHashMap<V> ensureNoNullKeys(int capacity, float loadFactor) { return new ObjectIntHashMap<V>(capacity, loadFactor) { @Override diff --git a/core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java b/core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java index 0eda7b9241..c6900e2ae4 100644 --- a/core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java +++ b/core/src/main/java/org/elasticsearch/common/geo/GeoDistance.java @@ -350,7 +350,7 @@ public enum GeoDistance implements Writeable { * Basic implementation of {@link FixedSourceDistance}. This class keeps the basic parameters for a distance * functions based on a fixed source. Namely latitude, longitude and unit. */ - public static abstract class FixedSourceDistanceBase implements FixedSourceDistance { + public abstract static class FixedSourceDistanceBase implements FixedSourceDistance { protected final double sourceLatitude; protected final double sourceLongitude; protected final DistanceUnit unit; diff --git a/core/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java b/core/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java index 9982a08f17..d8fc226b61 100644 --- a/core/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java +++ b/core/src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java @@ -195,7 +195,7 @@ public class GeoHashUtils { * @param dy delta of the second grid coordinate (must be -1, 0 or +1) * @return geohash of the defined cell */ - public final static String neighbor(String geohash, int level, int dx, int dy) { + public static final String neighbor(String geohash, int level, int dx, int dy) { int cell = BASE_32_STRING.indexOf(geohash.charAt(level -1)); // Decoding the Geohash bit pattern to determine grid coordinates diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/Errors.java b/core/src/main/java/org/elasticsearch/common/inject/internal/Errors.java index 795ff5380a..24a2b4b79e 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/internal/Errors.java +++ b/core/src/main/java/org/elasticsearch/common/inject/internal/Errors.java @@ -551,7 +551,7 @@ public final class Errors { return root.errors == null ? 0 : root.errors.size(); } - private static abstract class Converter<T> { + private abstract static class Converter<T> { final Class<T> type; diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java b/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java index bb9af656ea..4ee9c80b89 100644 --- a/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java +++ b/core/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java @@ -408,7 +408,7 @@ public abstract class StreamOutput extends OutputStream { void write(StreamOutput o, Object value) throws IOException; } - private final static Map<Class<?>, Writer> WRITERS; + private static final Map<Class<?>, Writer> WRITERS; static { Map<Class<?>, Writer> writers = new HashMap<>(); diff --git a/core/src/main/java/org/elasticsearch/common/logging/Loggers.java b/core/src/main/java/org/elasticsearch/common/logging/Loggers.java index 674522589a..613193baee 100644 --- a/core/src/main/java/org/elasticsearch/common/logging/Loggers.java +++ b/core/src/main/java/org/elasticsearch/common/logging/Loggers.java @@ -38,7 +38,7 @@ import static org.elasticsearch.common.util.CollectionUtils.asArrayList; */ public class Loggers { - private final static String commonPrefix = System.getProperty("es.logger.prefix", "org.elasticsearch."); + private static final String commonPrefix = System.getProperty("es.logger.prefix", "org.elasticsearch."); public static final String SPACE = " "; diff --git a/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java index 8508a8a2e4..39e67ce645 100644 --- a/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java +++ b/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java @@ -245,14 +245,14 @@ public class Lucene { /** * Wraps <code>delegate</code> with count based early termination collector with a threshold of <code>maxCountHits</code> */ - public final static EarlyTerminatingCollector wrapCountBasedEarlyTerminatingCollector(final Collector delegate, int maxCountHits) { + public static final EarlyTerminatingCollector wrapCountBasedEarlyTerminatingCollector(final Collector delegate, int maxCountHits) { return new EarlyTerminatingCollector(delegate, maxCountHits); } /** * Wraps <code>delegate</code> with a time limited collector with a timeout of <code>timeoutInMillis</code> */ - public final static TimeLimitingCollector wrapTimeLimitingCollector(final Collector delegate, final Counter counter, long timeoutInMillis) { + public static final TimeLimitingCollector wrapTimeLimitingCollector(final Collector delegate, final Counter counter, long timeoutInMillis) { return new TimeLimitingCollector(delegate, counter, timeoutInMillis); } @@ -510,7 +510,7 @@ public class Lucene { * This exception is thrown when {@link org.elasticsearch.common.lucene.Lucene.EarlyTerminatingCollector} * reaches early termination * */ - public final static class EarlyTerminationException extends ElasticsearchException { + public static final class EarlyTerminationException extends ElasticsearchException { public EarlyTerminationException(String msg) { super(msg); @@ -525,7 +525,7 @@ public class Lucene { * A collector that terminates early by throwing {@link org.elasticsearch.common.lucene.Lucene.EarlyTerminationException} * when count of matched documents has reached <code>maxCountHits</code> */ - public final static class EarlyTerminatingCollector extends SimpleCollector { + public static final class EarlyTerminatingCollector extends SimpleCollector { private final int maxCountHits; private final Collector delegate; diff --git a/core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java b/core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java index c454343591..b9caecea96 100644 --- a/core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java +++ b/core/src/main/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReader.java @@ -66,7 +66,7 @@ public final class ElasticsearchDirectoryReader extends FilterDirectoryReader { return new ElasticsearchDirectoryReader(reader, new SubReaderWrapper(shardId), shardId); } - private final static class SubReaderWrapper extends FilterDirectoryReader.SubReaderWrapper { + private static final class SubReaderWrapper extends FilterDirectoryReader.SubReaderWrapper { private final ShardId shardId; SubReaderWrapper(ShardId shardId) { this.shardId = shardId; diff --git a/core/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java b/core/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java index ded912cf9e..0ff0008a43 100644 --- a/core/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java +++ b/core/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java @@ -60,7 +60,7 @@ public class FilterableTermsEnum extends TermsEnum { } static final String UNSUPPORTED_MESSAGE = "This TermsEnum only supports #seekExact(BytesRef) as well as #docFreq() and #totalTermFreq()"; - protected final static int NOT_FOUND = -1; + protected static final int NOT_FOUND = -1; private final Holder[] enums; protected int currentDocFreq = 0; protected long currentTotalTermFreq = 0; diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java index 3927dcd518..c8698e8223 100644 --- a/core/src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java +++ b/core/src/main/java/org/elasticsearch/common/lucene/search/function/FiltersFunctionScoreQuery.java @@ -102,7 +102,7 @@ public class FiltersFunctionScoreQuery extends Query { final float maxBoost; private final Float minScore; - final protected CombineFunction combineFunction; + protected final CombineFunction combineFunction; public FiltersFunctionScoreQuery(Query subQuery, ScoreMode scoreMode, FilterFunction[] filterFunctions, float maxBoost, Float minScore, CombineFunction combineFunction) { this.subQuery = subQuery; diff --git a/core/src/main/java/org/elasticsearch/common/rounding/Rounding.java b/core/src/main/java/org/elasticsearch/common/rounding/Rounding.java index 7e94ebb9ee..7905ee29d7 100644 --- a/core/src/main/java/org/elasticsearch/common/rounding/Rounding.java +++ b/core/src/main/java/org/elasticsearch/common/rounding/Rounding.java @@ -76,7 +76,7 @@ public abstract class Rounding implements Streamable { */ public static class Interval extends Rounding { - final static byte ID = 0; + static final byte ID = 0; public static final ParseField INTERVAL_FIELD = new ParseField("interval"); @@ -157,7 +157,7 @@ public abstract class Rounding implements Streamable { public static class FactorRounding extends Rounding { - final static byte ID = 7; + static final byte ID = 7; public static final ParseField FACTOR_FIELD = new ParseField("factor"); @@ -226,7 +226,7 @@ public abstract class Rounding implements Streamable { public static class OffsetRounding extends Rounding { - final static byte ID = 8; + static final byte ID = 8; public static final ParseField OFFSET_FIELD = new ParseField("offset"); diff --git a/core/src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java b/core/src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java index 46362687e0..e52769d7f3 100644 --- a/core/src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java +++ b/core/src/main/java/org/elasticsearch/common/rounding/TimeZoneRounding.java @@ -195,7 +195,7 @@ public abstract class TimeZoneRounding extends Rounding { static class TimeIntervalRounding extends TimeZoneRounding { - final static byte ID = 2; + static final byte ID = 2; private long interval; private DateTimeZone timeZone; diff --git a/core/src/main/java/org/elasticsearch/common/util/BigArrays.java b/core/src/main/java/org/elasticsearch/common/util/BigArrays.java index c2c8e242ac..da49aac5ed 100644 --- a/core/src/main/java/org/elasticsearch/common/util/BigArrays.java +++ b/core/src/main/java/org/elasticsearch/common/util/BigArrays.java @@ -89,7 +89,7 @@ public class BigArrays implements Releasable { recycler.close(); } - private static abstract class AbstractArrayWrapper extends AbstractArray implements BigArray { + private abstract static class AbstractArrayWrapper extends AbstractArray implements BigArray { protected static final long SHALLOW_SIZE = RamUsageEstimator.shallowSizeOfInstance(ByteArrayWrapper.class); diff --git a/core/src/main/java/org/elasticsearch/common/util/ExtensionPoint.java b/core/src/main/java/org/elasticsearch/common/util/ExtensionPoint.java index db167c5dae..490209bd8d 100644 --- a/core/src/main/java/org/elasticsearch/common/util/ExtensionPoint.java +++ b/core/src/main/java/org/elasticsearch/common/util/ExtensionPoint.java @@ -162,7 +162,7 @@ public abstract class ExtensionPoint { /** * A set based extension point which allows to register extended classes that might be used to chain additional functionality etc. */ - public final static class ClassSet<T> extends ExtensionPoint { + public static final class ClassSet<T> extends ExtensionPoint { protected final Class<T> extensionClass; private final Set<Class<? extends T>> extensions = new HashSet<>(); @@ -205,7 +205,7 @@ public abstract class ExtensionPoint { * A an instance of a map, mapping one instance value to another. Both key and value are instances, not classes * like with other extension points. */ - public final static class InstanceMap<K, V> extends ExtensionPoint { + public static final class InstanceMap<K, V> extends ExtensionPoint { private final Map<K, V> map = new HashMap<>(); private final Class<K> keyType; private final Class<V> valueType; diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java index 0007903be0..e9b67c6565 100644 --- a/core/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java +++ b/core/src/main/java/org/elasticsearch/common/util/concurrent/KeyedLock.java @@ -110,7 +110,7 @@ public class KeyedLock<T> { } @SuppressWarnings("serial") - private final static class KeyLock extends ReentrantLock { + private static final class KeyLock extends ReentrantLock { KeyLock(boolean fair) { super(fair); } diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java b/core/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java index 54b3dd4782..1d8ce366b9 100644 --- a/core/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java +++ b/core/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java @@ -52,7 +52,7 @@ import org.joda.time.format.ISODateTimeFormat; */ public final class XContentBuilder implements BytesStream, Releasable { - public final static DateTimeFormatter defaultDatePrinter = ISODateTimeFormat.dateTime().withZone(DateTimeZone.UTC); + public static final DateTimeFormatter defaultDatePrinter = ISODateTimeFormat.dateTime().withZone(DateTimeZone.UTC); public static XContentBuilder builder(XContent xContent) throws IOException { return new XContentBuilder(xContent, new BytesStreamOutput()); @@ -809,7 +809,7 @@ public final class XContentBuilder implements BytesStream, Releasable { void write(XContentGenerator g, Object v) throws IOException; } - private final static Map<Class<?>, Writer> MAP; + private static final Map<Class<?>, Writer> MAP; static { Map<Class<?>, Writer> map = new HashMap<>(); diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java b/core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java index 901a9a7d71..c8715d03c3 100644 --- a/core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java +++ b/core/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java @@ -45,8 +45,8 @@ public class CborXContent implements XContent { return XContentBuilder.builder(cborXContent); } - final static CBORFactory cborFactory; - public final static CborXContent cborXContent; + static final CBORFactory cborFactory; + public static final CborXContent cborXContent; static { cborFactory = new CBORFactory(); diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java b/core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java index c989aa4a28..4828d8a752 100644 --- a/core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java +++ b/core/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java @@ -45,10 +45,10 @@ public class JsonXContent implements XContent { return XContentBuilder.builder(jsonXContent); } - private final static JsonFactory jsonFactory; - public final static String JSON_ALLOW_UNQUOTED_FIELD_NAMES = "elasticsearch.json.allow_unquoted_field_names"; - public final static JsonXContent jsonXContent; - public final static boolean unquotedFieldNamesSet; + private static final JsonFactory jsonFactory; + public static final String JSON_ALLOW_UNQUOTED_FIELD_NAMES = "elasticsearch.json.allow_unquoted_field_names"; + public static final JsonXContent jsonXContent; + public static final boolean unquotedFieldNamesSet; static { jsonFactory = new JsonFactory(); diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java b/core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java index f1bc879f26..629f8612ea 100644 --- a/core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java +++ b/core/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java @@ -45,8 +45,8 @@ public class SmileXContent implements XContent { return XContentBuilder.builder(smileXContent); } - final static SmileFactory smileFactory; - public final static SmileXContent smileXContent; + static final SmileFactory smileFactory; + public static final SmileXContent smileXContent; static { smileFactory = new SmileFactory(); diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java b/core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java index ce6e0e0e37..27a0dd46e0 100644 --- a/core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java +++ b/core/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java @@ -44,8 +44,8 @@ public class YamlXContent implements XContent { return XContentBuilder.builder(yamlXContent); } - final static YAMLFactory yamlFactory; - public final static YamlXContent yamlXContent; + static final YAMLFactory yamlFactory; + public static final YamlXContent yamlXContent; static { yamlFactory = new YAMLFactory(); diff --git a/core/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java b/core/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java index ca7ab342cd..6f5a6c9a74 100644 --- a/core/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java +++ b/core/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java @@ -36,9 +36,9 @@ import java.util.EnumSet; */ public class DiscoverySettings extends AbstractComponent { - public final static int NO_MASTER_BLOCK_ID = 2; - public final static ClusterBlock NO_MASTER_BLOCK_ALL = new ClusterBlock(NO_MASTER_BLOCK_ID, "no master", true, true, RestStatus.SERVICE_UNAVAILABLE, ClusterBlockLevel.ALL); - public final static ClusterBlock NO_MASTER_BLOCK_WRITES = new ClusterBlock(NO_MASTER_BLOCK_ID, "no master", true, false, RestStatus.SERVICE_UNAVAILABLE, EnumSet.of(ClusterBlockLevel.WRITE, ClusterBlockLevel.METADATA_WRITE)); + public static final int NO_MASTER_BLOCK_ID = 2; + public static final ClusterBlock NO_MASTER_BLOCK_ALL = new ClusterBlock(NO_MASTER_BLOCK_ID, "no master", true, true, RestStatus.SERVICE_UNAVAILABLE, ClusterBlockLevel.ALL); + public static final ClusterBlock NO_MASTER_BLOCK_WRITES = new ClusterBlock(NO_MASTER_BLOCK_ID, "no master", true, false, RestStatus.SERVICE_UNAVAILABLE, EnumSet.of(ClusterBlockLevel.WRITE, ClusterBlockLevel.METADATA_WRITE)); /** * sets the timeout for a complete publishing cycle, including both sending and committing. the master * will continue to process the next cluster state update after this time has elapsed diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/NodeJoinController.java b/core/src/main/java/org/elasticsearch/discovery/zen/NodeJoinController.java index 9659434e03..f4551ecb01 100644 --- a/core/src/main/java/org/elasticsearch/discovery/zen/NodeJoinController.java +++ b/core/src/main/java/org/elasticsearch/discovery/zen/NodeJoinController.java @@ -344,7 +344,7 @@ public class NodeJoinController extends AbstractComponent { static class JoinTaskListener implements ClusterStateTaskListener { final List<MembershipAction.JoinCallback> callbacks; - final private ESLogger logger; + private final ESLogger logger; JoinTaskListener(MembershipAction.JoinCallback callback, ESLogger logger) { this(Collections.singletonList(callback), logger); @@ -379,12 +379,12 @@ public class NodeJoinController extends AbstractComponent { } // a task indicated that the current node should become master, if no current master is known - private final static DiscoveryNode BECOME_MASTER_TASK = new DiscoveryNode("_BECOME_MASTER_TASK_", DummyTransportAddress.INSTANCE, + private static final DiscoveryNode BECOME_MASTER_TASK = new DiscoveryNode("_BECOME_MASTER_TASK_", DummyTransportAddress.INSTANCE, Collections.emptyMap(), Collections.emptySet(), Version.CURRENT); // a task that is used to process pending joins without explicitly becoming a master and listening to the results // this task is used when election is stop without the local node becoming a master per se (though it might - private final static DiscoveryNode FINISH_ELECTION_NOT_MASTER_TASK = new DiscoveryNode("_NOT_MASTER_TASK_", + private static final DiscoveryNode FINISH_ELECTION_NOT_MASTER_TASK = new DiscoveryNode("_NOT_MASTER_TASK_", DummyTransportAddress.INSTANCE, Collections.emptyMap(), Collections.emptySet(), Version.CURRENT); class JoinTaskExecutor implements ClusterStateTaskExecutor<DiscoveryNode> { diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java b/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java index 54ef992858..eca34389d9 100644 --- a/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java +++ b/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java @@ -88,25 +88,25 @@ import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; */ public class ZenDiscovery extends AbstractLifecycleComponent<Discovery> implements Discovery, PingContextProvider { - public final static Setting<TimeValue> PING_TIMEOUT_SETTING = + public static final Setting<TimeValue> PING_TIMEOUT_SETTING = Setting.positiveTimeSetting("discovery.zen.ping_timeout", timeValueSeconds(3), Property.NodeScope); - public final static Setting<TimeValue> JOIN_TIMEOUT_SETTING = + public static final Setting<TimeValue> JOIN_TIMEOUT_SETTING = Setting.timeSetting("discovery.zen.join_timeout", settings -> TimeValue.timeValueMillis(PING_TIMEOUT_SETTING.get(settings).millis() * 20).toString(), TimeValue.timeValueMillis(0), Property.NodeScope); - public final static Setting<Integer> JOIN_RETRY_ATTEMPTS_SETTING = + public static final Setting<Integer> JOIN_RETRY_ATTEMPTS_SETTING = Setting.intSetting("discovery.zen.join_retry_attempts", 3, 1, Property.NodeScope); - public final static Setting<TimeValue> JOIN_RETRY_DELAY_SETTING = + public static final Setting<TimeValue> JOIN_RETRY_DELAY_SETTING = Setting.positiveTimeSetting("discovery.zen.join_retry_delay", TimeValue.timeValueMillis(100), Property.NodeScope); - public final static Setting<Integer> MAX_PINGS_FROM_ANOTHER_MASTER_SETTING = + public static final Setting<Integer> MAX_PINGS_FROM_ANOTHER_MASTER_SETTING = Setting.intSetting("discovery.zen.max_pings_from_another_master", 3, 1, Property.NodeScope); - public final static Setting<Boolean> SEND_LEAVE_REQUEST_SETTING = + public static final Setting<Boolean> SEND_LEAVE_REQUEST_SETTING = Setting.boolSetting("discovery.zen.send_leave_request", true, Property.NodeScope); - public final static Setting<TimeValue> MASTER_ELECTION_WAIT_FOR_JOINS_TIMEOUT_SETTING = + public static final Setting<TimeValue> MASTER_ELECTION_WAIT_FOR_JOINS_TIMEOUT_SETTING = Setting.timeSetting("discovery.zen.master_election.wait_for_joins_timeout", settings -> TimeValue.timeValueMillis(JOIN_TIMEOUT_SETTING.get(settings).millis() / 2).toString(), TimeValue.timeValueMillis(0), Property.NodeScope); - public final static Setting<Boolean> MASTER_ELECTION_IGNORE_NON_MASTER_PINGS_SETTING = + public static final Setting<Boolean> MASTER_ELECTION_IGNORE_NON_MASTER_PINGS_SETTING = Setting.boolSetting("discovery.zen.master_election.ignore_non_master_pings", false, Property.NodeScope); public static final String DISCOVERY_REJOIN_ACTION_NAME = "internal:discovery/zen/rejoin"; diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java b/core/src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java index 48be9f64d5..7714f34d0e 100644 --- a/core/src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java +++ b/core/src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java @@ -543,11 +543,11 @@ public class PublishClusterStateAction extends AbstractComponent { } } - synchronized public boolean isCommitted() { + public synchronized boolean isCommitted() { return committed; } - synchronized public void onNodeSendAck(DiscoveryNode node) { + public synchronized void onNodeSendAck(DiscoveryNode node) { if (committed) { assert sendAckedBeforeCommit.isEmpty(); sendCommitToNode(node, clusterState, this); @@ -570,7 +570,7 @@ public class PublishClusterStateAction extends AbstractComponent { * check if enough master node responded to commit the change. fails the commit * if there are no more pending master nodes but not enough acks to commit. */ - synchronized private void checkForCommitOrFailIfNoPending(DiscoveryNode masterNode) { + private synchronized void checkForCommitOrFailIfNoPending(DiscoveryNode masterNode) { logger.trace("master node {} acked cluster state version [{}]. processing ... (current pending [{}], needed [{}])", masterNode, clusterState.version(), pendingMasterNodes, neededMastersToCommit); neededMastersToCommit--; @@ -585,14 +585,14 @@ public class PublishClusterStateAction extends AbstractComponent { decrementPendingMasterAcksAndChangeForFailure(); } - synchronized private void decrementPendingMasterAcksAndChangeForFailure() { + private synchronized void decrementPendingMasterAcksAndChangeForFailure() { pendingMasterNodes--; if (pendingMasterNodes == 0 && neededMastersToCommit > 0) { markAsFailed("no more pending master nodes, but failed to reach needed acks ([" + neededMastersToCommit + "] left)"); } } - synchronized public void onNodeSendFailed(DiscoveryNode node, Throwable t) { + public synchronized void onNodeSendFailed(DiscoveryNode node, Throwable t) { if (node.isMasterNode()) { logger.trace("master node {} failed to ack cluster state version [{}]. processing ... (current pending [{}], needed [{}])", node, clusterState.version(), pendingMasterNodes, neededMastersToCommit); @@ -606,7 +606,7 @@ public class PublishClusterStateAction extends AbstractComponent { * * @return true if successful */ - synchronized private boolean markAsCommitted() { + private synchronized boolean markAsCommitted() { if (committedOrFailed()) { return committed; } @@ -621,7 +621,7 @@ public class PublishClusterStateAction extends AbstractComponent { * * @return true if the publishing was failed and the cluster state is *not* committed **/ - synchronized private boolean markAsFailed(String details, Throwable reason) { + private synchronized boolean markAsFailed(String details, Throwable reason) { if (committedOrFailed()) { return committed == false; } @@ -636,7 +636,7 @@ public class PublishClusterStateAction extends AbstractComponent { * * @return true if the publishing was failed and the cluster state is *not* committed **/ - synchronized private boolean markAsFailed(String reason) { + private synchronized boolean markAsFailed(String reason) { if (committedOrFailed()) { return committed == false; } diff --git a/core/src/main/java/org/elasticsearch/index/Index.java b/core/src/main/java/org/elasticsearch/index/Index.java index 2fc62c5ea7..25b293ad38 100644 --- a/core/src/main/java/org/elasticsearch/index/Index.java +++ b/core/src/main/java/org/elasticsearch/index/Index.java @@ -128,7 +128,7 @@ public class Index implements Writeable, ToXContent { /** * Builder for Index objects. Used by ObjectParser instances only. */ - final private static class Builder { + private static final class Builder { private String name; private String uuid; diff --git a/core/src/main/java/org/elasticsearch/index/IndexService.java b/core/src/main/java/org/elasticsearch/index/IndexService.java index 1902f24c4b..4e8caa7d5e 100644 --- a/core/src/main/java/org/elasticsearch/index/IndexService.java +++ b/core/src/main/java/org/elasticsearch/index/IndexService.java @@ -186,7 +186,8 @@ public class IndexService extends AbstractIndexComponent implements IndicesClust * Return the shard with the provided id, or null if there is no such shard. */ @Override - public @Nullable IndexShard getShardOrNull(int shardId) { + @Nullable + public IndexShard getShardOrNull(int shardId) { return shards.get(shardId); } @@ -730,7 +731,7 @@ public class IndexService extends AbstractIndexComponent implements IndicesClust } } - static abstract class BaseAsyncTask implements Runnable, Closeable { + abstract static class BaseAsyncTask implements Runnable, Closeable { protected final IndexService indexService; protected final ThreadPool threadPool; private final TimeValue interval; @@ -827,7 +828,7 @@ public class IndexService extends AbstractIndexComponent implements IndicesClust /** * FSyncs the translog for all shards of this index in a defined interval. */ - final static class AsyncTranslogFSync extends BaseAsyncTask { + static final class AsyncTranslogFSync extends BaseAsyncTask { AsyncTranslogFSync(IndexService indexService) { super(indexService, indexService.getIndexSettings().getTranslogSyncInterval()); diff --git a/core/src/main/java/org/elasticsearch/index/codec/CodecService.java b/core/src/main/java/org/elasticsearch/index/codec/CodecService.java index 3edc509b7e..f8d19be3c8 100644 --- a/core/src/main/java/org/elasticsearch/index/codec/CodecService.java +++ b/core/src/main/java/org/elasticsearch/index/codec/CodecService.java @@ -40,10 +40,10 @@ public class CodecService { private final Map<String, Codec> codecs; - public final static String DEFAULT_CODEC = "default"; - public final static String BEST_COMPRESSION_CODEC = "best_compression"; + public static final String DEFAULT_CODEC = "default"; + public static final String BEST_COMPRESSION_CODEC = "best_compression"; /** the raw unfiltered lucene default. useful for testing */ - public final static String LUCENE_DEFAULT_CODEC = "lucene_default"; + public static final String LUCENE_DEFAULT_CODEC = "lucene_default"; public CodecService(@Nullable MapperService mapperService, ESLogger logger) { final MapBuilder<String, Codec> codecs = MapBuilder.<String, Codec>newMapBuilder(); diff --git a/core/src/main/java/org/elasticsearch/index/engine/Engine.java b/core/src/main/java/org/elasticsearch/index/engine/Engine.java index 5c1a20c16e..d169e495a3 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/Engine.java +++ b/core/src/main/java/org/elasticsearch/index/engine/Engine.java @@ -297,7 +297,7 @@ public abstract class Engine implements Closeable { PENDING_OPERATIONS } - final protected GetResult getFromSearcher(Get get, Function<String, Searcher> searcherFactory) throws EngineException { + protected final GetResult getFromSearcher(Get get, Function<String, Searcher> searcherFactory) throws EngineException { final Searcher searcher = searcherFactory.apply("get"); final Versions.DocIdAndVersion docIdAndVersion; try { @@ -506,7 +506,7 @@ public abstract class Engine implements Closeable { } /** How much heap is used that would be freed by a refresh. Note that this may throw {@link AlreadyClosedException}. */ - abstract public long getIndexBufferRAMBytesUsed(); + public abstract long getIndexBufferRAMBytesUsed(); protected Segment[] getSegmentInfo(SegmentInfos lastCommittedSegmentInfos, boolean verbose) { ensureOpen(); @@ -757,7 +757,7 @@ public abstract class Engine implements Closeable { } } - public static abstract class Operation { + public abstract static class Operation { private final Term uid; private long version; private final VersionType versionType; diff --git a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java index 449c04ce4d..6052de7f58 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java +++ b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java @@ -995,7 +995,7 @@ public class InternalEngine extends Engine { } /** Extended SearcherFactory that warms the segments if needed when acquiring a new searcher */ - final static class SearchFactory extends EngineSearcherFactory { + static final class SearchFactory extends EngineSearcherFactory { private final Engine.Warmer warmer; private final ESLogger logger; private final AtomicBoolean isEngineClosed; diff --git a/core/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java b/core/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java index 0a55803a5e..c8ee7d5b8b 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java +++ b/core/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java @@ -58,8 +58,8 @@ import java.util.function.Function; public class ShadowEngine extends Engine { /** how long to wait for an index to exist */ - public final static String NONEXISTENT_INDEX_RETRY_WAIT = "index.shadow.wait_for_initial_commit"; - public final static TimeValue DEFAULT_NONEXISTENT_INDEX_RETRY_WAIT = TimeValue.timeValueSeconds(5); + public static final String NONEXISTENT_INDEX_RETRY_WAIT = "index.shadow.wait_for_initial_commit"; + public static final TimeValue DEFAULT_NONEXISTENT_INDEX_RETRY_WAIT = TimeValue.timeValueSeconds(5); private volatile SearcherManager searcherManager; diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java b/core/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java index afaaa9a1df..408950c3ed 100644 --- a/core/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java +++ b/core/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java @@ -50,7 +50,7 @@ public interface ScriptDocValues<T> extends List<T> { */ List<T> getValues(); - public final static class Strings extends AbstractList<String> implements ScriptDocValues<String> { + public static final class Strings extends AbstractList<String> implements ScriptDocValues<String> { private final SortedBinaryDocValues values; diff --git a/core/src/main/java/org/elasticsearch/index/mapper/Mapper.java b/core/src/main/java/org/elasticsearch/index/mapper/Mapper.java index 9233dc3018..a6c3cdb901 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/Mapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/Mapper.java @@ -62,7 +62,7 @@ public abstract class Mapper implements ToXContent, Iterable<Mapper> { } } - public static abstract class Builder<T extends Builder, Y extends Mapper> { + public abstract static class Builder<T extends Builder, Y extends Mapper> { public String name; diff --git a/core/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java index 7237381159..17e8712f57 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java @@ -72,8 +72,8 @@ public class BooleanFieldMapper extends FieldMapper { } public static class Values { - public final static BytesRef TRUE = new BytesRef("T"); - public final static BytesRef FALSE = new BytesRef("F"); + public static final BytesRef TRUE = new BytesRef("T"); + public static final BytesRef FALSE = new BytesRef("F"); } public static class Builder extends FieldMapper.Builder<Builder, BooleanFieldMapper> { diff --git a/core/src/main/java/org/elasticsearch/index/mapper/core/LegacyNumberFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/LegacyNumberFieldMapper.java index 7278e17a3c..2b0cf0968a 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/core/LegacyNumberFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/core/LegacyNumberFieldMapper.java @@ -120,7 +120,7 @@ public abstract class LegacyNumberFieldMapper extends FieldMapper implements All protected abstract int maxPrecisionStep(); } - public static abstract class NumberFieldType extends TermBasedFieldType { + public abstract static class NumberFieldType extends TermBasedFieldType { public NumberFieldType(LegacyNumericType numericType) { setTokenized(false); diff --git a/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java index e883166f90..0dff9a9886 100644 --- a/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java @@ -239,14 +239,14 @@ public abstract class AbstractQueryBuilder<QB extends AbstractQueryBuilder<QB>> return getWriteableName(); } - protected final static void writeQueries(StreamOutput out, List<? extends QueryBuilder> queries) throws IOException { + protected static final void writeQueries(StreamOutput out, List<? extends QueryBuilder> queries) throws IOException { out.writeVInt(queries.size()); for (QueryBuilder query : queries) { out.writeNamedWriteable(query); } } - protected final static List<QueryBuilder> readQueries(StreamInput in) throws IOException { + protected static final List<QueryBuilder> readQueries(StreamInput in) throws IOException { List<QueryBuilder> queries = new ArrayList<>(); int size = in.readVInt(); for (int i = 0; i < size; i++) { diff --git a/core/src/main/java/org/elasticsearch/index/query/HasChildQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/HasChildQueryBuilder.java index 389e3812e3..9319719e81 100644 --- a/core/src/main/java/org/elasticsearch/index/query/HasChildQueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/HasChildQueryBuilder.java @@ -357,7 +357,7 @@ public class HasChildQueryBuilder extends AbstractQueryBuilder<HasChildQueryBuil parentType, scoreMode, parentChildIndexFieldData, context.getSearchSimilarity()); } - final static class LateParsingQuery extends Query { + static final class LateParsingQuery extends Query { private final Query toQuery; private final Query innerQuery; diff --git a/core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java b/core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java index b54d7713cd..631bc16315 100644 --- a/core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java @@ -62,7 +62,7 @@ public final class InnerHitBuilder extends ToXContentToBytes implements Writeabl public static final ParseField INNER_HITS_FIELD = new ParseField("inner_hits"); public static final QueryBuilder DEFAULT_INNER_HIT_QUERY = new MatchAllQueryBuilder(); - private final static ObjectParser<InnerHitBuilder, QueryParseContext> PARSER = new ObjectParser<>("inner_hits", InnerHitBuilder::new); + private static final ObjectParser<InnerHitBuilder, QueryParseContext> PARSER = new ObjectParser<>("inner_hits", InnerHitBuilder::new); static { PARSER.declareString(InnerHitBuilder::setName, NAME_FIELD); diff --git a/core/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java index 3b47378d1e..236d9751ab 100644 --- a/core/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java @@ -48,7 +48,7 @@ public class TemplateQueryBuilder extends AbstractQueryBuilder<TemplateQueryBuil public static final String NAME = "template"; public static final ParseField QUERY_NAME_FIELD = new ParseField(NAME); - private final static Map<String, ScriptService.ScriptType> parametersToTypes = new HashMap<>(); + private static final Map<String, ScriptService.ScriptType> parametersToTypes = new HashMap<>(); static { parametersToTypes.put("query", ScriptService.ScriptType.INLINE); parametersToTypes.put("file", ScriptService.ScriptType.FILE); diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java index 2df87a0ad6..7ddf11202d 100644 --- a/core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionBuilder.java @@ -501,7 +501,7 @@ public abstract class DecayFunctionBuilder<DFB extends DecayFunctionBuilder<DFB> * This is the base class for scoring a single field. * * */ - public static abstract class AbstractDistanceScoreFunction extends ScoreFunction { + public abstract static class AbstractDistanceScoreFunction extends ScoreFunction { private final double scale; protected final double offset; diff --git a/core/src/main/java/org/elasticsearch/index/search/stats/ShardSearchStats.java b/core/src/main/java/org/elasticsearch/index/search/stats/ShardSearchStats.java index 13d72a74b9..68a2a30a2e 100644 --- a/core/src/main/java/org/elasticsearch/index/search/stats/ShardSearchStats.java +++ b/core/src/main/java/org/elasticsearch/index/search/stats/ShardSearchStats.java @@ -179,7 +179,7 @@ public final class ShardSearchStats implements SearchOperationListener { totalStats.scrollMetric.inc(System.nanoTime() - context.getOriginNanoTime()); } - final static class StatsHolder { + static final class StatsHolder { public final MeanMetric queryMetric = new MeanMetric(); public final MeanMetric fetchMetric = new MeanMetric(); public final MeanMetric scrollMetric = new MeanMetric(); diff --git a/core/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java b/core/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java index 4ba2e0d0a3..7bb81a0109 100644 --- a/core/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java +++ b/core/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java @@ -36,7 +36,7 @@ import java.util.function.BiFunction; public final class SimilarityService extends AbstractIndexComponent { - public final static String DEFAULT_SIMILARITY = "BM25"; + public static final String DEFAULT_SIMILARITY = "BM25"; private final Similarity defaultSimilarity; private final Similarity baseSimilarity; private final Map<String, SimilarityProvider> similarities; diff --git a/core/src/main/java/org/elasticsearch/index/store/Store.java b/core/src/main/java/org/elasticsearch/index/store/Store.java index 51e80f0b87..2f647933ea 100644 --- a/core/src/main/java/org/elasticsearch/index/store/Store.java +++ b/core/src/main/java/org/elasticsearch/index/store/Store.java @@ -716,7 +716,7 @@ public class Store extends AbstractIndexShardComponent implements Closeable, Ref * * @see StoreFileMetaData */ - public final static class MetadataSnapshot implements Iterable<StoreFileMetaData>, Writeable { + public static final class MetadataSnapshot implements Iterable<StoreFileMetaData>, Writeable { private final Map<String, StoreFileMetaData> metadata; public static final MetadataSnapshot EMPTY = new MetadataSnapshot(); diff --git a/core/src/main/java/org/elasticsearch/index/translog/BaseTranslogReader.java b/core/src/main/java/org/elasticsearch/index/translog/BaseTranslogReader.java index 4cdbb28a68..49e8249e9d 100644 --- a/core/src/main/java/org/elasticsearch/index/translog/BaseTranslogReader.java +++ b/core/src/main/java/org/elasticsearch/index/translog/BaseTranslogReader.java @@ -52,7 +52,7 @@ public abstract class BaseTranslogReader implements Comparable<BaseTranslogReade public abstract long sizeInBytes(); - abstract public int totalOperations(); + public abstract int totalOperations(); public final long getFirstOperationOffset() { return firstOperationOffset; @@ -117,7 +117,7 @@ public abstract class BaseTranslogReader implements Comparable<BaseTranslogReade /** * reads bytes at position into the given buffer, filling it. */ - abstract protected void readBytes(ByteBuffer buffer, long position) throws IOException; + protected abstract void readBytes(ByteBuffer buffer, long position) throws IOException; @Override public String toString() { diff --git a/core/src/main/java/org/elasticsearch/index/translog/Translog.java b/core/src/main/java/org/elasticsearch/index/translog/Translog.java index 788ee547f7..fe970dcbc5 100644 --- a/core/src/main/java/org/elasticsearch/index/translog/Translog.java +++ b/core/src/main/java/org/elasticsearch/index/translog/Translog.java @@ -122,7 +122,7 @@ public class Translog extends AbstractIndexShardComponent implements IndexShardC private final Path location; private TranslogWriter current; - private final static long NOT_SET_GENERATION = -1; // -1 is safe as it will not cause a translog deletion. + private static final long NOT_SET_GENERATION = -1; // -1 is safe as it will not cause a translog deletion. private volatile long currentCommittingGeneration = NOT_SET_GENERATION; private volatile long lastCommittedTranslogFileGeneration = NOT_SET_GENERATION; @@ -1261,7 +1261,7 @@ public class Translog extends AbstractIndexShardComponent implements IndexShardC /** * References a transaction log generation */ - public final static class TranslogGeneration { + public static final class TranslogGeneration { public final String translogUUID; public final long translogFileGeneration; diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java b/core/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java index 59135684e0..b873c414b4 100644 --- a/core/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java +++ b/core/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java @@ -114,7 +114,7 @@ public class TranslogWriter extends BaseTranslogReader implements Closeable { return tragedy; } - private synchronized final void closeWithTragicEvent(Throwable throwable) throws IOException { + private synchronized void closeWithTragicEvent(Throwable throwable) throws IOException { assert throwable != null : "throwable must not be null in a tragic event"; if (tragedy == null) { tragedy = throwable; diff --git a/core/src/main/java/org/elasticsearch/indices/IndicesService.java b/core/src/main/java/org/elasticsearch/indices/IndicesService.java index 12d1966e4c..27387d7daa 100644 --- a/core/src/main/java/org/elasticsearch/indices/IndicesService.java +++ b/core/src/main/java/org/elasticsearch/indices/IndicesService.java @@ -331,7 +331,8 @@ public class IndicesService extends AbstractLifecycleComponent<IndicesService> * Returns an IndexService for the specified index if exists otherwise returns <code>null</code>. */ @Override - public @Nullable IndexService indexService(Index index) { + @Nullable + public IndexService indexService(Index index) { return indices.get(index.getUUID()); } @@ -737,7 +738,8 @@ public class IndicesService extends AbstractLifecycleComponent<IndicesService> * @return IndexMetaData for the index loaded from disk */ @Override - public @Nullable IndexMetaData verifyIndexIsDeleted(final Index index, final ClusterState clusterState) { + @Nullable + public IndexMetaData verifyIndexIsDeleted(final Index index, final ClusterState clusterState) { // this method should only be called when we know the index (name + uuid) is not part of the cluster state if (clusterState.metaData().index(index) != null) { throw new IllegalStateException("Cannot delete index [" + index + "], it is still part of the cluster state."); @@ -997,7 +999,7 @@ public class IndicesService extends AbstractLifecycleComponent<IndicesService> * has an entry invalidated may not clean up the entry if it is not read from * or written to after invalidation. */ - private final static class CacheCleaner implements Runnable, Releasable { + private static final class CacheCleaner implements Runnable, Releasable { private final IndicesFieldDataCache cache; private final ESLogger logger; @@ -1160,7 +1162,7 @@ public class IndicesService extends AbstractLifecycleComponent<IndicesService> return indicesRequestCache.getOrCompute(cacheEntity, reader, cacheKey); } - final static class IndexShardCacheEntity extends AbstractIndexShardCacheEntity { + static final class IndexShardCacheEntity extends AbstractIndexShardCacheEntity { private final IndexShard indexShard; protected IndexShardCacheEntity(IndexShard indexShard, Loader loader) { diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java b/core/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java index 97667fcdac..e7ba2bfd70 100644 --- a/core/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java +++ b/core/src/main/java/org/elasticsearch/indices/analysis/HunspellService.java @@ -75,11 +75,11 @@ import java.util.function.Function; */ public class HunspellService extends AbstractComponent { - public final static Setting<Boolean> HUNSPELL_LAZY_LOAD = + public static final Setting<Boolean> HUNSPELL_LAZY_LOAD = Setting.boolSetting("indices.analysis.hunspell.dictionary.lazy", Boolean.FALSE, Property.NodeScope); - public final static Setting<Boolean> HUNSPELL_IGNORE_CASE = + public static final Setting<Boolean> HUNSPELL_IGNORE_CASE = Setting.boolSetting("indices.analysis.hunspell.dictionary.ignore_case", Boolean.FALSE, Property.NodeScope); - public final static Setting<Settings> HUNSPELL_DICTIONARY_OPTIONS = + public static final Setting<Settings> HUNSPELL_DICTIONARY_OPTIONS = Setting.groupSetting("indices.analysis.hunspell.dictionary.", Property.NodeScope); private final ConcurrentHashMap<String, Dictionary> dictionaries = new ConcurrentHashMap<>(); private final Map<String, Dictionary> knownDictionaries; diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java b/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java index 6d5c3a8ed1..ca95461992 100644 --- a/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java +++ b/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzers.java @@ -465,7 +465,7 @@ public enum PreBuiltAnalyzers { } }; - abstract protected Analyzer create(Version version); + protected abstract Analyzer create(Version version); protected final PreBuiltCacheFactory.PreBuiltCache<Analyzer> cache; diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCharFilters.java b/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCharFilters.java index 3e8647892e..dcf6c29530 100644 --- a/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCharFilters.java +++ b/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltCharFilters.java @@ -38,7 +38,7 @@ public enum PreBuiltCharFilters { } }; - abstract public Reader create(Reader tokenStream, Version version); + public abstract Reader create(Reader tokenStream, Version version); protected final PreBuiltCacheFactory.PreBuiltCache<CharFilterFactory> cache; diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenFilters.java b/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenFilters.java index 027c75073f..6b69658b34 100644 --- a/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenFilters.java +++ b/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenFilters.java @@ -393,7 +393,7 @@ public enum PreBuiltTokenFilters { ; - abstract public TokenStream create(TokenStream tokenStream, Version version); + public abstract TokenStream create(TokenStream tokenStream, Version version); protected final PreBuiltCacheFactory.PreBuiltCache<TokenFilterFactory> cache; diff --git a/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java b/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java index c6a8255e4c..424b5e4534 100644 --- a/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java +++ b/core/src/main/java/org/elasticsearch/indices/analysis/PreBuiltTokenizers.java @@ -129,7 +129,7 @@ public enum PreBuiltTokenizers { ; - abstract protected Tokenizer create(Version version); + protected abstract Tokenizer create(Version version); protected final PreBuiltCacheFactory.PreBuiltCache<TokenizerFactory> cache; diff --git a/core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java b/core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java index 16e4d62a72..0fcdd16aba 100644 --- a/core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java +++ b/core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java @@ -443,7 +443,7 @@ public class SyncedFlushService extends AbstractComponent implements IndexEventL return new InFlightOpsResponse(opCount); } - public final static class PreShardSyncedFlushRequest extends TransportRequest { + public static final class PreShardSyncedFlushRequest extends TransportRequest { private ShardId shardId; public PreShardSyncedFlushRequest() { @@ -480,7 +480,7 @@ public class SyncedFlushService extends AbstractComponent implements IndexEventL /** * Response for first step of synced flush (flush) for one shard copy */ - final static class PreSyncedFlushResponse extends TransportResponse { + static final class PreSyncedFlushResponse extends TransportResponse { Engine.CommitId commitId; diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java index 34bd35dfed..4a2b93de08 100644 --- a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java +++ b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveriesCollection.java @@ -45,8 +45,8 @@ public class RecoveriesCollection { /** This is the single source of truth for ongoing recoveries. If it's not here, it was canceled or done */ private final ConcurrentMap<Long, RecoveryTarget> onGoingRecoveries = ConcurrentCollections.newConcurrentMap(); - final private ESLogger logger; - final private ThreadPool threadPool; + private final ESLogger logger; + private final ThreadPool threadPool; public RecoveriesCollection(ESLogger logger, ThreadPool threadPool) { this.logger = logger; diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java index 6e2b300c00..a742c582a9 100644 --- a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java +++ b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java @@ -706,7 +706,7 @@ public class RecoveryState implements ToXContent, Streamable { private Map<String, File> fileDetails = new HashMap<>(); - public final static long UNKNOWN = -1L; + public static final long UNKNOWN = -1L; private long version = UNKNOWN; private long sourceThrottlingInNanos = UNKNOWN; diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java index bafd5d0e58..a006c8de92 100644 --- a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java +++ b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java @@ -63,7 +63,7 @@ public class RecoveryTarget extends AbstractRefCounted implements RecoveryTarget private final ESLogger logger; - private final static AtomicLong idGenerator = new AtomicLong(); + private static final AtomicLong idGenerator = new AtomicLong(); private final String RECOVERY_PREFIX = "recovery."; diff --git a/core/src/main/java/org/elasticsearch/ingest/IngestDocument.java b/core/src/main/java/org/elasticsearch/ingest/IngestDocument.java index 80bbd52bcf..baa0f3acd0 100644 --- a/core/src/main/java/org/elasticsearch/ingest/IngestDocument.java +++ b/core/src/main/java/org/elasticsearch/ingest/IngestDocument.java @@ -47,7 +47,7 @@ import java.util.TimeZone; */ public final class IngestDocument { - public final static String INGEST_KEY = "_ingest"; + public static final String INGEST_KEY = "_ingest"; private static final String INGEST_KEY_PREFIX = INGEST_KEY + "."; private static final String SOURCE_PREFIX = SourceFieldMapper.NAME + "."; diff --git a/core/src/main/java/org/elasticsearch/ingest/IngestMetadata.java b/core/src/main/java/org/elasticsearch/ingest/IngestMetadata.java index 2a9c9fa758..9ad369e22d 100644 --- a/core/src/main/java/org/elasticsearch/ingest/IngestMetadata.java +++ b/core/src/main/java/org/elasticsearch/ingest/IngestMetadata.java @@ -44,8 +44,8 @@ import java.util.Map; */ public final class IngestMetadata implements MetaData.Custom { - public final static String TYPE = "ingest"; - public final static IngestMetadata PROTO = new IngestMetadata(); + public static final String TYPE = "ingest"; + public static final IngestMetadata PROTO = new IngestMetadata(); private static final ParseField PIPELINES_FIELD = new ParseField("pipeline"); private static final ObjectParser<List<PipelineConfiguration>, ParseFieldMatcherSupplier> INGEST_METADATA_PARSER = new ObjectParser<>( "ingest_metadata", ArrayList::new); diff --git a/core/src/main/java/org/elasticsearch/ingest/Pipeline.java b/core/src/main/java/org/elasticsearch/ingest/Pipeline.java index d568f5521a..df386166e7 100644 --- a/core/src/main/java/org/elasticsearch/ingest/Pipeline.java +++ b/core/src/main/java/org/elasticsearch/ingest/Pipeline.java @@ -31,9 +31,9 @@ import java.util.Map; */ public final class Pipeline { - final static String DESCRIPTION_KEY = "description"; - final static String PROCESSORS_KEY = "processors"; - final static String ON_FAILURE_KEY = "on_failure"; + static final String DESCRIPTION_KEY = "description"; + static final String PROCESSORS_KEY = "processors"; + static final String ON_FAILURE_KEY = "on_failure"; private final String id; private final String description; @@ -96,7 +96,7 @@ public final class Pipeline { return compoundProcessor.flattenProcessors(); } - public final static class Factory { + public static final class Factory { public Pipeline create(String id, Map<String, Object> config, ProcessorsRegistry processorRegistry) throws Exception { String description = ConfigurationUtils.readOptionalStringProperty(null, null, config, DESCRIPTION_KEY); diff --git a/core/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java b/core/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java index a6bff3ff5c..56f4e2c6a7 100644 --- a/core/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java +++ b/core/src/main/java/org/elasticsearch/ingest/PipelineConfiguration.java @@ -40,12 +40,12 @@ import java.util.function.BiFunction; */ public final class PipelineConfiguration extends AbstractDiffable<PipelineConfiguration> implements ToXContent { - final static PipelineConfiguration PROTOTYPE = new PipelineConfiguration(null, null); + static final PipelineConfiguration PROTOTYPE = new PipelineConfiguration(null, null); public static PipelineConfiguration readPipelineConfiguration(StreamInput in) throws IOException { return PROTOTYPE.readFrom(in); } - private final static ObjectParser<Builder, ParseFieldMatcherSupplier> PARSER = new ObjectParser<>("pipeline_config", Builder::new); + private static final ObjectParser<Builder, ParseFieldMatcherSupplier> PARSER = new ObjectParser<>("pipeline_config", Builder::new); static { PARSER.declareString(Builder::setId, new ParseField("id")); PARSER.declareField((parser, builder, aVoid) -> { diff --git a/core/src/main/java/org/elasticsearch/monitor/fs/FsService.java b/core/src/main/java/org/elasticsearch/monitor/fs/FsService.java index e04a06fc46..9f38538f26 100644 --- a/core/src/main/java/org/elasticsearch/monitor/fs/FsService.java +++ b/core/src/main/java/org/elasticsearch/monitor/fs/FsService.java @@ -36,7 +36,7 @@ public class FsService extends AbstractComponent { private final TimeValue refreshInterval; private final SingleObjectCache<FsInfo> cache; - public final static Setting<TimeValue> REFRESH_INTERVAL_SETTING = + public static final Setting<TimeValue> REFRESH_INTERVAL_SETTING = Setting.timeSetting( "monitor.fs.refresh_interval", TimeValue.timeValueSeconds(1), diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java b/core/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java index ac75eb93aa..69ec81c38e 100644 --- a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java +++ b/core/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java @@ -50,20 +50,20 @@ public class JvmGcMonitorService extends AbstractLifecycleComponent<JvmGcMonitor private volatile ScheduledFuture scheduledFuture; - public final static Setting<Boolean> ENABLED_SETTING = + public static final Setting<Boolean> ENABLED_SETTING = Setting.boolSetting("monitor.jvm.gc.enabled", true, Property.NodeScope); - public final static Setting<TimeValue> REFRESH_INTERVAL_SETTING = + public static final Setting<TimeValue> REFRESH_INTERVAL_SETTING = Setting.timeSetting("monitor.jvm.gc.refresh_interval", TimeValue.timeValueSeconds(1), TimeValue.timeValueSeconds(1), Property.NodeScope); private static String GC_COLLECTOR_PREFIX = "monitor.jvm.gc.collector."; - public final static Setting<Settings> GC_SETTING = Setting.groupSetting(GC_COLLECTOR_PREFIX, Property.NodeScope); + public static final Setting<Settings> GC_SETTING = Setting.groupSetting(GC_COLLECTOR_PREFIX, Property.NodeScope); - public final static Setting<Integer> GC_OVERHEAD_WARN_SETTING = + public static final Setting<Integer> GC_OVERHEAD_WARN_SETTING = Setting.intSetting("monitor.jvm.gc.overhead.warn", 50, 0, 100, Property.NodeScope); - public final static Setting<Integer> GC_OVERHEAD_INFO_SETTING = + public static final Setting<Integer> GC_OVERHEAD_INFO_SETTING = Setting.intSetting("monitor.jvm.gc.overhead.info", 25, 0, 100, Property.NodeScope); - public final static Setting<Integer> GC_OVERHEAD_DEBUG_SETTING = + public static final Setting<Integer> GC_OVERHEAD_DEBUG_SETTING = Setting.intSetting("monitor.jvm.gc.overhead.debug", 10, 0, 100, Property.NodeScope); static class GcOverheadThreshold { @@ -341,7 +341,7 @@ public class JvmGcMonitorService extends AbstractLifecycleComponent<JvmGcMonitor protected void doClose() { } - static abstract class JvmMonitor implements Runnable { + abstract static class JvmMonitor implements Runnable { enum Threshold { DEBUG, INFO, WARN } diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java b/core/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java index 78dcf13ae8..f0d71db699 100644 --- a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java +++ b/core/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java @@ -36,7 +36,7 @@ public class JvmService extends AbstractComponent { private JvmStats jvmStats; - public final static Setting<TimeValue> REFRESH_INTERVAL_SETTING = + public static final Setting<TimeValue> REFRESH_INTERVAL_SETTING = Setting.timeSetting("monitor.jvm.refresh_interval", TimeValue.timeValueSeconds(1), TimeValue.timeValueSeconds(1), Property.NodeScope); diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java b/core/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java index 43b675f34a..7122f1ea38 100644 --- a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java +++ b/core/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java @@ -48,10 +48,10 @@ import java.util.concurrent.TimeUnit; */ public class JvmStats implements Streamable, ToXContent { - private final static RuntimeMXBean runtimeMXBean; - private final static MemoryMXBean memoryMXBean; - private final static ThreadMXBean threadMXBean; - private final static ClassLoadingMXBean classLoadingMXBean; + private static final RuntimeMXBean runtimeMXBean; + private static final MemoryMXBean memoryMXBean; + private static final ThreadMXBean threadMXBean; + private static final ClassLoadingMXBean classLoadingMXBean; static { runtimeMXBean = ManagementFactory.getRuntimeMXBean(); diff --git a/core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java b/core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java index c6b4f080b9..f41afb90e0 100644 --- a/core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java +++ b/core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java @@ -153,7 +153,7 @@ public class OsProbe { } private static class OsProbeHolder { - private final static OsProbe INSTANCE = new OsProbe(); + private static final OsProbe INSTANCE = new OsProbe(); } public static OsProbe getInstance() { diff --git a/core/src/main/java/org/elasticsearch/monitor/os/OsService.java b/core/src/main/java/org/elasticsearch/monitor/os/OsService.java index eb535141d8..248b49f21c 100644 --- a/core/src/main/java/org/elasticsearch/monitor/os/OsService.java +++ b/core/src/main/java/org/elasticsearch/monitor/os/OsService.java @@ -38,7 +38,7 @@ public class OsService extends AbstractComponent { private SingleObjectCache<OsStats> osStatsCache; - public final static Setting<TimeValue> REFRESH_INTERVAL_SETTING = + public static final Setting<TimeValue> REFRESH_INTERVAL_SETTING = Setting.timeSetting("monitor.os.refresh_interval", TimeValue.timeValueSeconds(1), TimeValue.timeValueSeconds(1), Property.NodeScope); diff --git a/core/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java b/core/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java index 4cd005982c..019a00bd4c 100644 --- a/core/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java +++ b/core/src/main/java/org/elasticsearch/monitor/process/ProcessProbe.java @@ -47,7 +47,7 @@ public class ProcessProbe { } private static class ProcessProbeHolder { - private final static ProcessProbe INSTANCE = new ProcessProbe(); + private static final ProcessProbe INSTANCE = new ProcessProbe(); } public static ProcessProbe getInstance() { diff --git a/core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java b/core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java index dbab25037d..3859353448 100644 --- a/core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java +++ b/core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java @@ -35,7 +35,7 @@ public final class ProcessService extends AbstractComponent { private final ProcessInfo info; private final SingleObjectCache<ProcessStats> processStatsCache; - public final static Setting<TimeValue> REFRESH_INTERVAL_SETTING = + public static final Setting<TimeValue> REFRESH_INTERVAL_SETTING = Setting.timeSetting("monitor.process.refresh_interval", TimeValue.timeValueSeconds(1), TimeValue.timeValueSeconds(1), Property.NodeScope); diff --git a/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java b/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java index 506e64cb9a..c1efcb7801 100644 --- a/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java +++ b/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java @@ -233,12 +233,12 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent<Rep * * @return blob store */ - abstract protected BlobStore blobStore(); + protected abstract BlobStore blobStore(); /** * Returns base path of the repository */ - abstract protected BlobPath basePath(); + protected abstract BlobPath basePath(); /** * Returns true if metadata and snapshot files should be compressed diff --git a/core/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java b/core/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java index 56e7e08c2c..4e57c431f1 100644 --- a/core/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java +++ b/core/src/main/java/org/elasticsearch/repositories/fs/FsRepository.java @@ -50,7 +50,7 @@ import java.util.function.Function; */ public class FsRepository extends BlobStoreRepository { - public final static String TYPE = "fs"; + public static final String TYPE = "fs"; public static final Setting<String> LOCATION_SETTING = new Setting<>("location", "", Function.identity(), Property.NodeScope); diff --git a/core/src/main/java/org/elasticsearch/repositories/uri/URLRepository.java b/core/src/main/java/org/elasticsearch/repositories/uri/URLRepository.java index baea7fe28f..b805727fd9 100644 --- a/core/src/main/java/org/elasticsearch/repositories/uri/URLRepository.java +++ b/core/src/main/java/org/elasticsearch/repositories/uri/URLRepository.java @@ -55,7 +55,7 @@ import java.util.function.Predicate; */ public class URLRepository extends BlobStoreRepository { - public final static String TYPE = "url"; + public static final String TYPE = "url"; public static final Setting<List<String>> SUPPORTED_PROTOCOLS_SETTING = Setting.listSetting("repositories.url.supported_protocols", Arrays.asList("http", "https", "ftp", "file", "jar"), diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java index 3df457efb9..8826efef22 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java @@ -43,7 +43,7 @@ import static org.elasticsearch.rest.RestRequest.Method.GET; public class RestNodesInfoAction extends BaseRestHandler { private final SettingsFilter settingsFilter; - private final static Set<String> ALLOWED_METRICS = Sets.newHashSet("http", "jvm", "os", "plugins", "process", "settings", "thread_pool", "transport", "ingest", "indices"); + private static final Set<String> ALLOWED_METRICS = Sets.newHashSet("http", "jvm", "os", "plugins", "process", "settings", "thread_pool", "transport", "ingest", "indices"); @Inject public RestNodesInfoAction(Settings settings, RestController controller, SettingsFilter settingsFilter) { diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java index caf28a9b01..8987fd2741 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java @@ -55,7 +55,7 @@ import static org.elasticsearch.rest.RestRequest.Method.GET; public class RestThreadPoolAction extends AbstractCatAction { - private final static String[] SUPPORTED_NAMES = new String[]{ + private static final String[] SUPPORTED_NAMES = new String[]{ ThreadPool.Names.BULK, ThreadPool.Names.FLUSH, ThreadPool.Names.GENERIC, @@ -69,7 +69,7 @@ public class RestThreadPoolAction extends AbstractCatAction { ThreadPool.Names.WARMER }; - private final static String[] SUPPORTED_ALIASES = new String[]{ + private static final String[] SUPPORTED_ALIASES = new String[]{ "b", "f", "ge", @@ -87,14 +87,14 @@ public class RestThreadPoolAction extends AbstractCatAction { assert SUPPORTED_ALIASES.length == SUPPORTED_NAMES.length: "SUPPORTED_NAMES/ALIASES mismatch"; } - private final static String[] DEFAULT_THREAD_POOLS = new String[]{ + private static final String[] DEFAULT_THREAD_POOLS = new String[]{ ThreadPool.Names.BULK, ThreadPool.Names.INDEX, ThreadPool.Names.SEARCH, }; - private final static Map<String, String> ALIAS_TO_THREAD_POOL; - private final static Map<String, String> THREAD_POOL_TO_ALIAS; + private static final Map<String, String> ALIAS_TO_THREAD_POOL; + private static final Map<String, String> THREAD_POOL_TO_ALIAS; static { ALIAS_TO_THREAD_POOL = new HashMap<>(SUPPORTED_NAMES.length); diff --git a/core/src/main/java/org/elasticsearch/rest/action/termvectors/RestTermVectorsAction.java b/core/src/main/java/org/elasticsearch/rest/action/termvectors/RestTermVectorsAction.java index 6aa2d1bdb1..30ee18300b 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/termvectors/RestTermVectorsAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/termvectors/RestTermVectorsAction.java @@ -75,7 +75,7 @@ public class RestTermVectorsAction extends BaseRestHandler { client.termVectors(termVectorsRequest, new RestToXContentListener<TermVectorsResponse>(channel)); } - static public void readURIParameters(TermVectorsRequest termVectorsRequest, RestRequest request) { + public static void readURIParameters(TermVectorsRequest termVectorsRequest, RestRequest request) { String fields = request.param("fields"); addFieldStringsFromParameter(termVectorsRequest, fields); termVectorsRequest.offsets(request.paramAsBoolean("offsets", termVectorsRequest.offsets())); @@ -93,7 +93,7 @@ public class RestTermVectorsAction extends BaseRestHandler { termVectorsRequest.fieldStatistics(request.paramAsBoolean("field_statistics", termVectorsRequest.fieldStatistics())); } - static public void addFieldStringsFromParameter(TermVectorsRequest termVectorsRequest, String fields) { + public static void addFieldStringsFromParameter(TermVectorsRequest termVectorsRequest, String fields) { Set<String> selectedFields = termVectorsRequest.selectedFields(); if (fields != null) { String[] paramFieldStrings = Strings.commaDelimitedListToStringArray(fields); diff --git a/core/src/main/java/org/elasticsearch/script/Script.java b/core/src/main/java/org/elasticsearch/script/Script.java index 54b3cd9328..f5debcd67d 100644 --- a/core/src/main/java/org/elasticsearch/script/Script.java +++ b/core/src/main/java/org/elasticsearch/script/Script.java @@ -44,9 +44,9 @@ public class Script implements ToXContent, Writeable { private static final ScriptParser PARSER = new ScriptParser(); private String script; - private @Nullable ScriptType type; - private @Nullable String lang; - private @Nullable Map<String, Object> params; + @Nullable private ScriptType type; + @Nullable private String lang; + @Nullable private Map<String, Object> params; /** * Constructor for simple inline script. The script will have no lang or diff --git a/core/src/main/java/org/elasticsearch/script/ScriptMetaData.java b/core/src/main/java/org/elasticsearch/script/ScriptMetaData.java index 5c0f8cee04..78f33bbc60 100644 --- a/core/src/main/java/org/elasticsearch/script/ScriptMetaData.java +++ b/core/src/main/java/org/elasticsearch/script/ScriptMetaData.java @@ -47,8 +47,8 @@ import java.util.Optional; public final class ScriptMetaData implements MetaData.Custom { - public final static String TYPE = "stored_scripts"; - public final static ScriptMetaData PROTO = new ScriptMetaData(Collections.emptyMap()); + public static final String TYPE = "stored_scripts"; + public static final ScriptMetaData PROTO = new ScriptMetaData(Collections.emptyMap()); private final Map<String, ScriptAsBytes> scripts; @@ -205,7 +205,7 @@ public final class ScriptMetaData implements MetaData.Custom { return language + "#" + id; } - final public static class Builder { + public static final class Builder { private Map<String, ScriptAsBytes> scripts; @@ -234,7 +234,7 @@ public final class ScriptMetaData implements MetaData.Custom { } } - final static class ScriptMetadataDiff implements Diff<MetaData.Custom> { + static final class ScriptMetadataDiff implements Diff<MetaData.Custom> { final Diff<Map<String, ScriptAsBytes>> pipelines; @@ -257,7 +257,7 @@ public final class ScriptMetaData implements MetaData.Custom { } } - final static class ScriptAsBytes extends AbstractDiffable<ScriptAsBytes> { + static final class ScriptAsBytes extends AbstractDiffable<ScriptAsBytes> { public ScriptAsBytes(BytesReference script) { this.script = script; diff --git a/core/src/main/java/org/elasticsearch/script/ScriptSettings.java b/core/src/main/java/org/elasticsearch/script/ScriptSettings.java index 57fa8d58f2..41b19a3e57 100644 --- a/core/src/main/java/org/elasticsearch/script/ScriptSettings.java +++ b/core/src/main/java/org/elasticsearch/script/ScriptSettings.java @@ -35,9 +35,9 @@ import java.util.stream.Collectors; public class ScriptSettings { - public final static String DEFAULT_LANG = "groovy"; + public static final String DEFAULT_LANG = "groovy"; - private final static Map<ScriptService.ScriptType, Setting<Boolean>> SCRIPT_TYPE_SETTING_MAP; + private static final Map<ScriptService.ScriptType, Setting<Boolean>> SCRIPT_TYPE_SETTING_MAP; static { Map<ScriptService.ScriptType, Setting<Boolean>> scriptTypeSettingMap = new HashMap<>(); 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; diff --git a/core/src/main/java/org/elasticsearch/snapshots/RestoreService.java b/core/src/main/java/org/elasticsearch/snapshots/RestoreService.java index 74434413ae..4c4d5ed95b 100644 --- a/core/src/main/java/org/elasticsearch/snapshots/RestoreService.java +++ b/core/src/main/java/org/elasticsearch/snapshots/RestoreService.java @@ -496,7 +496,7 @@ public class RestoreService extends AbstractComponent implements ClusterStateLis UPDATE_RESTORE_ACTION_NAME, request, EmptyTransportResponseHandler.INSTANCE_SAME); } - public final static class RestoreCompletionResponse { + public static final class RestoreCompletionResponse { private final Snapshot snapshot; private final RestoreInfo restoreInfo; @@ -869,33 +869,33 @@ public class RestoreService extends AbstractComponent implements ClusterStateLis */ public static class RestoreRequest { - final private String cause; + private final String cause; - final private String repositoryName; + private final String repositoryName; - final private String snapshotName; + private final String snapshotName; - final private String[] indices; + private final String[] indices; - final private String renamePattern; + private final String renamePattern; - final private String renameReplacement; + private final String renameReplacement; - final private IndicesOptions indicesOptions; + private final IndicesOptions indicesOptions; - final private Settings settings; + private final Settings settings; - final private TimeValue masterNodeTimeout; + private final TimeValue masterNodeTimeout; - final private boolean includeGlobalState; + private final boolean includeGlobalState; - final private boolean partial; + private final boolean partial; - final private boolean includeAliases; + private final boolean includeAliases; - final private Settings indexSettings; + private final Settings indexSettings; - final private String[] ignoreIndexSettings; + private final String[] ignoreIndexSettings; /** * Constructs new restore request diff --git a/core/src/main/java/org/elasticsearch/tasks/LoggingTaskListener.java b/core/src/main/java/org/elasticsearch/tasks/LoggingTaskListener.java index b2016f094f..002d0b6a46 100644 --- a/core/src/main/java/org/elasticsearch/tasks/LoggingTaskListener.java +++ b/core/src/main/java/org/elasticsearch/tasks/LoggingTaskListener.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.logging.Loggers; * need a listener but aren't returning the result to the user. */ public final class LoggingTaskListener<Response> implements TaskListener<Response> { - private final static ESLogger logger = Loggers.getLogger(LoggingTaskListener.class); + private static final ESLogger logger = Loggers.getLogger(LoggingTaskListener.class); /** * Get the instance of NoopActionListener cast appropriately. diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskId.java b/core/src/main/java/org/elasticsearch/tasks/TaskId.java index eaab8d16b4..1aeceef247 100644 --- a/core/src/main/java/org/elasticsearch/tasks/TaskId.java +++ b/core/src/main/java/org/elasticsearch/tasks/TaskId.java @@ -31,7 +31,7 @@ import java.io.IOException; */ public final class TaskId implements Writeable { - public final static TaskId EMPTY_TASK_ID = new TaskId(); + public static final TaskId EMPTY_TASK_ID = new TaskId(); private final String nodeId; private final long id; diff --git a/core/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java b/core/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java index 5f36d391eb..0f9b79156e 100644 --- a/core/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java +++ b/core/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java @@ -78,7 +78,7 @@ public abstract class ExecutorBuilder<U extends ExecutorBuilder.ExecutorSettings */ abstract String formatInfo(ThreadPool.Info info); - static abstract class ExecutorSettings { + abstract static class ExecutorSettings { protected final String nodeName; diff --git a/core/src/main/java/org/elasticsearch/threadpool/ThreadPool.java b/core/src/main/java/org/elasticsearch/threadpool/ThreadPool.java index 551eeea838..c465f98c18 100644 --- a/core/src/main/java/org/elasticsearch/threadpool/ThreadPool.java +++ b/core/src/main/java/org/elasticsearch/threadpool/ThreadPool.java @@ -93,7 +93,7 @@ public class ThreadPool extends AbstractComponent implements Closeable { this.type = type; } - private final static Map<String, ThreadPoolType> TYPE_MAP; + private static final Map<String, ThreadPoolType> TYPE_MAP; static { Map<String, ThreadPoolType> typeMap = new HashMap<>(); diff --git a/core/src/main/java/org/elasticsearch/transport/TransportService.java b/core/src/main/java/org/elasticsearch/transport/TransportService.java index 21a43560eb..e2f3ab44ee 100644 --- a/core/src/main/java/org/elasticsearch/transport/TransportService.java +++ b/core/src/main/java/org/elasticsearch/transport/TransportService.java @@ -909,7 +909,7 @@ public class TransportService extends AbstractLifecycleComponent<TransportServic * This handler wrapper ensures that the response thread executes with the correct thread context. Before any of the4 handle methods * are invoked we restore the context. */ - private final static class ContextRestoreResponseHandler<T extends TransportResponse> implements TransportResponseHandler<T> { + private static final class ContextRestoreResponseHandler<T extends TransportResponse> implements TransportResponseHandler<T> { private final TransportResponseHandler<T> delegate; private final ThreadContext.StoredContext threadContext; @@ -944,8 +944,8 @@ public class TransportService extends AbstractLifecycleComponent<TransportServic static class DirectResponseChannel implements TransportChannel { final ESLogger logger; final DiscoveryNode localNode; - final private String action; - final private long requestId; + private final String action; + private final long requestId; final TransportServiceAdapter adapter; final ThreadPool threadPool; diff --git a/core/src/main/java/org/elasticsearch/transport/TransportSettings.java b/core/src/main/java/org/elasticsearch/transport/TransportSettings.java index e36d4e403c..6965e4ed24 100644 --- a/core/src/main/java/org/elasticsearch/transport/TransportSettings.java +++ b/core/src/main/java/org/elasticsearch/transport/TransportSettings.java @@ -34,7 +34,7 @@ import static org.elasticsearch.common.settings.Setting.listSetting; * a collection of settings related to transport components, which are also needed in org.elasticsearch.bootstrap.Security * This class should only contain static code which is *safe* to load before the security manager is enforced. */ -final public class TransportSettings { +public final class TransportSettings { public static final Setting<List<String>> HOST = listSetting("transport.host", emptyList(), Function.identity(), Property.NodeScope); diff --git a/core/src/main/java/org/elasticsearch/transport/Transports.java b/core/src/main/java/org/elasticsearch/transport/Transports.java index 1186c82130..15bf2c833f 100644 --- a/core/src/main/java/org/elasticsearch/transport/Transports.java +++ b/core/src/main/java/org/elasticsearch/transport/Transports.java @@ -27,7 +27,7 @@ public enum Transports { ; /** threads whose name is prefixed by this string will be considered network threads, even though they aren't */ - public final static String TEST_MOCK_TRANSPORT_THREAD_PREFIX = "__mock_network_thread"; + public static final String TEST_MOCK_TRANSPORT_THREAD_PREFIX = "__mock_network_thread"; /** * Utility method to detect whether a thread is a network thread. Typically diff --git a/core/src/main/java/org/elasticsearch/transport/local/LocalTransport.java b/core/src/main/java/org/elasticsearch/transport/local/LocalTransport.java index a2ffca2e80..ebb29d6fea 100644 --- a/core/src/main/java/org/elasticsearch/transport/local/LocalTransport.java +++ b/core/src/main/java/org/elasticsearch/transport/local/LocalTransport.java @@ -81,7 +81,7 @@ public class LocalTransport extends AbstractLifecycleComponent<Transport> implem private volatile TransportServiceAdapter transportServiceAdapter; private volatile BoundTransportAddress boundAddress; private volatile LocalTransportAddress localAddress; - private final static ConcurrentMap<LocalTransportAddress, LocalTransport> transports = newConcurrentMap(); + private static final ConcurrentMap<LocalTransportAddress, LocalTransport> transports = newConcurrentMap(); private static final AtomicLong transportAddressIdGenerator = new AtomicLong(); private final ConcurrentMap<DiscoveryNode, LocalTransport> connectedNodes = newConcurrentMap(); protected final NamedWriteableRegistry namedWriteableRegistry; diff --git a/core/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java b/core/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java index 3c75f68eeb..d591a75d05 100644 --- a/core/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java +++ b/core/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java @@ -668,7 +668,7 @@ public class NettyTransport extends TcpTransport<Channel> { } } - private final static class ChannelBufferStreamOutput extends StreamOutput { + private static final class ChannelBufferStreamOutput extends StreamOutput { private final ChannelBuffer buffer; private int offset; |