diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy index f451beeceb8..96b7ac42527 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/PrecommitTasks.groovy @@ -139,6 +139,7 @@ class PrecommitTasks { configProperties = [ suppressions: checkstyleSuppressions ] + toolVersion = 7.5 } for (String taskName : ['checkstyleMain', 'checkstyleTest']) { Task task = project.tasks.findByName(taskName) diff --git a/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java b/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java index 214a75d12cc..e9cde26e6c8 100644 --- a/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java +++ b/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java @@ -95,7 +95,7 @@ public class BulkBenchmarkTask implements BenchmarkTask { private final BlockingQueue> bulkQueue; private final int bulkSize; - public LoadGenerator(Path bulkDataFile, BlockingQueue> bulkQueue, int bulkSize) { + LoadGenerator(Path bulkDataFile, BlockingQueue> bulkQueue, int bulkSize) { this.bulkDataFile = bulkDataFile; this.bulkQueue = bulkQueue; this.bulkSize = bulkSize; @@ -143,7 +143,7 @@ public class BulkBenchmarkTask implements BenchmarkTask { private final BulkRequestExecutor bulkRequestExecutor; private final SampleRecorder sampleRecorder; - public BulkIndexer(BlockingQueue> bulkData, int warmupIterations, int measurementIterations, + BulkIndexer(BlockingQueue> bulkData, int warmupIterations, int measurementIterations, SampleRecorder sampleRecorder, BulkRequestExecutor bulkRequestExecutor) { this.bulkData = bulkData; this.warmupIterations = warmupIterations; diff --git a/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/rest/RestClientBenchmark.java b/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/rest/RestClientBenchmark.java index b342d93fba5..9210526e7c8 100644 --- a/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/rest/RestClientBenchmark.java +++ b/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/rest/RestClientBenchmark.java @@ -73,7 +73,7 @@ public final class RestClientBenchmark extends AbstractBenchmark { private final RestClient client; private final String actionMetaData; - public RestBulkRequestExecutor(RestClient client, String index, String type) { + RestBulkRequestExecutor(RestClient client, String index, String type) { this.client = client; this.actionMetaData = String.format(Locale.ROOT, "{ \"index\" : { \"_index\" : \"%s\", \"_type\" : \"%s\" } }%n", index, type); } diff --git a/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/transport/TransportClientBenchmark.java b/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/transport/TransportClientBenchmark.java index c5a544eb785..d2aee2251a6 100644 --- a/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/transport/TransportClientBenchmark.java +++ b/client/benchmark/src/main/java/org/elasticsearch/client/benchmark/transport/TransportClientBenchmark.java @@ -71,7 +71,7 @@ public final class TransportClientBenchmark extends AbstractBenchmark[] comparators; final int[] reverseMul; - public MergeSortQueue(Sort sort, CollapseTopFieldDocs[] shardHits) throws IOException { + MergeSortQueue(Sort sort, CollapseTopFieldDocs[] shardHits) throws IOException { super(shardHits.length); this.shardHits = new ScoreDoc[shardHits.length][]; for (int shardIDX = 0; shardIDX < shardHits.length; shardIDX++) { diff --git a/core/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java b/core/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java index 7573e98c6f9..5bc8afb347c 100644 --- a/core/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java +++ b/core/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java @@ -56,7 +56,7 @@ abstract class CollapsingDocValuesSource { private NumericDocValues values; private Bits docsWithField; - public Numeric(String field) throws IOException { + Numeric(String field) throws IOException { super(field); } @@ -122,7 +122,7 @@ abstract class CollapsingDocValuesSource { private Bits docsWithField; private SortedDocValues values; - public Keyword(String field) throws IOException { + Keyword(String field) throws IOException { super(field); } diff --git a/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java b/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java index c65f962dbb8..5eaf63369b9 100644 --- a/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java +++ b/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java @@ -392,7 +392,7 @@ public long ramBytesUsed() { final BytesRefBuilder spare = new BytesRefBuilder(); private char sepLabel; - public EscapingTokenStreamToAutomaton(char sepLabel) { + EscapingTokenStreamToAutomaton(char sepLabel) { this.sepLabel = sepLabel; } @@ -432,7 +432,7 @@ public long ramBytesUsed() { private final boolean hasPayloads; - public AnalyzingComparator(boolean hasPayloads) { + AnalyzingComparator(boolean hasPayloads) { this.hasPayloads = hasPayloads; } @@ -1114,7 +1114,7 @@ public long ramBytesUsed() { BytesRef payload; long weight; - public SurfaceFormAndPayload(BytesRef payload, long cost) { + SurfaceFormAndPayload(BytesRef payload, long cost) { super(); this.payload = payload; this.weight = cost; diff --git a/core/src/main/java/org/elasticsearch/ExceptionsHelper.java b/core/src/main/java/org/elasticsearch/ExceptionsHelper.java index c30662a0934..e89e04a301d 100644 --- a/core/src/main/java/org/elasticsearch/ExceptionsHelper.java +++ b/core/src/main/java/org/elasticsearch/ExceptionsHelper.java @@ -214,7 +214,7 @@ public final class ExceptionsHelper { final String index; final Class causeType; - public GroupBy(Throwable t) { + GroupBy(Throwable t) { if (t instanceof ElasticsearchException) { final Index index = ((ElasticsearchException) t).getIndex(); if (index != null) { diff --git a/core/src/main/java/org/elasticsearch/action/ActionModule.java b/core/src/main/java/org/elasticsearch/action/ActionModule.java index 3ffa6d60b02..4014c832b0f 100644 --- a/core/src/main/java/org/elasticsearch/action/ActionModule.java +++ b/core/src/main/java/org/elasticsearch/action/ActionModule.java @@ -382,7 +382,7 @@ public class ActionModule extends AbstractModule { static Map> setupActions(List actionPlugins) { // Subclass NamedRegistry for easy registration class ActionRegistry extends NamedRegistry> { - public ActionRegistry() { + ActionRegistry() { super("action"); } diff --git a/core/src/main/java/org/elasticsearch/action/ListenableActionFuture.java b/core/src/main/java/org/elasticsearch/action/ListenableActionFuture.java index 29b5a2a8774..87e4df3bc79 100644 --- a/core/src/main/java/org/elasticsearch/action/ListenableActionFuture.java +++ b/core/src/main/java/org/elasticsearch/action/ListenableActionFuture.java @@ -29,5 +29,5 @@ public interface ListenableActionFuture extends ActionFuture { /** * Add an action listener to be invoked when a response has received. */ - void addListener(final ActionListener listener); + void addListener(ActionListener listener); } diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java index ef9f718411f..50786d36766 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java @@ -217,7 +217,7 @@ public class TransportCancelTasksAction extends TransportTasksAction { - public static enum Feature { + public enum Feature { ALIASES((byte) 0, "_aliases", "_alias"), MAPPINGS((byte) 1, "_mappings", "_mapping"), SETTINGS((byte) 2, "_settings"); @@ -52,7 +52,7 @@ public class GetIndexRequest extends ClusterInfoRequest { private final String preferredName; private final byte id; - private Feature(byte id, String... validNames) { + Feature(byte id, String... validNames) { assert validNames != null && validNames.length > 0; this.id = id; this.validNames = Arrays.asList(validNames); diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java index 69b52e4d2dd..d6bfaf0a48c 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java @@ -47,7 +47,7 @@ public abstract class Condition implements NamedWriteable { this.name = name; } - public abstract Result evaluate(final Stats stats); + public abstract Result evaluate(Stats stats); @Override public final String toString() { diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java index e13578d66de..bce20df34e3 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java @@ -226,7 +226,7 @@ public class TransportIndicesShardStoresAction extends TransportMasterNodeReadAc private final List responses; private final List failures; - public Response(ShardId shardId, List responses, List failures) { + Response(ShardId shardId, List responses, List failures) { this.shardId = shardId; this.responses = responses; this.failures = failures; diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BackoffPolicy.java b/core/src/main/java/org/elasticsearch/action/bulk/BackoffPolicy.java index bc8f8c347ab..81084e22377 100644 --- a/core/src/main/java/org/elasticsearch/action/bulk/BackoffPolicy.java +++ b/core/src/main/java/org/elasticsearch/action/bulk/BackoffPolicy.java @@ -171,7 +171,7 @@ public abstract class BackoffPolicy implements Iterable { private final int numberOfElements; - public ConstantBackoff(TimeValue delay, int numberOfElements) { + ConstantBackoff(TimeValue delay, int numberOfElements) { assert numberOfElements >= 0; this.delay = delay; this.numberOfElements = numberOfElements; @@ -188,7 +188,7 @@ public abstract class BackoffPolicy implements Iterable { private final int numberOfElements; private int curr; - public ConstantBackoffIterator(TimeValue delay, int numberOfElements) { + ConstantBackoffIterator(TimeValue delay, int numberOfElements) { this.delay = delay; this.numberOfElements = numberOfElements; } @@ -212,7 +212,7 @@ public abstract class BackoffPolicy implements Iterable { private final BackoffPolicy delegate; private final Runnable onBackoff; - public WrappedBackoffPolicy(BackoffPolicy delegate, Runnable onBackoff) { + WrappedBackoffPolicy(BackoffPolicy delegate, Runnable onBackoff) { this.delegate = delegate; this.onBackoff = onBackoff; } @@ -227,7 +227,7 @@ public abstract class BackoffPolicy implements Iterable { private final Iterator delegate; private final Runnable onBackoff; - public WrappedBackoffIterator(Iterator delegate, Runnable onBackoff) { + WrappedBackoffIterator(Iterator delegate, Runnable onBackoff) { this.delegate = delegate; this.onBackoff = onBackoff; } diff --git a/core/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java b/core/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java index 6ad566ca500..5d9910d9179 100644 --- a/core/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java +++ b/core/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java @@ -59,7 +59,7 @@ abstract class BulkRequestHandler { private final BulkProcessor.Listener listener; private final BackoffPolicy backoffPolicy; - public SyncBulkRequestHandler(Client client, BackoffPolicy backoffPolicy, BulkProcessor.Listener listener) { + SyncBulkRequestHandler(Client client, BackoffPolicy backoffPolicy, BulkProcessor.Listener listener) { super(client); this.backoffPolicy = backoffPolicy; this.listener = listener; diff --git a/core/src/main/java/org/elasticsearch/action/bulk/Retry.java b/core/src/main/java/org/elasticsearch/action/bulk/Retry.java index a41bd454979..c746894b78e 100644 --- a/core/src/main/java/org/elasticsearch/action/bulk/Retry.java +++ b/core/src/main/java/org/elasticsearch/action/bulk/Retry.java @@ -102,7 +102,7 @@ public class Retry { private volatile BulkRequest currentBulkRequest; private volatile ScheduledFuture scheduledRequestFuture; - public AbstractRetryHandler(Class retryOnThrowable, BackoffPolicy backoffPolicy, Client client, ActionListener listener) { + AbstractRetryHandler(Class retryOnThrowable, BackoffPolicy backoffPolicy, Client client, ActionListener listener) { this.retryOnThrowable = retryOnThrowable; this.backoff = backoffPolicy.iterator(); this.client = client; @@ -213,7 +213,7 @@ public class Retry { } static class AsyncRetryHandler extends AbstractRetryHandler { - public AsyncRetryHandler(Class retryOnThrowable, BackoffPolicy backoffPolicy, Client client, ActionListener listener) { + AsyncRetryHandler(Class retryOnThrowable, BackoffPolicy backoffPolicy, Client client, ActionListener listener) { super(retryOnThrowable, backoffPolicy, client, listener); } } @@ -226,7 +226,7 @@ public class Retry { return new SyncRetryHandler(retryOnThrowable, backoffPolicy, client, actionFuture); } - public SyncRetryHandler(Class retryOnThrowable, BackoffPolicy backoffPolicy, Client client, PlainActionFuture actionFuture) { + SyncRetryHandler(Class retryOnThrowable, BackoffPolicy backoffPolicy, Client client, PlainActionFuture actionFuture) { super(retryOnThrowable, backoffPolicy, client, actionFuture); this.actionFuture = actionFuture; } diff --git a/core/src/main/java/org/elasticsearch/action/bulk/byscroll/WorkingBulkByScrollTask.java b/core/src/main/java/org/elasticsearch/action/bulk/byscroll/WorkingBulkByScrollTask.java index 5a37642cc16..1b458caa3d5 100644 --- a/core/src/main/java/org/elasticsearch/action/bulk/byscroll/WorkingBulkByScrollTask.java +++ b/core/src/main/java/org/elasticsearch/action/bulk/byscroll/WorkingBulkByScrollTask.java @@ -306,7 +306,7 @@ public class WorkingBulkByScrollTask extends BulkByScrollTask implements Success private final AtomicBoolean hasRun = new AtomicBoolean(false); private final AbstractRunnable delegate; - public RunOnce(AbstractRunnable delegate) { + RunOnce(AbstractRunnable delegate) { this.delegate = delegate; } diff --git a/core/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java b/core/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java index 63fd95aae8c..32585c62384 100644 --- a/core/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java +++ b/core/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java @@ -429,7 +429,7 @@ abstract class AbstractSearchAsyncAction private final SearchPhaseController searchPhaseController; private final AtomicArray queryResults; - public FetchPhase(AtomicArray queryResults, + FetchPhase(AtomicArray queryResults, SearchPhaseController searchPhaseController) { this.fetchResults = new AtomicArray<>(queryResults.length()); this.searchPhaseController = searchPhaseController; diff --git a/core/src/main/java/org/elasticsearch/action/search/ParsedScrollId.java b/core/src/main/java/org/elasticsearch/action/search/ParsedScrollId.java index f2ea5356106..b588827867f 100644 --- a/core/src/main/java/org/elasticsearch/action/search/ParsedScrollId.java +++ b/core/src/main/java/org/elasticsearch/action/search/ParsedScrollId.java @@ -31,7 +31,7 @@ class ParsedScrollId { private final ScrollIdForNode[] context; - public ParsedScrollId(String source, String type, ScrollIdForNode[] context) { + ParsedScrollId(String source, String type, ScrollIdForNode[] context) { this.source = source; this.type = type; this.context = context; diff --git a/core/src/main/java/org/elasticsearch/action/search/ScrollIdForNode.java b/core/src/main/java/org/elasticsearch/action/search/ScrollIdForNode.java index 488132fdda2..76d4ac11413 100644 --- a/core/src/main/java/org/elasticsearch/action/search/ScrollIdForNode.java +++ b/core/src/main/java/org/elasticsearch/action/search/ScrollIdForNode.java @@ -23,7 +23,7 @@ class ScrollIdForNode { private final String node; private final long scrollId; - public ScrollIdForNode(String node, long scrollId) { + ScrollIdForNode(String node, long scrollId) { this.node = node; this.scrollId = scrollId; } diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java b/core/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java index 8be41e23465..9cc686507f5 100644 --- a/core/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java +++ b/core/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java @@ -74,7 +74,7 @@ final class SearchDfsQueryThenFetchAsyncAction extends AbstractSearchAsyncAction private final AtomicArray firstResults; private final Function, CheckedRunnable> nextPhaseFactory; - public DfsQueryPhase(AtomicArray firstResults, + DfsQueryPhase(AtomicArray firstResults, SearchPhaseController searchPhaseController, Function, CheckedRunnable> nextPhaseFactory) { this.queryResult = new AtomicArray<>(firstResults.length()); diff --git a/core/src/main/java/org/elasticsearch/action/search/SearchTransportService.java b/core/src/main/java/org/elasticsearch/action/search/SearchTransportService.java index 26c505c8ed6..c62699b6bab 100644 --- a/core/src/main/java/org/elasticsearch/action/search/SearchTransportService.java +++ b/core/src/main/java/org/elasticsearch/action/search/SearchTransportService.java @@ -197,7 +197,7 @@ public class SearchTransportService extends AbstractLifecycleComponent { static class SearchFreeContextRequest extends ScrollFreeContextRequest implements IndicesRequest { private OriginalIndices originalIndices; - public SearchFreeContextRequest() { + SearchFreeContextRequest() { } SearchFreeContextRequest(SearchRequest request, long id) { 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 880d173b2fe..3e12d0cc842 100644 --- a/core/src/main/java/org/elasticsearch/action/support/ActionFilter.java +++ b/core/src/main/java/org/elasticsearch/action/support/ActionFilter.java @@ -47,7 +47,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 abstract static class Simple extends AbstractComponent implements ActionFilter { + abstract class Simple extends AbstractComponent implements ActionFilter { protected Simple(Settings settings) { super(settings); diff --git a/core/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java b/core/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java index 56ba070b1aa..97e0c535bff 100644 --- a/core/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java +++ b/core/src/main/java/org/elasticsearch/action/support/ActionFilterChain.java @@ -33,5 +33,5 @@ public interface ActionFilterChain listener); + void proceed(Task task, String action, Request request, ActionListener listener); } 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 a9cfaafd2c2..951c5dbc3ec 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 @@ -522,10 +522,10 @@ public abstract class TransportBroadcastByNodeAction exceptions; protected List results; - public NodeResponse() { + NodeResponse() { } - public NodeResponse(String nodeId, + NodeResponse(String nodeId, int totalShards, List results, List exceptions) { diff --git a/core/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java b/core/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java index 59b1997b356..9bf7356a9fe 100644 --- a/core/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java +++ b/core/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java @@ -52,5 +52,5 @@ public abstract class TransportClusterInfoAction listener); + protected abstract void doMasterOperation(Request request, String[] concreteIndices, ClusterState state, ActionListener listener); } 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 c616107203e..32f5b8f0f2c 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 @@ -575,7 +575,7 @@ public abstract class TransportReplicationAction< private class ResponseListener implements ActionListener { private final ReplicaResponse replicaResponse; - public ResponseListener(ReplicaResponse replicaResponse) { + ResponseListener(ReplicaResponse replicaResponse) { this.replicaResponse = replicaResponse; } diff --git a/core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java b/core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java index 09026960580..9d1cf5e37e7 100644 --- a/core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java +++ b/core/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java @@ -402,10 +402,10 @@ public abstract class TransportTasksAction< protected List exceptions; protected List results; - public NodeTasksResponse() { + NodeTasksResponse() { } - public NodeTasksResponse(String nodeId, + NodeTasksResponse(String nodeId, List results, List exceptions) { this.nodeId = nodeId; diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java b/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java index 534ef4164e2..088691a5c9c 100644 --- a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java +++ b/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java @@ -200,7 +200,7 @@ public final class TermVectorsFields extends Fields { private long sumDocFreq; private int docCount; - public TermVector(BytesReference termVectors, long readOffset) throws IOException { + TermVector(BytesReference termVectors, long readOffset) throws IOException { this.perFieldTermVectorInput = termVectors.streamInput(); this.readOffset = readOffset; reset(); diff --git a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java b/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java index 544b14523bc..cba14fecf9c 100644 --- a/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java +++ b/core/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java @@ -577,7 +577,7 @@ public class TermVectorsRequest extends SingleShardRequest i out.writeLong(version); } - public static enum Flag { + public enum Flag { // Do not change the order of these flags we use // the ordinal for encoding! Only append to the end! Positions, Offsets, Payloads, FieldStatistics, TermStatistics diff --git a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java b/core/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java index cb1b93aef39..231b9ac6d03 100644 --- a/core/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java +++ b/core/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java @@ -207,7 +207,7 @@ final class BootstrapChecks { static class OsXFileDescriptorCheck extends FileDescriptorCheck { - public OsXFileDescriptorCheck() { + OsXFileDescriptorCheck() { // see constant OPEN_MAX defined in // /usr/include/sys/syslimits.h on OS X and its use in JVM // initialization in int os:init_2(void) defined in the JVM @@ -258,7 +258,7 @@ final class BootstrapChecks { private final boolean mlockallSet; - public MlockallCheck(final boolean mlockAllSet) { + MlockallCheck(final boolean mlockAllSet) { this.mlockallSet = mlockAllSet; } @@ -360,7 +360,7 @@ final class BootstrapChecks { // visible for testing long getMaxMapCount(Logger logger) { final Path path = getProcSysVmMaxMapCountPath(); - try (final BufferedReader bufferedReader = getBufferedReader(path)) { + try (BufferedReader bufferedReader = getBufferedReader(path)) { final String rawProcSysVmMaxMapCount = readProcSysVmMaxMapCount(bufferedReader); if (rawProcSysVmMaxMapCount != null) { try { diff --git a/core/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java b/core/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java index 795d4d899fb..e8538daec56 100644 --- a/core/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java +++ b/core/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java @@ -48,7 +48,7 @@ final class ESPolicy extends Policy { final PermissionCollection dynamic; final Map plugins; - public ESPolicy(PermissionCollection dynamic, Map plugins, boolean filterBadDefaults) { + ESPolicy(PermissionCollection dynamic, Map plugins, boolean filterBadDefaults) { this.template = Security.readPolicy(getClass().getResource(POLICY_RESOURCE), JarHell.parseClassPath()); this.untrusted = Security.readPolicy(getClass().getResource(UNTRUSTED_RESOURCE), new URL[0]); if (filterBadDefaults) { @@ -150,7 +150,7 @@ final class ESPolicy extends Policy { * @param preImplies a test that is applied to a desired permission before checking if the bad default permission that * this instance wraps implies the desired permission */ - public BadDefaultPermission(final Permission badDefaultPermission, final Predicate preImplies) { + BadDefaultPermission(final Permission badDefaultPermission, final Predicate preImplies) { super(badDefaultPermission.getName()); this.badDefaultPermission = badDefaultPermission; this.preImplies = preImplies; diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java b/core/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java index 27d4ff69e54..d41d1879152 100644 --- a/core/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java +++ b/core/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java @@ -109,7 +109,7 @@ final class JNAKernel32Library { private final ConsoleCtrlHandler handler; - public NativeHandlerCallback(ConsoleCtrlHandler handler) { + NativeHandlerCallback(ConsoleCtrlHandler handler) { this.handler = handler; } @@ -155,11 +155,11 @@ final class JNAKernel32Library { public static class SizeT extends IntegerType { - public SizeT() { + SizeT() { this(0); } - public SizeT(long value) { + SizeT(long value) { super(Native.SIZE_T_SIZE, value); } diff --git a/core/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java b/core/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java index e6c5b2e6dd1..d9ca9698717 100644 --- a/core/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java +++ b/core/src/main/java/org/elasticsearch/bootstrap/SystemCallFilter.java @@ -154,7 +154,7 @@ final class SystemCallFilter { public short len; // number of filters public Pointer filter; // filters - public SockFProg(SockFilter filters[]) { + SockFProg(SockFilter filters[]) { len = (short) filters.length; // serialize struct sock_filter * explicitly, its less confusing than the JNA magic we would need Memory filter = new Memory(len * 8); diff --git a/core/src/main/java/org/elasticsearch/cli/Command.java b/core/src/main/java/org/elasticsearch/cli/Command.java index 73687393dcd..99a9a7e43d9 100644 --- a/core/src/main/java/org/elasticsearch/cli/Command.java +++ b/core/src/main/java/org/elasticsearch/cli/Command.java @@ -65,8 +65,8 @@ public abstract class Command implements Closeable { this.close(); } catch (final IOException e) { try ( - final StringWriter sw = new StringWriter(); - final PrintWriter pw = new PrintWriter(sw)) { + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw)) { e.printStackTrace(pw); terminal.println(sw.toString()); } catch (final IOException impossible) { diff --git a/core/src/main/java/org/elasticsearch/client/ElasticsearchClient.java b/core/src/main/java/org/elasticsearch/client/ElasticsearchClient.java index 84438ff6d1a..c6aa4991a82 100644 --- a/core/src/main/java/org/elasticsearch/client/ElasticsearchClient.java +++ b/core/src/main/java/org/elasticsearch/client/ElasticsearchClient.java @@ -41,7 +41,7 @@ public interface ElasticsearchClient { * @return A future allowing to get back the response. */ > ActionFuture execute( - final Action action, final Request request); + Action action, Request request); /** * Executes a generic action, denoted by an {@link Action}. @@ -54,7 +54,7 @@ public interface ElasticsearchClient { * @param The request builder type. */ > void execute( - final Action action, final Request request, ActionListener listener); + Action action, Request request, ActionListener listener); /** * Prepares a request builder to execute, specified by {@link Action}. @@ -66,7 +66,7 @@ public interface ElasticsearchClient { * @return The request builder, that can, at a later stage, execute the request. */ > RequestBuilder prepareExecute( - final Action action); + Action action); /** * Returns the threadpool used to execute requests on this client diff --git a/core/src/main/java/org/elasticsearch/client/support/AbstractClient.java b/core/src/main/java/org/elasticsearch/client/support/AbstractClient.java index 5a789af3eeb..e0ebcfe70a9 100644 --- a/core/src/main/java/org/elasticsearch/client/support/AbstractClient.java +++ b/core/src/main/java/org/elasticsearch/client/support/AbstractClient.java @@ -401,7 +401,7 @@ public abstract class AbstractClient extends AbstractComponent implements Client doExecute(action, request, listener); } - protected abstract > void doExecute(final Action action, final Request request, ActionListener listener); + protected abstract > void doExecute(Action action, Request request, ActionListener listener); @Override public ActionFuture index(final IndexRequest request) { @@ -672,7 +672,7 @@ public abstract class AbstractClient extends AbstractComponent implements Client private final ClusterAdmin clusterAdmin; private final IndicesAdmin indicesAdmin; - public Admin(ElasticsearchClient client) { + Admin(ElasticsearchClient client) { this.clusterAdmin = new ClusterAdmin(client); this.indicesAdmin = new IndicesAdmin(client); } @@ -692,7 +692,7 @@ public abstract class AbstractClient extends AbstractComponent implements Client private final ElasticsearchClient client; - public ClusterAdmin(ElasticsearchClient client) { + ClusterAdmin(ElasticsearchClient client) { this.client = client; } @@ -1218,7 +1218,7 @@ public abstract class AbstractClient extends AbstractComponent implements Client private final ElasticsearchClient client; - public IndicesAdmin(ElasticsearchClient client) { + IndicesAdmin(ElasticsearchClient client) { this.client = client; } diff --git a/core/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java b/core/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java index b8600465b0e..ea2906dab67 100644 --- a/core/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java +++ b/core/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java @@ -264,7 +264,7 @@ final class TransportClientNodesService extends AbstractComponent implements Clo private volatile int i; - public RetryListener(NodeListenerCallback callback, ActionListener listener, + RetryListener(NodeListenerCallback callback, ActionListener listener, List nodes, int index, TransportClient.HostFailureListener hostFailureListener) { this.callback = callback; this.listener = listener; diff --git a/core/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java b/core/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java index aec3cb73039..8e63bc2b9d7 100644 --- a/core/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java +++ b/core/src/main/java/org/elasticsearch/cluster/AbstractDiffable.java @@ -52,21 +52,21 @@ public abstract class AbstractDiffable> implements Diffabl /** * Creates simple diff with changes */ - public CompleteDiff(T part) { + CompleteDiff(T part) { this.part = part; } /** * Creates simple diff without changes */ - public CompleteDiff() { + CompleteDiff() { this.part = null; } /** * Read simple diff from the stream */ - public CompleteDiff(Reader reader, StreamInput in) throws IOException { + CompleteDiff(Reader reader, StreamInput in) throws IOException { if (in.readBoolean()) { this.part = reader.read(in); } else { diff --git a/core/src/main/java/org/elasticsearch/cluster/AbstractNamedDiffable.java b/core/src/main/java/org/elasticsearch/cluster/AbstractNamedDiffable.java index 00e55463118..fb253a1a5df 100644 --- a/core/src/main/java/org/elasticsearch/cluster/AbstractNamedDiffable.java +++ b/core/src/main/java/org/elasticsearch/cluster/AbstractNamedDiffable.java @@ -64,7 +64,7 @@ public abstract class AbstractNamedDiffable> implemen /** * Creates simple diff with changes */ - public CompleteNamedDiff(T part) { + CompleteNamedDiff(T part) { this.part = part; this.name = part.getWriteableName(); this.minimalSupportedVersion = part.getMinimalSupportedVersion(); @@ -73,7 +73,7 @@ public abstract class AbstractNamedDiffable> implemen /** * Creates simple diff without changes */ - public CompleteNamedDiff(String name, Version minimalSupportedVersion) { + CompleteNamedDiff(String name, Version minimalSupportedVersion) { this.part = null; this.name = name; this.minimalSupportedVersion = minimalSupportedVersion; @@ -82,7 +82,7 @@ public abstract class AbstractNamedDiffable> implemen /** * Read simple diff from the stream */ - public CompleteNamedDiff(Class tClass, String name, StreamInput in) throws IOException { + CompleteNamedDiff(Class tClass, String name, StreamInput in) throws IOException { if (in.readBoolean()) { this.part = in.readNamedWriteable(tClass, name); this.minimalSupportedVersion = part.getMinimalSupportedVersion(); diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterState.java b/core/src/main/java/org/elasticsearch/cluster/ClusterState.java index 35cce3ab213..c9ef935224c 100644 --- a/core/src/main/java/org/elasticsearch/cluster/ClusterState.java +++ b/core/src/main/java/org/elasticsearch/cluster/ClusterState.java @@ -713,7 +713,7 @@ public class ClusterState implements ToXContent, Diffable { private final Diff> customs; - public ClusterStateDiff(ClusterState before, ClusterState after) { + ClusterStateDiff(ClusterState before, ClusterState after) { fromUuid = before.stateUUID; toUuid = after.stateUUID; toVersion = after.version; @@ -725,7 +725,7 @@ public class ClusterState implements ToXContent, Diffable { customs = DiffableUtils.diff(before.customs, after.customs, DiffableUtils.getStringKeySerializer(), CUSTOM_VALUE_SERIALIZER); } - public ClusterStateDiff(StreamInput in, DiscoveryNode localNode) throws IOException { + ClusterStateDiff(StreamInput in, DiscoveryNode localNode) throws IOException { clusterName = new ClusterName(in); fromUuid = in.readString(); toUuid = in.readString(); diff --git a/core/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java b/core/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java index 4964a14dfca..96177f7b7d8 100644 --- a/core/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java +++ b/core/src/main/java/org/elasticsearch/cluster/ClusterStateObserver.java @@ -246,7 +246,7 @@ public class ClusterStateObserver { private final String masterNodeId; private final long version; - public StoredState(ClusterState clusterState) { + StoredState(ClusterState clusterState) { this.masterNodeId = clusterState.nodes().getMasterNodeId(); this.version = clusterState.version(); } @@ -271,7 +271,7 @@ public class ClusterStateObserver { public final Listener listener; public final Predicate statePredicate; - public ObservingContext(Listener listener, Predicate statePredicate) { + ObservingContext(Listener listener, Predicate statePredicate) { this.listener = listener; this.statePredicate = statePredicate; } diff --git a/core/src/main/java/org/elasticsearch/cluster/DiffableUtils.java b/core/src/main/java/org/elasticsearch/cluster/DiffableUtils.java index ca83a8947f4..ba769c34d0e 100644 --- a/core/src/main/java/org/elasticsearch/cluster/DiffableUtils.java +++ b/core/src/main/java/org/elasticsearch/cluster/DiffableUtils.java @@ -166,7 +166,7 @@ public final class DiffableUtils { super(in, keySerializer, valueSerializer); } - public JdkMapDiff(Map before, Map after, + JdkMapDiff(Map before, Map after, KeySerializer keySerializer, ValueSerializer valueSerializer) { super(keySerializer, valueSerializer); assert after != null && before != null; @@ -298,7 +298,7 @@ public final class DiffableUtils { super(in, keySerializer, valueSerializer); } - public ImmutableOpenIntMapDiff(ImmutableOpenIntMap before, ImmutableOpenIntMap after, + ImmutableOpenIntMapDiff(ImmutableOpenIntMap before, ImmutableOpenIntMap after, KeySerializer keySerializer, ValueSerializer valueSerializer) { super(keySerializer, valueSerializer); assert after != null && before != null; diff --git a/core/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java b/core/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java index 411aabbf843..8973890021f 100644 --- a/core/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java +++ b/core/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java @@ -199,7 +199,7 @@ public class ShardStateAction extends AbstractComponent { private final ShardFailedClusterStateTaskExecutor shardFailedClusterStateTaskExecutor; private final Logger logger; - public ShardFailedTransportHandler(ClusterService clusterService, ShardFailedClusterStateTaskExecutor shardFailedClusterStateTaskExecutor, Logger logger) { + ShardFailedTransportHandler(ClusterService clusterService, ShardFailedClusterStateTaskExecutor shardFailedClusterStateTaskExecutor, Logger logger) { this.clusterService = clusterService; this.shardFailedClusterStateTaskExecutor = shardFailedClusterStateTaskExecutor; this.logger = logger; @@ -365,7 +365,7 @@ public class ShardStateAction extends AbstractComponent { private final ShardStartedClusterStateTaskExecutor shardStartedClusterStateTaskExecutor; private final Logger logger; - public ShardStartedTransportHandler(ClusterService clusterService, ShardStartedClusterStateTaskExecutor shardStartedClusterStateTaskExecutor, Logger logger) { + ShardStartedTransportHandler(ClusterService clusterService, ShardStartedClusterStateTaskExecutor shardStartedClusterStateTaskExecutor, Logger logger) { this.clusterService = clusterService; this.shardStartedClusterStateTaskExecutor = shardStartedClusterStateTaskExecutor; this.logger = logger; diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java b/core/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java index 4ad9b7e5317..786bd9af78a 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/AliasOrIndex.java @@ -121,7 +121,7 @@ public interface AliasOrIndex { } @Override - public final void remove() { + public void remove() { throw new UnsupportedOperationException(); } 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 a08401005c1..68575634a1e 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java @@ -139,7 +139,7 @@ public class IndexMetaData implements Diffable, ToXContent { public static final ClusterBlock INDEX_WRITE_BLOCK = new ClusterBlock(8, "index write (api)", false, false, RestStatus.FORBIDDEN, EnumSet.of(ClusterBlockLevel.WRITE)); public static final ClusterBlock INDEX_METADATA_BLOCK = new ClusterBlock(9, "index metadata (api)", false, false, RestStatus.FORBIDDEN, EnumSet.of(ClusterBlockLevel.METADATA_WRITE, ClusterBlockLevel.METADATA_READ)); - public static enum State { + public enum State { OPEN((byte) 0), CLOSE((byte) 1); @@ -620,7 +620,7 @@ public class IndexMetaData implements Diffable, ToXContent { private final Diff> customs; private final Diff>> inSyncAllocationIds; - public IndexMetaDataDiff(IndexMetaData before, IndexMetaData after) { + IndexMetaDataDiff(IndexMetaData before, IndexMetaData after) { index = after.index.getName(); version = after.version; routingNumShards = after.routingNumShards; @@ -634,7 +634,7 @@ public class IndexMetaData implements Diffable, ToXContent { DiffableUtils.getVIntKeySerializer(), DiffableUtils.StringSetValueSerializer.getInstance()); } - public IndexMetaDataDiff(StreamInput in) throws IOException { + IndexMetaDataDiff(StreamInput in) throws IOException { index = in.readString(); routingNumShards = in.readInt(); version = in.readLong(); 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 0c7a2db68dc..168fe2ad7f2 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java @@ -502,11 +502,11 @@ public class IndexNameExpressionResolver extends AbstractComponent { this(state, options, System.currentTimeMillis(), preserveAliases); } - public Context(ClusterState state, IndicesOptions options, long startTime) { + Context(ClusterState state, IndicesOptions options, long startTime) { this(state, options, startTime, false); } - public Context(ClusterState state, IndicesOptions options, long startTime, boolean preserveAliases) { + Context(ClusterState state, IndicesOptions options, long startTime, boolean preserveAliases) { this.state = state; this.options = options; this.startTime = startTime; @@ -754,7 +754,7 @@ public class IndexNameExpressionResolver extends AbstractComponent { private final String defaultDateFormatterPattern; private final DateTimeFormatter defaultDateFormatter; - public DateMathExpressionResolver(Settings settings) { + DateMathExpressionResolver(Settings settings) { String defaultTimeZoneId = settings.get("date_math_expression_resolver.default_time_zone", "UTC"); this.defaultTimeZone = DateTimeZone.forID(defaultTimeZoneId); defaultDateFormatterPattern = settings.get("date_math_expression_resolver.default_date_format", "YYYY.MM.dd"); 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 8e49225d66f..a13e5e21e5e 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java @@ -600,7 +600,7 @@ public class MetaData implements Iterable, Diffable, To private Diff> templates; private Diff> customs; - public MetaDataDiff(MetaData before, MetaData after) { + MetaDataDiff(MetaData before, MetaData after) { clusterUUID = after.clusterUUID; version = after.version; transientSettings = after.transientSettings; @@ -610,7 +610,7 @@ public class MetaData implements Iterable, Diffable, To customs = DiffableUtils.diff(before.customs, after.customs, DiffableUtils.getStringKeySerializer(), CUSTOM_VALUE_SERIALIZER); } - public MetaDataDiff(StreamInput in) throws IOException { + MetaDataDiff(StreamInput in) throws IOException { clusterUUID = in.readString(); version = in.readLong(); transientSettings = Settings.readSettingsFromStream(in); diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java b/core/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java index d4aa89b99c5..0b1a0044567 100644 --- a/core/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java +++ b/core/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java @@ -378,12 +378,12 @@ public class RoutingTable implements Iterable, Diffable> indicesRouting; - public RoutingTableDiff(RoutingTable before, RoutingTable after) { + RoutingTableDiff(RoutingTable before, RoutingTable after) { version = after.version; indicesRouting = DiffableUtils.diff(before.indicesRouting, after.indicesRouting, DiffableUtils.getStringKeySerializer()); } - public RoutingTableDiff(StreamInput in) throws IOException { + RoutingTableDiff(StreamInput in) throws IOException { version = in.readLong(); indicesRouting = DiffableUtils.readImmutableOpenMapDiff(in, DiffableUtils.getStringKeySerializer(), IndexRoutingTable::readFrom, IndexRoutingTable::readDiffFrom); diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java index 9943aaccae9..a60287a8487 100644 --- a/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java +++ b/core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java @@ -1052,7 +1052,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards private int numShards = 0; private final RoutingNode routingNode; - public ModelNode(RoutingNode routingNode) { + ModelNode(RoutingNode routingNode) { this.routingNode = routingNode; } @@ -1130,7 +1130,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards private final Set shards = new HashSet<>(4); // expect few shards of same index to be allocated on same node private int highestPrimary = -1; - public ModelIndex(String id) { + ModelIndex(String id) { this.id = id; } @@ -1187,7 +1187,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards private final Balancer balancer; private float pivotWeight; - public NodeSorter(ModelNode[] modelNodes, WeightFunction function, Balancer balancer) { + NodeSorter(ModelNode[] modelNodes, WeightFunction function, Balancer balancer) { this.function = function; this.balancer = balancer; this.modelNodes = modelNodes; 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 0c328dfc478..e2040312e09 100644 --- a/core/src/main/java/org/elasticsearch/cluster/service/ClusterService.java +++ b/core/src/main/java/org/elasticsearch/cluster/service/ClusterService.java @@ -582,7 +582,7 @@ public class ClusterService extends AbstractLifecycleComponent { abstract static class SourcePrioritizedRunnable extends PrioritizedRunnable { protected final String source; - public SourcePrioritizedRunnable(Priority priority, String source) { + SourcePrioritizedRunnable(Priority priority, String source) { super(priority); this.source = source; } @@ -892,7 +892,7 @@ public class ClusterService extends AbstractLifecycleComponent { public final List nonFailedTasks; public final Map executionResults; - public TaskOutputs(TaskInputs taskInputs, ClusterState previousClusterState, + TaskOutputs(TaskInputs taskInputs, ClusterState previousClusterState, ClusterState newClusterState, List nonFailedTasks, Map executionResults) { this.taskInputs = taskInputs; @@ -982,7 +982,7 @@ public class ClusterService extends AbstractLifecycleComponent { private final ClusterStateTaskListener listener; private final Logger logger; - public SafeClusterStateTaskListener(ClusterStateTaskListener listener, Logger logger) { + SafeClusterStateTaskListener(ClusterStateTaskListener listener, Logger logger) { this.listener = listener; this.logger = logger; } @@ -1029,7 +1029,7 @@ public class ClusterService extends AbstractLifecycleComponent { private final AckedClusterStateTaskListener listener; private final Logger logger; - public SafeAckedClusterStateTaskListener(AckedClusterStateTaskListener listener, Logger logger) { + SafeAckedClusterStateTaskListener(AckedClusterStateTaskListener listener, Logger logger) { super(listener, logger); this.listener = listener; this.logger = logger; diff --git a/core/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java b/core/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java index 4dcd92bf549..fff6392f238 100644 --- a/core/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java +++ b/core/src/main/java/org/elasticsearch/common/bytes/BytesReferenceStreamInput.java @@ -37,7 +37,7 @@ final class BytesReferenceStreamInput extends StreamInput { private final int length; // the total size of the stream private int offset; // the current position of the stream - public BytesReferenceStreamInput(BytesRefIterator iterator, final int length) throws IOException { + BytesReferenceStreamInput(BytesRefIterator iterator, final int length) throws IOException { this.iterator = iterator; this.slice = iterator.next(); this.length = length; diff --git a/core/src/main/java/org/elasticsearch/common/cache/Cache.java b/core/src/main/java/org/elasticsearch/common/cache/Cache.java index fd83f5f1494..2297df67655 100644 --- a/core/src/main/java/org/elasticsearch/common/cache/Cache.java +++ b/core/src/main/java/org/elasticsearch/common/cache/Cache.java @@ -166,7 +166,7 @@ public class Cache { Entry after; State state = State.NEW; - public Entry(K key, V value, long writeTime) { + Entry(K key, V value, long writeTime) { this.key = key; this.value = value; this.writeTime = this.accessTime = writeTime; 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 53167686736..85d7eda8363 100644 --- a/core/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java +++ b/core/src/main/java/org/elasticsearch/common/collect/CopyOnWriteHashMap.java @@ -433,7 +433,7 @@ public final class CopyOnWriteHashMap extends AbstractMap { private final Deque> entries; private final Deque> nodes; - public EntryIterator(Node node) { + EntryIterator(Node node) { entries = new ArrayDeque<>(); nodes = new ArrayDeque<>(); node.visit(entries, nodes); diff --git a/core/src/main/java/org/elasticsearch/common/collect/Iterators.java b/core/src/main/java/org/elasticsearch/common/collect/Iterators.java index d44bf7341c4..a8c811a0d06 100644 --- a/core/src/main/java/org/elasticsearch/common/collect/Iterators.java +++ b/core/src/main/java/org/elasticsearch/common/collect/Iterators.java @@ -36,7 +36,7 @@ public class Iterators { private final Iterator[] iterators; private int index = 0; - public ConcatenatedIterator(Iterator... iterators) { + ConcatenatedIterator(Iterator... iterators) { if (iterators == null) { throw new NullPointerException("iterators"); } diff --git a/core/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java b/core/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java index 5a7c9e2a325..acac5fd6690 100644 --- a/core/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java +++ b/core/src/main/java/org/elasticsearch/common/geo/SpatialStrategy.java @@ -31,7 +31,7 @@ public enum SpatialStrategy implements Writeable { private final String strategyName; - private SpatialStrategy(String strategyName) { + SpatialStrategy(String strategyName) { this.strategyName = strategyName; } diff --git a/core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java b/core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java index cb2f8bb4e78..fbe47a17826 100644 --- a/core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java +++ b/core/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java @@ -381,7 +381,7 @@ public abstract class ShapeBuilder extends ToXContentToBytes implements NamedWri } } - public static enum Orientation { + public enum Orientation { LEFT, RIGHT; @@ -427,7 +427,7 @@ public abstract class ShapeBuilder extends ToXContentToBytes implements NamedWri /** * Enumeration that lists all {@link GeoShapeType}s that can be handled */ - public static enum GeoShapeType { + public enum GeoShapeType { POINT("point"), MULTIPOINT("multipoint"), LINESTRING("linestring"), @@ -440,7 +440,7 @@ public abstract class ShapeBuilder extends ToXContentToBytes implements NamedWri private final String shapename; - private GeoShapeType(String shapename) { + GeoShapeType(String shapename) { this.shapename = shapename; } diff --git a/core/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java b/core/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java index 87bf31e911e..aa7029f2a9c 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java +++ b/core/src/main/java/org/elasticsearch/common/inject/ConstantFactory.java @@ -30,7 +30,7 @@ class ConstantFactory implements InternalFactory { private final Initializable initializable; - public ConstantFactory(Initializable initializable) { + ConstantFactory(Initializable initializable) { this.initializable = initializable; } diff --git a/core/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java b/core/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java index 40d589f37dc..2bc8f770bf8 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java +++ b/core/src/main/java/org/elasticsearch/common/inject/DeferredLookups.java @@ -34,7 +34,7 @@ class DeferredLookups implements Lookups { private final InjectorImpl injector; private final List lookups = new ArrayList<>(); - public DeferredLookups(InjectorImpl injector) { + DeferredLookups(InjectorImpl injector) { this.injector = injector; } diff --git a/core/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java b/core/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java index 8b8b7b78218..ed49d28dea7 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java +++ b/core/src/main/java/org/elasticsearch/common/inject/EncounterImpl.java @@ -36,7 +36,7 @@ final class EncounterImpl implements TypeEncounter { private List> injectionListeners; // lazy private boolean valid = true; - public EncounterImpl(Errors errors, Lookups lookups) { + EncounterImpl(Errors errors, Lookups lookups) { this.errors = errors; this.lookups = lookups; } diff --git a/core/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java b/core/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java index efc10b27e49..b3cf0a14b6b 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java +++ b/core/src/main/java/org/elasticsearch/common/inject/ExposedKeyFactory.java @@ -33,7 +33,7 @@ class ExposedKeyFactory implements InternalFactory, BindingProcessor.Creat private final PrivateElements privateElements; private BindingImpl delegate; - public ExposedKeyFactory(Key key, PrivateElements privateElements) { + ExposedKeyFactory(Key key, PrivateElements privateElements) { this.key = key; this.privateElements = privateElements; } diff --git a/core/src/main/java/org/elasticsearch/common/inject/Initializer.java b/core/src/main/java/org/elasticsearch/common/inject/Initializer.java index 1d68f163bfe..ce7d7765ce3 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/Initializer.java +++ b/core/src/main/java/org/elasticsearch/common/inject/Initializer.java @@ -115,7 +115,7 @@ class Initializer { private final Object source; private MembersInjectorImpl membersInjector; - public InjectableReference(InjectorImpl injector, T instance, Object source) { + InjectableReference(InjectorImpl injector, T instance, Object source) { this.injector = injector; this.instance = Objects.requireNonNull(instance, "instance"); this.source = Objects.requireNonNull(source, "source"); diff --git a/core/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java b/core/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java index e8b38b51330..909779cb442 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java +++ b/core/src/main/java/org/elasticsearch/common/inject/InjectionRequestProcessor.java @@ -86,7 +86,7 @@ class InjectionRequestProcessor extends AbstractProcessor { final StaticInjectionRequest request; List memberInjectors; - public StaticInjection(InjectorImpl injector, StaticInjectionRequest request) { + StaticInjection(InjectorImpl injector, StaticInjectionRequest request) { this.injector = injector; this.source = request.getSource(); this.request = request; diff --git a/core/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java b/core/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java index 8739d9182d8..54fecae9ba9 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java +++ b/core/src/main/java/org/elasticsearch/common/inject/InternalFactoryToProviderAdapter.java @@ -33,11 +33,11 @@ class InternalFactoryToProviderAdapter implements InternalFactory { private final Initializable> initializable; private final Object source; - public InternalFactoryToProviderAdapter(Initializable> initializable) { + InternalFactoryToProviderAdapter(Initializable> initializable) { this(initializable, SourceProvider.UNKNOWN_SOURCE); } - public InternalFactoryToProviderAdapter( + InternalFactoryToProviderAdapter( Initializable> initializable, Object source) { this.initializable = Objects.requireNonNull(initializable, "provider"); this.source = Objects.requireNonNull(source, "source"); diff --git a/core/src/main/java/org/elasticsearch/common/inject/Key.java b/core/src/main/java/org/elasticsearch/common/inject/Key.java index 83ab440d23c..833aac2d3fc 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/Key.java +++ b/core/src/main/java/org/elasticsearch/common/inject/Key.java @@ -380,7 +380,7 @@ public class Key { } } - static enum NullAnnotationStrategy implements AnnotationStrategy { + enum NullAnnotationStrategy implements AnnotationStrategy { INSTANCE; @Override diff --git a/core/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java b/core/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java index d7b6afbe6da..f4437569088 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java +++ b/core/src/main/java/org/elasticsearch/common/inject/ProviderToInternalFactoryAdapter.java @@ -30,7 +30,7 @@ class ProviderToInternalFactoryAdapter implements Provider { private final InjectorImpl injector; private final InternalFactory internalFactory; - public ProviderToInternalFactoryAdapter(InjectorImpl injector, + ProviderToInternalFactoryAdapter(InjectorImpl injector, InternalFactory internalFactory) { this.injector = injector; this.internalFactory = internalFactory; diff --git a/core/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java b/core/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java index 10ba17d86cd..ce02a26ffd0 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java +++ b/core/src/main/java/org/elasticsearch/common/inject/SingleFieldInjector.java @@ -34,7 +34,7 @@ class SingleFieldInjector implements SingleMemberInjector { final Dependency dependency; final InternalFactory factory; - public SingleFieldInjector(InjectorImpl injector, InjectionPoint injectionPoint, Errors errors) + SingleFieldInjector(InjectorImpl injector, InjectionPoint injectionPoint, Errors errors) throws ErrorsException { this.injectionPoint = injectionPoint; this.field = (Field) injectionPoint.getMember(); diff --git a/core/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java b/core/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java index 9c407791160..7330d05df3b 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java +++ b/core/src/main/java/org/elasticsearch/common/inject/SingleMethodInjector.java @@ -34,7 +34,7 @@ class SingleMethodInjector implements SingleMemberInjector { final SingleParameterInjector[] parameterInjectors; final InjectionPoint injectionPoint; - public SingleMethodInjector(InjectorImpl injector, InjectionPoint injectionPoint, Errors errors) + SingleMethodInjector(InjectorImpl injector, InjectionPoint injectionPoint, Errors errors) throws ErrorsException { this.injectionPoint = injectionPoint; final Method method = (Method) injectionPoint.getMember(); diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java index 07166537081..edd45c290a5 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java +++ b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/AssistedConstructor.java @@ -43,7 +43,7 @@ class AssistedConstructor { private final List allParameters; @SuppressWarnings("unchecked") - public AssistedConstructor(Constructor constructor, List> parameterTypes) { + AssistedConstructor(Constructor constructor, List> parameterTypes) { this.constructor = constructor; Annotation[][] annotations = constructor.getParameterAnnotations(); diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java index 5ceb086db9f..a21dc3aa7f5 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java +++ b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/Parameter.java @@ -39,7 +39,7 @@ class Parameter { private final Annotation bindingAnnotation; private final boolean isProvider; - public Parameter(Type type, Annotation[] annotations) { + Parameter(Type type, Annotation[] annotations) { this.type = type; this.bindingAnnotation = getBindingAnnotation(annotations); this.isAssisted = hasAssistedAnnotation(annotations); diff --git a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java index fc2a96e19df..7967f473948 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java +++ b/core/src/main/java/org/elasticsearch/common/inject/assistedinject/ParameterListKey.java @@ -34,11 +34,11 @@ class ParameterListKey { private final List paramList; - public ParameterListKey(List paramList) { + ParameterListKey(List paramList) { this.paramList = new ArrayList<>(paramList); } - public ParameterListKey(Type[] types) { + ParameterListKey(Type[] types) { this(Arrays.asList(types)); } diff --git a/core/src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java b/core/src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java index cc5a23a786d..0fec6b5bac2 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java +++ b/core/src/main/java/org/elasticsearch/common/inject/internal/NullOutputException.java @@ -24,7 +24,7 @@ package org.elasticsearch.common.inject.internal; * @author Bob Lee */ class NullOutputException extends NullPointerException { - public NullOutputException(String s) { + NullOutputException(String s) { super(s); } } diff --git a/core/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java b/core/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java index 931d290fc19..76df334e4e3 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java +++ b/core/src/main/java/org/elasticsearch/common/inject/matcher/AbstractMatcher.java @@ -36,7 +36,7 @@ public abstract class AbstractMatcher implements Matcher { private static class AndMatcher extends AbstractMatcher { private final Matcher a, b; - public AndMatcher(Matcher a, Matcher b) { + AndMatcher(Matcher a, Matcher b) { this.a = a; this.b = b; } @@ -67,7 +67,7 @@ public abstract class AbstractMatcher implements Matcher { private static class OrMatcher extends AbstractMatcher { private final Matcher a, b; - public OrMatcher(Matcher a, Matcher b) { + OrMatcher(Matcher a, Matcher b) { this.a = a; this.b = b; } diff --git a/core/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java b/core/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java index e2ced98034e..cc354145b11 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java +++ b/core/src/main/java/org/elasticsearch/common/inject/matcher/Matchers.java @@ -113,7 +113,7 @@ public class Matchers { private static class AnnotatedWithType extends AbstractMatcher { private final Class annotationType; - public AnnotatedWithType(Class annotationType) { + AnnotatedWithType(Class annotationType) { this.annotationType = Objects.requireNonNull(annotationType, "annotation type"); checkForRuntimeRetention(annotationType); } @@ -152,7 +152,7 @@ public class Matchers { private static class AnnotatedWith extends AbstractMatcher { private final Annotation annotation; - public AnnotatedWith(Annotation annotation) { + AnnotatedWith(Annotation annotation) { this.annotation = Objects.requireNonNull(annotation, "annotation"); checkForRuntimeRetention(annotation.annotationType()); } @@ -191,7 +191,7 @@ public class Matchers { private static class SubclassesOf extends AbstractMatcher { private final Class superclass; - public SubclassesOf(Class superclass) { + SubclassesOf(Class superclass) { this.superclass = Objects.requireNonNull(superclass, "superclass"); } @@ -227,7 +227,7 @@ public class Matchers { private static class Only extends AbstractMatcher { private final Object value; - public Only(Object value) { + Only(Object value) { this.value = Objects.requireNonNull(value, "value"); } @@ -263,7 +263,7 @@ public class Matchers { private static class IdenticalTo extends AbstractMatcher { private final Object value; - public IdenticalTo(Object value) { + IdenticalTo(Object value) { this.value = Objects.requireNonNull(value, "value"); } @@ -301,7 +301,7 @@ public class Matchers { private final transient Package targetPackage; private final String packageName; - public InPackage(Package targetPackage) { + InPackage(Package targetPackage) { this.targetPackage = Objects.requireNonNull(targetPackage, "package"); this.packageName = targetPackage.getName(); } @@ -345,7 +345,7 @@ public class Matchers { private static class InSubpackage extends AbstractMatcher { private final String targetPackageName; - public InSubpackage(String targetPackageName) { + InSubpackage(String targetPackageName) { this.targetPackageName = targetPackageName; } @@ -384,7 +384,7 @@ public class Matchers { private static class Returns extends AbstractMatcher { private final Matcher> returnType; - public Returns(Matcher> returnType) { + Returns(Matcher> returnType) { this.returnType = Objects.requireNonNull(returnType, "return type matcher"); } diff --git a/core/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java b/core/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java index e4cc088e30a..eb3fb00a51a 100644 --- a/core/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java +++ b/core/src/main/java/org/elasticsearch/common/inject/name/NamedImpl.java @@ -23,7 +23,7 @@ class NamedImpl implements Named { private final String value; - public NamedImpl(String value) { + NamedImpl(String value) { this.value = Objects.requireNonNull(value, "name"); } diff --git a/core/src/main/java/org/elasticsearch/common/io/stream/Writeable.java b/core/src/main/java/org/elasticsearch/common/io/stream/Writeable.java index 30607f33759..9d645038d65 100644 --- a/core/src/main/java/org/elasticsearch/common/io/stream/Writeable.java +++ b/core/src/main/java/org/elasticsearch/common/io/stream/Writeable.java @@ -34,7 +34,7 @@ public interface Writeable { /** * Write this into the {@linkplain StreamOutput}. */ - void writeTo(final StreamOutput out) throws IOException; + void writeTo(StreamOutput out) throws IOException; /** * Reference to a method that can write some object to a {@link StreamOutput}. @@ -60,7 +60,7 @@ public interface Writeable { * @param out Output to write the {@code value} too * @param value The value to add */ - void write(final StreamOutput out, final V value) throws IOException; + void write(StreamOutput out, V value) throws IOException; } @@ -86,7 +86,7 @@ public interface Writeable { * * @param in Input to read the value from */ - V read(final StreamInput in) throws IOException; + V read(StreamInput in) throws IOException; } 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 79f4c534688..fe12622748e 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 @@ -156,7 +156,7 @@ public class FiltersFunctionScoreQuery extends Query { final Weight[] filterWeights; final boolean needsScores; - public CustomBoostFactorWeight(Query parent, Weight subQueryWeight, Weight[] filterWeights, boolean needsScores) throws IOException { + CustomBoostFactorWeight(Query parent, Weight subQueryWeight, Weight[] filterWeights, boolean needsScores) throws IOException { super(parent); this.subQueryWeight = subQueryWeight; this.filterWeights = filterWeights; diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java index 5e94e82021f..61de1ab303f 100644 --- a/core/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java +++ b/core/src/main/java/org/elasticsearch/common/lucene/search/function/FunctionScoreQuery.java @@ -109,7 +109,7 @@ public class FunctionScoreQuery extends Query { final Weight subQueryWeight; final boolean needsScores; - public CustomBoostFactorWeight(Query parent, Weight subQueryWeight, boolean needsScores) throws IOException { + CustomBoostFactorWeight(Query parent, Weight subQueryWeight, boolean needsScores) throws IOException { super(parent); this.subQueryWeight = subQueryWeight; this.needsScores = needsScores; diff --git a/core/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java b/core/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java index 47b85250735..bee7087c1d5 100644 --- a/core/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java +++ b/core/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java @@ -38,7 +38,7 @@ public class ScriptScoreFunction extends ScoreFunction { protected int docid; protected float score; - public CannedScorer() { + CannedScorer() { super(null); } diff --git a/core/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDAndVersionLookup.java b/core/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDAndVersionLookup.java index 67f06c4f8d0..6e4e3e1923d 100644 --- a/core/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDAndVersionLookup.java +++ b/core/src/main/java/org/elasticsearch/common/lucene/uid/PerThreadIDAndVersionLookup.java @@ -57,7 +57,7 @@ final class PerThreadIDAndVersionLookup { /** * Initialize lookup for the provided segment */ - public PerThreadIDAndVersionLookup(LeafReader reader) throws IOException { + PerThreadIDAndVersionLookup(LeafReader reader) throws IOException { TermsEnum termsEnum = null; NumericDocValues versions = null; diff --git a/core/src/main/java/org/elasticsearch/common/recycler/Recyclers.java b/core/src/main/java/org/elasticsearch/common/recycler/Recyclers.java index 5bac8f7bcfd..f84441fbce4 100644 --- a/core/src/main/java/org/elasticsearch/common/recycler/Recyclers.java +++ b/core/src/main/java/org/elasticsearch/common/recycler/Recyclers.java @@ -170,7 +170,7 @@ public enum Recyclers { } } - final int slot() { + int slot() { final long id = Thread.currentThread().getId(); // don't trust Thread.hashCode to have equiprobable low bits int slot = (int) BitMixer.mix64(id); diff --git a/core/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java b/core/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java index 3bf4f460d71..9a3e40ac844 100644 --- a/core/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java +++ b/core/src/main/java/org/elasticsearch/common/rounding/DateTimeUnit.java @@ -40,7 +40,7 @@ public enum DateTimeUnit { private final byte id; private final Function fieldFunction; - private DateTimeUnit(byte id, Function fieldFunction) { + DateTimeUnit(byte id, Function fieldFunction) { this.id = id; this.fieldFunction = fieldFunction; } diff --git a/core/src/main/java/org/elasticsearch/common/settings/Setting.java b/core/src/main/java/org/elasticsearch/common/settings/Setting.java index a1f25a5e98b..f85894790a8 100644 --- a/core/src/main/java/org/elasticsearch/common/settings/Setting.java +++ b/core/src/main/java/org/elasticsearch/common/settings/Setting.java @@ -563,7 +563,7 @@ public class Setting extends ToXContentToBytes { private final Logger logger; private final Consumer accept; - public Updater(Consumer consumer, Logger logger, Consumer accept) { + Updater(Consumer consumer, Logger logger, Consumer accept) { this.consumer = consumer; this.logger = logger; this.accept = accept; diff --git a/core/src/main/java/org/elasticsearch/common/util/BigByteArray.java b/core/src/main/java/org/elasticsearch/common/util/BigByteArray.java index cac3132385f..02f2c627a4c 100644 --- a/core/src/main/java/org/elasticsearch/common/util/BigByteArray.java +++ b/core/src/main/java/org/elasticsearch/common/util/BigByteArray.java @@ -36,7 +36,7 @@ final class BigByteArray extends AbstractBigArray implements ByteArray { private byte[][] pages; /** Constructor. */ - public BigByteArray(long size, BigArrays bigArrays, boolean clearOnResize) { + BigByteArray(long size, BigArrays bigArrays, boolean clearOnResize) { super(BYTE_PAGE_SIZE, bigArrays, clearOnResize); this.size = size; pages = new byte[numPages(size)][]; diff --git a/core/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java b/core/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java index 4aab593affe..a8b4503bda6 100644 --- a/core/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java +++ b/core/src/main/java/org/elasticsearch/common/util/BigDoubleArray.java @@ -35,7 +35,7 @@ final class BigDoubleArray extends AbstractBigArray implements DoubleArray { private long[][] pages; /** Constructor. */ - public BigDoubleArray(long size, BigArrays bigArrays, boolean clearOnResize) { + BigDoubleArray(long size, BigArrays bigArrays, boolean clearOnResize) { super(LONG_PAGE_SIZE, bigArrays, clearOnResize); this.size = size; pages = new long[numPages(size)][]; diff --git a/core/src/main/java/org/elasticsearch/common/util/BigFloatArray.java b/core/src/main/java/org/elasticsearch/common/util/BigFloatArray.java index 1fa79a9f3db..cf11eba37ae 100644 --- a/core/src/main/java/org/elasticsearch/common/util/BigFloatArray.java +++ b/core/src/main/java/org/elasticsearch/common/util/BigFloatArray.java @@ -35,7 +35,7 @@ final class BigFloatArray extends AbstractBigArray implements FloatArray { private int[][] pages; /** Constructor. */ - public BigFloatArray(long size, BigArrays bigArrays, boolean clearOnResize) { + BigFloatArray(long size, BigArrays bigArrays, boolean clearOnResize) { super(INT_PAGE_SIZE, bigArrays, clearOnResize); this.size = size; pages = new int[numPages(size)][]; diff --git a/core/src/main/java/org/elasticsearch/common/util/BigIntArray.java b/core/src/main/java/org/elasticsearch/common/util/BigIntArray.java index 4ce5fc7acee..16ca3ada24d 100644 --- a/core/src/main/java/org/elasticsearch/common/util/BigIntArray.java +++ b/core/src/main/java/org/elasticsearch/common/util/BigIntArray.java @@ -35,7 +35,7 @@ final class BigIntArray extends AbstractBigArray implements IntArray { private int[][] pages; /** Constructor. */ - public BigIntArray(long size, BigArrays bigArrays, boolean clearOnResize) { + BigIntArray(long size, BigArrays bigArrays, boolean clearOnResize) { super(INT_PAGE_SIZE, bigArrays, clearOnResize); this.size = size; pages = new int[numPages(size)][]; diff --git a/core/src/main/java/org/elasticsearch/common/util/BigLongArray.java b/core/src/main/java/org/elasticsearch/common/util/BigLongArray.java index 2e3248143b4..cb9b9e6c332 100644 --- a/core/src/main/java/org/elasticsearch/common/util/BigLongArray.java +++ b/core/src/main/java/org/elasticsearch/common/util/BigLongArray.java @@ -35,7 +35,7 @@ final class BigLongArray extends AbstractBigArray implements LongArray { private long[][] pages; /** Constructor. */ - public BigLongArray(long size, BigArrays bigArrays, boolean clearOnResize) { + BigLongArray(long size, BigArrays bigArrays, boolean clearOnResize) { super(LONG_PAGE_SIZE, bigArrays, clearOnResize); this.size = size; pages = new long[numPages(size)][]; diff --git a/core/src/main/java/org/elasticsearch/common/util/BigObjectArray.java b/core/src/main/java/org/elasticsearch/common/util/BigObjectArray.java index 19a41d3096d..023c710f3aa 100644 --- a/core/src/main/java/org/elasticsearch/common/util/BigObjectArray.java +++ b/core/src/main/java/org/elasticsearch/common/util/BigObjectArray.java @@ -35,7 +35,7 @@ final class BigObjectArray extends AbstractBigArray implements ObjectArray private Object[][] pages; /** Constructor. */ - public BigObjectArray(long size, BigArrays bigArrays) { + BigObjectArray(long size, BigArrays bigArrays) { super(OBJECT_PAGE_SIZE, bigArrays, true); this.size = size; pages = new Object[numPages(size)][]; diff --git a/core/src/main/java/org/elasticsearch/common/util/CollectionUtils.java b/core/src/main/java/org/elasticsearch/common/util/CollectionUtils.java index 5171be0ee91..54a49f7e4f2 100644 --- a/core/src/main/java/org/elasticsearch/common/util/CollectionUtils.java +++ b/core/src/main/java/org/elasticsearch/common/util/CollectionUtils.java @@ -226,7 +226,7 @@ public class CollectionUtils { private final List in; private final int distance; - public RotatedList(List list, int distance) { + RotatedList(List list, int distance) { if (distance < 0 || distance >= list.size()) { throw new IllegalArgumentException(); } diff --git a/core/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java b/core/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java index 4095f5d7014..a79e8d88be6 100644 --- a/core/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java +++ b/core/src/main/java/org/elasticsearch/common/util/LongObjectPagedHashMap.java @@ -161,7 +161,7 @@ public class LongObjectPagedHashMap extends AbstractPagedHashMap implements I } @Override - public final void remove() { + public void remove() { throw new UnsupportedOperationException(); } diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java index 2dad4663dc4..bd99f3b1a47 100644 --- a/core/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java +++ b/core/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java @@ -161,7 +161,7 @@ public class EsExecutors { final AtomicInteger threadNumber = new AtomicInteger(1); final String namePrefix; - public EsThreadFactory(String namePrefix) { + EsThreadFactory(String namePrefix) { this.namePrefix = namePrefix; SecurityManager s = System.getSecurityManager(); group = (s != null) ? s.getThreadGroup() : @@ -189,7 +189,7 @@ public class EsExecutors { ThreadPoolExecutor executor; - public ExecutorScalingQueue() { + ExecutorScalingQueue() { } @Override diff --git a/core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java b/core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java index 813265f19c4..1b01455c1ca 100644 --- a/core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java +++ b/core/src/main/java/org/elasticsearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java @@ -250,14 +250,14 @@ public class PrioritizedEsThreadPoolExecutor extends EsThreadPoolExecutor { final Priority priority; final long insertionOrder; - public PrioritizedFutureTask(Runnable runnable, Priority priority, T value, long insertionOrder) { + PrioritizedFutureTask(Runnable runnable, Priority priority, T value, long insertionOrder) { super(runnable, value); this.task = runnable; this.priority = priority; this.insertionOrder = insertionOrder; } - public PrioritizedFutureTask(PrioritizedCallable callable, long insertionOrder) { + PrioritizedFutureTask(PrioritizedCallable callable, long insertionOrder) { super(callable); this.task = callable; this.priority = callable.priority(); diff --git a/core/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java b/core/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java index fe606c130d1..82ee94550c1 100644 --- a/core/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java +++ b/core/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java @@ -267,7 +267,7 @@ public final class ConstructingObjectParser extends AbstractObje */ private Value targetObject; - public Target(XContentParser parser) { + Target(XContentParser parser) { this.parser = parser; } @@ -360,7 +360,7 @@ public final class ConstructingObjectParser extends AbstractObje final ParseField field; final boolean required; - public ConstructorArgInfo(ParseField field, boolean required) { + ConstructorArgInfo(ParseField field, boolean required) { this.field = field; this.required = required; } 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 ce7dba98797..effc92a0c67 100644 --- a/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java +++ b/core/src/main/java/org/elasticsearch/discovery/zen/ZenDiscovery.java @@ -516,7 +516,7 @@ public class ZenDiscovery extends AbstractLifecycleComponent implements Discover private final DiscoveryNode node; private final String reason; - public Task(final DiscoveryNode node, final String reason) { + Task(final DiscoveryNode node, final String reason) { this.node = node; this.reason = reason; } @@ -1136,7 +1136,7 @@ public class ZenDiscovery extends AbstractLifecycleComponent implements Discover private final AtomicBoolean running = new AtomicBoolean(false); private final AtomicReference currentJoinThread = new AtomicReference<>(); - public JoinThreadControl(ThreadPool threadPool) { + JoinThreadControl(ThreadPool threadPool) { this.threadPool = threadPool; } diff --git a/core/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java b/core/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java index 37277586bf7..5a38a4b2b9e 100644 --- a/core/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java +++ b/core/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java @@ -343,7 +343,7 @@ public abstract class AsyncShardFetch implements Rel private boolean valueSet; private Throwable failure; - public NodeEntry(String nodeId) { + NodeEntry(String nodeId) { this.nodeId = nodeId; } diff --git a/core/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java b/core/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java index 56f8b71ee58..69f7af6eef5 100644 --- a/core/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java +++ b/core/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java @@ -134,7 +134,7 @@ public class GatewayAllocator extends AbstractComponent { class InternalAsyncFetch extends AsyncShardFetch { - public InternalAsyncFetch(Logger logger, String type, ShardId shardId, Lister, T> action) { + InternalAsyncFetch(Logger logger, String type, ShardId shardId, Lister, T> action) { super(logger, type, shardId, action); } @@ -149,7 +149,7 @@ public class GatewayAllocator extends AbstractComponent { private final TransportNodesListGatewayStartedShards startedAction; - public InternalPrimaryShardAllocator(Settings settings, TransportNodesListGatewayStartedShards startedAction) { + InternalPrimaryShardAllocator(Settings settings, TransportNodesListGatewayStartedShards startedAction) { super(settings); this.startedAction = startedAction; } @@ -172,7 +172,7 @@ public class GatewayAllocator extends AbstractComponent { private final TransportNodesListShardStoreMetaData storeAction; - public InternalReplicaShardAllocator(Settings settings, TransportNodesListShardStoreMetaData storeAction) { + InternalReplicaShardAllocator(Settings settings, TransportNodesListShardStoreMetaData storeAction) { super(settings); this.storeAction = storeAction; } diff --git a/core/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java b/core/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java index b6fd1842b80..fb48405b725 100644 --- a/core/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java +++ b/core/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java @@ -184,7 +184,7 @@ public abstract class MetaDataStateFormat { */ public final T read(NamedXContentRegistry namedXContentRegistry, Path file) throws IOException { try (Directory dir = newDirectory(file.getParent())) { - try (final IndexInput indexInput = dir.openInput(file.getFileName().toString(), IOContext.DEFAULT)) { + try (IndexInput indexInput = dir.openInput(file.getFileName().toString(), IOContext.DEFAULT)) { // We checksum the entire file before we even go and parse it. If it's corrupted we barf right here. CodecUtil.checksumEntireFile(indexInput); final int fileVersion = CodecUtil.checkHeader(indexInput, STATE_FILE_CODEC, MIN_COMPATIBLE_STATE_FILE_VERSION, diff --git a/core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java b/core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java index f7e5b78e143..8e85081a3c1 100644 --- a/core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java +++ b/core/src/main/java/org/elasticsearch/gateway/PrimaryShardAllocator.java @@ -515,7 +515,7 @@ public abstract class PrimaryShardAllocator extends BaseGatewayShardAllocator { final List orderedAllocationCandidates; final int allocationsFound; - public NodeShardsResult(List orderedAllocationCandidates, int allocationsFound) { + NodeShardsResult(List orderedAllocationCandidates, int allocationsFound) { this.orderedAllocationCandidates = orderedAllocationCandidates; this.allocationsFound = allocationsFound; } @@ -526,7 +526,7 @@ public abstract class PrimaryShardAllocator extends BaseGatewayShardAllocator { final List throttleNodeShards; final List noNodeShards; - public NodesToAllocate(List yesNodeShards, List throttleNodeShards, List noNodeShards) { + NodesToAllocate(List yesNodeShards, List throttleNodeShards, List noNodeShards) { this.yesNodeShards = yesNodeShards; this.throttleNodeShards = throttleNodeShards; this.noNodeShards = noNodeShards; diff --git a/core/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java b/core/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java index 3a838ef3785..b91637e072f 100644 --- a/core/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java +++ b/core/src/main/java/org/elasticsearch/gateway/ReplicaShardAllocator.java @@ -395,7 +395,7 @@ public abstract class ReplicaShardAllocator extends BaseGatewayShardAllocator { @Nullable private final Map nodeDecisions; - public MatchingNodes(ObjectLongMap nodesToSize, @Nullable Map nodeDecisions) { + MatchingNodes(ObjectLongMap nodesToSize, @Nullable Map nodeDecisions) { this.nodesToSize = nodesToSize; this.nodeDecisions = nodeDecisions; diff --git a/core/src/main/java/org/elasticsearch/index/IndexModule.java b/core/src/main/java/org/elasticsearch/index/IndexModule.java index 25e32dc0dee..dc7021e81fc 100644 --- a/core/src/main/java/org/elasticsearch/index/IndexModule.java +++ b/core/src/main/java/org/elasticsearch/index/IndexModule.java @@ -316,7 +316,7 @@ public final class IndexModule { /** * Returns a new IndexSearcherWrapper. This method is called once per index per node */ - IndexSearcherWrapper newWrapper(final IndexService indexService); + IndexSearcherWrapper newWrapper(IndexService indexService); } public IndexService newIndexService( diff --git a/core/src/main/java/org/elasticsearch/index/IndexService.java b/core/src/main/java/org/elasticsearch/index/IndexService.java index 25e2666343f..ee35993c01e 100644 --- a/core/src/main/java/org/elasticsearch/index/IndexService.java +++ b/core/src/main/java/org/elasticsearch/index/IndexService.java @@ -517,7 +517,7 @@ public class IndexService extends AbstractIndexComponent implements IndicesClust private final boolean ownsShard; private final Closeable[] toClose; - public StoreCloseListener(ShardId shardId, boolean ownsShard, Closeable... toClose) { + StoreCloseListener(ShardId shardId, boolean ownsShard, Closeable... toClose) { this.shardId = shardId; this.ownsShard = ownsShard; this.toClose = toClose; @@ -572,7 +572,7 @@ public class IndexService extends AbstractIndexComponent implements IndicesClust private final class FieldDataCacheListener implements IndexFieldDataCache.Listener { final IndexService indexService; - public FieldDataCacheListener(IndexService indexService) { + FieldDataCacheListener(IndexService indexService) { this.indexService = indexService; } diff --git a/core/src/main/java/org/elasticsearch/index/IndexWarmer.java b/core/src/main/java/org/elasticsearch/index/IndexWarmer.java index 72068f3d1d2..fdaad19e528 100644 --- a/core/src/main/java/org/elasticsearch/index/IndexWarmer.java +++ b/core/src/main/java/org/elasticsearch/index/IndexWarmer.java @@ -111,7 +111,7 @@ public final class IndexWarmer extends AbstractComponent { private static class FieldDataWarmer implements IndexWarmer.Listener { private final Executor executor; - public FieldDataWarmer(Executor executor) { + FieldDataWarmer(Executor executor) { this.executor = executor; } diff --git a/core/src/main/java/org/elasticsearch/index/SearchSlowLog.java b/core/src/main/java/org/elasticsearch/index/SearchSlowLog.java index b52164699ec..a48e3d7bd72 100644 --- a/core/src/main/java/org/elasticsearch/index/SearchSlowLog.java +++ b/core/src/main/java/org/elasticsearch/index/SearchSlowLog.java @@ -141,7 +141,7 @@ public final class SearchSlowLog implements SearchOperationListener { private final SearchContext context; private final long tookInNanos; - public SlowLogSearchContextPrinter(SearchContext context, long tookInNanos) { + SlowLogSearchContextPrinter(SearchContext context, long tookInNanos) { this.context = context; this.tookInNanos = tookInNanos; } diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java b/core/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java index 238fde5e6b3..b9e70d05bb7 100644 --- a/core/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java +++ b/core/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java @@ -45,7 +45,7 @@ public interface CharMatcher { } } - public enum Basic implements CharMatcher { + enum Basic implements CharMatcher { LETTER { @Override public boolean isTokenChar(int c) { @@ -97,7 +97,7 @@ public interface CharMatcher { } } - public final class Builder { + final class Builder { private final Set matchers; Builder() { matchers = new HashSet<>(); diff --git a/core/src/main/java/org/elasticsearch/index/cache/query/QueryCache.java b/core/src/main/java/org/elasticsearch/index/cache/query/QueryCache.java index 318059d6a3f..7a033acff9b 100644 --- a/core/src/main/java/org/elasticsearch/index/cache/query/QueryCache.java +++ b/core/src/main/java/org/elasticsearch/index/cache/query/QueryCache.java @@ -25,7 +25,7 @@ import java.io.Closeable; public interface QueryCache extends IndexComponent, Closeable, org.apache.lucene.search.QueryCache { - static class EntriesStats { + class EntriesStats { public final long sizeInBytes; public final long count; diff --git a/core/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java b/core/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java index b145a86e43d..dbfb2416bae 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java +++ b/core/src/main/java/org/elasticsearch/index/engine/DeleteVersionValue.java @@ -29,7 +29,7 @@ class DeleteVersionValue extends VersionValue { private final long time; - public DeleteVersionValue(long version, long time) { + DeleteVersionValue(long version, long time) { super(version); this.time = time; } diff --git a/core/src/main/java/org/elasticsearch/index/engine/ElasticsearchConcurrentMergeScheduler.java b/core/src/main/java/org/elasticsearch/index/engine/ElasticsearchConcurrentMergeScheduler.java index 466da06dec4..11cc838660f 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/ElasticsearchConcurrentMergeScheduler.java +++ b/core/src/main/java/org/elasticsearch/index/engine/ElasticsearchConcurrentMergeScheduler.java @@ -67,7 +67,7 @@ class ElasticsearchConcurrentMergeScheduler extends ConcurrentMergeScheduler { private final Set readOnlyOnGoingMerges = Collections.unmodifiableSet(onGoingMerges); private final MergeSchedulerConfig config; - public ElasticsearchConcurrentMergeScheduler(ShardId shardId, IndexSettings indexSettings) { + ElasticsearchConcurrentMergeScheduler(ShardId shardId, IndexSettings indexSettings) { this.config = indexSettings.getMergeSchedulerConfig(); this.shardId = shardId; this.indexSettings = indexSettings.getSettings(); 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 253710c649e..03ea99b1bd5 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/Engine.java +++ b/core/src/main/java/org/elasticsearch/index/engine/Engine.java @@ -282,7 +282,7 @@ public abstract class Engine implements Closeable { * * Note: engine level failures (i.e. persistent engine failures) are thrown */ - public abstract IndexResult index(final Index index) throws IOException; + public abstract IndexResult index(Index index) throws IOException; /** * Perform document delete operation on the engine @@ -292,9 +292,9 @@ public abstract class Engine implements Closeable { * * Note: engine level failures (i.e. persistent engine failures) are thrown */ - public abstract DeleteResult delete(final Delete delete) throws IOException; + public abstract DeleteResult delete(Delete delete) throws IOException; - public abstract NoOpResult noOp(final NoOp noOp); + public abstract NoOpResult noOp(NoOp noOp); /** * Base class for index and delete operation results @@ -569,7 +569,7 @@ public abstract class Engine implements Closeable { */ public final SegmentsStats segmentsStats(boolean includeSegmentFileSizes) { ensureOpen(); - try (final Searcher searcher = acquireSearcher("segments_stats")) { + try (Searcher searcher = acquireSearcher("segments_stats")) { SegmentsStats stats = new SegmentsStats(); for (LeafReaderContext reader : searcher.reader().leaves()) { final SegmentReader segmentReader = segmentReader(reader.reader()); 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 48b9f0a08a5..8b9cc8564d1 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java +++ b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java @@ -671,7 +671,7 @@ public class InternalEngine extends Engine { throw new AssertionError("doc [" + index.type() + "][" + index.id() + "] exists in version map (version " + versionValue + ")"); } } else { - try (final Searcher searcher = acquireSearcher("assert doc doesn't exist")) { + try (Searcher searcher = acquireSearcher("assert doc doesn't exist")) { final long docsWithId = searcher.searcher().count(new TermQuery(index.uid())); if (docsWithId > 0) { throw new AssertionError("doc [" + index.type() + "][" + index.id() + "] exists [" + docsWithId + "] times in index"); @@ -797,7 +797,7 @@ public class InternalEngine extends Engine { @Override public NoOpResult noOp(final NoOp noOp) { NoOpResult noOpResult; - try (final ReleasableLock ignored = readLock.acquire()) { + try (ReleasableLock ignored = readLock.acquire()) { noOpResult = innerNoOp(noOp); } catch (final Exception e) { noOpResult = new NoOpResult(noOp.seqNo(), e); @@ -1286,7 +1286,7 @@ public class InternalEngine extends Engine { private long loadCurrentVersionFromIndex(Term uid) throws IOException { assert incrementIndexVersionLookup(); - try (final Searcher searcher = acquireSearcher("load_version")) { + try (Searcher searcher = acquireSearcher("load_version")) { return Versions.loadVersion(searcher.reader(), uid); } } diff --git a/core/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java b/core/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java index b489cec5768..44b302e85cd 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java +++ b/core/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java @@ -43,12 +43,12 @@ class LiveVersionMap implements ReferenceManager.RefreshListener, Accountable { // Used while refresh is running, and to hold adds/deletes until refresh finishes. We read from both current and old on lookup: final Map old; - public Maps(Map current, Map old) { + Maps(Map current, Map old) { this.current = current; this.old = old; } - public Maps() { + Maps() { this(ConcurrentCollections.newConcurrentMapWithAggressiveConcurrency(), ConcurrentCollections.newConcurrentMapWithAggressiveConcurrency()); } diff --git a/core/src/main/java/org/elasticsearch/index/engine/VersionValue.java b/core/src/main/java/org/elasticsearch/index/engine/VersionValue.java index 5258b270091..6ee484b2b38 100644 --- a/core/src/main/java/org/elasticsearch/index/engine/VersionValue.java +++ b/core/src/main/java/org/elasticsearch/index/engine/VersionValue.java @@ -31,7 +31,7 @@ class VersionValue implements Accountable { private final long version; - public VersionValue(long version) { + VersionValue(long version) { this.version = version; } diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java index feacfe59996..97f10932e0f 100644 --- a/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java +++ b/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java @@ -52,7 +52,7 @@ import java.io.IOException; */ public interface IndexFieldData extends IndexComponent { - public static class CommonSettings { + class CommonSettings { public static final String SETTING_MEMORY_STORAGE_HINT = "memory_storage_hint"; public enum MemoryStorageFormat { diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java b/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java index 948b19a8afb..5238f06a790 100644 --- a/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java +++ b/core/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java @@ -31,7 +31,7 @@ public interface IndexFieldDataCache { > FD load(LeafReaderContext context, IFD indexFieldData) throws Exception; - > IFD load(final DirectoryReader indexReader, final IFD indexFieldData) throws Exception; + > IFD load(DirectoryReader indexReader, IFD indexFieldData) throws Exception; /** * Clears all the field data stored cached in on this index. diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java index d6573b930fa..2ae6c24af7c 100644 --- a/core/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java +++ b/core/src/main/java/org/elasticsearch/index/fielddata/IndexNumericFieldData.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.fielddata; public interface IndexNumericFieldData extends IndexFieldData { - public static enum NumericType { + enum NumericType { BOOLEAN(false), BYTE(false), SHORT(false), @@ -33,7 +33,7 @@ public interface IndexNumericFieldData extends IndexFieldData atomicFD; private final int segmentIndex; - public GlobalAtomicFieldData(Set types, Map atomicFD, int segmentIndex) { + GlobalAtomicFieldData(Set types, Map atomicFD, int segmentIndex) { this.types = types; this.atomicFD = atomicFD; this.segmentIndex = segmentIndex; diff --git a/core/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java index 58380ce6890..85403ccc03b 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java @@ -160,7 +160,7 @@ public class AllFieldMapper extends MetadataFieldMapper { static final class AllFieldType extends StringFieldType { - public AllFieldType() { + AllFieldType() { } protected AllFieldType(AllFieldType ref) { diff --git a/core/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java index c32f6219a3c..aa60bfcd9a0 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java @@ -83,7 +83,7 @@ public class BinaryFieldMapper extends FieldMapper { static final class BinaryFieldType extends MappedFieldType { - public BinaryFieldType() {} + BinaryFieldType() {} protected BinaryFieldType(BinaryFieldType ref) { super(ref); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/CustomDocValuesField.java b/core/src/main/java/org/elasticsearch/index/mapper/CustomDocValuesField.java index a8b27d11245..8e6cee222d4 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/CustomDocValuesField.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/CustomDocValuesField.java @@ -39,7 +39,7 @@ abstract class CustomDocValuesField implements IndexableField { private final String name; - public CustomDocValuesField(String name) { + CustomDocValuesField(String name) { this.name = name; } diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java b/core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java index 97891b28aa7..5ec1eab2115 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java @@ -47,7 +47,7 @@ final class DocumentParser { private final DocumentMapperParser docMapperParser; private final DocumentMapper docMapper; - public DocumentParser(IndexSettings indexSettings, DocumentMapperParser docMapperParser, DocumentMapper docMapper) { + DocumentParser(IndexSettings indexSettings, DocumentMapperParser docMapperParser, DocumentMapper docMapper) { this.indexSettings = indexSettings; this.docMapperParser = docMapperParser; this.docMapper = docMapper; diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java b/core/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java index c31306c7fa3..b07492740ae 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/DynamicTemplate.java @@ -38,7 +38,7 @@ public class DynamicTemplate implements ToXContent { private static final DeprecationLogger DEPRECATION_LOGGER = new DeprecationLogger(Loggers.getLogger(DynamicTemplate.class)); - public static enum MatchType { + public enum MatchType { SIMPLE { @Override public boolean matches(String pattern, String value) { diff --git a/core/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java index 863ce3c5149..4396cba58cc 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java @@ -243,7 +243,7 @@ public class FieldNamesFieldMapper extends MetadataFieldMapper { } @Override - public final void remove() { + public void remove() { throw new UnsupportedOperationException(); } diff --git a/core/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java b/core/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java index d05077fe5cf..fee41e43f2a 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java @@ -43,7 +43,7 @@ class FieldTypeLookup implements Iterable { final CopyOnWriteHashMap> fullNameToTypes; /** Create a new empty instance. */ - public FieldTypeLookup() { + FieldTypeLookup() { fullNameToFieldType = new CopyOnWriteHashMap<>(); fullNameToTypes = new CopyOnWriteHashMap<>(); } diff --git a/core/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java index 4f74278014b..6cac16d2fce 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java @@ -88,7 +88,7 @@ public class IdFieldMapper extends MetadataFieldMapper { static final class IdFieldType extends TermBasedFieldType { - public IdFieldType() { + IdFieldType() { } protected IdFieldType(IdFieldType ref) { diff --git a/core/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java index 164f18075a4..c961b74d77a 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java @@ -92,7 +92,7 @@ public class IndexFieldMapper extends MetadataFieldMapper { static final class IndexFieldType extends MappedFieldType { - public IndexFieldType() {} + IndexFieldType() {} protected IndexFieldType(IndexFieldType ref) { super(ref); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java index 8824b84fc9b..f988a68d5ef 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java @@ -300,7 +300,7 @@ public final class KeywordFieldMapper extends FieldMapper { final NamedAnalyzer normalizer = fieldType().normalizer(); if (normalizer != null) { - try (final TokenStream ts = normalizer.tokenStream(name(), value)) { + try (TokenStream ts = normalizer.tokenStream(name(), value)) { final CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class); ts.reset(); if (ts.incrementToken() == false) { diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java b/core/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java index 64f3f06a110..93f22d42a80 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java @@ -393,7 +393,7 @@ public abstract class MappedFieldType extends FieldType { * An enum used to describe the relation between the range of terms in a * shard when compared with a query range */ - public static enum Relation { + public enum Relation { WITHIN, INTERSECTS, DISJOINT; diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java index 9cd6ef3b65f..1d3c4791b65 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java @@ -53,7 +53,7 @@ public class ObjectMapper extends Mapper implements Cloneable { public static final Dynamic DYNAMIC = null; // not set, inherited from root } - public static enum Dynamic { + public enum Dynamic { TRUE, FALSE, STRICT diff --git a/core/src/main/java/org/elasticsearch/index/mapper/ParentFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/ParentFieldMapper.java index aee6979b5c8..62877567c3d 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/ParentFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/ParentFieldMapper.java @@ -152,7 +152,7 @@ public class ParentFieldMapper extends MetadataFieldMapper { final String documentType; - public ParentFieldType() { + ParentFieldType() { documentType = null; setEagerGlobalOrdinals(true); } diff --git a/core/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java index d1161b4740f..88679d910b1 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java @@ -105,7 +105,7 @@ public class RoutingFieldMapper extends MetadataFieldMapper { static final class RoutingFieldType extends TermBasedFieldType { - public RoutingFieldType() { + RoutingFieldType() { } protected RoutingFieldType(RoutingFieldType ref) { diff --git a/core/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java index e38a2aab840..c160f2b8cb9 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java @@ -145,7 +145,7 @@ public class SeqNoFieldMapper extends MetadataFieldMapper { static final class SeqNoFieldType extends MappedFieldType { - public SeqNoFieldType() { + SeqNoFieldType() { } protected SeqNoFieldType(SeqNoFieldType ref) { diff --git a/core/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java index 2eb2fdeaa03..5e1b6843940 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java @@ -149,7 +149,7 @@ public class SourceFieldMapper extends MetadataFieldMapper { static final class SourceFieldType extends MappedFieldType { - public SourceFieldType() {} + SourceFieldType() {} protected SourceFieldType(SourceFieldType ref) { super(ref); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/TermBasedFieldType.java b/core/src/main/java/org/elasticsearch/index/mapper/TermBasedFieldType.java index 71d07aa385f..e1fd56616f3 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/TermBasedFieldType.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/TermBasedFieldType.java @@ -35,7 +35,7 @@ import org.elasticsearch.index.query.QueryShardContext; * with the inverted index. */ abstract class TermBasedFieldType extends MappedFieldType { - public TermBasedFieldType() {} + TermBasedFieldType() {} protected TermBasedFieldType(MappedFieldType ref) { super(ref); diff --git a/core/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java index 67775283d5a..5f5be04a914 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java @@ -90,7 +90,7 @@ public class TypeFieldMapper extends MetadataFieldMapper { static final class TypeFieldType extends StringFieldType { private boolean fielddata; - public TypeFieldType() { + TypeFieldType() { this.fielddata = false; } diff --git a/core/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java index bb98f44ed1c..a2d76dcf2c0 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/UidFieldMapper.java @@ -77,7 +77,7 @@ public class UidFieldMapper extends MetadataFieldMapper { static final class UidFieldType extends TermBasedFieldType { - public UidFieldType() { + UidFieldType() { } protected UidFieldType(UidFieldType ref) { diff --git a/core/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java index ce3b2c4b8e8..1d2e997acba 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java @@ -70,7 +70,7 @@ public class VersionFieldMapper extends MetadataFieldMapper { static final class VersionFieldType extends MappedFieldType { - public VersionFieldType() { + VersionFieldType() { } protected VersionFieldType(VersionFieldType ref) { diff --git a/core/src/main/java/org/elasticsearch/index/query/RegexpFlag.java b/core/src/main/java/org/elasticsearch/index/query/RegexpFlag.java index c0fc8b80928..e00c19b68b5 100644 --- a/core/src/main/java/org/elasticsearch/index/query/RegexpFlag.java +++ b/core/src/main/java/org/elasticsearch/index/query/RegexpFlag.java @@ -78,7 +78,7 @@ public enum RegexpFlag { final int value; - private RegexpFlag(int value) { + RegexpFlag(int value) { this.value = value; } diff --git a/core/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java index 526fc2b69ce..5ca91a3d5a6 100644 --- a/core/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java @@ -136,7 +136,7 @@ public class ScriptQueryBuilder extends AbstractQueryBuilder final Script script; final SearchScript searchScript; - public ScriptQuery(Script script, SearchScript searchScript) { + ScriptQuery(Script script, SearchScript searchScript) { this.script = script; this.searchScript = searchScript; } diff --git a/core/src/main/java/org/elasticsearch/index/query/SimpleQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SimpleQueryParser.java index 4a49405ec2f..ddc1c620e3d 100644 --- a/core/src/main/java/org/elasticsearch/index/query/SimpleQueryParser.java +++ b/core/src/main/java/org/elasticsearch/index/query/SimpleQueryParser.java @@ -267,10 +267,10 @@ public class SimpleQueryParser extends org.apache.lucene.queryparser.simple.Simp * Generates default {@link Settings} object (uses ROOT locale, does * lowercase terms, no lenient parsing, no wildcard analysis). * */ - public Settings() { + Settings() { } - public Settings(Settings other) { + Settings(Settings other) { this.lenient = other.lenient; this.analyzeWildcard = other.analyzeWildcard; this.quoteFieldSuffix = other.quoteFieldSuffix; diff --git a/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java b/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java index 68d19db7cc6..e8cbe035c90 100644 --- a/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java +++ b/core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java @@ -43,7 +43,7 @@ public enum SimpleQueryStringFlag { final int value; - private SimpleQueryStringFlag(int value) { + SimpleQueryStringFlag(int value) { this.value = value; } diff --git a/core/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java index 7ef57a8a79e..198537f0060 100644 --- a/core/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java @@ -245,7 +245,7 @@ public class TermsQueryBuilder extends AbstractQueryBuilder { final boolean allStrings = list.stream().allMatch(o -> o != null && STRING_TYPES.contains(o.getClass())); if (allStrings) { final BytesRefBuilder builder = new BytesRefBuilder(); - try (final BytesStreamOutput bytesOut = new BytesStreamOutput()) { + try (BytesStreamOutput bytesOut = new BytesStreamOutput()) { final int[] endOffsets = new int[list.size()]; int i = 0; for (Object o : list) { 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 ad4e9572572..6235f654884 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 @@ -331,7 +331,7 @@ public abstract class DecayFunctionBuilder private static final GeoDistance distFunction = GeoDistance.ARC; - public GeoFieldDataScoreFunction(GeoPoint origin, double scale, double decay, double offset, DecayFunction func, + GeoFieldDataScoreFunction(GeoPoint origin, double scale, double decay, double offset, DecayFunction func, IndexGeoPointFieldData fieldData, MultiValueMode mode) { super(scale, decay, offset, func, mode); this.origin = origin; @@ -413,7 +413,7 @@ public abstract class DecayFunctionBuilder private final IndexNumericFieldData fieldData; private final double origin; - public NumericFieldDataScoreFunction(double origin, double scale, double decay, double offset, DecayFunction func, + NumericFieldDataScoreFunction(double origin, double scale, double decay, double offset, DecayFunction func, IndexNumericFieldData fieldData, MultiValueMode mode) { super(scale, decay, offset, func, mode); this.fieldData = fieldData; diff --git a/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java b/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java index 738bfee061f..be56463ee1b 100644 --- a/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java +++ b/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java @@ -53,7 +53,7 @@ import java.util.List; public class MatchQuery { - public static enum Type implements Writeable { + public enum Type implements Writeable { /** * The text is analyzed and terms are added to a boolean query. */ @@ -69,7 +69,7 @@ public class MatchQuery { private final int ordinal; - private Type(int ordinal) { + Type(int ordinal) { this.ordinal = ordinal; } @@ -89,13 +89,13 @@ public class MatchQuery { } } - public static enum ZeroTermsQuery implements Writeable { + public enum ZeroTermsQuery implements Writeable { NONE(0), ALL(1); private final int ordinal; - private ZeroTermsQuery(int ordinal) { + ZeroTermsQuery(int ordinal) { this.ordinal = ordinal; } @@ -301,7 +301,7 @@ public class MatchQuery { /** * Creates a new QueryBuilder using the given analyzer. */ - public MatchQueryBuilder(Analyzer analyzer, @Nullable MappedFieldType mapper) { + MatchQueryBuilder(Analyzer analyzer, @Nullable MappedFieldType mapper) { super(analyzer); this.mapper = mapper; } diff --git a/core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java b/core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java index d295bc0a2d7..15e8561c8fd 100644 --- a/core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java +++ b/core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java @@ -165,7 +165,7 @@ public class MultiMatchQuery extends MatchQuery { final class CrossFieldsQueryBuilder extends QueryBuilder { private FieldAndFieldType[] blendedFields; - public CrossFieldsQueryBuilder(float tieBreaker) { + CrossFieldsQueryBuilder(float tieBreaker) { super(false, tieBreaker); } diff --git a/core/src/main/java/org/elasticsearch/index/shard/CommitPoint.java b/core/src/main/java/org/elasticsearch/index/shard/CommitPoint.java index 8291298a54d..03afc356f31 100644 --- a/core/src/main/java/org/elasticsearch/index/shard/CommitPoint.java +++ b/core/src/main/java/org/elasticsearch/index/shard/CommitPoint.java @@ -61,7 +61,7 @@ public class CommitPoint { } } - public static enum Type { + public enum Type { GENERATED, SAVED } diff --git a/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java index bb2518ed2ae..0e6054deccd 100644 --- a/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java +++ b/core/src/main/java/org/elasticsearch/index/shard/IndexShard.java @@ -384,7 +384,7 @@ public class IndexShard extends AbstractIndexShardComponent implements IndicesCl * @throws IndexShardRelocatedException if shard is marked as relocated and relocation aborted * @throws IOException if shard state could not be persisted */ - public void updateRoutingEntry(final ShardRouting newRouting) throws IOException { + public void updateRoutingEntry(ShardRouting newRouting) throws IOException { final ShardRouting currentRouting; synchronized (mutex) { currentRouting = this.shardRouting; @@ -671,7 +671,7 @@ public class IndexShard extends AbstractIndexShardComponent implements IndicesCl } public DocsStats docStats() { - try (final Engine.Searcher searcher = acquireSearcher("doc_stats")) { + try (Engine.Searcher searcher = acquireSearcher("doc_stats")) { return new DocsStats(searcher.reader().numDocs(), searcher.reader().numDeletedDocs()); } } @@ -754,7 +754,7 @@ public class IndexShard extends AbstractIndexShardComponent implements IndicesCl public CompletionStats completionStats(String... fields) { CompletionStats completionStats = new CompletionStats(); - try (final Engine.Searcher currentSearcher = acquireSearcher("completion_stats")) { + try (Engine.Searcher currentSearcher = acquireSearcher("completion_stats")) { completionStats.add(CompletionFieldStats.completionStats(currentSearcher.reader(), fields)); } return completionStats; diff --git a/core/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java b/core/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java index cc45c97bf39..302cdda4804 100644 --- a/core/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java +++ b/core/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java @@ -41,7 +41,7 @@ final class LocalShardSnapshot implements Closeable { private final IndexCommit indexCommit; private final AtomicBoolean closed = new AtomicBoolean(false); - public LocalShardSnapshot(IndexShard shard) { + LocalShardSnapshot(IndexShard shard) { this.shard = shard; store = shard.store(); store.incRef(); diff --git a/core/src/main/java/org/elasticsearch/index/shard/SnapshotStatus.java b/core/src/main/java/org/elasticsearch/index/shard/SnapshotStatus.java index c7d1938cd6d..32ddcd1c273 100644 --- a/core/src/main/java/org/elasticsearch/index/shard/SnapshotStatus.java +++ b/core/src/main/java/org/elasticsearch/index/shard/SnapshotStatus.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.shard; public class SnapshotStatus { - public static enum Stage { + public enum Stage { NONE, INDEX, TRANSLOG, 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 ea4097c1362..d4761dccbb6 100644 --- a/core/src/main/java/org/elasticsearch/index/store/Store.java +++ b/core/src/main/java/org/elasticsearch/index/store/Store.java @@ -858,7 +858,7 @@ public class Store extends AbstractIndexShardComponent implements Closeable, Ref Logger logger, Version version, boolean readFileAsHash) throws IOException { final String checksum; final BytesRefBuilder fileHash = new BytesRefBuilder(); - try (final IndexInput in = directory.openInput(file, IOContext.READONCE)) { + try (IndexInput in = directory.openInput(file, IOContext.READONCE)) { final long length; try { length = in.length(); @@ -1194,11 +1194,11 @@ public class Store extends AbstractIndexShardComponent implements Closeable, Ref private final byte[] checksum = new byte[8]; private long verifiedPosition = 0; - public VerifyingIndexInput(IndexInput input) { + VerifyingIndexInput(IndexInput input) { this(input, new BufferedChecksum(new CRC32())); } - public VerifyingIndexInput(IndexInput input, Checksum digest) { + VerifyingIndexInput(IndexInput input, Checksum digest) { super("VerifyingIndexInput(" + input + ")"); this.input = input; this.digest = digest; @@ -1366,7 +1366,7 @@ public class Store extends AbstractIndexShardComponent implements Closeable, Ref private static class StoreStatsCache extends SingleObjectCache { private final Directory directory; - public StoreStatsCache(TimeValue refreshInterval, Directory directory) throws IOException { + StoreStatsCache(TimeValue refreshInterval, Directory directory) throws IOException { super(refreshInterval, new StoreStats(estimateSize(directory))); this.directory = directory; } diff --git a/core/src/main/java/org/elasticsearch/index/translog/Checkpoint.java b/core/src/main/java/org/elasticsearch/index/translog/Checkpoint.java index 932bf24a0ac..6f5d7fa8414 100644 --- a/core/src/main/java/org/elasticsearch/index/translog/Checkpoint.java +++ b/core/src/main/java/org/elasticsearch/index/translog/Checkpoint.java @@ -106,7 +106,7 @@ class Checkpoint { public static Checkpoint read(Path path) throws IOException { try (Directory dir = new SimpleFSDirectory(path.getParent())) { - try (final IndexInput indexInput = dir.openInput(path.getFileName().toString(), IOContext.DEFAULT)) { + try (IndexInput indexInput = dir.openInput(path.getFileName().toString(), IOContext.DEFAULT)) { if (indexInput.length() == LEGACY_NON_CHECKSUMMED_FILE_LENGTH) { // OLD unchecksummed file that was written < ES 5.0.0 return Checkpoint.readNonChecksummed(indexInput); @@ -136,7 +136,7 @@ class Checkpoint { } }; final String resourceDesc = "checkpoint(path=\"" + checkpointFile + "\", gen=" + checkpoint + ")"; - try (final OutputStreamIndexOutput indexOutput = + try (OutputStreamIndexOutput indexOutput = new OutputStreamIndexOutput(resourceDesc, checkpointFile.toString(), byteOutputStream, FILE_SIZE)) { CodecUtil.writeHeader(indexOutput, CHECKPOINT_CODEC, CURRENT_VERSION); checkpoint.write(indexOutput); 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 0765c14cc89..3e650638fec 100644 --- a/core/src/main/java/org/elasticsearch/index/translog/Translog.java +++ b/core/src/main/java/org/elasticsearch/index/translog/Translog.java @@ -464,7 +464,7 @@ public class Translog extends AbstractIndexShardComponent implements IndexShardC * @return the last synced checkpoint */ public long getLastSyncedGlobalCheckpoint() { - try (final ReleasableLock ignored = readLock.acquire()) { + try (ReleasableLock ignored = readLock.acquire()) { return current.getLastSyncedCheckpoint().globalCheckpoint; } } diff --git a/core/src/main/java/org/elasticsearch/index/translog/TranslogSnapshot.java b/core/src/main/java/org/elasticsearch/index/translog/TranslogSnapshot.java index a08259ef32d..ffbe1002eb1 100644 --- a/core/src/main/java/org/elasticsearch/index/translog/TranslogSnapshot.java +++ b/core/src/main/java/org/elasticsearch/index/translog/TranslogSnapshot.java @@ -40,7 +40,7 @@ final class TranslogSnapshot extends BaseTranslogReader implements Translog.Snap * Create a snapshot of translog file channel. The length parameter should be consistent with totalOperations and point * at the end of the last operation in this snapshot. */ - public TranslogSnapshot(long generation, FileChannel channel, Path path, long firstOperationOffset, long length, int totalOperations) { + TranslogSnapshot(long generation, FileChannel channel, Path path, long firstOperationOffset, long length, int totalOperations) { super(generation, channel, path, firstOperationOffset); this.length = length; this.totalOperations = totalOperations; 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 6870643d20b..785566b976c 100644 --- a/core/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java +++ b/core/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java @@ -374,7 +374,7 @@ public class TranslogWriter extends BaseTranslogReader implements Closeable { private final class BufferedChannelOutputStream extends BufferedOutputStream { - public BufferedChannelOutputStream(OutputStream out, int size) throws IOException { + BufferedChannelOutputStream(OutputStream out, int size) throws IOException { super(out, size); } diff --git a/core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java b/core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java index cbbd7b84213..1b960bb1599 100644 --- a/core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java +++ b/core/src/main/java/org/elasticsearch/indices/IndexingMemoryController.java @@ -221,7 +221,7 @@ public class IndexingMemoryController extends AbstractComponent implements Index final long bytesUsed; final IndexShard shard; - public ShardAndBytesUsed(long bytesUsed, IndexShard shard) { + ShardAndBytesUsed(long bytesUsed, IndexShard shard) { this.bytesUsed = bytesUsed; this.shard = shard; } diff --git a/core/src/main/java/org/elasticsearch/indices/IndicesService.java b/core/src/main/java/org/elasticsearch/indices/IndicesService.java index ee1048a81d9..69ecdb5e54a 100644 --- a/core/src/main/java/org/elasticsearch/indices/IndicesService.java +++ b/core/src/main/java/org/elasticsearch/indices/IndicesService.java @@ -880,7 +880,7 @@ public class IndicesService extends AbstractLifecycleComponent /** * Creates a new pending delete of an index */ - public PendingDelete(ShardId shardId, IndexSettings settings) { + PendingDelete(ShardId shardId, IndexSettings settings) { this.index = shardId.getIndex(); this.shardId = shardId.getId(); this.settings = settings; @@ -890,7 +890,7 @@ public class IndicesService extends AbstractLifecycleComponent /** * Creates a new pending delete of a shard */ - public PendingDelete(Index index, IndexSettings settings) { + PendingDelete(Index index, IndexSettings settings) { this.index = index; this.shardId = -1; this.settings = settings; @@ -1030,7 +1030,7 @@ public class IndicesService extends AbstractLifecycleComponent private final AtomicBoolean closed = new AtomicBoolean(false); private final IndicesRequestCache requestCache; - public CacheCleaner(IndicesFieldDataCache cache, IndicesRequestCache requestCache, Logger logger, ThreadPool threadPool, TimeValue interval) { + CacheCleaner(IndicesFieldDataCache cache, IndicesRequestCache requestCache, Logger logger, ThreadPool threadPool, TimeValue interval) { this.cache = cache; this.requestCache = requestCache; this.logger = logger; 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 273682db312..3dce0ecdfd4 100644 --- a/core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java +++ b/core/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java @@ -658,10 +658,10 @@ public class SyncedFlushService extends AbstractComponent implements IndexEventL int opCount; - public InFlightOpsResponse() { + InFlightOpsResponse() { } - public InFlightOpsResponse(int opCount) { + InFlightOpsResponse(int opCount) { this.opCount = opCount; } diff --git a/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java b/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java index 21c4d81fe4b..a6aa47492e1 100644 --- a/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java +++ b/core/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java @@ -127,7 +127,7 @@ public class RecoverySourceHandler { * performs the recovery from the local engine to the target */ public RecoveryResponse recoverToTarget() throws IOException { - try (final Translog.View translogView = shard.acquireTranslogView()) { + try (Translog.View translogView = shard.acquireTranslogView()) { logger.trace("captured translog id [{}] for recovery", translogView.minTranslogGeneration()); boolean isSequenceNumberBasedRecoveryPossible = request.startingSeqNo() != SequenceNumbersService.UNASSIGNED_SEQ_NO && @@ -497,8 +497,10 @@ public class RecoverySourceHandler { throw new IndexShardClosedException(request.shardId()); } cancellableThreads.checkForCancel(); - // we have to send older ops for which no sequence number was assigned, and any ops after the starting sequence number - if (operation.seqNo() == SequenceNumbersService.UNASSIGNED_SEQ_NO || operation.seqNo() < startingSeqNo) continue; + // if we are doing a sequence-number-based recovery, we have to skip older ops for which no sequence number was assigned, and + // any ops before the starting sequence number + final long seqNo = operation.seqNo(); + if (startingSeqNo >= 0 && (seqNo == SequenceNumbersService.UNASSIGNED_SEQ_NO || seqNo < startingSeqNo)) continue; operations.add(operation); ops++; size += operation.estimateSize(); @@ -586,7 +588,7 @@ public class RecoverySourceHandler { ArrayUtil.timSort(files, (a, b) -> Long.compare(a.length(), b.length())); // send smallest first for (int i = 0; i < files.length; i++) { final StoreFileMetaData md = files[i]; - try (final IndexInput indexInput = store.directory().openInput(md.name(), IOContext.READONCE)) { + try (IndexInput indexInput = store.directory().openInput(md.name(), IOContext.READONCE)) { // it's fine that we are only having the indexInput in the try/with block. The copy methods handles // exceptions during close correctly and doesn't hide the original exception. Streams.copy(new InputStreamIndexInput(indexInput, md.length()), outputStreamFactory.apply(md)); 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 919601de949..77d8b4d7077 100644 --- a/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java +++ b/core/src/main/java/org/elasticsearch/indices/recovery/RecoveryState.java @@ -45,7 +45,7 @@ import java.util.Map; */ public class RecoveryState implements ToXContent, Streamable { - public static enum Stage { + public enum Stage { INIT((byte) 0), /** diff --git a/core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java b/core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java index 8b59a3342b0..4f0ee0e11e4 100644 --- a/core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java +++ b/core/src/main/java/org/elasticsearch/indices/store/IndicesStore.java @@ -233,7 +233,7 @@ public class IndicesStore extends AbstractComponent implements ClusterStateListe private final AtomicInteger awaitingResponses; private final AtomicInteger activeCopies; - public ShardActiveResponseHandler(ShardId shardId, long clusterStateVersion, int expectedActiveCopies) { + ShardActiveResponseHandler(ShardId shardId, long clusterStateVersion, int expectedActiveCopies) { this.shardId = shardId; this.expectedActiveCopies = expectedActiveCopies; this.clusterStateVersion = clusterStateVersion; @@ -396,7 +396,7 @@ public class IndicesStore extends AbstractComponent implements ClusterStateListe private String indexUUID; private ShardId shardId; - public ShardActiveRequest() { + ShardActiveRequest() { } ShardActiveRequest(ClusterName clusterName, String indexUUID, ShardId shardId, TimeValue timeout) { diff --git a/core/src/main/java/org/elasticsearch/ingest/IngestMetadata.java b/core/src/main/java/org/elasticsearch/ingest/IngestMetadata.java index 012ce5ba68d..ca8a5df8450 100644 --- a/core/src/main/java/org/elasticsearch/ingest/IngestMetadata.java +++ b/core/src/main/java/org/elasticsearch/ingest/IngestMetadata.java @@ -132,7 +132,7 @@ public final class IngestMetadata implements MetaData.Custom { this.pipelines = DiffableUtils.diff(before.pipelines, after.pipelines, DiffableUtils.getStringKeySerializer()); } - public IngestMetadataDiff(StreamInput in) throws IOException { + IngestMetadataDiff(StreamInput in) throws IOException { pipelines = DiffableUtils.readJdkMapDiff(in, DiffableUtils.getStringKeySerializer(), PipelineConfiguration::readFrom, PipelineConfiguration::readDiffFrom); } diff --git a/core/src/main/java/org/elasticsearch/ingest/InternalTemplateService.java b/core/src/main/java/org/elasticsearch/ingest/InternalTemplateService.java index aedbe70e434..26d6737706b 100644 --- a/core/src/main/java/org/elasticsearch/ingest/InternalTemplateService.java +++ b/core/src/main/java/org/elasticsearch/ingest/InternalTemplateService.java @@ -70,7 +70,7 @@ public class InternalTemplateService implements TemplateService { private final String value; - public StringTemplate(String value) { + StringTemplate(String value) { this.value = value; } 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 6c0ee57d28d..66534514b36 100644 --- a/core/src/main/java/org/elasticsearch/monitor/fs/FsService.java +++ b/core/src/main/java/org/elasticsearch/monitor/fs/FsService.java @@ -73,7 +73,7 @@ public class FsService extends AbstractComponent { private final FsInfo initialValue; - public FsInfoCache(TimeValue interval, FsInfo initialValue) { + FsInfoCache(TimeValue interval, FsInfo initialValue) { super(interval, initialValue); this.initialValue = initialValue; } 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 3a19fe5bd00..f260d7430e2 100644 --- a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java +++ b/core/src/main/java/org/elasticsearch/monitor/jvm/JvmGcMonitorService.java @@ -71,7 +71,7 @@ public class JvmGcMonitorService extends AbstractLifecycleComponent { final int infoThreshold; final int debugThreshold; - public GcOverheadThreshold(final int warnThreshold, final int infoThreshold, final int debugThreshold) { + GcOverheadThreshold(final int warnThreshold, final int infoThreshold, final int debugThreshold) { this.warnThreshold = warnThreshold; this.infoThreshold = infoThreshold; this.debugThreshold = debugThreshold; @@ -355,7 +355,7 @@ public class JvmGcMonitorService extends AbstractLifecycleComponent { final JvmStats currentJvmStats; final ByteSizeValue maxHeapUsed; - public SlowGcEvent( + SlowGcEvent( final GarbageCollector currentGc, final long collectionCount, final TimeValue collectionTime, @@ -380,7 +380,7 @@ public class JvmGcMonitorService extends AbstractLifecycleComponent { private final Map gcThresholds; final GcOverheadThreshold gcOverheadThreshold; - public JvmMonitor(final Map gcThresholds, final GcOverheadThreshold gcOverheadThreshold) { + JvmMonitor(final Map gcThresholds, final GcOverheadThreshold gcOverheadThreshold) { this.gcThresholds = Objects.requireNonNull(gcThresholds); this.gcOverheadThreshold = Objects.requireNonNull(gcOverheadThreshold); } @@ -486,9 +486,9 @@ public class JvmGcMonitorService extends AbstractLifecycleComponent { return System.nanoTime(); } - abstract void onSlowGc(final Threshold threshold, final long seq, final SlowGcEvent slowGcEvent); + abstract void onSlowGc(Threshold threshold, long seq, SlowGcEvent slowGcEvent); - abstract void onGcOverhead(final Threshold threshold, final long total, final long elapsed, final long seq); + abstract void onGcOverhead(Threshold threshold, long total, long elapsed, long seq); } 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 f37daddbb06..ef6270850a7 100644 --- a/core/src/main/java/org/elasticsearch/monitor/os/OsService.java +++ b/core/src/main/java/org/elasticsearch/monitor/os/OsService.java @@ -55,7 +55,7 @@ public class OsService extends AbstractComponent { } private class OsStatsCache extends SingleObjectCache { - public OsStatsCache(TimeValue interval, OsStats initValue) { + OsStatsCache(TimeValue interval, OsStats initValue) { super(interval, initValue); } 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 1cae0602ff2..7bebeb97586 100644 --- a/core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java +++ b/core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java @@ -54,7 +54,7 @@ public final class ProcessService extends AbstractComponent { } private class ProcessStatsCache extends SingleObjectCache { - public ProcessStatsCache(TimeValue interval, ProcessStats initValue) { + ProcessStatsCache(TimeValue interval, ProcessStats initValue) { super(interval, initValue); } diff --git a/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java b/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java index b502b2a4016..00e10162b29 100644 --- a/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java +++ b/core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java @@ -288,7 +288,7 @@ class InstallPluginCommand extends EnvironmentAwareCommand { private int width = 50; private final boolean enabled; - public TerminalProgressInputStream(InputStream is, int expectedTotalSize, Terminal terminal) { + TerminalProgressInputStream(InputStream is, int expectedTotalSize, Terminal terminal) { super(is, expectedTotalSize); this.terminal = terminal; this.enabled = expectedTotalSize > 0; diff --git a/core/src/main/java/org/elasticsearch/plugins/ProgressInputStream.java b/core/src/main/java/org/elasticsearch/plugins/ProgressInputStream.java index 16e1f203bb3..64d9437fa24 100644 --- a/core/src/main/java/org/elasticsearch/plugins/ProgressInputStream.java +++ b/core/src/main/java/org/elasticsearch/plugins/ProgressInputStream.java @@ -37,7 +37,7 @@ abstract class ProgressInputStream extends FilterInputStream { private int currentPercent; private int count = 0; - public ProgressInputStream(InputStream is, int expectedTotalSize) { + ProgressInputStream(InputStream is, int expectedTotalSize) { super(is); this.expectedTotalSize = expectedTotalSize; this.currentPercent = 0; diff --git a/core/src/main/java/org/elasticsearch/repositories/RepositoriesService.java b/core/src/main/java/org/elasticsearch/repositories/RepositoriesService.java index 300ba811a1b..7aea5d18afb 100644 --- a/core/src/main/java/org/elasticsearch/repositories/RepositoriesService.java +++ b/core/src/main/java/org/elasticsearch/repositories/RepositoriesService.java @@ -401,7 +401,7 @@ public class RepositoriesService extends AbstractComponent implements ClusterSta private final ActionListener listener; - public VerifyingRegisterRepositoryListener(String name, final ActionListener listener) { + VerifyingRegisterRepositoryListener(String name, final ActionListener listener) { this.name = name; this.listener = listener; } 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 290a040e7c3..ab4b63e0781 100644 --- a/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java +++ b/core/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java @@ -901,11 +901,11 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent imp protected final Version version; - public Context(SnapshotId snapshotId, Version version, IndexId indexId, ShardId shardId) { + Context(SnapshotId snapshotId, Version version, IndexId indexId, ShardId shardId) { this(snapshotId, version, indexId, shardId, shardId); } - public Context(SnapshotId snapshotId, Version version, IndexId indexId, ShardId shardId, ShardId snapshotShardId) { + Context(SnapshotId snapshotId, Version version, IndexId indexId, ShardId shardId, ShardId snapshotShardId) { this.snapshotId = snapshotId; this.version = version; this.shardId = shardId; @@ -1112,7 +1112,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent imp * @param indexId the id of the index being snapshotted * @param snapshotStatus snapshot status to report progress */ - public SnapshotContext(IndexShard shard, SnapshotId snapshotId, IndexId indexId, IndexShardSnapshotStatus snapshotStatus) { + SnapshotContext(IndexShard shard, SnapshotId snapshotId, IndexId indexId, IndexShardSnapshotStatus snapshotStatus) { super(snapshotId, Version.CURRENT, indexId, shard.shardId()); this.snapshotStatus = snapshotStatus; this.store = shard.store(); @@ -1315,7 +1315,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent imp private class AbortableInputStream extends FilterInputStream { private final String fileName; - public AbortableInputStream(InputStream delegate, String fileName) { + AbortableInputStream(InputStream delegate, String fileName) { super(delegate); this.fileName = fileName; } @@ -1353,7 +1353,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent imp // we have a hash - check if our repo has a hash too otherwise we have // to calculate it. // we might have multiple parts even though the file is small... make sure we read all of it. - try (final InputStream stream = new PartSliceStream(blobContainer, fileInfo)) { + try (InputStream stream = new PartSliceStream(blobContainer, fileInfo)) { BytesRefBuilder builder = new BytesRefBuilder(); Store.MetadataSnapshot.hashFile(builder, stream, fileInfo.length()); BytesRef hash = fileInfo.metadata().hash(); // reset the file infos metadata hash @@ -1371,7 +1371,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent imp private final BlobContainer container; private final BlobStoreIndexShardSnapshot.FileInfo info; - public PartSliceStream(BlobContainer container, BlobStoreIndexShardSnapshot.FileInfo info) { + PartSliceStream(BlobContainer container, BlobStoreIndexShardSnapshot.FileInfo info) { super(info.numberOfParts()); this.info = info; this.container = container; @@ -1401,7 +1401,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent imp * @param snapshotShardId shard in the snapshot that data should be restored from * @param recoveryState recovery state to report progress */ - public RestoreContext(IndexShard shard, SnapshotId snapshotId, Version version, IndexId indexId, ShardId snapshotShardId, RecoveryState recoveryState) { + RestoreContext(IndexShard shard, SnapshotId snapshotId, Version version, IndexId indexId, ShardId snapshotShardId, RecoveryState recoveryState) { super(snapshotId, version, indexId, shard.shardId(), snapshotShardId); this.recoveryState = recoveryState; this.targetShard = shard; @@ -1563,7 +1563,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent imp stream = new RateLimitingInputStream(partSliceStream, restoreRateLimiter, restoreRateLimitingTimeInNanos::inc); } - try (final IndexOutput indexOutput = store.createVerifyingOutput(fileInfo.physicalName(), fileInfo.metadata(), IOContext.DEFAULT)) { + try (IndexOutput indexOutput = store.createVerifyingOutput(fileInfo.physicalName(), fileInfo.metadata(), IOContext.DEFAULT)) { final byte[] buffer = new byte[BUFFER_SIZE]; int length; while ((length = stream.read(buffer)) > 0) { diff --git a/core/src/main/java/org/elasticsearch/rest/BytesRestResponse.java b/core/src/main/java/org/elasticsearch/rest/BytesRestResponse.java index a7b709625ce..72ee7efc489 100644 --- a/core/src/main/java/org/elasticsearch/rest/BytesRestResponse.java +++ b/core/src/main/java/org/elasticsearch/rest/BytesRestResponse.java @@ -98,7 +98,7 @@ public class BytesRestResponse extends RestResponse { this.content = BytesArray.EMPTY; this.contentType = TEXT_CONTENT_TYPE; } else { - try (final XContentBuilder builder = build(channel, status, e)) { + try (XContentBuilder builder = build(channel, status, e)) { this.content = builder.bytes(); this.contentType = builder.contentType().mediaType(); } diff --git a/core/src/main/java/org/elasticsearch/rest/RestController.java b/core/src/main/java/org/elasticsearch/rest/RestController.java index fd3587df2ae..060e90c5e9d 100644 --- a/core/src/main/java/org/elasticsearch/rest/RestController.java +++ b/core/src/main/java/org/elasticsearch/rest/RestController.java @@ -343,7 +343,7 @@ public class RestController extends AbstractComponent { private final int contentLength; private final AtomicBoolean closed = new AtomicBoolean(); - public ResourceHandlingHttpChannel(RestChannel delegate, CircuitBreakerService circuitBreakerService, int contentLength) { + ResourceHandlingHttpChannel(RestChannel delegate, CircuitBreakerService circuitBreakerService, int contentLength) { this.delegate = delegate; this.circuitBreakerService = circuitBreakerService; this.contentLength = contentLength; diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java index 7289e9c76e7..806a89166d5 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java @@ -43,11 +43,11 @@ public abstract class AbstractCatAction extends BaseRestHandler { super(settings); } - protected abstract RestChannelConsumer doCatRequest(final RestRequest request, final NodeClient client); + protected abstract RestChannelConsumer doCatRequest(RestRequest request, NodeClient client); protected abstract void documentation(StringBuilder sb); - protected abstract Table getTableWithHeader(final RestRequest request); + protected abstract Table getTableWithHeader(RestRequest request); @Override public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException { diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java index 0ab2c86453e..5ebf36c63a1 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestTable.java @@ -461,7 +461,7 @@ public class RestTable { private final String column; private final boolean reverse; - public ColumnOrderElement(String column, boolean reverse) { + ColumnOrderElement(String column, boolean reverse) { this.column = column; this.reverse = reverse; } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java index 7348046494f..61d85b80ad9 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java @@ -49,7 +49,7 @@ public class BestBucketsDeferringCollector extends DeferringBucketCollector { final PackedLongValues docDeltas; final PackedLongValues buckets; - public Entry(LeafReaderContext context, PackedLongValues docDeltas, PackedLongValues buckets) { + Entry(LeafReaderContext context, PackedLongValues docDeltas, PackedLongValues buckets) { this.context = context; this.docDeltas = docDeltas; this.buckets = buckets; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java index 90316c1a001..8d699b7c438 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/BestDocsDeferringCollector.java @@ -163,7 +163,7 @@ public class BestDocsDeferringCollector extends DeferringBucketCollector impleme private long parentBucket; private int matchedDocs; - public PerParentBucketSamples(long parentBucket, Scorer scorer, LeafReaderContext readerContext) { + PerParentBucketSamples(long parentBucket, Scorer scorer, LeafReaderContext readerContext) { try { this.parentBucket = parentBucket; tdc = createTopDocsCollector(shardSize); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java index 2d8d26dd35c..54b33bb76a0 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/MultiBucketsAggregation.java @@ -64,7 +64,7 @@ public interface MultiBucketsAggregation extends Aggregation { Object getProperty(String containingAggName, List path); - static class SubAggregationComparator implements java.util.Comparator { + class SubAggregationComparator implements java.util.Comparator { private final AggregationPath path; private final boolean asc; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregator.java index 4bf434816e0..8f8ed143ca3 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregator.java @@ -149,7 +149,7 @@ public class AdjacencyMatrixAggregator extends BucketsAggregator { Bits a; Bits b; - public BitsIntersector(Bits a, Bits b) { + BitsIntersector(Bits a, Bits b) { super(); this.a = a; this.b = b; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java index 728ed2c8823..602c3a81c66 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregationBuilder.java @@ -212,7 +212,7 @@ public class GeoGridAggregationBuilder extends ValuesSourceAggregationBuilder { - public BucketPriorityQueue(int size) { + BucketPriorityQueue(int size) { super(size); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java index 48f14211361..a52f2b2cfb5 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java @@ -62,7 +62,7 @@ class DateHistogramAggregator extends BucketsAggregator { private final LongHash bucketOrds; private long offset; - public DateHistogramAggregator(String name, AggregatorFactories factories, Rounding rounding, long offset, InternalOrder order, + DateHistogramAggregator(String name, AggregatorFactories factories, Rounding rounding, long offset, InternalOrder order, boolean keyed, long minDocCount, @Nullable ExtendedBounds extendedBounds, @Nullable ValuesSource.Numeric valuesSource, DocValueFormat formatter, SearchContext aggregationContext, diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java index d459618d8d0..4b547989d8b 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregator.java @@ -61,7 +61,7 @@ class HistogramAggregator extends BucketsAggregator { private final LongHash bucketOrds; - public HistogramAggregator(String name, AggregatorFactories factories, double interval, double offset, + HistogramAggregator(String name, AggregatorFactories factories, double interval, double offset, InternalOrder order, boolean keyed, long minDocCount, double minBound, double maxBound, @Nullable ValuesSource.Numeric valuesSource, DocValueFormat formatter, SearchContext context, Aggregator parent, 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 58d5c14767c..0ca0ef0a71e 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 @@ -59,7 +59,7 @@ public class NestedAggregatorFactory extends AggregatorFactory pipelineAggregators, + Unmapped(String name, SearchContext context, Aggregator parent, List pipelineAggregators, Map metaData) throws IOException { super(name, context, parent, pipelineAggregators, metaData); } 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 c792ca23246..3ed6f21d99c 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 @@ -58,7 +58,7 @@ public class ReverseNestedAggregatorFactory extends AggregatorFactory pipelineAggregators, + Unmapped(String name, SearchContext context, Aggregator parent, List pipelineAggregators, Map metaData) throws IOException { super(name, context, parent, pipelineAggregators, metaData); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceRangeAggregatorFactory.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceRangeAggregatorFactory.java index d44b940601b..e12853e5b17 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceRangeAggregatorFactory.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceRangeAggregatorFactory.java @@ -88,7 +88,7 @@ public class GeoDistanceRangeAggregatorFactory private final DistanceUnit units; private final org.elasticsearch.common.geo.GeoPoint origin; - public DistanceSource(ValuesSource.GeoPoint source, GeoDistance distanceType, + DistanceSource(ValuesSource.GeoPoint source, GeoDistance distanceType, org.elasticsearch.common.geo.GeoPoint origin, DistanceUnit units) { this.source = source; // even if the geo points are unique, there's no guarantee the diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java index e958639ab4e..f4d45a7d471 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedBytesHashSamplerAggregator.java @@ -70,7 +70,7 @@ public class DiversifiedBytesHashSamplerAggregator extends SamplerAggregator { */ class DiverseDocsDeferringCollector extends BestDocsDeferringCollector { - public DiverseDocsDeferringCollector() { + DiverseDocsDeferringCollector() { super(shardSize, context.bigArrays()); } @@ -86,7 +86,7 @@ public class DiversifiedBytesHashSamplerAggregator extends SamplerAggregator { private SortedBinaryDocValues values; - public ValuesDiversifiedTopDocsCollector(int numHits, int maxHitsPerValue) { + ValuesDiversifiedTopDocsCollector(int numHits, int maxHitsPerValue) { super(numHits, maxHitsPerValue); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java index e3e2b547285..08fa1bcb7fa 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedMapSamplerAggregator.java @@ -76,7 +76,7 @@ public class DiversifiedMapSamplerAggregator extends SamplerAggregator { */ class DiverseDocsDeferringCollector extends BestDocsDeferringCollector { - public DiverseDocsDeferringCollector() { + DiverseDocsDeferringCollector() { super(shardSize, context.bigArrays()); } @@ -92,7 +92,7 @@ public class DiversifiedMapSamplerAggregator extends SamplerAggregator { private SortedBinaryDocValues values; - public ValuesDiversifiedTopDocsCollector(int numHits, int maxHitsPerKey) { + ValuesDiversifiedTopDocsCollector(int numHits, int maxHitsPerKey) { super(numHits, maxHitsPerKey); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java index fb3f5cd4e30..c595fdb5c25 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedNumericSamplerAggregator.java @@ -63,7 +63,7 @@ public class DiversifiedNumericSamplerAggregator extends SamplerAggregator { * This implementation is only for use with a single bucket aggregation. */ class DiverseDocsDeferringCollector extends BestDocsDeferringCollector { - public DiverseDocsDeferringCollector() { + DiverseDocsDeferringCollector() { super(shardSize, context.bigArrays()); } @@ -78,7 +78,7 @@ public class DiversifiedNumericSamplerAggregator extends SamplerAggregator { private SortedNumericDocValues values; - public ValuesDiversifiedTopDocsCollector(int numHits, int maxHitsPerKey) { + ValuesDiversifiedTopDocsCollector(int numHits, int maxHitsPerKey) { super(numHits, maxHitsPerKey); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java index e33cf6b867e..5eb37f310ad 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedOrdinalsSamplerAggregator.java @@ -65,7 +65,7 @@ public class DiversifiedOrdinalsSamplerAggregator extends SamplerAggregator { */ class DiverseDocsDeferringCollector extends BestDocsDeferringCollector { - public DiverseDocsDeferringCollector() { + DiverseDocsDeferringCollector() { super(shardSize, context.bigArrays()); } @@ -79,7 +79,7 @@ public class DiversifiedOrdinalsSamplerAggregator extends SamplerAggregator { class ValuesDiversifiedTopDocsCollector extends DiversifiedTopDocsCollector { - public ValuesDiversifiedTopDocsCollector(int numHits, int maxHitsPerKey) { + ValuesDiversifiedTopDocsCollector(int numHits, int maxHitsPerKey) { super(numHits, maxHitsPerKey); } 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 ffca3740184..ae33cc87308 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 @@ -40,19 +40,19 @@ public class SignificantLongTerms extends InternalMappedSignificantTerms { - abstract static class Bucket extends InternalMultiBucketAggregation.InternalBucket { + abstract class Bucket extends InternalMultiBucketAggregation.InternalBucket { long subsetDf; long subsetSize; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java index f160c86943a..9b40fcc42dc 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractStringTermsAggregator.java @@ -36,7 +36,7 @@ abstract class AbstractStringTermsAggregator extends TermsAggregator { protected final boolean showTermDocCountError; - public AbstractStringTermsAggregator(String name, AggregatorFactories factories, SearchContext context, Aggregator parent, + AbstractStringTermsAggregator(String name, AggregatorFactories factories, SearchContext context, Aggregator parent, Terms.Order order, DocValueFormat format, BucketCountThresholds bucketCountThresholds, SubAggCollectionMode subAggCollectMode, boolean showTermDocCountError, List pipelineAggregators, Map metaData) throws IOException { super(name, factories, context, parent, bucketCountThresholds, order, format, subAggCollectMode, pipelineAggregators, metaData); 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 d8df9501e4e..1e7be237f88 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 @@ -40,7 +40,7 @@ public class DoubleTerms extends InternalMappedTerms { private final double term; - public Bucket(double term, long docCount, InternalAggregations aggregations, boolean showDocCountError, long docCountError, + Bucket(double term, long docCount, InternalAggregations aggregations, boolean showDocCountError, long docCountError, DocValueFormat format) { super(docCount, aggregations, showDocCountError, docCountError, format); this.term = term; @@ -49,7 +49,7 @@ public class DoubleTerms extends InternalMappedTerms orderElements; - public CompoundOrder(List compoundOrder) { + CompoundOrder(List compoundOrder) { this(compoundOrder, true); } - public CompoundOrder(List compoundOrder, boolean absoluteOrdering) { + CompoundOrder(List compoundOrder, boolean absoluteOrdering) { this.orderElements = new LinkedList<>(compoundOrder); Terms.Order lastElement = compoundOrder.get(compoundOrder.size() - 1); if (absoluteOrdering && !(InternalOrder.TERM_ASC == lastElement || InternalOrder.TERM_DESC == lastElement)) { @@ -300,7 +300,7 @@ class InternalOrder extends Terms.Order { private List compoundOrder; private Aggregator aggregator; - public CompoundOrderComparator(List compoundOrder, Aggregator aggregator) { + CompoundOrderComparator(List compoundOrder, Aggregator aggregator) { this.compoundOrder = compoundOrder; this.aggregator = aggregator; } 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 aa70309da95..e4ff4cd3944 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 @@ -33,7 +33,7 @@ import java.util.List; */ public interface Terms extends MultiBucketsAggregation { - static enum ValueType { + enum ValueType { STRING(org.elasticsearch.search.aggregations.support.ValueType.STRING), LONG(org.elasticsearch.search.aggregations.support.ValueType.LONG), @@ -41,7 +41,7 @@ public interface Terms extends MultiBucketsAggregation { final org.elasticsearch.search.aggregations.support.ValueType scriptValueType; - private ValueType(org.elasticsearch.search.aggregations.support.ValueType scriptValueType) { + ValueType(org.elasticsearch.search.aggregations.support.ValueType scriptValueType) { this.scriptValueType = scriptValueType; } @@ -62,7 +62,7 @@ public interface Terms extends MultiBucketsAggregation { /** * A bucket that is associated with a single term */ - abstract static class Bucket extends InternalMultiBucketAggregation.InternalBucket { + abstract 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 */ - abstract static class Order implements ToXContent { + abstract 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 02252bdbf9a..5925cc2e4ad 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 @@ -223,7 +223,7 @@ public class IncludeExclude implements Writeable, ToXContent { private final Set valids; private final Set invalids; - public TermListBackedStringFilter(Set includeValues, Set excludeValues) { + TermListBackedStringFilter(Set includeValues, Set excludeValues) { this.valids = includeValues; this.invalids = excludeValues; } @@ -295,7 +295,7 @@ public class IncludeExclude implements Writeable, ToXContent { private final SortedSet includeValues; private final SortedSet excludeValues; - public TermListBackedOrdinalsFilter(SortedSet includeValues, SortedSet excludeValues) { + TermListBackedOrdinalsFilter(SortedSet includeValues, SortedSet excludeValues) { this.includeValues = includeValues; this.excludeValues = excludeValues; } 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 e9ca652f2c7..7d5db460ae6 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 @@ -327,7 +327,7 @@ public class CardinalityAggregator extends NumericMetricsAggregator.SingleValue private final SortedNumericDocValues values; - public Long(SortedNumericDocValues values) { + Long(SortedNumericDocValues values) { this.values = values; } @@ -351,7 +351,7 @@ public class CardinalityAggregator extends NumericMetricsAggregator.SingleValue private final SortedNumericDoubleValues values; - public Double(SortedNumericDoubleValues values) { + Double(SortedNumericDoubleValues values) { this.values = values; } @@ -377,7 +377,7 @@ public class CardinalityAggregator extends NumericMetricsAggregator.SingleValue private final SortedBinaryDocValues values; - public Bytes(SortedBinaryDocValues values) { + Bytes(SortedBinaryDocValues values) { this.values = values; } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java index 568ecdbec59..42b4561e07b 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlus.java @@ -433,7 +433,7 @@ public final class HyperLogLogPlusPlus implements Releasable { private final BytesRef readSpare; private final ByteBuffer writeSpare; - public Hashset(long initialBucketCount) { + Hashset(long initialBucketCount) { capacity = m / 4; // because ints take 4 bytes threshold = (int) (capacity * MAX_LOAD_FACTOR); mask = capacity - 1; 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 b999936693d..5a9df082965 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 @@ -188,7 +188,7 @@ public class InternalGeoBounds extends InternalMetricsAggregation implements Geo private final GeoPoint topLeft; private final GeoPoint bottomRight; - public BoundingBox(GeoPoint topLeft, GeoPoint bottomRight) { + BoundingBox(GeoPoint topLeft, GeoPoint bottomRight) { this.topLeft = topLeft; this.bottomRight = bottomRight; } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java index af609c3bdd0..b10880a13c0 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/PercentilesMethod.java @@ -41,7 +41,7 @@ public enum PercentilesMethod implements Writeable { private final ParseField parseField; - private PercentilesMethod(String name, String... deprecatedNames) { + PercentilesMethod(String name, String... deprecatedNames) { this.parseField = new ParseField(name, deprecatedNames); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractInternalHDRPercentiles.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractInternalHDRPercentiles.java index ba76f8b9863..05ae303dc89 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractInternalHDRPercentiles.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/AbstractInternalHDRPercentiles.java @@ -40,7 +40,7 @@ abstract class AbstractInternalHDRPercentiles extends InternalNumericMetricsAggr protected final DoubleHistogram state; private final boolean keyed; - public AbstractInternalHDRPercentiles(String name, double[] keys, DoubleHistogram state, boolean keyed, DocValueFormat format, + AbstractInternalHDRPercentiles(String name, double[] keys, DoubleHistogram state, boolean keyed, DocValueFormat format, List pipelineAggregators, Map metaData) { super(name, pipelineAggregators, metaData); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractInternalTDigestPercentiles.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractInternalTDigestPercentiles.java index 43bee101f4a..ec9adc45ec9 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractInternalTDigestPercentiles.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/AbstractInternalTDigestPercentiles.java @@ -37,7 +37,7 @@ abstract class AbstractInternalTDigestPercentiles extends InternalNumericMetrics protected final TDigestState state; private final boolean keyed; - public AbstractInternalTDigestPercentiles(String name, double[] keys, TDigestState state, boolean keyed, DocValueFormat formatter, + AbstractInternalTDigestPercentiles(String name, double[] keys, TDigestState state, boolean keyed, DocValueFormat formatter, List pipelineAggregators, Map metaData) { super(name, pipelineAggregators, metaData); diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java index 1b235a6cfec..8a198a5825a 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ExtendedStats.java @@ -67,7 +67,7 @@ public interface ExtendedStats extends Stats { String getVarianceAsString(); - public enum Bounds { + enum Bounds { UPPER, LOWER } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java index d2a53ca343b..9fc1136968e 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketHelpers.java @@ -52,7 +52,7 @@ public class BucketHelpers { * "insert_zeros": empty buckets will be filled with zeros for all metrics * "ignore": empty buckets will simply be ignored */ - public static enum GapPolicy { + public enum GapPolicy { INSERT_ZEROS((byte) 0, "insert_zeros"), SKIP((byte) 1, "skip"); /** @@ -87,7 +87,7 @@ public class BucketHelpers { private final byte id; private final ParseField parseField; - private GapPolicy(byte id, String name) { + GapPolicy(byte id, String name) { this.id = id; this.parseField = new ParseField(name); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java index 4c18103a39c..318540e3e58 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java @@ -95,7 +95,7 @@ public enum ValueType implements Writeable { private final byte id; private String preferredName; - private ValueType(byte id, String description, String preferredName, ValuesSourceType valuesSourceType, + ValueType(byte id, String description, String preferredName, ValuesSourceType valuesSourceType, Class fieldDataType, DocValueFormat defaultFormat) { this.id = id; this.description = description; 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 124b7ba71f4..f3de52ae653 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 @@ -318,7 +318,7 @@ public abstract class ValuesSource { private final SortedNumericDocValues longValues; private final LeafSearchScript script; - public LongValues(SortedNumericDocValues values, LeafSearchScript script) { + LongValues(SortedNumericDocValues values, LeafSearchScript script) { this.longValues = values; this.script = script; } @@ -346,7 +346,7 @@ public abstract class ValuesSource { private final SortedNumericDoubleValues doubleValues; private final LeafSearchScript script; - public DoubleValues(SortedNumericDoubleValues values, LeafSearchScript script) { + DoubleValues(SortedNumericDoubleValues values, LeafSearchScript script) { this.doubleValues = values; this.script = script; } @@ -462,7 +462,7 @@ public abstract class ValuesSource { private final SortedBinaryDocValues bytesValues; private final LeafSearchScript script; - public BytesValues(SortedBinaryDocValues bytesValues, LeafSearchScript script) { + BytesValues(SortedBinaryDocValues bytesValues, LeafSearchScript script) { this.bytesValues = bytesValues; this.script = script; } diff --git a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/CustomQueryScorer.java b/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/CustomQueryScorer.java index 8a16d4c6eb0..e25e7b74941 100644 --- a/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/CustomQueryScorer.java +++ b/core/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/CustomQueryScorer.java @@ -66,11 +66,11 @@ public final class CustomQueryScorer extends QueryScorer { private static class CustomWeightedSpanTermExtractor extends WeightedSpanTermExtractor { - public CustomWeightedSpanTermExtractor() { + CustomWeightedSpanTermExtractor() { super(); } - public CustomWeightedSpanTermExtractor(String defaultField) { + CustomWeightedSpanTermExtractor(String defaultField) { super(defaultField); } diff --git a/core/src/main/java/org/elasticsearch/search/profile/query/ProfileCollector.java b/core/src/main/java/org/elasticsearch/search/profile/query/ProfileCollector.java index c65d0978906..ea8dbb2f335 100644 --- a/core/src/main/java/org/elasticsearch/search/profile/query/ProfileCollector.java +++ b/core/src/main/java/org/elasticsearch/search/profile/query/ProfileCollector.java @@ -34,7 +34,7 @@ final class ProfileCollector extends FilterCollector { private long time; /** Sole constructor. */ - public ProfileCollector(Collector in) { + ProfileCollector(Collector in) { super(in); } 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 625458f2c91..b048977741f 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 @@ -108,7 +108,7 @@ public class CompletionSuggester extends Suggester private List suggestScoreDocs; - public SuggestDoc(int doc, CharSequence key, CharSequence context, float score) { + SuggestDoc(int doc, CharSequence key, CharSequence context, float score) { super(doc, key, context, score); } @@ -152,7 +152,7 @@ public class CompletionSuggester extends Suggester private static final class SuggestDocPriorityQueue extends PriorityQueue { - public SuggestDocPriorityQueue(int maxSize) { + SuggestDocPriorityQueue(int maxSize) { super(maxSize); } @@ -184,7 +184,7 @@ public class CompletionSuggester extends Suggester private final SuggestDocPriorityQueue pq; private final Map scoreDocMap; - public TopDocumentsCollector(int num) { + TopDocumentsCollector(int num) { super(1); // TODO hack, we don't use the underlying pq, so we allocate a size of 1 this.num = num; this.scoreDocMap = new LinkedHashMap<>(num); diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java index 7ef1a000e4d..91dfd510995 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java @@ -210,7 +210,7 @@ public class CompletionSuggestionBuilder extends SuggestionBuilder> contexts; private final ParseContext.Document document; - public TypedContextField(String name, String value, int weight, Map> contexts, + TypedContextField(String name, String value, int weight, Map> contexts, ParseContext.Document document) { super(name, value, weight); this.contexts = contexts; diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java index b3dad43ad34..d24ce6b3c29 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/phrase/CandidateScorer.java @@ -29,7 +29,7 @@ final class CandidateScorer { private final int maxNumCorrections; private final int gramSize; - public CandidateScorer(WordScorer scorer, int maxNumCorrections, int gramSize) { + CandidateScorer(WordScorer scorer, int maxNumCorrections, int gramSize) { this.scorer = scorer; this.maxNumCorrections = maxNumCorrections; this.gramSize = gramSize; diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java index 960dca419f7..99e2e18496b 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java @@ -60,7 +60,7 @@ class PhraseSuggestionContext extends SuggestionContext { private Map collateScriptParams = new HashMap<>(1); private WordScorer.WordScorerFactory scorer = DEFAULT_SCORER; - public PhraseSuggestionContext(QueryShardContext shardContext) { + PhraseSuggestionContext(QueryShardContext shardContext) { super(PhraseSuggester.INSTANCE, shardContext); } diff --git a/core/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java b/core/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java index 8eb08ef0688..166a4182c8f 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java @@ -28,7 +28,7 @@ import java.io.IOException; class StupidBackoffScorer extends WordScorer { private final double discount; - public StupidBackoffScorer(IndexReader reader, Terms terms,String field, double realWordLikelyhood, BytesRef separator, double discount) + StupidBackoffScorer(IndexReader reader, Terms terms,String field, double realWordLikelyhood, BytesRef separator, double discount) throws IOException { super(reader, terms, field, realWordLikelyhood, separator); this.discount = discount; diff --git a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java b/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java index c950e5729da..19ad03e1b47 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionContext.java @@ -26,7 +26,7 @@ final class TermSuggestionContext extends SuggestionContext { private final DirectSpellcheckerSettings settings = new DirectSpellcheckerSettings(); - public TermSuggestionContext(QueryShardContext shardContext) { + TermSuggestionContext(QueryShardContext shardContext) { super(TermSuggester.INSTANCE, shardContext); } diff --git a/core/src/main/java/org/elasticsearch/snapshots/RestoreService.java b/core/src/main/java/org/elasticsearch/snapshots/RestoreService.java index 1d7843e7826..6afefec2c94 100644 --- a/core/src/main/java/org/elasticsearch/snapshots/RestoreService.java +++ b/core/src/main/java/org/elasticsearch/snapshots/RestoreService.java @@ -636,7 +636,7 @@ public class RestoreService extends AbstractComponent implements ClusterStateApp private final Logger logger; - public CleanRestoreStateTaskExecutor(Logger logger) { + CleanRestoreStateTaskExecutor(Logger logger) { this.logger = logger; } diff --git a/core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java b/core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java index 2f93c20c37a..d6f8cf8b586 100644 --- a/core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java +++ b/core/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java @@ -447,7 +447,7 @@ public class SnapshotsService extends AbstractLifecycleComponent implements Clus private final CreateSnapshotListener userCreateSnapshotListener; private final Exception e; - public CleanupAfterErrorListener(SnapshotsInProgress.Entry snapshot, boolean snapshotCreated, CreateSnapshotListener userCreateSnapshotListener, Exception e) { + CleanupAfterErrorListener(SnapshotsInProgress.Entry snapshot, boolean snapshotCreated, CreateSnapshotListener userCreateSnapshotListener, Exception e) { this.snapshot = snapshot; this.snapshotCreated = snapshotCreated; this.userCreateSnapshotListener = userCreateSnapshotListener; diff --git a/core/src/main/java/org/elasticsearch/tasks/TaskManager.java b/core/src/main/java/org/elasticsearch/tasks/TaskManager.java index dce39cea7d7..bf62b5bb013 100644 --- a/core/src/main/java/org/elasticsearch/tasks/TaskManager.java +++ b/core/src/main/java/org/elasticsearch/tasks/TaskManager.java @@ -374,7 +374,7 @@ public class TaskManager extends AbstractComponent implements ClusterStateApplie private volatile Runnable cancellationListener = null; - public CancellableTaskHolder(CancellableTask task) { + CancellableTaskHolder(CancellableTask task) { this.task = task; } diff --git a/core/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java b/core/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java index 0f9b79156e6..54f5ab0af38 100644 --- a/core/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java +++ b/core/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java @@ -82,7 +82,7 @@ public abstract class ExecutorBuilder { private final TaskManager taskManager; - public TransportChannelWrapper(TaskManager taskManager, Task task, TransportChannel channel) { + TransportChannelWrapper(TaskManager taskManager, Task task, TransportChannel channel) { super(channel); this.task = task; this.taskManager = taskManager; diff --git a/core/src/main/java/org/elasticsearch/transport/TcpTransport.java b/core/src/main/java/org/elasticsearch/transport/TcpTransport.java index 8e3e62fe65a..5cfb5f7a423 100644 --- a/core/src/main/java/org/elasticsearch/transport/TcpTransport.java +++ b/core/src/main/java/org/elasticsearch/transport/TcpTransport.java @@ -235,7 +235,7 @@ public abstract class TcpTransport extends AbstractLifecycleComponent i final AtomicReference exceptionRef = new AtomicReference<>(); final Channel channel; - public HandshakeResponseHandler(Channel channel) { + HandshakeResponseHandler(Channel channel) { this.channel = channel; } @@ -1444,7 +1444,7 @@ public abstract class TcpTransport extends AbstractLifecycleComponent i private final TransportRequest request; private final TransportChannel transportChannel; - public RequestHandler(RequestHandlerRegistry reg, TransportRequest request, TransportChannel transportChannel) { + RequestHandler(RequestHandlerRegistry reg, TransportRequest request, TransportChannel transportChannel) { this.reg = reg; this.request = request; this.transportChannel = transportChannel; diff --git a/core/src/main/java/org/elasticsearch/transport/TransportInterceptor.java b/core/src/main/java/org/elasticsearch/transport/TransportInterceptor.java index 782903d6dc5..cc90a6c6d23 100644 --- a/core/src/main/java/org/elasticsearch/transport/TransportInterceptor.java +++ b/core/src/main/java/org/elasticsearch/transport/TransportInterceptor.java @@ -55,8 +55,8 @@ public interface TransportInterceptor { * {@link #sendRequest(Transport.Connection, String, TransportRequest, TransportRequestOptions, TransportResponseHandler)} */ interface AsyncSender { - void sendRequest(Transport.Connection connection, final String action, - final TransportRequest request, final TransportRequestOptions options, + void sendRequest(Transport.Connection connection, String action, + TransportRequest request, TransportRequestOptions options, TransportResponseHandler handler); } } diff --git a/core/src/main/java/org/elasticsearch/transport/TransportService.java b/core/src/main/java/org/elasticsearch/transport/TransportService.java index 51073bc9f6a..5e26d0a4b37 100644 --- a/core/src/main/java/org/elasticsearch/transport/TransportService.java +++ b/core/src/main/java/org/elasticsearch/transport/TransportService.java @@ -398,10 +398,10 @@ public class TransportService extends AbstractLifecycleComponent { private ClusterName clusterName; private Version version; - public HandshakeResponse() { + HandshakeResponse() { } - public HandshakeResponse(DiscoveryNode discoveryNode, ClusterName clusterName, Version version) { + HandshakeResponse(DiscoveryNode discoveryNode, ClusterName clusterName, Version version) { this.discoveryNode = discoveryNode; this.version = version; this.clusterName = clusterName; @@ -1049,7 +1049,7 @@ public class TransportService extends AbstractLifecycleComponent { final TransportServiceAdapter adapter; final ThreadPool threadPool; - public DirectResponseChannel(Logger logger, DiscoveryNode localNode, String action, long requestId, + DirectResponseChannel(Logger logger, DiscoveryNode localNode, String action, long requestId, TransportServiceAdapter adapter, ThreadPool threadPool) { this.logger = logger; this.localNode = localNode; diff --git a/core/src/main/java/org/elasticsearch/watcher/FileWatcher.java b/core/src/main/java/org/elasticsearch/watcher/FileWatcher.java index 8d5c04e7708..0b0504f4609 100644 --- a/core/src/main/java/org/elasticsearch/watcher/FileWatcher.java +++ b/core/src/main/java/org/elasticsearch/watcher/FileWatcher.java @@ -80,7 +80,7 @@ public class FileWatcher extends AbstractResourceWatcher { private boolean isDirectory; private FileObserver[] children; - public FileObserver(Path file) { + FileObserver(Path file) { this.file = file; } diff --git a/core/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java b/core/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java index 926510ef120..1aff2af5235 100644 --- a/core/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java +++ b/core/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java @@ -58,7 +58,7 @@ public class CollapsingTopDocsCollectorTests extends ESTestCase { private static class SegmentSearcher extends IndexSearcher { private final List ctx; - public SegmentSearcher(LeafReaderContext ctx, IndexReaderContext parent) { + SegmentSearcher(LeafReaderContext ctx, IndexReaderContext parent) { super(parent); this.ctx = Collections.singletonList(ctx); } diff --git a/core/src/test/java/org/elasticsearch/action/ActionModuleTests.java b/core/src/test/java/org/elasticsearch/action/ActionModuleTests.java index 339843d7e90..7c9d5443464 100644 --- a/core/src/test/java/org/elasticsearch/action/ActionModuleTests.java +++ b/core/src/test/java/org/elasticsearch/action/ActionModuleTests.java @@ -144,7 +144,7 @@ public class ActionModuleTests extends ESTestCase { public void testPluginCanRegisterRestHandler() { class FakeHandler implements RestHandler { - public FakeHandler(RestController restController) { + FakeHandler(RestController restController) { restController.registerHandler(Method.GET, "/_dummy", this); } @Override diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java index 99d058886a5..b4ba0354ed7 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java +++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TestTaskPlugin.java @@ -79,7 +79,7 @@ public class TestTaskPlugin extends Plugin implements ActionPlugin { private volatile boolean blocked = true; - public TestTask(long id, String type, String action, String description, TaskId parentTaskId) { + TestTask(long id, String type, String action, String description, TaskId parentTaskId) { super(id, type, action, description, parentTaskId); } diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java index 1e9256d20e3..07859070d10 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java +++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TransportTasksActionTests.java @@ -190,7 +190,7 @@ public class TransportTasksActionTests extends TaskManagerTestCase { private final String status; - public TestTaskResponse(StreamInput in) throws IOException { + TestTaskResponse(StreamInput in) throws IOException { status = in.readString(); } @@ -199,7 +199,7 @@ public class TransportTasksActionTests extends TaskManagerTestCase { out.writeString(status); } - public TestTaskResponse(String status) { + TestTaskResponse(String status) { this.status = status; } @@ -216,11 +216,11 @@ public class TransportTasksActionTests extends TaskManagerTestCase { private List tasks; - public TestTasksResponse() { + TestTasksResponse() { } - public TestTasksResponse(List tasks, List taskFailures, + TestTasksResponse(List tasks, List taskFailures, List nodeFailures) { super(taskFailures, nodeFailures); this.tasks = tasks == null ? Collections.emptyList() : Collections.unmodifiableList(new ArrayList<>(tasks)); diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java b/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java index 44fb991af94..7cd18f0254e 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java @@ -219,7 +219,7 @@ public class IndicesShardStoreRequestIT extends ESIntegTestCase { private static final class IndexNodePredicate implements Predicate { private final Set nodesWithShard; - public IndexNodePredicate(String index) { + IndexNodePredicate(String index) { this.nodesWithShard = findNodesWithShard(index); } diff --git a/core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java b/core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java index cdfe54575fa..0e3d96b5e8e 100644 --- a/core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java +++ b/core/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java @@ -200,7 +200,7 @@ public class TransportBulkActionTookTests extends ESTestCase { } static class Resolver extends IndexNameExpressionResolver { - public Resolver(Settings settings) { + Resolver(Settings settings) { super(settings); } @@ -212,7 +212,7 @@ public class TransportBulkActionTookTests extends ESTestCase { static class TestTransportBulkAction extends TransportBulkAction { - public TestTransportBulkAction( + TestTransportBulkAction( Settings settings, ThreadPool threadPool, TransportService transportService, @@ -251,7 +251,7 @@ public class TransportBulkActionTookTests extends ESTestCase { static class TestTransportCreateIndexAction extends TransportCreateIndexAction { - public TestTransportCreateIndexAction( + TestTransportCreateIndexAction( Settings settings, TransportService transportService, ClusterService clusterService, diff --git a/core/src/test/java/org/elasticsearch/action/bulk/byscroll/AsyncBulkByScrollActionTests.java b/core/src/test/java/org/elasticsearch/action/bulk/byscroll/AsyncBulkByScrollActionTests.java index b7405634113..6b3ca0d2815 100644 --- a/core/src/test/java/org/elasticsearch/action/bulk/byscroll/AsyncBulkByScrollActionTests.java +++ b/core/src/test/java/org/elasticsearch/action/bulk/byscroll/AsyncBulkByScrollActionTests.java @@ -663,7 +663,7 @@ public class AsyncBulkByScrollActionTests extends ESTestCase { } private class DummyAsyncBulkByScrollAction extends AbstractAsyncBulkByScrollAction { - public DummyAsyncBulkByScrollAction() { + DummyAsyncBulkByScrollAction() { super(testTask, AsyncBulkByScrollActionTests.this.logger, new ParentTaskAssigningClient(client, localNode, testTask), client.threadPool(), testRequest, null, null, listener); } @@ -691,7 +691,7 @@ public class AsyncBulkByScrollActionTests extends ESTestCase { } private static class DummyAbstractBulkByScrollRequest extends AbstractBulkByScrollRequest { - public DummyAbstractBulkByScrollRequest(SearchRequest searchRequest) { + DummyAbstractBulkByScrollRequest(SearchRequest searchRequest) { super(searchRequest, true); } @@ -729,7 +729,7 @@ public class AsyncBulkByScrollActionTests extends ESTestCase { private int searchesToReject = 0; private int scrollsToReject = 0; - public MyMockClient(Client in) { + MyMockClient(Client in) { super(in); } @@ -856,7 +856,7 @@ public class AsyncBulkByScrollActionTests extends ESTestCase { private final Request request; private final ActionListener listener; - public RequestAndListener(Request request, ActionListener listener) { + RequestAndListener(Request request, ActionListener listener) { this.request = request; this.listener = listener; } diff --git a/core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java b/core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java index 6df7c39aea9..230812bec88 100644 --- a/core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java +++ b/core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java @@ -221,7 +221,7 @@ public class TransportActionFilterChainTests extends ESTestCase { } } - private static enum RequestOperation implements RequestCallback { + private enum RequestOperation implements RequestCallback { CONTINUE_PROCESSING { @Override public void execute(Task task, String action, Request request, diff --git a/core/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java b/core/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java index 3ff0e486c31..ef025e3c37b 100644 --- a/core/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java +++ b/core/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java @@ -116,7 +116,7 @@ public class TransportBroadcastByNodeActionTests extends ESTestCase { class TestTransportBroadcastByNodeAction extends TransportBroadcastByNodeAction { private final Map shards = new HashMap<>(); - public TestTransportBroadcastByNodeAction(Settings settings, TransportService transportService, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver, Supplier request, String executor) { + TestTransportBroadcastByNodeAction(Settings settings, TransportService transportService, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver, Supplier request, String executor) { super(settings, "indices:admin/test", THREAD_POOL, TransportBroadcastByNodeActionTests.this.clusterService, transportService, actionFilters, indexNameExpressionResolver, request, executor); } @@ -170,7 +170,7 @@ public class TransportBroadcastByNodeActionTests extends ESTestCase { } class MyResolver extends IndexNameExpressionResolver { - public MyResolver() { + MyResolver() { super(Settings.EMPTY); } diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java b/core/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java index 30691ca82a1..7fa900a921c 100644 --- a/core/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java +++ b/core/src/test/java/org/elasticsearch/action/support/replication/BroadcastReplicationTests.java @@ -202,7 +202,7 @@ public class BroadcastReplicationTests extends ESTestCase { private class TestBroadcastReplicationAction extends TransportBroadcastReplicationAction { protected final Set>> capturedShardRequests = ConcurrentCollections.newConcurrentSet(); - public TestBroadcastReplicationAction(Settings settings, ThreadPool threadPool, ClusterService clusterService, + TestBroadcastReplicationAction(Settings settings, ThreadPool threadPool, ClusterService clusterService, TransportService transportService, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver, TransportReplicationAction replicatedBroadcastShardAction) { super("test-broadcast-replication-action", DummyBroadcastRequest::new, settings, threadPool, clusterService, transportService, diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java b/core/src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java index 74a57f3aa91..a701193d220 100644 --- a/core/src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java +++ b/core/src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java @@ -403,7 +403,7 @@ public class ReplicationOperationTests extends ESTestCase { private final Request request; private ShardInfo shardInfo; - public Result(Request request) { + Result(Request request) { this.request = request; } @@ -517,12 +517,12 @@ public class ReplicationOperationTests extends ESTestCase { } class TestReplicationOperation extends ReplicationOperation { - public TestReplicationOperation(Request request, Primary primary, + TestReplicationOperation(Request request, Primary primary, ActionListener listener, Replicas replicas, Supplier clusterStateSupplier) { this(request, primary, listener, true, replicas, clusterStateSupplier, ReplicationOperationTests.this.logger, "test"); } - public TestReplicationOperation(Request request, Primary primary, + TestReplicationOperation(Request request, Primary primary, ActionListener listener, boolean executeOnReplicas, Replicas replicas, Supplier clusterStateSupplier, Logger logger, String opType) { super(request, primary, listener, executeOnReplicas, replicas, clusterStateSupplier, logger, opType); diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java b/core/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java index e78552147ef..c2c484fe3e6 100644 --- a/core/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java +++ b/core/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java @@ -1157,7 +1157,7 @@ public class TransportReplicationActionTests extends ESTestCase { } class NoopReplicationOperation extends ReplicationOperation> { - public NoopReplicationOperation(Request request, ActionListener> listener) { + NoopReplicationOperation(Request request, ActionListener> listener) { super(request, null, listener, true, null, null, TransportReplicationActionTests.this.logger, "noop"); } diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java b/core/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java index 730528965a3..82cd013c195 100644 --- a/core/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java +++ b/core/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java @@ -223,7 +223,7 @@ public class TransportWriteActionTests extends ESTestCase { } private static class TestRequest extends ReplicatedWriteRequest { - public TestRequest() { + TestRequest() { setShardId(new ShardId("test", "test", 1)); } diff --git a/core/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java b/core/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java index 2a3d6d4a968..c83a76ddc1e 100644 --- a/core/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java +++ b/core/src/test/java/org/elasticsearch/action/support/single/instance/TransportInstanceSingleOperationActionTests.java @@ -88,7 +88,7 @@ public class TransportInstanceSingleOperationActionTests extends ESTestCase { class TestTransportInstanceSingleOperationAction extends TransportInstanceSingleOperationAction { private final Map shards = new HashMap<>(); - public TestTransportInstanceSingleOperationAction(Settings settings, String actionName, TransportService transportService, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver, Supplier request) { + TestTransportInstanceSingleOperationAction(Settings settings, String actionName, TransportService transportService, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver, Supplier request) { super(settings, actionName, THREAD_POOL, TransportInstanceSingleOperationActionTests.this.clusterService, transportService, actionFilters, indexNameExpressionResolver, request); } @@ -122,7 +122,7 @@ public class TransportInstanceSingleOperationActionTests extends ESTestCase { } class MyResolver extends IndexNameExpressionResolver { - public MyResolver() { + MyResolver() { super(Settings.EMPTY); } diff --git a/core/src/test/java/org/elasticsearch/bootstrap/BootstrapCheckTests.java b/core/src/test/java/org/elasticsearch/bootstrap/BootstrapCheckTests.java index bc810254920..881d03b3dc6 100644 --- a/core/src/test/java/org/elasticsearch/bootstrap/BootstrapCheckTests.java +++ b/core/src/test/java/org/elasticsearch/bootstrap/BootstrapCheckTests.java @@ -246,7 +246,7 @@ public class BootstrapCheckTests extends ESTestCase { private final boolean isMemoryLocked; private final boolean shouldFail; - public MlockallCheckTestCase(final boolean mlockallSet, final boolean isMemoryLocked, final boolean shouldFail) { + MlockallCheckTestCase(final boolean mlockallSet, final boolean isMemoryLocked, final boolean shouldFail) { this.mlockallSet = mlockallSet; this.isMemoryLocked = isMemoryLocked; this.shouldFail = shouldFail; diff --git a/core/src/test/java/org/elasticsearch/bwcompat/RepositoryUpgradabilityIT.java b/core/src/test/java/org/elasticsearch/bwcompat/RepositoryUpgradabilityIT.java index ec8c12cb525..02ba7f5ea4f 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/RepositoryUpgradabilityIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/RepositoryUpgradabilityIT.java @@ -154,7 +154,7 @@ public class RepositoryUpgradabilityIT extends AbstractSnapshotIntegTestCase { final String prefix = "repo"; final List repoVersions = new ArrayList<>(); final Path repoFiles = getBwcIndicesPath(); - try (final DirectoryStream dirStream = Files.newDirectoryStream(repoFiles, prefix + "-*.zip")) { + try (DirectoryStream dirStream = Files.newDirectoryStream(repoFiles, prefix + "-*.zip")) { for (final Path entry : dirStream) { final String fileName = entry.getFileName().toString(); String version = fileName.substring(prefix.length() + 1); diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java b/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java index 5e68d64616f..a6e2431a15f 100644 --- a/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java +++ b/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java @@ -203,7 +203,7 @@ public class TransportClientNodesServiceTests extends ESTestCase { public void testListenerFailures() throws InterruptedException { int iters = iterations(10, 100); for (int i = 0; i > taskGroups) { + TaskExecutor(List> taskGroups) { this.taskGroups = taskGroups; } @@ -1223,7 +1223,7 @@ public class ClusterServiceTests extends ESTestCase { private static class BlockingTask extends ClusterStateUpdateTask implements Releasable { private final CountDownLatch latch = new CountDownLatch(1); - public BlockingTask(Priority priority) { + BlockingTask(Priority priority) { super(priority); } @@ -1271,7 +1271,7 @@ public class ClusterServiceTests extends ESTestCase { public volatile Long currentTimeOverride = null; - public TimedClusterService(Settings settings, ClusterSettings clusterSettings, ThreadPool threadPool, + TimedClusterService(Settings settings, ClusterSettings clusterSettings, ThreadPool threadPool, Supplier localNodeSupplier) { super(settings, clusterSettings, threadPool, localNodeSupplier); } diff --git a/core/src/test/java/org/elasticsearch/common/ChannelsTests.java b/core/src/test/java/org/elasticsearch/common/ChannelsTests.java index c0cb3482b0e..aeb86c73470 100644 --- a/core/src/test/java/org/elasticsearch/common/ChannelsTests.java +++ b/core/src/test/java/org/elasticsearch/common/ChannelsTests.java @@ -165,7 +165,7 @@ public class ChannelsTests extends ESTestCase { FileChannel delegate; - public MockFileChannel(FileChannel delegate) { + MockFileChannel(FileChannel delegate) { this.delegate = delegate; } diff --git a/core/src/test/java/org/elasticsearch/common/UUIDTests.java b/core/src/test/java/org/elasticsearch/common/UUIDTests.java index f82e1a464d9..62ad47868a6 100644 --- a/core/src/test/java/org/elasticsearch/common/UUIDTests.java +++ b/core/src/test/java/org/elasticsearch/common/UUIDTests.java @@ -58,7 +58,7 @@ public class UUIDTests extends ESTestCase { public Set uuidSet = null; UUIDGenerator uuidSource; - public UUIDGenRunner(int count, UUIDGenerator uuidSource) { + UUIDGenRunner(int count, UUIDGenerator uuidSource) { this.count = count; this.uuidSource = uuidSource; } diff --git a/core/src/test/java/org/elasticsearch/common/cache/CacheTests.java b/core/src/test/java/org/elasticsearch/common/cache/CacheTests.java index d7bb90f6c00..c2f27beb04e 100644 --- a/core/src/test/java/org/elasticsearch/common/cache/CacheTests.java +++ b/core/src/test/java/org/elasticsearch/common/cache/CacheTests.java @@ -416,7 +416,7 @@ public class CacheTests extends ESTestCase { private String value; private long weight; - public Value(String value, long weight) { + Value(String value, long weight) { this.value = value; this.weight = weight; } @@ -552,7 +552,7 @@ public class CacheTests extends ESTestCase { class Key { private final int key; - public Key(int key) { + Key(int key) { this.key = key; } diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java b/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java index 17761d9687f..4a02a1f345b 100644 --- a/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java +++ b/core/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java @@ -531,7 +531,7 @@ public class BytesStreamsTests extends ESTestCase { this.field2 = field2; } - public TestNamedWriteable(StreamInput in) throws IOException { + TestNamedWriteable(StreamInput in) throws IOException { field1 = in.readString(); field2 = in.readString(); } @@ -613,9 +613,9 @@ public class BytesStreamsTests extends ESTestCase { private boolean value; - public TestStreamable() { } + TestStreamable() { } - public TestStreamable(boolean value) { + TestStreamable(boolean value) { this.value = value; } diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/NamedWriteableRegistryTests.java b/core/src/test/java/org/elasticsearch/common/io/stream/NamedWriteableRegistryTests.java index 8442e793a92..682615d6f1a 100644 --- a/core/src/test/java/org/elasticsearch/common/io/stream/NamedWriteableRegistryTests.java +++ b/core/src/test/java/org/elasticsearch/common/io/stream/NamedWriteableRegistryTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.test.ESTestCase; public class NamedWriteableRegistryTests extends ESTestCase { private static class DummyNamedWriteable implements NamedWriteable { - public DummyNamedWriteable(StreamInput in) {} + DummyNamedWriteable(StreamInput in) {} @Override public String getWriteableName() { return "test"; diff --git a/core/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java b/core/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java index d40a2b7fcb4..9d885fe131c 100644 --- a/core/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java +++ b/core/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java @@ -216,11 +216,11 @@ public class StreamTests extends ESTestCase { static final class WriteableString implements Writeable { final String string; - public WriteableString(String string) { + WriteableString(String string) { this.string = string; } - public WriteableString(StreamInput in) throws IOException { + WriteableString(StreamInput in) throws IOException { this(in.readString()); } diff --git a/core/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java b/core/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java index 31e07902159..7c73520173f 100644 --- a/core/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java +++ b/core/src/test/java/org/elasticsearch/common/network/NetworkModuleTests.java @@ -70,7 +70,7 @@ public class NetworkModuleTests extends ModuleTestCase { } static class FakeHttpTransport extends AbstractLifecycleComponent implements HttpServerTransport { - public FakeHttpTransport() { + FakeHttpTransport() { super(null); } @Override @@ -95,7 +95,7 @@ public class NetworkModuleTests extends ModuleTestCase { static class FakeRestHandler extends BaseRestHandler { - public FakeRestHandler() { + FakeRestHandler() { super(null); } @Override @@ -103,7 +103,7 @@ public class NetworkModuleTests extends ModuleTestCase { } static class FakeCatRestHandler extends AbstractCatAction { - public FakeCatRestHandler() { + FakeCatRestHandler() { super(null); } @Override diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java b/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java index ed4c7c9f7bb..b2664b134ed 100644 --- a/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java @@ -128,7 +128,7 @@ public class RefCountedTests extends ESTestCase { private final AtomicBoolean closed = new AtomicBoolean(false); - public MyRefCounted() { + MyRefCounted() { super("test"); } diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java index d32d54c6c2b..0e11e630ea9 100644 --- a/core/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java +++ b/core/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java @@ -233,7 +233,7 @@ public class ConstructingObjectParserTests extends ESTestCase { public void testCalledOneTime() throws IOException { boolean ctorArgOptional = randomBoolean(); class CalledOneTime { - public CalledOneTime(String yeah) { + CalledOneTime(String yeah) { Matcher yeahMatcher = equalTo("!"); if (ctorArgOptional) { // either(yeahMatcher).or(nullValue) is broken by https://github.com/hamcrest/JavaHamcrest/issues/49 @@ -290,7 +290,7 @@ public class ConstructingObjectParserTests extends ESTestCase { + "}"); class TestStruct { public final String test; - public TestStruct(String test) { + TestStruct(String test) { this.test = test; } } @@ -313,7 +313,7 @@ public class ConstructingObjectParserTests extends ESTestCase { String c; boolean d; - public HasCtorArguments(@Nullable String animal, @Nullable Integer vegetable) { + HasCtorArguments(@Nullable String animal, @Nullable Integer vegetable) { this.animal = animal; this.vegetable = vegetable; } diff --git a/core/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java b/core/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java index 264e6ed0289..6d0ee8a9782 100644 --- a/core/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java +++ b/core/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java @@ -47,7 +47,7 @@ public class BlockingClusterStatePublishResponseHandlerTests extends ESTestCase final Logger logger; final BlockingClusterStatePublishResponseHandler handler; - public PublishResponder(boolean fail, DiscoveryNode node, CyclicBarrier barrier, Logger logger, BlockingClusterStatePublishResponseHandler handler) { + PublishResponder(boolean fail, DiscoveryNode node, CyclicBarrier barrier, Logger logger, BlockingClusterStatePublishResponseHandler handler) { this.fail = fail; this.node = node; diff --git a/core/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java b/core/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java index f089f76dcff..49af88f5331 100644 --- a/core/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java +++ b/core/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java @@ -304,7 +304,7 @@ public class ZenFaultDetectionTests extends ESTestCase { private final Set> completedPings = Collections.newSetFromMap(new ConcurrentHashMap<>()); private final CountDownLatch waitForPings; - public PingProbe(int minCompletedPings) { + PingProbe(int minCompletedPings) { this.waitForPings = new CountDownLatch(minCompletedPings); } diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java b/core/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java index 7d9636b8e55..40309a38f28 100644 --- a/core/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java +++ b/core/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java @@ -773,7 +773,7 @@ public class UnicastZenPingTests extends ESTestCase { public final DiscoveryNode node; public final ConcurrentMap counters; - public NetworkHandle( + NetworkHandle( final TransportAddress address, final TransportService transportService, final DiscoveryNode discoveryNode, @@ -787,7 +787,7 @@ public class UnicastZenPingTests extends ESTestCase { private static class TestUnicastZenPing extends UnicastZenPing { - public TestUnicastZenPing(Settings settings, ThreadPool threadPool, NetworkHandle networkHandle, + TestUnicastZenPing(Settings settings, ThreadPool threadPool, NetworkHandle networkHandle, UnicastHostsProvider unicastHostsProvider) { super(Settings.builder().put("node.name", networkHandle.node.getName()).put(settings).build(), threadPool, networkHandle.transportService, unicastHostsProvider); diff --git a/core/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java b/core/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java index 13e39a342dc..1cdaa27815a 100644 --- a/core/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java @@ -232,7 +232,7 @@ public class AsyncShardFetchTests extends ESTestCase { private final CountDownLatch executeLatch = new CountDownLatch(1); private final CountDownLatch waitLatch = new CountDownLatch(1); - public Entry(Response response, Throwable failure) { + Entry(Response response, Throwable failure) { this.response = response; this.failure = failure; } @@ -242,7 +242,7 @@ public class AsyncShardFetchTests extends ESTestCase { private final Map simulations = new ConcurrentHashMap<>(); private AtomicInteger reroute = new AtomicInteger(); - public TestFetch(ThreadPool threadPool) { + TestFetch(ThreadPool threadPool) { super(Loggers.getLogger(TestFetch.class), "test", new ShardId("test", "_na_", 1), null); this.threadPool = threadPool; } @@ -305,7 +305,7 @@ public class AsyncShardFetchTests extends ESTestCase { static class Response extends BaseNodeResponse { - public Response(DiscoveryNode node) { + Response(DiscoveryNode node) { super(node); } } diff --git a/core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java b/core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java index 5c5826adf67..bbf95795337 100644 --- a/core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java @@ -385,7 +385,7 @@ public class GatewayMetaStateTests extends ESAllocationTestCase { private static class MockMetaDataIndexUpgradeService extends MetaDataIndexUpgradeService { private final boolean upgrade; - public MockMetaDataIndexUpgradeService(boolean upgrade) { + MockMetaDataIndexUpgradeService(boolean upgrade) { super(Settings.EMPTY, null, null, null); this.upgrade = upgrade; } diff --git a/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java b/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java index e507cfa7798..5cb6b2d9f98 100644 --- a/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java @@ -196,7 +196,7 @@ public class MetaDataStateFormatTests extends ESTestCase { public static void corruptFile(Path file, Logger logger) throws IOException { Path fileToCorrupt = file; - try (final SimpleFSDirectory dir = new SimpleFSDirectory(fileToCorrupt.getParent())) { + try (SimpleFSDirectory dir = new SimpleFSDirectory(fileToCorrupt.getParent())) { long checksumBeforeCorruption; try (IndexInput input = dir.openInput(fileToCorrupt.getFileName().toString(), IOContext.DEFAULT)) { checksumBeforeCorruption = CodecUtil.retrieveChecksum(input); @@ -386,7 +386,7 @@ public class MetaDataStateFormatTests extends ESTestCase { '}'; } - public DummyState(String string, int aInt, long aLong, double aDouble, boolean aBoolean) { + DummyState(String string, int aInt, long aLong, double aDouble, boolean aBoolean) { this.string = string; this.aInt = aInt; this.aLong = aLong; @@ -394,7 +394,7 @@ public class MetaDataStateFormatTests extends ESTestCase { this.aBoolean = aBoolean; } - public DummyState() { + DummyState() { } diff --git a/core/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java b/core/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java index a7cf4e606f6..cb4bd91288f 100644 --- a/core/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java @@ -764,7 +764,7 @@ public class PrimaryShardAllocatorTests extends ESAllocationTestCase { private Map data; - public TestAllocator() { + TestAllocator() { super(Settings.EMPTY); } diff --git a/core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java b/core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java index 0e977f8c122..d78b849917d 100644 --- a/core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java @@ -339,7 +339,7 @@ public class ReplicaShardAllocatorTests extends ESAllocationTestCase { private Map data = null; private AtomicBoolean fetchDataCalled = new AtomicBoolean(false); - public TestAllocator() { + TestAllocator() { super(Settings.EMPTY); } diff --git a/core/src/test/java/org/elasticsearch/index/IndexModuleTests.java b/core/src/test/java/org/elasticsearch/index/IndexModuleTests.java index 86dbc8b740e..106dc9274da 100644 --- a/core/src/test/java/org/elasticsearch/index/IndexModuleTests.java +++ b/core/src/test/java/org/elasticsearch/index/IndexModuleTests.java @@ -418,7 +418,7 @@ public class IndexModuleTests extends ESTestCase { private final String key; - public TestSimilarity(String key) { + TestSimilarity(String key) { if (key == null) { throw new AssertionError("key is null"); } diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index 94b95d1aabf..8de796a7612 100644 --- a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -1642,7 +1642,7 @@ public class InternalEngineTests extends ESTestCase { public boolean sawIndexWriterIFDMessage; - public MockAppender(final String name) throws IllegalAccessException { + MockAppender(final String name) throws IllegalAccessException { super(name, RegexFilter.createFilter(".*(\n.*)*", new String[0], false, null, null), null); } @@ -1818,8 +1818,8 @@ public class InternalEngineTests extends ESTestCase { // this test writes documents to the engine while concurrently flushing/commit // and ensuring that the commit points contain the correct sequence number data public void testConcurrentWritesAndCommits() throws Exception { - try (final Store store = createStore(); - final InternalEngine engine = new InternalEngine(config(defaultSettings, store, createTempDir(), newMergePolicy(), + try (Store store = createStore(); + InternalEngine engine = new InternalEngine(config(defaultSettings, store, createTempDir(), newMergePolicy(), new SnapshotDeletionPolicy(NoDeletionPolicy.INSTANCE), IndexRequest.UNSET_AUTO_GENERATED_TIMESTAMP, null))) { @@ -2545,7 +2545,7 @@ public class InternalEngineTests extends ESTestCase { private static class ThrowingIndexWriter extends IndexWriter { private AtomicReference> failureToThrow = new AtomicReference<>(); - public ThrowingIndexWriter(Directory d, IndexWriterConfig conf) throws IOException { + ThrowingIndexWriter(Directory d, IndexWriterConfig conf) throws IOException { super(d, conf); } @@ -3090,7 +3090,7 @@ public class InternalEngineTests extends ESTestCase { IOUtils.close(initialEngine); } - try (final Engine recoveringEngine = + try (Engine recoveringEngine = new InternalEngine(copy(initialEngine.config(), EngineConfig.OpenMode.OPEN_INDEX_AND_TRANSLOG))) { assertThat(recoveringEngine.seqNoService().getLocalCheckpoint(), greaterThanOrEqualTo((long) (docs - 1))); } @@ -3128,7 +3128,7 @@ public class InternalEngineTests extends ESTestCase { IOUtils.close(initialEngine); } - try (final Engine recoveringEngine = + try (Engine recoveringEngine = new InternalEngine(copy(initialEngine.config(), EngineConfig.OpenMode.OPEN_INDEX_AND_TRANSLOG))) { assertThat(recoveringEngine.seqNoService().getLocalCheckpoint(), greaterThanOrEqualTo((long) (3 * (docs - 1) + 2 - 1))); } @@ -3207,7 +3207,7 @@ public class InternalEngineTests extends ESTestCase { } assertThat(engine.seqNoService().getLocalCheckpoint(), equalTo(expectedLocalCheckpoint)); - try (final Engine.GetResult result = engine.get(new Engine.Get(true, uid))) { + try (Engine.GetResult result = engine.get(new Engine.Get(true, uid))) { assertThat(result.exists(), equalTo(exists)); } } diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java index 6cd16ffc072..27b90801ecc 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java @@ -43,7 +43,7 @@ public class DocumentFieldMapperTests extends LuceneTestCase { private final String output; - public FakeAnalyzer(String output) { + FakeAnalyzer(String output) { this.output = output; } @@ -70,7 +70,7 @@ public class DocumentFieldMapperTests extends LuceneTestCase { static class FakeFieldType extends TermBasedFieldType { - public FakeFieldType() { + FakeFieldType() { super(); } @@ -94,7 +94,7 @@ public class DocumentFieldMapperTests extends LuceneTestCase { private static final Settings SETTINGS = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT).build(); - public FakeFieldMapper(String simpleName, MappedFieldType fieldType) { + FakeFieldMapper(String simpleName, MappedFieldType fieldType) { super(simpleName, fieldType.clone(), fieldType.clone(), SETTINGS, null, null); } diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java b/core/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java index 94f129219f2..cb1de56808a 100755 --- a/core/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java @@ -114,7 +114,7 @@ public class ExternalMapper extends FieldMapper { static class ExternalFieldType extends TermBasedFieldType { - public ExternalFieldType() {} + ExternalFieldType() {} protected ExternalFieldType(ExternalFieldType ref) { super(ref); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java index 4105ac00f1c..dc2de3e3dd9 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java @@ -175,7 +175,7 @@ public class FieldNamesFieldMapperTests extends ESSingleNodeTestCase { private static class DummyFieldType extends TermBasedFieldType { - public DummyFieldType() { + DummyFieldType() { super(); } diff --git a/core/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java b/core/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java index 1091e313416..4ae9b004413 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java @@ -207,7 +207,7 @@ public class FieldTypeLookupTests extends ESTestCase { } static class OtherFakeFieldType extends TermBasedFieldType { - public OtherFakeFieldType() { + OtherFakeFieldType() { } protected OtherFakeFieldType(OtherFakeFieldType ref) { diff --git a/core/src/test/java/org/elasticsearch/index/query/MockRepeatAnalyzer.java b/core/src/test/java/org/elasticsearch/index/query/MockRepeatAnalyzer.java index fc76a0d464c..f4a0600bd94 100644 --- a/core/src/test/java/org/elasticsearch/index/query/MockRepeatAnalyzer.java +++ b/core/src/test/java/org/elasticsearch/index/query/MockRepeatAnalyzer.java @@ -35,7 +35,7 @@ public class MockRepeatAnalyzer extends Analyzer { PositionIncrementAttribute posIncAtt = addAttribute(PositionIncrementAttribute.class); String repeat; - public MockRepeatFilter(TokenStream input) { + MockRepeatFilter(TokenStream input) { super(input); } diff --git a/core/src/test/java/org/elasticsearch/index/query/SimpleQueryParserTests.java b/core/src/test/java/org/elasticsearch/index/query/SimpleQueryParserTests.java index 22fca23c69a..746caa0e805 100644 --- a/core/src/test/java/org/elasticsearch/index/query/SimpleQueryParserTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/SimpleQueryParserTests.java @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.equalTo; public class SimpleQueryParserTests extends ESTestCase { private static class MockSimpleQueryParser extends SimpleQueryParser { - public MockSimpleQueryParser(Analyzer analyzer, Map weights, int flags, Settings settings) { + MockSimpleQueryParser(Analyzer analyzer, Map weights, int flags, Settings settings) { super(analyzer, weights, flags, settings, null); } diff --git a/core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java index 993897fe096..20f4475ec76 100644 --- a/core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java @@ -772,13 +772,13 @@ public class FunctionScoreQueryBuilderTests extends AbstractQueryTestCase listener, + ReplicationAction(Request request, ActionListener listener, ReplicationGroup group, String opType) { this.request = request; this.listener = listener; @@ -445,7 +445,7 @@ public abstract class ESIndexLevelReplicationTestCase extends IndexShardTestCase final ReplicaRequest replicaRequest; final Response finalResponse; - public PrimaryResult(ReplicaRequest replicaRequest, Response finalResponse) { + PrimaryResult(ReplicaRequest replicaRequest, Response finalResponse) { this.replicaRequest = replicaRequest; this.finalResponse = finalResponse; } @@ -469,7 +469,7 @@ public abstract class ESIndexLevelReplicationTestCase extends IndexShardTestCase class IndexingAction extends ReplicationAction { - public IndexingAction(IndexRequest request, ActionListener listener, ReplicationGroup replicationGroup) { + IndexingAction(IndexRequest request, ActionListener listener, ReplicationGroup replicationGroup) { super(request, listener, replicationGroup, "indexing"); request.process(null, true, request.index()); } @@ -523,7 +523,7 @@ public abstract class ESIndexLevelReplicationTestCase extends IndexShardTestCase class GlobalCheckpointSync extends ReplicationAction { - public GlobalCheckpointSync(ActionListener listener, ReplicationGroup replicationGroup) { + GlobalCheckpointSync(ActionListener listener, ReplicationGroup replicationGroup) { super(new GlobalCheckpointSyncAction.PrimaryRequest(replicationGroup.getPrimary().shardId()), listener, replicationGroup, "global_ckp"); } diff --git a/core/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java b/core/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java index 42faab84f18..03f051c1c02 100644 --- a/core/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java +++ b/core/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java @@ -66,7 +66,7 @@ public class RecoveryDuringReplicationTests extends ESIndexLevelReplicationTestC } public void testRecoveryOfDisconnectedReplica() throws Exception { - try (final ReplicationGroup shards = createGroup(1)) { + try (ReplicationGroup shards = createGroup(1)) { shards.startAll(); int docs = shards.indexDocs(randomInt(50)); shards.flush(); @@ -132,7 +132,7 @@ public class RecoveryDuringReplicationTests extends ESIndexLevelReplicationTestC @TestLogging("org.elasticsearch.index.shard:TRACE,org.elasticsearch.indices.recovery:TRACE") public void testRecoveryAfterPrimaryPromotion() throws Exception { - try (final ReplicationGroup shards = createGroup(2)) { + try (ReplicationGroup shards = createGroup(2)) { shards.startAll(); int totalDocs = shards.indexDocs(randomInt(10)); int committedDocs = 0; diff --git a/core/src/test/java/org/elasticsearch/index/shard/IndexSearcherWrapperTests.java b/core/src/test/java/org/elasticsearch/index/shard/IndexSearcherWrapperTests.java index 1600d22efd7..6b7c77fdf5e 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/IndexSearcherWrapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/shard/IndexSearcherWrapperTests.java @@ -122,7 +122,7 @@ public class IndexSearcherWrapperTests extends ESTestCase { }; final ConcurrentHashMap cache = new ConcurrentHashMap<>(); try (Engine.Searcher engineSearcher = new Engine.Searcher("foo", searcher)) { - try (final Engine.Searcher wrap = wrapper.wrap(engineSearcher)) { + try (Engine.Searcher wrap = wrapper.wrap(engineSearcher)) { ElasticsearchDirectoryReader.addReaderCloseListener(wrap.getDirectoryReader(), reader -> { cache.remove(reader.getCoreCacheKey()); }); @@ -205,7 +205,7 @@ public class IndexSearcherWrapperTests extends ESTestCase { private final String field; private final AtomicInteger closeCalls; - public FieldMaskingReader(String field, DirectoryReader in, AtomicInteger closeCalls) throws IOException { + FieldMaskingReader(String field, DirectoryReader in, AtomicInteger closeCalls) throws IOException { super(in, new SubReaderWrapper() { @Override public LeafReader wrap(LeafReader reader) { @@ -237,7 +237,7 @@ public class IndexSearcherWrapperTests extends ESTestCase { private final boolean hideDelegate; - public BrokenWrapper(DirectoryReader in, boolean hideDelegate) throws IOException { + BrokenWrapper(DirectoryReader in, boolean hideDelegate) throws IOException { super(in, new SubReaderWrapper() { @Override public LeafReader wrap(LeafReader reader) { diff --git a/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index 4a03a263232..cb3abaea60a 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -1461,7 +1461,7 @@ public class IndexShardTests extends IndexShardTestCase { private abstract static class RestoreOnlyRepository extends AbstractLifecycleComponent implements Repository { private final String indexName; - public RestoreOnlyRepository(String indexName) { + RestoreOnlyRepository(String indexName) { super(Settings.EMPTY); this.indexName = indexName; } diff --git a/core/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java b/core/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java index f1515cd559b..fc8fc12e75d 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java +++ b/core/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java @@ -76,7 +76,7 @@ public class NewPathForShardTests extends ESTestCase { /** Mock file system that fakes usable space for each FileStore */ static class MockUsableSpaceFileSystemProvider extends FilterFileSystemProvider { - public MockUsableSpaceFileSystemProvider(FileSystem inner) { + MockUsableSpaceFileSystemProvider(FileSystem inner) { super("mockusablespace://", inner); final List fileStores = new ArrayList<>(); fileStores.add(aFileStore); @@ -99,7 +99,7 @@ public class NewPathForShardTests extends ESTestCase { private final String desc; - public MockFileStore(String desc) { + MockFileStore(String desc) { this.desc = desc; } diff --git a/core/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java b/core/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java index bcb29b66148..f3c9cd9dbfd 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java +++ b/core/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.is; public class ShardPathTests extends ESTestCase { public void testLoadShardPath() throws IOException { - try (final NodeEnvironment env = newNodeEnvironment(Settings.builder().build())) { + try (NodeEnvironment env = newNodeEnvironment(Settings.builder().build())) { Settings.Builder builder = Settings.builder().put(IndexMetaData.SETTING_INDEX_UUID, "0xDEADBEEF") .put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT); Settings settings = builder.build(); @@ -54,7 +54,7 @@ public class ShardPathTests extends ESTestCase { } public void testFailLoadShardPathOnMultiState() throws IOException { - try (final NodeEnvironment env = newNodeEnvironment(Settings.builder().build())) { + try (NodeEnvironment env = newNodeEnvironment(Settings.builder().build())) { final String indexUUID = "0xDEADBEEF"; Settings.Builder builder = Settings.builder().put(IndexMetaData.SETTING_INDEX_UUID, indexUUID) .put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT); @@ -71,7 +71,7 @@ public class ShardPathTests extends ESTestCase { } public void testFailLoadShardPathIndexUUIDMissmatch() throws IOException { - try (final NodeEnvironment env = newNodeEnvironment(Settings.builder().build())) { + try (NodeEnvironment env = newNodeEnvironment(Settings.builder().build())) { Settings.Builder builder = Settings.builder().put(IndexMetaData.SETTING_INDEX_UUID, "foobar") .put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT); Settings settings = builder.build(); @@ -127,7 +127,7 @@ public class ShardPathTests extends ESTestCase { indexSettings = indexSettingsBuilder.build(); nodeSettings = Settings.EMPTY; } - try (final NodeEnvironment env = newNodeEnvironment(nodeSettings)) { + try (NodeEnvironment env = newNodeEnvironment(nodeSettings)) { ShardId shardId = new ShardId("foo", indexUUID, 0); Path[] paths = env.availableShardPaths(shardId); Path path = randomFrom(paths); diff --git a/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java b/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java index 74b61047ace..1fefbfceac3 100644 --- a/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java +++ b/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java @@ -121,7 +121,7 @@ public class SlicedInputStreamTests extends ESTestCase { public boolean closed = false; - public CheckClosedInputStream(InputStream in) { + CheckClosedInputStream(InputStream in) { super(in); } diff --git a/core/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java b/core/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java index 9c4bcce6ff6..6fa32df2885 100644 --- a/core/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java +++ b/core/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java @@ -61,7 +61,7 @@ public class IndexStoreTests extends ESTestCase { Settings settings = settingsBuilder.build(); IndexSettings indexSettings = IndexSettingsModule.newIndexSettings("foo", settings); FsDirectoryService service = new FsDirectoryService(indexSettings, null, new ShardPath(false, tempDir, tempDir, new ShardId(index, 0))); - try (final Directory directory = service.newFSDirectory(tempDir, NoLockFactory.INSTANCE)) { + try (Directory directory = service.newFSDirectory(tempDir, NoLockFactory.INSTANCE)) { switch (type) { case NIOFS: assertTrue(type + " " + directory.toString(), directory instanceof NIOFSDirectory); diff --git a/core/src/test/java/org/elasticsearch/index/store/StoreTests.java b/core/src/test/java/org/elasticsearch/index/store/StoreTests.java index 11b94c26fff..156c2132358 100644 --- a/core/src/test/java/org/elasticsearch/index/store/StoreTests.java +++ b/core/src/test/java/org/elasticsearch/index/store/StoreTests.java @@ -468,11 +468,11 @@ public class StoreTests extends ESTestCase { private final Directory dir; private final Random random; - public LuceneManagedDirectoryService(Random random) { + LuceneManagedDirectoryService(Random random) { this(random, true); } - public LuceneManagedDirectoryService(Random random, boolean preventDoubleWrite) { + LuceneManagedDirectoryService(Random random, boolean preventDoubleWrite) { super(new ShardId(INDEX_SETTINGS.getIndex(), 1), INDEX_SETTINGS); dir = StoreTests.newDirectory(random); this.random = random; diff --git a/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java b/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java index 05915004239..33f6f8b8a25 100644 --- a/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java +++ b/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java @@ -349,7 +349,7 @@ public class TranslogTests extends ESTestCase { assertThat(copy.estimatedNumberOfOperations(), equalTo(4L)); assertThat(copy.getTranslogSizeInBytes(), equalTo(expectedSizeInBytes)); - try (final XContentBuilder builder = XContentFactory.jsonBuilder()) { + try (XContentBuilder builder = XContentFactory.jsonBuilder()) { builder.startObject(); copy.toXContent(builder, ToXContent.EMPTY_PARAMS); builder.endObject(); @@ -463,7 +463,7 @@ public class TranslogTests extends ESTestCase { final Translog.Operation operation; final Translog.Location location; - public LocationOperation(Translog.Operation operation, Translog.Location location) { + LocationOperation(Translog.Operation operation, Translog.Location location) { this.operation = operation; this.location = location; } @@ -941,7 +941,7 @@ public class TranslogTests extends ESTestCase { translog.add(new Translog.Index("test", "" + translogOperations, Integer.toString(translogOperations).getBytes(Charset.forName("UTF-8")))); final Checkpoint checkpoint = Checkpoint.read(translog.location().resolve(Translog.CHECKPOINT_FILE_NAME)); - try (final TranslogReader reader = translog.openReader(translog.location().resolve(Translog.getFilename(translog.currentFileGeneration())), checkpoint)) { + try (TranslogReader reader = translog.openReader(translog.location().resolve(Translog.getFilename(translog.currentFileGeneration())), checkpoint)) { assertEquals(lastSynced + 1, reader.totalOperations()); Translog.Snapshot snapshot = reader.newSnapshot(); @@ -1355,7 +1355,7 @@ public class TranslogTests extends ESTestCase { private final Exception[] threadExceptions; private final Translog translog; - public TranslogThread(Translog translog, CountDownLatch downLatch, int opsPerThread, int threadId, Collection writtenOperations, Exception[] threadExceptions) { + TranslogThread(Translog translog, CountDownLatch downLatch, int opsPerThread, int threadId, Collection writtenOperations, Exception[] threadExceptions) { this.translog = translog; this.downLatch = downLatch; this.opsPerThread = opsPerThread; diff --git a/core/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java b/core/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java index fee2964fe12..fb524f27591 100644 --- a/core/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java +++ b/core/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java @@ -65,7 +65,7 @@ public class IndexingMemoryControllerTests extends ESSingleNodeTestCase { // Shards that are currently throttled final Set throttled = new HashSet<>(); - public MockController(Settings settings) { + MockController(Settings settings) { super(Settings.builder() .put("indices.memory.interval", "200h") // disable it .put(settings) diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java b/core/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java index f129bdea398..3c0674609c5 100644 --- a/core/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java +++ b/core/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java @@ -322,7 +322,7 @@ public class IndicesRequestCacheTests extends ESTestCase { private final int id; public boolean loadedFromCache = true; - public Loader(DirectoryReader reader, int id) { + Loader(DirectoryReader reader, int id) { super(); this.reader = reader; this.id = id; diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java b/core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java index 72a789ddc1c..5a7f983b056 100644 --- a/core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java +++ b/core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java @@ -636,7 +636,7 @@ public class IndexRecoveryIT extends ESIntegTestCase { private final String recoveryActionToBlock; private final CountDownLatch requestBlocked; - public RecoveryActionBlocker(boolean dropRequests, String recoveryActionToBlock, Transport delegate, CountDownLatch requestBlocked) { + RecoveryActionBlocker(boolean dropRequests, String recoveryActionToBlock, Transport delegate, CountDownLatch requestBlocked) { super(delegate); this.dropRequests = dropRequests; this.recoveryActionToBlock = recoveryActionToBlock; diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java b/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java index e304ff46b55..3858b6647f9 100644 --- a/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java +++ b/core/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java @@ -20,6 +20,7 @@ package org.elasticsearch.indices.recovery; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.CorruptIndexException; @@ -27,6 +28,7 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexCommit; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; +import org.apache.lucene.index.Term; import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; @@ -35,13 +37,24 @@ import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.node.DiscoveryNode; +import org.elasticsearch.common.bytes.BytesArray; +import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.FileSystemUtils; import org.elasticsearch.common.lease.Releasable; import org.elasticsearch.common.lucene.store.IndexOutputOutputStream; +import org.elasticsearch.common.lucene.uid.Versions; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.IndexSettings; +import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.engine.SegmentsStats; +import org.elasticsearch.index.mapper.Mapping; +import org.elasticsearch.index.mapper.ParseContext; +import org.elasticsearch.index.mapper.ParsedDocument; +import org.elasticsearch.index.mapper.SeqNoFieldMapper; +import org.elasticsearch.index.mapper.Uid; +import org.elasticsearch.index.mapper.UidFieldMapper; import org.elasticsearch.index.seqno.SeqNoStats; import org.elasticsearch.index.seqno.SequenceNumbersService; import org.elasticsearch.index.shard.IndexShard; @@ -60,6 +73,7 @@ import org.elasticsearch.test.IndexSettingsModule; import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; @@ -136,6 +150,73 @@ public class RecoverySourceHandlerTests extends ESTestCase { IOUtils.close(reader, store, targetStore); } + public void testSendSnapshotSendsOps() throws IOException { + final RecoverySettings recoverySettings = new RecoverySettings(Settings.EMPTY, service); + final int fileChunkSizeInBytes = recoverySettings.getChunkSize().bytesAsInt(); + final long startingSeqNo = randomBoolean() ? SequenceNumbersService.UNASSIGNED_SEQ_NO : randomIntBetween(0, 16); + final StartRecoveryRequest request = new StartRecoveryRequest( + shardId, + new DiscoveryNode("b", buildNewFakeTransportAddress(), emptyMap(), emptySet(), Version.CURRENT), + new DiscoveryNode("b", buildNewFakeTransportAddress(), emptyMap(), emptySet(), Version.CURRENT), + null, + randomBoolean(), + randomNonNegativeLong(), + randomBoolean() ? SequenceNumbersService.UNASSIGNED_SEQ_NO : randomNonNegativeLong()); + final IndexShard shard = mock(IndexShard.class); + when(shard.state()).thenReturn(IndexShardState.STARTED); + final RecoveryTargetHandler recoveryTarget = mock(RecoveryTargetHandler.class); + final RecoverySourceHandler handler = + new RecoverySourceHandler(shard, recoveryTarget, request, () -> 0L, e -> () -> {}, fileChunkSizeInBytes, Settings.EMPTY); + final List operations = new ArrayList<>(); + final int initialNumberOfDocs = randomIntBetween(16, 64); + for (int i = 0; i < initialNumberOfDocs; i++) { + final Engine.Index index = getIndex(Integer.toString(i)); + operations.add(new Translog.Index(index, new Engine.IndexResult(1, SequenceNumbersService.UNASSIGNED_SEQ_NO, true))); + } + final int numberOfDocsWithValidSequenceNumbers = randomIntBetween(16, 64); + for (int i = initialNumberOfDocs; i < initialNumberOfDocs + numberOfDocsWithValidSequenceNumbers; i++) { + final Engine.Index index = getIndex(Integer.toString(i)); + operations.add(new Translog.Index(index, new Engine.IndexResult(1, i - initialNumberOfDocs, true))); + } + operations.add(null); + int totalOperations = handler.sendSnapshot(startingSeqNo, new Translog.Snapshot() { + private int counter = 0; + + @Override + public int totalOperations() { + return operations.size() - 1; + } + + @Override + public Translog.Operation next() throws IOException { + return operations.get(counter++); + } + }); + if (startingSeqNo == SequenceNumbersService.UNASSIGNED_SEQ_NO) { + assertThat(totalOperations, equalTo(initialNumberOfDocs + numberOfDocsWithValidSequenceNumbers)); + } else { + assertThat(totalOperations, equalTo(Math.toIntExact(numberOfDocsWithValidSequenceNumbers - startingSeqNo))); + } + } + + private Engine.Index getIndex(final String id) { + final String type = "test"; + final ParseContext.Document document = new ParseContext.Document(); + document.add(new TextField("test", "test", Field.Store.YES)); + final Field uidField = new Field("_uid", Uid.createUid(type, id), UidFieldMapper.Defaults.FIELD_TYPE); + final Field versionField = new NumericDocValuesField("_version", Versions.MATCH_ANY); + final SeqNoFieldMapper.SequenceID seqID = SeqNoFieldMapper.SequenceID.emptySeqID(); + document.add(uidField); + document.add(versionField); + document.add(seqID.seqNo); + document.add(seqID.seqNoDocValue); + document.add(seqID.primaryTerm); + final BytesReference source = new BytesArray(new byte[] { 1 }); + final ParsedDocument doc = + new ParsedDocument(versionField, seqID, id, type, null, Arrays.asList(document), source, XContentType.JSON, null); + return new Engine.Index(new Term("_uid", doc.uid()), doc); + } + public void testHandleCorruptedIndexOnSendSendFiles() throws Throwable { Settings settings = Settings.builder().put("indices.recovery.concurrent_streams", 1). put("indices.recovery.concurrent_small_file_streams", 1).build(); diff --git a/core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java b/core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java index 3cdea34a69b..f7b9cb306f3 100644 --- a/core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java +++ b/core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java @@ -244,7 +244,7 @@ public class UpdateSettingsIT extends ESIntegTestCase { public boolean sawUpdateMaxThreadCount; public boolean sawUpdateAutoThrottle; - public MockAppender(final String name) throws IllegalAccessException { + MockAppender(final String name) throws IllegalAccessException { super(name, RegexFilter.createFilter(".*(\n.*)*", new String[0], false, null, null), null); } diff --git a/core/src/test/java/org/elasticsearch/ingest/PipelineExecutionServiceTests.java b/core/src/test/java/org/elasticsearch/ingest/PipelineExecutionServiceTests.java index 7ad445e3013..44c8e78bef7 100644 --- a/core/src/test/java/org/elasticsearch/ingest/PipelineExecutionServiceTests.java +++ b/core/src/test/java/org/elasticsearch/ingest/PipelineExecutionServiceTests.java @@ -384,7 +384,7 @@ public class PipelineExecutionServiceTests extends ESTestCase { private final IngestDocument ingestDocument; - public IngestDocumentMatcher(String index, String type, String id, Map source) { + IngestDocumentMatcher(String index, String type, String id, Map source) { this.ingestDocument = new IngestDocument(index, type, id, null, null, source); } diff --git a/core/src/test/java/org/elasticsearch/recovery/RelocationIT.java b/core/src/test/java/org/elasticsearch/recovery/RelocationIT.java index 56f9b265c0d..f32688aafff 100644 --- a/core/src/test/java/org/elasticsearch/recovery/RelocationIT.java +++ b/core/src/test/java/org/elasticsearch/recovery/RelocationIT.java @@ -517,7 +517,7 @@ public class RelocationIT extends ESIntegTestCase { private final CountDownLatch corruptionCount; - public RecoveryCorruption(Transport transport, CountDownLatch corruptionCount) { + RecoveryCorruption(Transport transport, CountDownLatch corruptionCount) { super(transport); this.corruptionCount = corruptionCount; } diff --git a/core/src/test/java/org/elasticsearch/rest/DeprecationRestHandlerTests.java b/core/src/test/java/org/elasticsearch/rest/DeprecationRestHandlerTests.java index 7f46139a269..3c31b5b7f4d 100644 --- a/core/src/test/java/org/elasticsearch/rest/DeprecationRestHandlerTests.java +++ b/core/src/test/java/org/elasticsearch/rest/DeprecationRestHandlerTests.java @@ -138,7 +138,7 @@ public class DeprecationRestHandlerTests extends ESTestCase { /** * Create a generator for characters [32, 126]. */ - public ASCIIHeaderGenerator() { + ASCIIHeaderGenerator() { super(asciiFromTo(32, 126)); } } diff --git a/core/src/test/java/org/elasticsearch/rest/RestControllerTests.java b/core/src/test/java/org/elasticsearch/rest/RestControllerTests.java index 79c6f6561e6..50f9afd5c28 100644 --- a/core/src/test/java/org/elasticsearch/rest/RestControllerTests.java +++ b/core/src/test/java/org/elasticsearch/rest/RestControllerTests.java @@ -312,7 +312,7 @@ public class RestControllerTests extends ESTestCase { private static final class TestHttpServerTransport extends AbstractLifecycleComponent implements HttpServerTransport { - public TestHttpServerTransport() { + TestHttpServerTransport() { super(Settings.EMPTY); } diff --git a/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java b/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java index 840cdc8af6c..7366834391b 100644 --- a/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java +++ b/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java @@ -268,7 +268,7 @@ public class SearchCancellationIT extends ESIntegTestCase { private final AtomicBoolean shouldBlock = new AtomicBoolean(true); - public NativeTestScriptedBlockFactory() { + NativeTestScriptedBlockFactory() { } public void reset() { diff --git a/core/src/test/java/org/elasticsearch/search/SearchModuleTests.java b/core/src/test/java/org/elasticsearch/search/SearchModuleTests.java index e5652845ab4..0eeab9897fa 100644 --- a/core/src/test/java/org/elasticsearch/search/SearchModuleTests.java +++ b/core/src/test/java/org/elasticsearch/search/SearchModuleTests.java @@ -374,7 +374,7 @@ public class SearchModuleTests extends ModuleTestCase { /** * Read from a stream. */ - public TestPipelineAggregationBuilder(StreamInput in) throws IOException { + TestPipelineAggregationBuilder(StreamInput in) throws IOException { super(in, "test"); } @@ -419,7 +419,7 @@ public class SearchModuleTests extends ModuleTestCase { /** * Read from a stream. */ - public TestPipelineAggregator(StreamInput in) throws IOException { + TestPipelineAggregator(StreamInput in) throws IOException { super(in); } @Override diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java b/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java index af6def4aaa5..aab44c32fcf 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java @@ -199,7 +199,7 @@ public abstract class AggregatorTestCase extends ESTestCase { private static class ShardSearcher extends IndexSearcher { private final List ctx; - public ShardSearcher(LeafReaderContext ctx, IndexReaderContext parent) { + ShardSearcher(LeafReaderContext ctx, IndexReaderContext parent) { super(parent); this.ctx = Collections.singletonList(ctx); } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java index ccc3b2f09aa..e896e1cc1fb 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java @@ -76,7 +76,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; public class SignificanceHeuristicTests extends ESTestCase { static class SignificantTermsTestSearchContext extends TestSearchContext { - public SignificantTermsTestSearchContext() { + SignificantTermsTestSearchContext() { super(null); } diff --git a/core/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatIT.java b/core/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatIT.java index 7e1793bd05c..56ff111e4b0 100644 --- a/core/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatIT.java +++ b/core/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatIT.java @@ -60,7 +60,7 @@ public class BlobStoreFormatIT extends AbstractSnapshotIntegTestCase { private final String text; - public BlobObj(String text) { + BlobObj(String text) { this.text = text; } diff --git a/core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java b/core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java index c89a26a07e0..cd29c8ea031 100644 --- a/core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java +++ b/core/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepository.java @@ -280,7 +280,7 @@ public class MockRepository extends FsRepository { } - public MockBlobContainer(BlobContainer delegate) { + MockBlobContainer(BlobContainer delegate) { super(delegate); } diff --git a/core/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java b/core/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java index e18ba0fe322..12f84f23c28 100644 --- a/core/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java +++ b/core/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java @@ -56,7 +56,7 @@ public class RandomShapeGenerator extends RandomGeoGenerator { protected static final double xDIVISIBLE = 2; protected static boolean ST_VALIDATE = true; - public static enum ShapeType { + public enum ShapeType { POINT, MULTIPOINT, LINESTRING, MULTILINESTRING, POLYGON; private static final ShapeType[] types = values(); diff --git a/core/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java b/core/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java index 849f6460a73..c00f5fb07a5 100644 --- a/core/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java +++ b/core/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java @@ -165,7 +165,7 @@ public class TransportServiceHandshakeTests extends ESTestCase { private TransportService transportService; private DiscoveryNode discoveryNode; - public NetworkHandle(TransportService transportService, DiscoveryNode discoveryNode) { + NetworkHandle(TransportService transportService, DiscoveryNode discoveryNode) { this.transportService = transportService; this.discoveryNode = discoveryNode; } diff --git a/core/src/test/java/org/elasticsearch/update/UpdateByNativeScriptIT.java b/core/src/test/java/org/elasticsearch/update/UpdateByNativeScriptIT.java index 59826608456..2d28f75ff93 100644 --- a/core/src/test/java/org/elasticsearch/update/UpdateByNativeScriptIT.java +++ b/core/src/test/java/org/elasticsearch/update/UpdateByNativeScriptIT.java @@ -90,7 +90,7 @@ public class UpdateByNativeScriptIT extends ESIntegTestCase { private Map params; private Map vars = new HashMap<>(2); - public CustomScript(Map params) { + CustomScript(Map params) { this.params = params; } diff --git a/core/src/test/java/org/elasticsearch/update/UpdateIT.java b/core/src/test/java/org/elasticsearch/update/UpdateIT.java index bc065823215..75c3feb038a 100644 --- a/core/src/test/java/org/elasticsearch/update/UpdateIT.java +++ b/core/src/test/java/org/elasticsearch/update/UpdateIT.java @@ -886,7 +886,7 @@ public class UpdateIT extends ESIntegTestCase { private final Semaphore updateRequestsOutstanding = new Semaphore(maxUpdateRequests); private final Semaphore deleteRequestsOutstanding = new Semaphore(maxDeleteRequests); - public UpdateThread(int numberOfIds, int updatesPerId) { + UpdateThread(int numberOfIds, int updatesPerId) { this.numberOfIds = numberOfIds; this.updatesPerId = updatesPerId; } @@ -894,7 +894,7 @@ public class UpdateIT extends ESIntegTestCase { final class UpdateListener implements ActionListener { int id; - public UpdateListener(int id) { + UpdateListener(int id) { this.id = id; } @@ -916,7 +916,7 @@ public class UpdateIT extends ESIntegTestCase { final class DeleteListener implements ActionListener { int id; - public DeleteListener(int id) { + DeleteListener(int id) { this.id = id; } diff --git a/docs/reference/mapping/types/date.asciidoc b/docs/reference/mapping/types/date.asciidoc index d0a889f15d9..691387ba8ab 100644 --- a/docs/reference/mapping/types/date.asciidoc +++ b/docs/reference/mapping/types/date.asciidoc @@ -74,7 +74,7 @@ PUT my_index "properties": { "date": { "type": "date", - "format": "yyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis" + "format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis" } } } diff --git a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsResults.java b/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsResults.java index 1ae29e65761..f82c6df73be 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsResults.java +++ b/modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsResults.java @@ -39,13 +39,13 @@ class MatrixStatsResults implements Writeable { protected final Map> correlation; /** Base ctor */ - public MatrixStatsResults() { + MatrixStatsResults() { results = new RunningStats(); this.correlation = new HashMap<>(); } /** creates and computes result from provided stats */ - public MatrixStatsResults(RunningStats stats) { + MatrixStatsResults(RunningStats stats) { this.results = stats.clone(); this.correlation = new HashMap<>(); this.compute(); diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/Grok.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/Grok.java index 7120643f47c..1902d9900f7 100644 --- a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/Grok.java +++ b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/Grok.java @@ -61,12 +61,12 @@ final class Grok { private final String expression; - public Grok(Map patternBank, String grokPattern) { + Grok(Map patternBank, String grokPattern) { this(patternBank, grokPattern, true); } @SuppressWarnings("unchecked") - public Grok(Map patternBank, String grokPattern, boolean namedCaptures) { + Grok(Map patternBank, String grokPattern, boolean namedCaptures) { this.patternBank = patternBank; this.namedCaptures = namedCaptures; diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokMatchGroup.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokMatchGroup.java index 35f8fd312ff..924e298e462 100644 --- a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokMatchGroup.java +++ b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokMatchGroup.java @@ -26,7 +26,7 @@ final class GrokMatchGroup { private final String type; private final String groupValue; - public GrokMatchGroup(String groupName, String groupValue) { + GrokMatchGroup(String groupName, String groupValue) { String[] parts = groupName.split(":"); patternName = parts[0]; if (parts.length >= 2) { diff --git a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/CustomMustacheFactory.java b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/CustomMustacheFactory.java index 662cd86f799..43232cc8f65 100644 --- a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/CustomMustacheFactory.java +++ b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/CustomMustacheFactory.java @@ -106,7 +106,7 @@ public class CustomMustacheFactory extends DefaultMustacheFactory { class CustomMustacheVisitor extends DefaultMustacheVisitor { - public CustomMustacheVisitor(DefaultMustacheFactory df) { + CustomMustacheVisitor(DefaultMustacheFactory df) { super(df); } @@ -133,7 +133,7 @@ public class CustomMustacheFactory extends DefaultMustacheFactory { private final String code; - public CustomCode(TemplateContext tc, DefaultMustacheFactory df, Mustache mustache, String code) { + CustomCode(TemplateContext tc, DefaultMustacheFactory df, Mustache mustache, String code) { super(tc, df, mustache, extractVariableName(code, mustache, tc)); this.code = Objects.requireNonNull(code); } @@ -188,7 +188,7 @@ public class CustomMustacheFactory extends DefaultMustacheFactory { private static final String CODE = "toJson"; - public ToJsonCode(TemplateContext tc, DefaultMustacheFactory df, Mustache mustache, String variable) { + ToJsonCode(TemplateContext tc, DefaultMustacheFactory df, Mustache mustache, String variable) { super(tc, df, mustache, CODE); if (CODE.equalsIgnoreCase(variable) == false) { throw new MustacheException("Mismatch function code [" + CODE + "] cannot be applied to [" + variable + "]"); @@ -239,12 +239,12 @@ public class CustomMustacheFactory extends DefaultMustacheFactory { private final String delimiter; - public JoinerCode(TemplateContext tc, DefaultMustacheFactory df, Mustache mustache, String delimiter) { + JoinerCode(TemplateContext tc, DefaultMustacheFactory df, Mustache mustache, String delimiter) { super(tc, df, mustache, CODE); this.delimiter = delimiter; } - public JoinerCode(TemplateContext tc, DefaultMustacheFactory df, Mustache mustache) { + JoinerCode(TemplateContext tc, DefaultMustacheFactory df, Mustache mustache) { this(tc, df, mustache, DEFAULT_DELIMITER); } @@ -273,7 +273,7 @@ public class CustomMustacheFactory extends DefaultMustacheFactory { private static final Pattern PATTERN = Pattern.compile("^(?:" + CODE + " delimiter='(.*)')$"); - public CustomJoinerCode(TemplateContext tc, DefaultMustacheFactory df, Mustache mustache, String variable) { + CustomJoinerCode(TemplateContext tc, DefaultMustacheFactory df, Mustache mustache, String variable) { super(tc, df, mustache, extractDelimiter(variable)); } @@ -299,7 +299,7 @@ public class CustomMustacheFactory extends DefaultMustacheFactory { private static final String CODE = "url"; private final Encoder encoder; - public UrlEncoderCode(TemplateContext tc, DefaultMustacheFactory df, Mustache mustache, String variable) { + UrlEncoderCode(TemplateContext tc, DefaultMustacheFactory df, Mustache mustache, String variable) { super(tc, df, mustache.getCodes(), variable); this.encoder = new UrlEncoder(); } @@ -336,7 +336,7 @@ public class CustomMustacheFactory extends DefaultMustacheFactory { * @param s The string to encode * @param writer The {@link Writer} to which the encoded string will be written to */ - void encode(final String s, final Writer writer) throws IOException; + void encode(String s, Writer writer) throws IOException; } /** diff --git a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/CustomReflectionObjectHandler.java b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/CustomReflectionObjectHandler.java index dd3055ba8e8..eef9d7af8dd 100644 --- a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/CustomReflectionObjectHandler.java +++ b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/CustomReflectionObjectHandler.java @@ -54,7 +54,7 @@ final class CustomReflectionObjectHandler extends ReflectionObjectHandler { private final Object array; private final int length; - public ArrayMap(Object array) { + ArrayMap(Object array) { this.array = array; this.length = Array.getLength(array); } @@ -113,7 +113,7 @@ final class CustomReflectionObjectHandler extends ReflectionObjectHandler { private final Collection col; - public CollectionMap(Collection col) { + CollectionMap(Collection col) { this.col = col; } diff --git a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngineService.java b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngineService.java index 6686b8a76c4..c7964a716f8 100644 --- a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngineService.java +++ b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngineService.java @@ -140,7 +140,7 @@ public final class MustacheScriptEngineService extends AbstractComponent impleme * @param template the compiled template object wrapper * @param vars the parameters to fill above object with **/ - public MustacheExecutableScript(CompiledScript template, Map vars) { + MustacheExecutableScript(CompiledScript template, Map vars) { this.template = template; this.vars = vars == null ? Collections.emptyMap() : vars; } diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Executable.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/Executable.java index c6e38374aa7..c02c66ffc10 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Executable.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/Executable.java @@ -48,7 +48,7 @@ public abstract class Executable { return source; } - /** + /** * Finds the start of the first statement boundary that is * on or before {@code offset}. If one is not found, {@code -1} * is returned. @@ -56,8 +56,8 @@ public abstract class Executable { public int getPreviousStatement(int offset) { return statements.previousSetBit(offset); } - - /** + + /** * Finds the start of the first statement boundary that is * after {@code offset}. If one is not found, {@code -1} * is returned. @@ -66,6 +66,5 @@ public abstract class Executable { return statements.nextSetBit(offset+1); } - public abstract Object execute( - final Map params, final Scorer scorer, final LeafDocLookup doc, final Object value); + public abstract Object execute(Map params, Scorer scorer, LeafDocLookup doc, Object value); } diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubCallInvoke.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubCallInvoke.java index 86553096e35..5665f7163af 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubCallInvoke.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubCallInvoke.java @@ -39,7 +39,7 @@ final class PSubCallInvoke extends AExpression { private final Type box; private final List arguments; - public PSubCallInvoke(Location location, Method method, Type box, List arguments) { + PSubCallInvoke(Location location, Method method, Type box, List arguments) { super(location); this.method = Objects.requireNonNull(method); diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubField.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubField.java index a7a01caac46..efed81c4c81 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubField.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/PSubField.java @@ -37,7 +37,7 @@ final class PSubField extends AStoreable { private final Field field; - public PSubField(Location location, Field field) { + PSubField(Location location, Field field) { super(location); this.field = Objects.requireNonNull(field); diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachArray.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachArray.java index edbad88e2c2..c153eacbf92 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachArray.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachArray.java @@ -47,7 +47,7 @@ final class SSubEachArray extends AStatement { private Variable index = null; private Type indexed = null; - public SSubEachArray(Location location, Variable variable, AExpression expression, SBlock block) { + SSubEachArray(Location location, Variable variable, AExpression expression, SBlock block) { super(location); this.variable = Objects.requireNonNull(variable); diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachIterable.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachIterable.java index 5a1410d0343..845cc264530 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachIterable.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachIterable.java @@ -55,7 +55,7 @@ final class SSubEachIterable extends AStatement { private Variable iterator = null; private Method method = null; - public SSubEachIterable(Location location, Variable variable, AExpression expression, SBlock block) { + SSubEachIterable(Location location, Variable variable, AExpression expression, SBlock block) { super(location); this.variable = Objects.requireNonNull(variable); diff --git a/modules/percolator/src/main/java/org/elasticsearch/percolator/QueryAnalyzer.java b/modules/percolator/src/main/java/org/elasticsearch/percolator/QueryAnalyzer.java index 9564601627f..dce0e3dd2a3 100644 --- a/modules/percolator/src/main/java/org/elasticsearch/percolator/QueryAnalyzer.java +++ b/modules/percolator/src/main/java/org/elasticsearch/percolator/QueryAnalyzer.java @@ -380,7 +380,7 @@ public final class QueryAnalyzer { private final Query unsupportedQuery; - public UnsupportedQueryException(Query unsupportedQuery) { + UnsupportedQueryException(Query unsupportedQuery) { super(LoggerMessageFormat.format("no query terms can be extracted from query [{}]", unsupportedQuery)); this.unsupportedQuery = unsupportedQuery; } diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportReindexAction.java b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportReindexAction.java index aa0dcd19617..deee6ae1160 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportReindexAction.java +++ b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportReindexAction.java @@ -251,7 +251,7 @@ public class TransportReindexAction extends HandledTransportAction createdThreads = emptyList(); - public AsyncIndexBySearchAction(WorkingBulkByScrollTask task, Logger logger, ParentTaskAssigningClient client, + AsyncIndexBySearchAction(WorkingBulkByScrollTask task, Logger logger, ParentTaskAssigningClient client, ThreadPool threadPool, ReindexRequest request, ScriptService scriptService, ClusterState clusterState, ActionListener listener) { super(task, logger, client, threadPool, request, scriptService, clusterState, listener); diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportUpdateByQueryAction.java b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportUpdateByQueryAction.java index d4bc805e227..8ee98d1df0a 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportUpdateByQueryAction.java +++ b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportUpdateByQueryAction.java @@ -90,7 +90,7 @@ public class TransportUpdateByQueryAction extends HandledTransportAction { - public AsyncIndexBySearchAction(WorkingBulkByScrollTask task, Logger logger, ParentTaskAssigningClient client, + AsyncIndexBySearchAction(WorkingBulkByScrollTask task, Logger logger, ParentTaskAssigningClient client, ThreadPool threadPool, UpdateByQueryRequest request, ScriptService scriptService, ClusterState clusterState, ActionListener listener) { super(task, logger, client, threadPool, request, scriptService, clusterState, listener); diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteScrollableHitSource.java b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteScrollableHitSource.java index 9c78d14c69e..796106c269e 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteScrollableHitSource.java +++ b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteScrollableHitSource.java @@ -120,10 +120,23 @@ public class RemoteScrollableHitSource extends ScrollableHitSource { } @Override - public void onFailure(Exception t) { - logger.warn((Supplier) () -> new ParameterizedMessage("Failed to clear scroll [{}]", scrollId), t); + public void onFailure(Exception e) { + logFailure(e); onCompletion.run(); } + + private void logFailure(Exception e) { + if (e instanceof ResponseException) { + ResponseException re = (ResponseException) e; + if (remoteVersion.before(Version.V_2_0_0) && re.getResponse().getStatusLine().getStatusCode() == 404) { + logger.debug((Supplier) () -> new ParameterizedMessage( + "Failed to clear scroll [{}] from pre-2.0 Elasticsearch. This is normal if the request terminated " + + "normally as the scroll has already been cleared automatically.", scrollId), e); + return; + } + } + logger.warn((Supplier) () -> new ParameterizedMessage("Failed to clear scroll [{}]", scrollId), e); + } }); } @@ -134,7 +147,7 @@ public class RemoteScrollableHitSource extends ScrollableHitSource { threadPool.generic().submit(() -> { try { client.close(); - logger.info("Shut down remote connection"); + logger.debug("Shut down remote connection"); } catch (IOException e) { logger.error("Failed to shutdown the remote connection", e); } diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexMetadataTests.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexMetadataTests.java index fd4d6d622e8..172047bfef2 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexMetadataTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexMetadataTests.java @@ -79,7 +79,7 @@ public class ReindexMetadataTests extends AbstractAsyncBulkByScrollActionMetadat } private class TestAction extends TransportReindexAction.AsyncIndexBySearchAction { - public TestAction() { + TestAction() { super(ReindexMetadataTests.this.task, ReindexMetadataTests.this.logger, null, ReindexMetadataTests.this.threadPool, request(), null, null, listener()); } diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryMetadataTests.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryMetadataTests.java index b05c12bcf18..c2b1dc50871 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryMetadataTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryMetadataTests.java @@ -45,7 +45,7 @@ public class UpdateByQueryMetadataTests } private class TestAction extends TransportUpdateByQueryAction.AsyncIndexBySearchAction { - public TestAction() { + TestAction() { super(UpdateByQueryMetadataTests.this.task, UpdateByQueryMetadataTests.this.logger, null, UpdateByQueryMetadataTests.this.threadPool, request(), null, null, listener()); } diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryWhileModifyingTests.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryWhileModifyingTests.java index 7200ae513e7..cb027d156e6 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryWhileModifyingTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryWhileModifyingTests.java @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; */ public class UpdateByQueryWhileModifyingTests extends ReindexTestCase { private static final int MAX_MUTATIONS = 50; - private static final int MAX_ATTEMPTS = 10; + private static final int MAX_ATTEMPTS = 50; public void testUpdateWhileReindexing() throws Exception { AtomicReference value = new AtomicReference<>(randomSimpleString(random())); @@ -83,9 +83,8 @@ public class UpdateByQueryWhileModifyingTests extends ReindexTestCase { throw new RuntimeException( "Failed to index after [" + MAX_ATTEMPTS + "] attempts. Too many version conflicts!"); } - logger.info( - "Caught expected version conflict trying to perform mutation number {} with version {}. Retrying.", - i, get.getVersion()); + logger.info("Caught expected version conflict trying to perform mutation number [{}] with version [{}] " + + "on attempt [{}]. Retrying.", i, get.getVersion(), attempts); get = client().prepareGet("test", "test", "test").get(); } } diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/ByteBufStreamInput.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/ByteBufStreamInput.java index 45aa029b46f..f29ca9c10ff 100644 --- a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/ByteBufStreamInput.java +++ b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/ByteBufStreamInput.java @@ -36,7 +36,7 @@ class ByteBufStreamInput extends StreamInput { private final int startIndex; private final int endIndex; - public ByteBufStreamInput(ByteBuf buffer, int length) { + ByteBufStreamInput(ByteBuf buffer, int length) { if (length > buffer.readableBytes()) { throw new IndexOutOfBoundsException(); } diff --git a/modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpServerPipeliningTests.java b/modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpServerPipeliningTests.java index c0f8746d514..d7e2d7782d5 100644 --- a/modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpServerPipeliningTests.java +++ b/modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpServerPipeliningTests.java @@ -87,7 +87,7 @@ public class Netty4HttpServerPipeliningTests extends ESTestCase { .put("http.pipelining", true) .put("http.port", "0") .build(); - try (final HttpServerTransport httpServerTransport = new CustomNettyHttpServerTransport(settings)) { + try (HttpServerTransport httpServerTransport = new CustomNettyHttpServerTransport(settings)) { httpServerTransport.start(); final TransportAddress transportAddress = randomFrom(httpServerTransport.boundAddress().boundAddresses()); @@ -114,7 +114,7 @@ public class Netty4HttpServerPipeliningTests extends ESTestCase { .put("http.pipelining", false) .put("http.port", "0") .build(); - try (final HttpServerTransport httpServerTransport = new CustomNettyHttpServerTransport(settings)) { + try (HttpServerTransport httpServerTransport = new CustomNettyHttpServerTransport(settings)) { httpServerTransport.start(); final TransportAddress transportAddress = randomFrom(httpServerTransport.boundAddress().boundAddresses()); diff --git a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/network/Ec2NameResolver.java b/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/network/Ec2NameResolver.java index 7399d4d7089..4350b4d5277 100755 --- a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/network/Ec2NameResolver.java +++ b/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/network/Ec2NameResolver.java @@ -59,7 +59,7 @@ public class Ec2NameResolver extends AbstractComponent implements CustomNameReso * * @author Paul_Loy */ - private static enum Ec2HostnameType { + private enum Ec2HostnameType { PRIVATE_IPv4("ec2:privateIpv4", "local-ipv4"), PRIVATE_DNS("ec2:privateDns", "local-hostname"), @@ -74,7 +74,7 @@ public class Ec2NameResolver extends AbstractComponent implements CustomNameReso final String configName; final String ec2Name; - private Ec2HostnameType(String configName, String ec2Name) { + Ec2HostnameType(String configName, String ec2Name) { this.configName = configName; this.ec2Name = ec2Name; } diff --git a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryTests.java b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryTests.java index 13ec8944ca2..d05ca712f18 100644 --- a/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryTests.java +++ b/plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryTests.java @@ -294,7 +294,7 @@ public class Ec2DiscoveryTests extends ESTestCase { abstract class DummyEc2HostProvider extends AwsEc2UnicastHostsProvider { public int fetchCount = 0; - public DummyEc2HostProvider(Settings settings, TransportService transportService, AwsEc2Service service) { + DummyEc2HostProvider(Settings settings, TransportService transportService, AwsEc2Service service) { super(settings, transportService, service); } } diff --git a/plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/TikaDocTests.java b/plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/TikaDocTests.java index 4b9a40dd8a9..b4445d16b77 100644 --- a/plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/TikaDocTests.java +++ b/plugins/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/TikaDocTests.java @@ -22,6 +22,7 @@ package org.elasticsearch.ingest.attachment; import org.apache.lucene.util.LuceneTestCase.SuppressFileSystems; import org.apache.lucene.util.TestUtil; import org.apache.tika.metadata.Metadata; +import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.test.ESTestCase; import java.nio.file.DirectoryStream; @@ -37,11 +38,17 @@ import java.nio.file.Path; public class TikaDocTests extends ESTestCase { /** some test files from tika test suite, zipped up */ - static final String TIKA_FILES = "/org/elasticsearch/ingest/attachment/test/tika-files.zip"; + static final String TIKA_FILES = "/org/elasticsearch/ingest/attachment/test/tika-files/"; public void testFiles() throws Exception { Path tmp = createTempDir(); - TestUtil.unzip(getClass().getResourceAsStream(TIKA_FILES), tmp); + logger.debug("unzipping all tika sample files"); + try (DirectoryStream stream = Files.newDirectoryStream(PathUtils.get(getClass().getResource(TIKA_FILES).toURI()))) { + for (Path doc : stream) { + String filename = doc.getFileName().toString(); + TestUtil.unzip(getClass().getResourceAsStream(TIKA_FILES + filename), tmp); + } + } try (DirectoryStream stream = Files.newDirectoryStream(tmp)) { for (Path doc : stream) { diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files.zip deleted file mode 100644 index 67d1316cb4c..00000000000 Binary files a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files.zip and /dev/null differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/Doc1_ole.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/Doc1_ole.doc.zip new file mode 100644 index 00000000000..f9bd7c46b2b Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/Doc1_ole.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedDocument.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedDocument.docx.zip new file mode 100644 index 00000000000..bb4e8e1ef3e Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedDocument.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedOutlook.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedOutlook.docx.zip new file mode 100644 index 00000000000..67de787f017 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedOutlook.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedPDF.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedPDF.docx.zip new file mode 100644 index 00000000000..7e02f55c03d Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/EmbeddedPDF.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/NullHeader.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/NullHeader.docx.zip new file mode 100644 index 00000000000..0516c35b071 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/NullHeader.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/big-preamble.html.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/big-preamble.html.zip new file mode 100644 index 00000000000..fc851923abb Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/big-preamble.html.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/boilerplate-whitespace.html.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/boilerplate-whitespace.html.zip new file mode 100644 index 00000000000..2d1f8e601ce Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/boilerplate-whitespace.html.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/boilerplate.html.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/boilerplate.html.zip new file mode 100644 index 00000000000..c728a6303b4 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/boilerplate.html.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/footnotes.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/footnotes.docx.zip new file mode 100644 index 00000000000..21376b69179 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/footnotes.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/headerPic.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/headerPic.docx.zip new file mode 100644 index 00000000000..6bb9b3f463d Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/headerPic.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/headers.mbox.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/headers.mbox.zip new file mode 100644 index 00000000000..f36e6b8de47 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/headers.mbox.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/pictures.ppt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/pictures.ppt.zip new file mode 100644 index 00000000000..55dde5eada7 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/pictures.ppt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protect.xlsx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protect.xlsx.zip new file mode 100644 index 00000000000..9823a8debf8 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protect.xlsx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protectedFile.xlsx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protectedFile.xlsx.zip new file mode 100644 index 00000000000..b4de09b0fdc Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protectedFile.xlsx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protectedSheets.xlsx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protectedSheets.xlsx.zip new file mode 100644 index 00000000000..8dde8a493a2 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/protectedSheets.xlsx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/resume.html.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/resume.html.zip new file mode 100644 index 00000000000..0c53eae3b3a Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/resume.html.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test-outlook.msg.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test-outlook.msg.zip new file mode 100644 index 00000000000..e9a0bfbed00 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test-outlook.msg.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test-outlook2003.msg.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test-outlook2003.msg.zip new file mode 100644 index 00000000000..bce3da6e05b Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test-outlook2003.msg.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test.doc.zip new file mode 100644 index 00000000000..4bcf68dcebc Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testAnnotations.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testAnnotations.pdf.zip new file mode 100644 index 00000000000..3268c952a33 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testAnnotations.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testBinControlWord.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testBinControlWord.rtf.zip new file mode 100644 index 00000000000..4a7efa19f0a Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testBinControlWord.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testBulletPoints.key.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testBulletPoints.key.zip new file mode 100644 index 00000000000..41b896525ca Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testBulletPoints.key.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.doc.zip new file mode 100644 index 00000000000..15a056cb3a3 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.docx.zip new file mode 100644 index 00000000000..30b4f6877a8 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.pdf.zip new file mode 100644 index 00000000000..bb21a9d7103 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.ppt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.ppt.zip new file mode 100644 index 00000000000..e0122d4004b Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.ppt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.pptx.zip new file mode 100644 index 00000000000..77967db80c6 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.rtf.zip new file mode 100644 index 00000000000..b7b6bdf5c13 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.xls.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.xls.zip new file mode 100644 index 00000000000..7250235b89c Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.xls.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.xlsx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.xlsx.zip new file mode 100644 index 00000000000..7fe71de731d Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testComment.xlsx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testDOCX_Thumbnail.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testDOCX_Thumbnail.docx.zip new file mode 100644 index 00000000000..e0fd82103fe Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testDOCX_Thumbnail.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-charts.xls.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-charts.xls.zip new file mode 100644 index 00000000000..fd5d8472d49 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-charts.xls.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-formats.xls.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-formats.xls.zip new file mode 100644 index 00000000000..f1015248b63 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-formats.xls.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-formats.xlsx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-formats.xlsx.zip new file mode 100644 index 00000000000..b62c8813e96 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL-formats.xlsx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL.xls.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL.xls.zip new file mode 100644 index 00000000000..f0dc3b00f96 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL.xls.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL.xlsx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL.xlsx.zip new file mode 100644 index 00000000000..45b3dae6f44 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL.xlsx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_1img.xls.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_1img.xls.zip new file mode 100644 index 00000000000..09cb2161697 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_1img.xls.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_1img.xlsx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_1img.xlsx.zip new file mode 100644 index 00000000000..81228661820 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_1img.xlsx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_4.xls.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_4.xls.zip new file mode 100644 index 00000000000..46da553af95 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_4.xls.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_5.xls.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_5.xls.zip new file mode 100644 index 00000000000..ca3e08c4701 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_5.xls.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_95.xls.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_95.xls.zip new file mode 100644 index 00000000000..00e3d373d11 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_95.xls.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_custom_props.xls.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_custom_props.xls.zip new file mode 100644 index 00000000000..2fa4d6b8b91 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_custom_props.xls.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_custom_props.xlsx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_custom_props.xlsx.zip new file mode 100644 index 00000000000..9cfd16cec25 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_custom_props.xlsx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xls.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xls.zip new file mode 100644 index 00000000000..b7291cafc98 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xls.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xlsx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xlsx.zip new file mode 100644 index 00000000000..755b7395e83 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xlsx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_headers_footers.xls.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_headers_footers.xls.zip new file mode 100644 index 00000000000..6cb18625ca7 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_headers_footers.xls.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_headers_footers.xlsx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_headers_footers.xlsx.zip new file mode 100644 index 00000000000..924ad5eece2 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_headers_footers.xlsx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_textbox.xlsx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_textbox.xlsx.zip new file mode 100644 index 00000000000..43046dff526 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testEXCEL_textbox.xlsx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testExtraSpaces.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testExtraSpaces.pdf.zip new file mode 100644 index 00000000000..8f6ed7a19f2 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testExtraSpaces.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFontAfterBufferedText.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFontAfterBufferedText.rtf.zip new file mode 100644 index 00000000000..77a5ac60dc4 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFontAfterBufferedText.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFooter.ods.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFooter.ods.zip new file mode 100644 index 00000000000..8659af1e691 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFooter.ods.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFooter.odt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFooter.odt.zip new file mode 100644 index 00000000000..85ba5501448 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testFooter.odt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTML.html.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTML.html.zip new file mode 100644 index 00000000000..58cfd638254 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTML.html.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_1.html.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_1.html.zip new file mode 100644 index 00000000000..a12735a5205 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_1.html.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_2.html.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_2.html.zip new file mode 100644 index 00000000000..89a3f9d7aaa Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_2.html.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_3.html.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_3.html.zip new file mode 100644 index 00000000000..da23b13ee44 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_3.html.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_4.html.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_4.html.zip new file mode 100644 index 00000000000..15850474d98 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTMLNoisyMetaEncoding_4.html.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTML_utf8.html.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTML_utf8.html.zip new file mode 100644 index 00000000000..bdb5e58f373 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testHTML_utf8.html.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testKeynote.key.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testKeynote.key.zip new file mode 100644 index 00000000000..68693369d10 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testKeynote.key.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testMasterFooter.odp.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testMasterFooter.odp.zip new file mode 100644 index 00000000000..42467aa951b Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testMasterFooter.odp.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testMasterSlideTable.key.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testMasterSlideTable.key.zip new file mode 100644 index 00000000000..8d7803d396c Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testMasterSlideTable.key.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testNPEOpenDocument.odt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testNPEOpenDocument.odt.zip new file mode 100644 index 00000000000..4c41bc7a466 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testNPEOpenDocument.odt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testODFwithOOo3.odt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testODFwithOOo3.odt.zip new file mode 100644 index 00000000000..9202fe44e44 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testODFwithOOo3.odt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOpenOffice2.odt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOpenOffice2.odt.zip new file mode 100644 index 00000000000..1993365b5d1 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOpenOffice2.odt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.doc.zip new file mode 100644 index 00000000000..b9f515941e3 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.docx.zip new file mode 100644 index 00000000000..033871556d1 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.pdf.zip new file mode 100644 index 00000000000..37fab939058 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.ppt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.ppt.zip new file mode 100644 index 00000000000..e50261f4324 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.ppt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.pptx.zip new file mode 100644 index 00000000000..19d6e78e6df Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.rtf.zip new file mode 100644 index 00000000000..d86048798c2 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOptionalHyphen.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOverlappingText.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOverlappingText.pdf.zip new file mode 100644 index 00000000000..c7f8b787048 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testOverlappingText.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF-custommetadata.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF-custommetadata.pdf.zip new file mode 100644 index 00000000000..44865eca76c Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF-custommetadata.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF.pdf.zip new file mode 100644 index 00000000000..fd5195b0538 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFEmbeddingAndEmbedded.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFEmbeddingAndEmbedded.docx.zip new file mode 100644 index 00000000000..a7ceed20665 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFEmbeddingAndEmbedded.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFFileEmbInAnnotation.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFFileEmbInAnnotation.pdf.zip new file mode 100644 index 00000000000..4b6e3338950 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFFileEmbInAnnotation.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFPackage.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFPackage.pdf.zip new file mode 100644 index 00000000000..8bbb9166bb3 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFPackage.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFTripleLangTitle.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFTripleLangTitle.pdf.zip new file mode 100644 index 00000000000..2d1ebdbdb2f Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFTripleLangTitle.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFTwoTextBoxes.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFTwoTextBoxes.pdf.zip new file mode 100644 index 00000000000..d05907a3da1 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFTwoTextBoxes.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFVarious.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFVarious.pdf.zip new file mode 100644 index 00000000000..cf86cbae79e Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDFVarious.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_PDFEncodedStringInXMP.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_PDFEncodedStringInXMP.pdf.zip new file mode 100644 index 00000000000..e8377846e79 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_PDFEncodedStringInXMP.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.10.x.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.10.x.pdf.zip new file mode 100644 index 00000000000..4fffed77ad8 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.10.x.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.11.x.PDFA-1b.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.11.x.PDFA-1b.pdf.zip new file mode 100644 index 00000000000..16098515ce2 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.11.x.PDFA-1b.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.4.x.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.4.x.pdf.zip new file mode 100644 index 00000000000..cdf93347572 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.4.x.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.5.x.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.5.x.pdf.zip new file mode 100644 index 00000000000..e5ef413b8be Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.5.x.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.6.x.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.6.x.pdf.zip new file mode 100644 index 00000000000..b57b4dc4efb Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.6.x.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.7.x.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.7.x.pdf.zip new file mode 100644 index 00000000000..d69bbb50fee Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.7.x.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.8.x.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.8.x.pdf.zip new file mode 100644 index 00000000000..e077af20743 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.8.x.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.9.x.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.9.x.pdf.zip new file mode 100644 index 00000000000..c9b6857c152 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_Version.9.x.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_acroform3.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_acroform3.pdf.zip new file mode 100644 index 00000000000..267d41df314 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_acroform3.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_bom.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_bom.pdf.zip new file mode 100644 index 00000000000..c4ea31f96f4 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_bom.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_bookmarks.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_bookmarks.pdf.zip new file mode 100644 index 00000000000..88a5db5e63e Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_bookmarks.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_multiFormatEmbFiles.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_multiFormatEmbFiles.pdf.zip new file mode 100644 index 00000000000..e61f2bf1112 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_multiFormatEmbFiles.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_no_extract_no_accessibility_owner_empty.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_no_extract_no_accessibility_owner_empty.pdf.zip new file mode 100644 index 00000000000..16920b49e3a Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_no_extract_no_accessibility_owner_empty.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_no_extract_yes_accessibility_owner_empty.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_no_extract_yes_accessibility_owner_empty.pdf.zip new file mode 100644 index 00000000000..59887f7e5d2 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_no_extract_yes_accessibility_owner_empty.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_twoAuthors.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_twoAuthors.pdf.zip new file mode 100644 index 00000000000..d240c51d822 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPDF_twoAuthors.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.potm.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.potm.zip new file mode 100644 index 00000000000..0f87b774a2a Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.potm.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppsm.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppsm.zip new file mode 100644 index 00000000000..47f652d14af Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppsm.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppsx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppsx.zip new file mode 100644 index 00000000000..0f21f13be0f Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppsx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppt.zip new file mode 100644 index 00000000000..00c5c88c6ee Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.ppt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.pptm.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.pptm.zip new file mode 100644 index 00000000000..edd3e444fd7 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.pptm.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.pptx.zip new file mode 100644 index 00000000000..68a9d662756 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPTX_Thumbnail.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPTX_Thumbnail.pptx.zip new file mode 100644 index 00000000000..23dba29f324 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPTX_Thumbnail.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_2imgs.ppt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_2imgs.ppt.zip new file mode 100644 index 00000000000..317e1bbe352 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_2imgs.ppt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_2imgs.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_2imgs.pptx.zip new file mode 100644 index 00000000000..62096338a49 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_2imgs.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_autodate.ppt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_autodate.ppt.zip new file mode 100644 index 00000000000..5bd71fbd2e4 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_autodate.ppt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_autodate.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_autodate.pptx.zip new file mode 100644 index 00000000000..811ab85cc26 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_autodate.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_comment.ppt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_comment.ppt.zip new file mode 100644 index 00000000000..3e94ba4cce1 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_comment.ppt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_comment.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_comment.pptx.zip new file mode 100644 index 00000000000..68d2135d412 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_comment.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_custom_props.ppt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_custom_props.ppt.zip new file mode 100644 index 00000000000..80673e625d7 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_custom_props.ppt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_custom_props.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_custom_props.pptx.zip new file mode 100644 index 00000000000..d27c98d2c2d Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_custom_props.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embedded2.ppt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embedded2.ppt.zip new file mode 100644 index 00000000000..017f9f500c7 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embedded2.ppt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embedded_two_slides.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embedded_two_slides.pptx.zip new file mode 100644 index 00000000000..dfa459cccbd Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embedded_two_slides.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embeded.ppt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embeded.ppt.zip new file mode 100644 index 00000000000..fb8a3caf755 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embeded.ppt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embeded.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embeded.pptx.zip new file mode 100644 index 00000000000..f33f463c335 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_embeded.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterFooter.ppt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterFooter.ppt.zip new file mode 100644 index 00000000000..6a727889394 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterFooter.ppt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterFooter.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterFooter.pptx.zip new file mode 100644 index 00000000000..992dad41c53 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterFooter.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText.ppt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText.ppt.zip new file mode 100644 index 00000000000..e31c4719f47 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText.ppt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText.pptx.zip new file mode 100644 index 00000000000..1fa4f487487 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText2.ppt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText2.ppt.zip new file mode 100644 index 00000000000..f58055ecfcb Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText2.ppt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText2.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText2.pptx.zip new file mode 100644 index 00000000000..f8ff31052d1 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_masterText2.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_various.ppt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_various.ppt.zip new file mode 100644 index 00000000000..5d13efb8d4a Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_various.ppt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_various.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_various.pptx.zip new file mode 100644 index 00000000000..5d146a1de0b Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPPT_various.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPageNumber.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPageNumber.pdf.zip new file mode 100644 index 00000000000..4f9db82c299 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPageNumber.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPages.pages.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPages.pages.zip new file mode 100644 index 00000000000..3db77c08733 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPages.pages.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesComments.pages.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesComments.pages.zip new file mode 100644 index 00000000000..55004e812d2 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesComments.pages.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaLower.pages.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaLower.pages.zip new file mode 100644 index 00000000000..bfea0c7825a Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaLower.pages.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaUpper.pages.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaUpper.pages.zip new file mode 100644 index 00000000000..3298d7eaa8f Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaUpper.pages.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersFootnotes.pages.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersFootnotes.pages.zip new file mode 100644 index 00000000000..34a4fb83230 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersFootnotes.pages.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanLower.pages.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanLower.pages.zip new file mode 100644 index 00000000000..b48ebe4458d Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanLower.pages.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanUpper.pages.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanUpper.pages.zip new file mode 100644 index 00000000000..967e139595f Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanUpper.pages.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesLayout.pages.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesLayout.pages.zip new file mode 100644 index 00000000000..c6f0e04a536 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPagesLayout.pages.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPopupAnnotation.pdf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPopupAnnotation.pdf.zip new file mode 100644 index 00000000000..4eb78653562 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testPopupAnnotation.pdf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTF-ms932.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTF-ms932.rtf.zip new file mode 100644 index 00000000000..bd80f2b061a Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTF-ms932.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTF.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTF.rtf.zip new file mode 100644 index 00000000000..72ef8ebfc56 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTF.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFBoldItalic.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFBoldItalic.rtf.zip new file mode 100644 index 00000000000..935c249176b Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFBoldItalic.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFControls.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFControls.rtf.zip new file mode 100644 index 00000000000..0c55479cc89 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFControls.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFCorruptListOverride.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFCorruptListOverride.rtf.zip new file mode 100644 index 00000000000..e6ea82d4760 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFCorruptListOverride.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFEmbeddedLink.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFEmbeddedLink.rtf.zip new file mode 100644 index 00000000000..857c589d9eb Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFEmbeddedLink.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFHexEscapeInsideWord.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFHexEscapeInsideWord.rtf.zip new file mode 100644 index 00000000000..f10b768d5a2 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFHexEscapeInsideWord.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFHyperlink.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFHyperlink.rtf.zip new file mode 100644 index 00000000000..658eb87784f Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFHyperlink.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFIgnoredControlWord.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFIgnoredControlWord.rtf.zip new file mode 100644 index 00000000000..15a74d726b6 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFIgnoredControlWord.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFInvalidUnicode.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFInvalidUnicode.rtf.zip new file mode 100644 index 00000000000..f24a5ab9c08 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFInvalidUnicode.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFJapanese.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFJapanese.rtf.zip new file mode 100644 index 00000000000..8bf4f6e7165 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFJapanese.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListLibreOffice.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListLibreOffice.rtf.zip new file mode 100644 index 00000000000..e2a406d99a6 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListLibreOffice.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListMicrosoftWord.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListMicrosoftWord.rtf.zip new file mode 100644 index 00000000000..155718ac8b3 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListMicrosoftWord.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListOverride.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListOverride.rtf.zip new file mode 100644 index 00000000000..c9b7f3fdbee Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFListOverride.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFNewlines.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFNewlines.rtf.zip new file mode 100644 index 00000000000..8b0dffe1351 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFNewlines.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFRegularImages.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFRegularImages.rtf.zip new file mode 100644 index 00000000000..2bf8d9b5301 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFRegularImages.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFTableCellSeparation.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFTableCellSeparation.rtf.zip new file mode 100644 index 00000000000..5e110de5169 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFTableCellSeparation.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFTableCellSeparation2.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFTableCellSeparation2.rtf.zip new file mode 100644 index 00000000000..599e7f22edb Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFTableCellSeparation2.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUmlautSpaces.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUmlautSpaces.rtf.zip new file mode 100644 index 00000000000..f3cbec9e51d Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUmlautSpaces.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUmlautSpaces2.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUmlautSpaces2.rtf.zip new file mode 100644 index 00000000000..2c905405ca4 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUmlautSpaces2.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUnicodeGothic.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUnicodeGothic.rtf.zip new file mode 100644 index 00000000000..40263351a04 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUnicodeGothic.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUnicodeUCNControlWordCharacterDoubling.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUnicodeUCNControlWordCharacterDoubling.rtf.zip new file mode 100644 index 00000000000..c8f40b549c3 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFUnicodeUCNControlWordCharacterDoubling.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFVarious.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFVarious.rtf.zip new file mode 100644 index 00000000000..60281e7f9ae Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFVarious.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWindowsCodepage1250.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWindowsCodepage1250.rtf.zip new file mode 100644 index 00000000000..4a7852c97d3 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWindowsCodepage1250.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWithCurlyBraces.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWithCurlyBraces.rtf.zip new file mode 100644 index 00000000000..48268a457c0 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWithCurlyBraces.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWord2010CzechCharacters.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWord2010CzechCharacters.rtf.zip new file mode 100644 index 00000000000..be845e4f925 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWord2010CzechCharacters.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWordPadCzechCharacters.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWordPadCzechCharacters.rtf.zip new file mode 100644 index 00000000000..508801675de Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testRTFWordPadCzechCharacters.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testStyles.odt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testStyles.odt.zip new file mode 100644 index 00000000000..22f6c76b9a8 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testStyles.odt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTXTNonASCIIUTF8.txt.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTXTNonASCIIUTF8.txt.zip new file mode 100644 index 00000000000..7326a28ad76 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTXTNonASCIIUTF8.txt.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTables.key.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTables.key.zip new file mode 100644 index 00000000000..3c963dcc077 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTables.key.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTextBoxes.key.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTextBoxes.key.zip new file mode 100644 index 00000000000..aea9b1cf66c Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testTextBoxes.key.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD.doc.zip new file mode 100644 index 00000000000..38b2954a4ff Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD.docx.zip new file mode 100644 index 00000000000..2ed0aae33f4 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD6.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD6.doc.zip new file mode 100644 index 00000000000..b8dbbd8322e Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD6.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_1img.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_1img.doc.zip new file mode 100644 index 00000000000..1baa330e5ce Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_1img.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_1img.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_1img.docx.zip new file mode 100644 index 00000000000..8920521bd2d Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_1img.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_3imgs.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_3imgs.doc.zip new file mode 100644 index 00000000000..b60716b93d2 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_3imgs.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_3imgs.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_3imgs.docx.zip new file mode 100644 index 00000000000..062713d9318 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_3imgs.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs.doc.zip new file mode 100644 index 00000000000..b0a6af23d34 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs.docx.zip new file mode 100644 index 00000000000..546f98bf093 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs2.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs2.doc.zip new file mode 100644 index 00000000000..5dbedec5e86 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs2.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs2.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs2.docx.zip new file mode 100644 index 00000000000..8edde24f993 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_bold_character_runs2.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_closingSmartQInHyperLink.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_closingSmartQInHyperLink.doc.zip new file mode 100644 index 00000000000..4484a6b0052 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_closingSmartQInHyperLink.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_custom_props.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_custom_props.doc.zip new file mode 100644 index 00000000000..72a94832d3e Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_custom_props.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_custom_props.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_custom_props.docx.zip new file mode 100644 index 00000000000..30aaef7d817 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_custom_props.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embedded_pdf.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embedded_pdf.docx.zip new file mode 100644 index 00000000000..2b74f67dc9f Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embedded_pdf.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embedded_rtf.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embedded_rtf.doc.zip new file mode 100644 index 00000000000..e456721065c Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embedded_rtf.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embeded.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embeded.doc.zip new file mode 100644 index 00000000000..699a13b652a Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embeded.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embeded.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embeded.docx.zip new file mode 100644 index 00000000000..b53088ddb71 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_embeded.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_header_hyperlink.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_header_hyperlink.doc.zip new file mode 100644 index 00000000000..867dc1808f6 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_header_hyperlink.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_missing_ooxml_bean1.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_missing_ooxml_bean1.docx.zip new file mode 100644 index 00000000000..04172a65382 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_missing_ooxml_bean1.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_missing_text.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_missing_text.docx.zip new file mode 100644 index 00000000000..325ecce9279 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_missing_text.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_no_format.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_no_format.doc.zip new file mode 100644 index 00000000000..38eecb941d4 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_no_format.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_no_format.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_no_format.docx.zip new file mode 100644 index 00000000000..1c19cf3e982 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_no_format.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_null_style.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_null_style.docx.zip new file mode 100644 index 00000000000..605eeb25023 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_null_style.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_numbered_list.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_numbered_list.doc.zip new file mode 100644 index 00000000000..7f8d3b9ad20 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_numbered_list.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_numbered_list.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_numbered_list.docx.zip new file mode 100644 index 00000000000..42b4ed17c4d Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_numbered_list.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_override_list_numbering.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_override_list_numbering.doc.zip new file mode 100644 index 00000000000..39c954b2d19 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_override_list_numbering.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_override_list_numbering.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_override_list_numbering.docx.zip new file mode 100644 index 00000000000..77bb9dbda68 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_override_list_numbering.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_tabular_symbol.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_tabular_symbol.doc.zip new file mode 100644 index 00000000000..0c63f982567 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_tabular_symbol.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_text_box.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_text_box.docx.zip new file mode 100644 index 00000000000..504c56728c9 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_text_box.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_various.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_various.doc.zip new file mode 100644 index 00000000000..9d7c24e0520 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_various.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_various.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_various.docx.zip new file mode 100644 index 00000000000..393aca11ab7 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWORD_various.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWordArt.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWordArt.pptx.zip new file mode 100644 index 00000000000..75234fde98d Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testWordArt.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXHTML.html.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXHTML.html.zip new file mode 100644 index 00000000000..45c4dd0479a Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXHTML.html.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXLSX_Thumbnail.xlsx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXLSX_Thumbnail.xlsx.zip new file mode 100644 index 00000000000..919cf31e75b Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXLSX_Thumbnail.xlsx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML.xml.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML.xml.zip new file mode 100644 index 00000000000..a6520a8a811 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML.xml.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML2.xml.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML2.xml.zip new file mode 100644 index 00000000000..5b89863685a Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML2.xml.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML3.xml.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML3.xml.zip new file mode 100644 index 00000000000..08a066d9c1e Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/testXML3.xml.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_TIKA-1251.doc.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_TIKA-1251.doc.zip new file mode 100644 index 00000000000..4d307129021 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_TIKA-1251.doc.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_embedded_package.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_embedded_package.rtf.zip new file mode 100644 index 00000000000..58d7f15b23b Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_embedded_package.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_embedded_zip.pptx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_embedded_zip.pptx.zip new file mode 100644 index 00000000000..e9d802cfd4e Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_embedded_zip.pptx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_list_override.rtf.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_list_override.rtf.zip new file mode 100644 index 00000000000..57d55538294 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_list_override.rtf.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_recursive_embedded.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_recursive_embedded.docx.zip new file mode 100644 index 00000000000..edd97967e95 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_recursive_embedded.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_recursive_embedded_npe.docx.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_recursive_embedded_npe.docx.zip new file mode 100644 index 00000000000..84da48f0250 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/test_recursive_embedded_npe.docx.zip differ diff --git a/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/tika434.html.zip b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/tika434.html.zip new file mode 100644 index 00000000000..41972bc8447 Binary files /dev/null and b/plugins/ingest-attachment/src/test/resources/org/elasticsearch/ingest/attachment/test/tika-files/tika434.html.zip differ diff --git a/plugins/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java b/plugins/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java index afc4231afff..3d1418dc940 100644 --- a/plugins/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java +++ b/plugins/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java @@ -317,7 +317,7 @@ public final class GeoIpProcessor extends AbstractProcessor { // it with an unchecked exception. private static final class AddressNotFoundRuntimeException extends RuntimeException { - public AddressNotFoundRuntimeException(Throwable cause) { + AddressNotFoundRuntimeException(Throwable cause) { super(cause); } } diff --git a/plugins/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/UserAgentParser.java b/plugins/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/UserAgentParser.java index 55c79adb7e0..0d9660e9fb5 100644 --- a/plugins/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/UserAgentParser.java +++ b/plugins/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/UserAgentParser.java @@ -40,11 +40,11 @@ final class UserAgentParser { private final List osPatterns = new ArrayList<>(); private final List devicePatterns = new ArrayList<>(); private final String name; - - public UserAgentParser(String name, InputStream regexStream, UserAgentCache cache) { + + UserAgentParser(String name, InputStream regexStream, UserAgentCache cache) { this.name = name; this.cache = cache; - + try { init(regexStream); } catch (IOException e) { @@ -55,16 +55,16 @@ final class UserAgentParser { private void init(InputStream regexStream) throws IOException { // EMPTY is safe here because we don't use namedObject XContentParser yamlParser = XContentFactory.xContent(XContentType.YAML).createParser(NamedXContentRegistry.EMPTY, regexStream); - + XContentParser.Token token = yamlParser.nextToken(); - + if (token == XContentParser.Token.START_OBJECT) { token = yamlParser.nextToken(); - + for (; token != null; token = yamlParser.nextToken()) { if (token == XContentParser.Token.FIELD_NAME && yamlParser.currentName().equals("user_agent_parsers")) { List> parserConfigurations = readParserConfigurations(yamlParser); - + for (Map map : parserConfigurations) { uaPatterns.add(new UserAgentSubpattern(compilePattern(map.get("regex"), map.get("regex_flag")), map.get("family_replacement"), map.get("v1_replacement"), map.get("v2_replacement"), @@ -73,7 +73,7 @@ final class UserAgentParser { } else if (token == XContentParser.Token.FIELD_NAME && yamlParser.currentName().equals("os_parsers")) { List> parserConfigurations = readParserConfigurations(yamlParser); - + for (Map map : parserConfigurations) { osPatterns.add(new UserAgentSubpattern(compilePattern(map.get("regex"), map.get("regex_flag")), map.get("os_replacement"), map.get("os_v1_replacement"), map.get("os_v2_replacement"), @@ -82,7 +82,7 @@ final class UserAgentParser { } else if (token == XContentParser.Token.FIELD_NAME && yamlParser.currentName().equals("device_parsers")) { List> parserConfigurations = readParserConfigurations(yamlParser); - + for (Map map : parserConfigurations) { devicePatterns.add(new UserAgentSubpattern(compilePattern(map.get("regex"), map.get("regex_flag")), map.get("device_replacement"), null, null, null, null)); @@ -90,7 +90,7 @@ final class UserAgentParser { } } } - + if (uaPatterns.isEmpty() && osPatterns.isEmpty() && devicePatterns.isEmpty()) { throw new ElasticsearchParseException("not a valid regular expression file"); } @@ -107,38 +107,38 @@ final class UserAgentParser { private List> readParserConfigurations(XContentParser yamlParser) throws IOException { List > patternList = new ArrayList<>(); - + XContentParser.Token token = yamlParser.nextToken(); if (token != XContentParser.Token.START_ARRAY) { throw new ElasticsearchParseException("malformed regular expression file, should continue with 'array' after 'object'"); } - + token = yamlParser.nextToken(); if (token != XContentParser.Token.START_OBJECT) { throw new ElasticsearchParseException("malformed regular expression file, expecting 'object'"); } - + while (token == XContentParser.Token.START_OBJECT) { token = yamlParser.nextToken(); - + if (token != XContentParser.Token.FIELD_NAME) { throw new ElasticsearchParseException("malformed regular expression file, should continue with 'field_name' after 'array'"); } - + Map regexMap = new HashMap<>(); for (; token == XContentParser.Token.FIELD_NAME; token = yamlParser.nextToken()) { String fieldName = yamlParser.currentName(); - + token = yamlParser.nextToken(); String fieldValue = yamlParser.text(); regexMap.put(fieldName, fieldValue); } patternList.add(regexMap); - + token = yamlParser.nextToken(); } - + return patternList; } @@ -153,21 +153,21 @@ final class UserAgentParser { List getDevicePatterns() { return devicePatterns; } - + String getName() { return name; } public Details parse(String agentString) { Details details = cache.get(name, agentString);; - + if (details == null) { VersionedName userAgent = findMatch(uaPatterns, agentString); VersionedName operatingSystem = findMatch(osPatterns, agentString); VersionedName device = findMatch(devicePatterns, agentString); - + details = new Details(userAgent, operatingSystem, device); - + cache.put(name, agentString, details); } @@ -183,7 +183,7 @@ final class UserAgentParser { return name; } } - + return null; } @@ -191,22 +191,22 @@ final class UserAgentParser { public final VersionedName userAgent; public final VersionedName operatingSystem; public final VersionedName device; - - public Details(VersionedName userAgent, VersionedName operatingSystem, VersionedName device) { + + Details(VersionedName userAgent, VersionedName operatingSystem, VersionedName device) { this.userAgent = userAgent; this.operatingSystem = operatingSystem; this.device = device; } } - + static final class VersionedName { public final String name; public final String major; public final String minor; public final String patch; public final String build; - - public VersionedName(String name, String major, String minor, String patch, String build) { + + VersionedName(String name, String major, String minor, String patch, String build) { this.name = name; this.major = major; this.minor = minor; @@ -214,7 +214,7 @@ final class UserAgentParser { this.build = build; } } - + /** * One of: user agent, operating system, device */ @@ -222,7 +222,7 @@ final class UserAgentParser { private final Pattern pattern; private final String nameReplacement, v1Replacement, v2Replacement, v3Replacement, v4Replacement; - public UserAgentSubpattern(Pattern pattern, String nameReplacement, + UserAgentSubpattern(Pattern pattern, String nameReplacement, String v1Replacement, String v2Replacement, String v3Replacement, String v4Replacement) { this.pattern = pattern; this.nameReplacement = nameReplacement; @@ -263,19 +263,19 @@ final class UserAgentParser { } else if (groupCount >= 3) { minor = matcher.group(3); } - + if (v3Replacement != null) { patch = v3Replacement; } else if (groupCount >= 4) { patch = matcher.group(4); } - + if (v4Replacement != null) { build = v4Replacement; } else if (groupCount >= 5) { build = matcher.group(5); } - + return name == null ? null : new VersionedName(name, major, minor, patch, build); } } diff --git a/plugins/repository-azure/src/test/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceTests.java b/plugins/repository-azure/src/test/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceTests.java index cf7f0cd1abb..ba377c03c47 100644 --- a/plugins/repository-azure/src/test/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceTests.java +++ b/plugins/repository-azure/src/test/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceTests.java @@ -147,7 +147,7 @@ public class AzureStorageServiceTests extends ESTestCase { * This internal class just overload createClient method which is called by AzureStorageServiceImpl.doStart() */ class AzureStorageServiceMock extends AzureStorageServiceImpl { - public AzureStorageServiceMock(Settings settings) { + AzureStorageServiceMock(Settings settings) { super(settings); } diff --git a/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryTests.java b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryTests.java index 425adb7bf51..79fc453e0ed 100644 --- a/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryTests.java +++ b/plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryTests.java @@ -50,7 +50,7 @@ public class S3RepositoryTests extends ESTestCase { } private static class DummyS3Service extends AbstractLifecycleComponent implements AwsS3Service { - public DummyS3Service() { + DummyS3Service() { super(Settings.EMPTY); } @Override diff --git a/plugins/store-smb/src/main/java/org/elasticsearch/index/store/SmbDirectoryWrapper.java b/plugins/store-smb/src/main/java/org/elasticsearch/index/store/SmbDirectoryWrapper.java index fe2c32723e2..19499f56e79 100644 --- a/plugins/store-smb/src/main/java/org/elasticsearch/index/store/SmbDirectoryWrapper.java +++ b/plugins/store-smb/src/main/java/org/elasticsearch/index/store/SmbDirectoryWrapper.java @@ -59,7 +59,7 @@ public final class SmbDirectoryWrapper extends FilterDirectory { */ static final int CHUNK_SIZE = 8192; - public SmbFSIndexOutput(String name) throws IOException { + SmbFSIndexOutput(String name) throws IOException { super("SmbFSIndexOutput(path=\"" + fsDirectory.getDirectory().resolve(name) + "\")", name, new FilterOutputStream(Channels.newOutputStream(Files.newByteChannel(fsDirectory.getDirectory().resolve(name), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.READ, StandardOpenOption.WRITE))) { // This implementation ensures, that we never write more than CHUNK_SIZE bytes: @Override diff --git a/qa/backwards-5.0/src/test/java/org/elasticsearch/backwards/IndexingIT.java b/qa/backwards-5.0/src/test/java/org/elasticsearch/backwards/IndexingIT.java index 90a58087107..3dd98441592 100644 --- a/qa/backwards-5.0/src/test/java/org/elasticsearch/backwards/IndexingIT.java +++ b/qa/backwards-5.0/src/test/java/org/elasticsearch/backwards/IndexingIT.java @@ -28,7 +28,9 @@ import org.elasticsearch.client.RestClient; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; +import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.seqno.SeqNoStats; import org.elasticsearch.index.seqno.SequenceNumbersService; @@ -36,6 +38,7 @@ import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.yaml.ObjectPath; import java.io.IOException; +import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; @@ -95,7 +98,8 @@ public class IndexingIT extends ESRestTestCase { Nodes nodes = buildNodeAndVersions(); assumeFalse("new nodes is empty", nodes.getNewNodes().isEmpty()); logger.info("cluster discovered: {}", nodes.toString()); - final String bwcNames = nodes.getBWCNodes().stream().map(Node::getNodeName).collect(Collectors.joining(",")); + final List bwcNamesList = nodes.getBWCNodes().stream().map(Node::getNodeName).collect(Collectors.toList()); + final String bwcNames = bwcNamesList.stream().collect(Collectors.joining(",")); Settings.Builder settings = Settings.builder() .put(IndexMetaData.INDEX_NUMBER_OF_SHARDS_SETTING.getKey(), 1) .put(IndexMetaData.INDEX_NUMBER_OF_REPLICAS_SETTING.getKey(), 2) @@ -111,26 +115,60 @@ public class IndexingIT extends ESRestTestCase { createIndex(index, settings.build()); try (RestClient newNodeClient = buildClient(restClientSettings(), nodes.getNewNodes().stream().map(Node::getPublishAddress).toArray(HttpHost[]::new))) { - int numDocs = indexDocs(index, 0, randomInt(5)); + int numDocs = 0; + final int numberOfInitialDocs = 1 + randomInt(5); + logger.info("indexing [{}] docs initially", numberOfInitialDocs); + numDocs += indexDocs(index, 0, numberOfInitialDocs); assertSeqNoOnShards(nodes, checkGlobalCheckpoints, 0, newNodeClient); - logger.info("allowing shards on all nodes"); updateIndexSetting(index, Settings.builder().putNull("index.routing.allocation.include._name")); ensureGreen(); - logger.info("indexing some more docs"); - numDocs += indexDocs(index, numDocs, randomInt(5)); + assertOK(client().performRequest("POST", index + "/_refresh")); + for (final String bwcName : bwcNamesList) { + assertCount(index, "_only_nodes:" + bwcName, numDocs); + } + final int numberOfDocsAfterAllowingShardsOnAllNodes = 1 + randomInt(5); + logger.info("indexing [{}] docs after allowing shards on all nodes", numberOfDocsAfterAllowingShardsOnAllNodes); + numDocs += indexDocs(index, numDocs, numberOfDocsAfterAllowingShardsOnAllNodes); assertSeqNoOnShards(nodes, checkGlobalCheckpoints, 0, newNodeClient); - logger.info("moving primary to new node"); Shard primary = buildShards(nodes, newNodeClient).stream().filter(Shard::isPrimary).findFirst().get(); + logger.info("moving primary to new node by excluding {}", primary.getNode().getNodeName()); updateIndexSetting(index, Settings.builder().put("index.routing.allocation.exclude._name", primary.getNode().getNodeName())); ensureGreen(); - logger.info("indexing some more docs"); - int numDocsOnNewPrimary = indexDocs(index, numDocs, randomInt(5)); - numDocs += numDocsOnNewPrimary; + int numDocsOnNewPrimary = 0; + final int numberOfDocsAfterMovingPrimary = 1 + randomInt(5); + logger.info("indexing [{}] docs after moving primary", numberOfDocsAfterMovingPrimary); + numDocsOnNewPrimary += indexDocs(index, numDocs, numberOfDocsAfterMovingPrimary); + numDocs += numberOfDocsAfterMovingPrimary; + assertSeqNoOnShards(nodes, checkGlobalCheckpoints, numDocsOnNewPrimary, newNodeClient); + /* + * Dropping the number of replicas to zero, and then increasing it to one triggers a recovery thus exercising any BWC-logic in + * the recovery code. + */ + logger.info("setting number of replicas to 0"); + updateIndexSetting(index, Settings.builder().put("index.number_of_replicas", 0)); + final int numberOfDocsAfterDroppingReplicas = 1 + randomInt(5); + logger.info("indexing [{}] docs after setting number of replicas to 0", numberOfDocsAfterDroppingReplicas); + numDocsOnNewPrimary += indexDocs(index, numDocs, numberOfDocsAfterDroppingReplicas); + numDocs += numberOfDocsAfterDroppingReplicas; + logger.info("setting number of replicas to 1"); + updateIndexSetting(index, Settings.builder().put("index.number_of_replicas", 1)); + ensureGreen(); + assertOK(client().performRequest("POST", index + "/_refresh")); + // the number of documents on the primary and on the recovered replica should match the number of indexed documents + assertCount(index, "_primary", numDocs); + assertCount(index, "_replica", numDocs); assertSeqNoOnShards(nodes, checkGlobalCheckpoints, numDocsOnNewPrimary, newNodeClient); } } + private void assertCount(final String index, final String preference, final int expectedCount) throws IOException { + final Response response = client().performRequest("GET", index + "/_count", Collections.singletonMap("preference", preference)); + assertOK(response); + final int actualCount = Integer.parseInt(objectPath(response).evaluate("count").toString()); + assertThat(actualCount, equalTo(expectedCount)); + } + private void assertSeqNoOnShards(Nodes nodes, boolean checkGlobalCheckpoints, int numDocs, RestClient client) throws Exception { assertBusy(() -> { try { diff --git a/qa/evil-tests/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java b/qa/evil-tests/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java index 5ea91eae394..7d3115e25db 100644 --- a/qa/evil-tests/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java +++ b/qa/evil-tests/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java @@ -108,7 +108,7 @@ public class InstallPluginCommandTests extends ESTestCase { private final FileSystem fileSystem; private final Function temp; - public Parameter(FileSystem fileSystem, String root) { + Parameter(FileSystem fileSystem, String root) { this(fileSystem, s -> { try { return Files.createTempDirectory(fileSystem.getPath(root), s); @@ -118,7 +118,7 @@ public class InstallPluginCommandTests extends ESTestCase { }); } - public Parameter(FileSystem fileSystem, Function temp) { + Parameter(FileSystem fileSystem, Function temp) { this.fileSystem = fileSystem; this.temp = temp; } diff --git a/test/framework/src/main/java/org/elasticsearch/bootstrap/ESElasticsearchCliTestCase.java b/test/framework/src/main/java/org/elasticsearch/bootstrap/ESElasticsearchCliTestCase.java index d12a73c00c6..7b575d0b7a6 100644 --- a/test/framework/src/main/java/org/elasticsearch/bootstrap/ESElasticsearchCliTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/bootstrap/ESElasticsearchCliTestCase.java @@ -35,7 +35,7 @@ import static org.hamcrest.CoreMatchers.equalTo; abstract class ESElasticsearchCliTestCase extends ESTestCase { interface InitConsumer { - void accept(final boolean foreground, final Path pidFile, final boolean quiet, final Environment initialEnv); + void accept(boolean foreground, Path pidFile, boolean quiet, Environment initialEnv); } void runTest( diff --git a/test/framework/src/main/java/org/elasticsearch/common/io/FileTestUtils.java b/test/framework/src/main/java/org/elasticsearch/common/io/FileTestUtils.java index 98155967514..4128c9d9efc 100644 --- a/test/framework/src/main/java/org/elasticsearch/common/io/FileTestUtils.java +++ b/test/framework/src/main/java/org/elasticsearch/common/io/FileTestUtils.java @@ -71,7 +71,7 @@ public class FileTestUtils { } Files.createDirectories(destDir); - try (final ZipInputStream zipInput = new ZipInputStream(Files.newInputStream(zip))) { + try (ZipInputStream zipInput = new ZipInputStream(Files.newInputStream(zip))) { ZipEntry entry; while ((entry = zipInput.getNextEntry()) != null) { final String entryPath; diff --git a/test/framework/src/main/java/org/elasticsearch/repositories/ESBlobStoreContainerTestCase.java b/test/framework/src/main/java/org/elasticsearch/repositories/ESBlobStoreContainerTestCase.java index e25c16cb5c0..42029b053a4 100644 --- a/test/framework/src/main/java/org/elasticsearch/repositories/ESBlobStoreContainerTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/repositories/ESBlobStoreContainerTestCase.java @@ -46,7 +46,7 @@ import static org.hamcrest.CoreMatchers.notNullValue; public abstract class ESBlobStoreContainerTestCase extends ESTestCase { public void testWriteRead() throws IOException { - try(final BlobStore store = newBlobStore()) { + try(BlobStore store = newBlobStore()) { final BlobContainer container = store.blobContainer(new BlobPath()); byte[] data = randomBytes(randomIntBetween(10, scaledRandomIntBetween(1024, 1 << 16))); writeBlob(container, "foobar", new BytesArray(data)); @@ -65,7 +65,7 @@ public abstract class ESBlobStoreContainerTestCase extends ESTestCase { } public void testMoveAndList() throws IOException { - try(final BlobStore store = newBlobStore()) { + try(BlobStore store = newBlobStore()) { final BlobContainer container = store.blobContainer(new BlobPath()); assertThat(container.listBlobs().size(), equalTo(0)); int numberOfFooBlobs = randomIntBetween(0, 10); @@ -113,7 +113,7 @@ public abstract class ESBlobStoreContainerTestCase extends ESTestCase { } public void testDeleteBlob() throws IOException { - try (final BlobStore store = newBlobStore()) { + try (BlobStore store = newBlobStore()) { final String blobName = "foobar"; final BlobContainer container = store.blobContainer(new BlobPath()); expectThrows(IOException.class, () -> container.deleteBlob(blobName)); @@ -129,7 +129,7 @@ public abstract class ESBlobStoreContainerTestCase extends ESTestCase { } public void testVerifyOverwriteFails() throws IOException { - try (final BlobStore store = newBlobStore()) { + try (BlobStore store = newBlobStore()) { final String blobName = "foobar"; final BlobContainer container = store.blobContainer(new BlobPath()); byte[] data = randomBytes(randomIntBetween(10, scaledRandomIntBetween(1024, 1 << 16))); diff --git a/test/framework/src/main/java/org/elasticsearch/repositories/ESBlobStoreTestCase.java b/test/framework/src/main/java/org/elasticsearch/repositories/ESBlobStoreTestCase.java index 0cec570dbe8..e7f8edb1fa2 100644 --- a/test/framework/src/main/java/org/elasticsearch/repositories/ESBlobStoreTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/repositories/ESBlobStoreTestCase.java @@ -36,7 +36,7 @@ import static org.hamcrest.CoreMatchers.equalTo; public abstract class ESBlobStoreTestCase extends ESTestCase { public void testContainerCreationAndDeletion() throws IOException { - try(final BlobStore store = newBlobStore()) { + try(BlobStore store = newBlobStore()) { final BlobContainer containerFoo = store.blobContainer(new BlobPath().add("foo")); final BlobContainer containerBar = store.blobContainer(new BlobPath().add("bar")); byte[] data1 = randomBytes(randomIntBetween(10, scaledRandomIntBetween(1024, 1 << 16))); diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java index b1d66fd399b..92aafd4e8a3 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java @@ -1582,7 +1582,7 @@ public abstract class ESIntegTestCase extends ESTestCase { private class LatchedActionListener implements ActionListener { private final CountDownLatch latch; - public LatchedActionListener(CountDownLatch latch) { + LatchedActionListener(CountDownLatch latch) { this.latch = latch; } @@ -1610,7 +1610,7 @@ public abstract class ESIntegTestCase extends ESTestCase { private final CopyOnWriteArrayList> errors; private final T builder; - public PayloadLatchedActionListener(T builder, CountDownLatch latch, CopyOnWriteArrayList> errors) { + PayloadLatchedActionListener(T builder, CountDownLatch latch, CopyOnWriteArrayList> errors) { super(latch); this.errors = errors; this.builder = builder; diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java index b4aee750a31..85278358bec 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java +++ b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java @@ -1846,7 +1846,7 @@ public final class InternalTestCluster extends TestCluster { private static final class MasterNodePredicate implements Predicate { private final String masterNodeName; - public MasterNodePredicate(String masterNodeName) { + MasterNodePredicate(String masterNodeName) { this.masterNodeName = masterNodeName; } @@ -1937,8 +1937,7 @@ public final class InternalTestCluster extends TestCluster { private static final class NodeNamePredicate implements Predicate { private final HashSet nodeNames; - - public NodeNamePredicate(HashSet nodeNames) { + NodeNamePredicate(HashSet nodeNames) { this.nodeNames = nodeNames; } diff --git a/test/framework/src/main/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java b/test/framework/src/main/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java index 37ed43b9450..9da5d7515c7 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java +++ b/test/framework/src/main/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java @@ -147,7 +147,7 @@ public class ThrowingLeafReaderWrapper extends FilterLeafReader { static class ThrowingTermsEnum extends FilterTermsEnum { private final Thrower thrower; - public ThrowingTermsEnum(TermsEnum in, Thrower thrower) { + ThrowingTermsEnum(TermsEnum in, Thrower thrower) { super(in); this.thrower = thrower; diff --git a/test/framework/src/main/java/org/elasticsearch/test/store/MockFSDirectoryService.java b/test/framework/src/main/java/org/elasticsearch/test/store/MockFSDirectoryService.java index 2a653ce5871..281dbb5115f 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/store/MockFSDirectoryService.java +++ b/test/framework/src/main/java/org/elasticsearch/test/store/MockFSDirectoryService.java @@ -190,7 +190,7 @@ public class MockFSDirectoryService extends FsDirectoryService { private final BaseDirectoryWrapper dir; private final TestRuleMarkFailure failureMarker; - public CloseableDirectory(BaseDirectoryWrapper dir) { + CloseableDirectory(BaseDirectoryWrapper dir) { this.dir = dir; this.failureMarker = ESTestCase.getSuiteFailureMarker(); } diff --git a/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java b/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java index e7c0020c0bf..4ea5ec500af 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java @@ -932,7 +932,7 @@ public abstract class AbstractSimpleTransportTestCase extends ESTestCase { public volatile boolean sawResponseReceived; public AtomicReference expectedEvents = new AtomicReference<>(); - public Tracer(Set actions) { + Tracer(Set actions) { this.actions = actions; } @Override @@ -1543,10 +1543,10 @@ public abstract class AbstractSimpleTransportTestCase extends ESTestCase { String info; - public TestResponse() { + TestResponse() { } - public TestResponse(String info) { + TestResponse(String info) { this.info = info; } @@ -1690,7 +1690,7 @@ public abstract class AbstractSimpleTransportTestCase extends ESTestCase { private final int id; - public TestResponseHandler(int id) { + TestResponseHandler(int id) { this.id = id; } diff --git a/test/logger-usage/src/main/java/org/elasticsearch/test/loggerusage/ESLoggerUsageChecker.java b/test/logger-usage/src/main/java/org/elasticsearch/test/loggerusage/ESLoggerUsageChecker.java index 928cc0a1fb9..4ee2e473890 100644 --- a/test/logger-usage/src/main/java/org/elasticsearch/test/loggerusage/ESLoggerUsageChecker.java +++ b/test/logger-usage/src/main/java/org/elasticsearch/test/loggerusage/ESLoggerUsageChecker.java @@ -176,7 +176,7 @@ public class ESLoggerUsageChecker { private final Consumer wrongUsageCallback; private final Predicate methodsToCheck; - public ClassChecker(Consumer wrongUsageCallback, Predicate methodsToCheck) { + ClassChecker(Consumer wrongUsageCallback, Predicate methodsToCheck) { super(Opcodes.ASM5); this.wrongUsageCallback = wrongUsageCallback; this.methodsToCheck = methodsToCheck; @@ -210,7 +210,7 @@ public class ESLoggerUsageChecker { private final Consumer wrongUsageCallback; private boolean ignoreChecks; - public MethodChecker(String className, int access, String name, String desc, Consumer wrongUsageCallback) { + MethodChecker(String className, int access, String name, String desc, Consumer wrongUsageCallback) { super(Opcodes.ASM5, new MethodNode(access, name, desc, null, null)); this.className = className; this.wrongUsageCallback = wrongUsageCallback; @@ -409,13 +409,13 @@ public class ESLoggerUsageChecker { protected final int minValue; protected final int maxValue; - public IntMinMaxTrackingBasicValue(Type type, int value) { + IntMinMaxTrackingBasicValue(Type type, int value) { super(type); this.minValue = value; this.maxValue = value; } - public IntMinMaxTrackingBasicValue(Type type, int minValue, int maxValue) { + IntMinMaxTrackingBasicValue(Type type, int minValue, int maxValue) { super(type); this.minValue = minValue; this.maxValue = maxValue; @@ -454,27 +454,27 @@ public class ESLoggerUsageChecker { private static final class PlaceHolderStringBasicValue extends IntMinMaxTrackingBasicValue { public static final Type STRING_OBJECT_TYPE = Type.getObjectType("java/lang/String"); - public PlaceHolderStringBasicValue(int placeHolders) { + PlaceHolderStringBasicValue(int placeHolders) { super(STRING_OBJECT_TYPE, placeHolders); } - public PlaceHolderStringBasicValue(int minPlaceHolders, int maxPlaceHolders) { + PlaceHolderStringBasicValue(int minPlaceHolders, int maxPlaceHolders) { super(STRING_OBJECT_TYPE, minPlaceHolders, maxPlaceHolders); } } private static final class ArraySizeBasicValue extends IntMinMaxTrackingBasicValue { - public ArraySizeBasicValue(Type type, int minArraySize, int maxArraySize) { + ArraySizeBasicValue(Type type, int minArraySize, int maxArraySize) { super(type, minArraySize, maxArraySize); } } private static final class IntegerConstantBasicValue extends IntMinMaxTrackingBasicValue { - public IntegerConstantBasicValue(Type type, int constant) { + IntegerConstantBasicValue(Type type, int constant) { super(type, constant); } - public IntegerConstantBasicValue(Type type, int minConstant, int maxConstant) { + IntegerConstantBasicValue(Type type, int minConstant, int maxConstant) { super(type, minConstant, maxConstant); } }