diff --git a/core/pom.xml b/core/pom.xml index fa8e352bd66..c5c4be0f15c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -15,6 +15,10 @@ Elasticsearch: Core Elasticsearch - Open Source, Distributed, RESTful Search Engine + + -Xlint:-cast,-deprecation,-fallthrough,-overrides,-rawtypes,-serial,-try,-unchecked + + org.hamcrest diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java b/core/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java index e4793027559..264d77de420 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java @@ -36,6 +36,8 @@ import org.elasticsearch.node.settings.NodeSettingsService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; +import java.util.Arrays; + /** * Close index action */ @@ -92,7 +94,7 @@ public class TransportCloseIndexAction extends TransportMasterNodeAction the injectable type encountered * @since 2.0 */ +@SuppressWarnings("overloads") public interface TypeEncounter { /** diff --git a/core/src/main/java/org/elasticsearch/env/NodeEnvironment.java b/core/src/main/java/org/elasticsearch/env/NodeEnvironment.java index c75e26fbf36..725ec82ac8d 100644 --- a/core/src/main/java/org/elasticsearch/env/NodeEnvironment.java +++ b/core/src/main/java/org/elasticsearch/env/NodeEnvironment.java @@ -71,7 +71,7 @@ public class NodeEnvironment extends AbstractComponent implements Closeable { public NodePath(Path path, Environment environment) throws IOException { this.path = path; this.indicesPath = path.resolve(INDICES_FOLDER); - this.fileStore = environment.getFileStore(path); + this.fileStore = Environment.getFileStore(path); if (fileStore.supportsFileAttributeView("lucene")) { this.spins = (Boolean) fileStore.getAttribute("lucene:spins"); } else { diff --git a/core/src/main/java/org/elasticsearch/gateway/Gateway.java b/core/src/main/java/org/elasticsearch/gateway/Gateway.java index 249243cffa5..8405aec8267 100644 --- a/core/src/main/java/org/elasticsearch/gateway/Gateway.java +++ b/core/src/main/java/org/elasticsearch/gateway/Gateway.java @@ -33,6 +33,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.NodeEnvironment; import java.nio.file.Path; +import java.util.Arrays; /** * @@ -171,7 +172,7 @@ public class Gateway extends AbstractComponent implements ClusterStateListener { public void reset() throws Exception { try { Path[] dataPaths = nodeEnv.nodeDataPaths(); - logger.trace("removing node data paths: [{}]", dataPaths); + logger.trace("removing node data paths: [{}]", (Object)dataPaths); IOUtils.rm(dataPaths); } catch (Exception ex) { logger.debug("failed to delete shard locations", ex); diff --git a/core/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java b/core/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java index a60e2fa31bd..3d5a01c41d1 100644 --- a/core/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java +++ b/core/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java @@ -59,6 +59,7 @@ public class SingleFieldsVisitor extends FieldsVisitor { public void postProcess(MappedFieldType fieldType) { if (uid != null) { + // TODO: this switch seems very wrong...either each case should be breaking, or this should not be a switch switch (field) { case UidFieldMapper.NAME: addValue(field, uid.toString()); case IdFieldMapper.NAME: addValue(field, uid.id()); diff --git a/core/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java index a18c865cadb..8a86ca050f0 100644 --- a/core/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java +++ b/core/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java @@ -77,10 +77,10 @@ public class IndicesQueryParser implements QueryParser { currentFieldName = parser.currentName(); } else if (token == XContentParser.Token.START_OBJECT) { if (parseContext.parseFieldMatcher().match(currentFieldName, QUERY_FIELD)) { - innerQuery = new XContentStructure.InnerQuery(parseContext, null); + innerQuery = new XContentStructure.InnerQuery(parseContext, (String[])null); queryFound = true; } else if (parseContext.parseFieldMatcher().match(currentFieldName, NO_MATCH_QUERY)) { - innerNoMatchQuery = new XContentStructure.InnerQuery(parseContext, null); + innerNoMatchQuery = new XContentStructure.InnerQuery(parseContext, (String[])null); } else { throw new QueryParsingException(parseContext, "[indices] query does not support [" + currentFieldName + "]"); } diff --git a/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParserMapper.java b/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParserMapper.java index 837837a92b2..fe33532c347 100644 --- a/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParserMapper.java +++ b/core/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionParserMapper.java @@ -59,7 +59,7 @@ public class ScoreFunctionParserMapper { public ScoreFunctionParser get(QueryParseContext parseContext, String parserName) { ScoreFunctionParser functionParser = get(parserName); if (functionParser == null) { - throw new QueryParsingException(parseContext, "No function with the name [" + parserName + "] is registered.", null); + throw new QueryParsingException(parseContext, "No function with the name [" + parserName + "] is registered."); } return functionParser; } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketBuilder.java index 53e90808f8a..9293e146185 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/percentile/PercentilesBucketBuilder.java @@ -40,7 +40,7 @@ public class PercentilesBucketBuilder extends BucketMetricsBuilder implem for (int i = 0; i < hostAddresses.length; i++) { addresses[i] = NetworkAddress.format(hostAddresses[i]); } - logger.debug("binding server bootstrap to: {}", addresses); + logger.debug("binding server bootstrap to: {}", (Object)addresses); } for (InetAddress hostAddress : hostAddresses) { bindServerBootstrap(name, hostAddress, settings); diff --git a/core/src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityIT.java b/core/src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityIT.java index 4b38cf73919..3a58d710510 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityIT.java @@ -60,7 +60,7 @@ public class BasicAnalysisBackwardCompatibilityIT extends ESBackcompatTestCase { fields[i] = "type=string,analyzer=" + analyzer; } assertAcked(prepareCreate("test") - .addMapping("type", fields) + .addMapping("type", (Object[])fields) .setSettings(indexSettings())); ensureYellow(); InputOutput[] inout = new InputOutput[numFields]; diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java b/core/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java index e8459b48002..1a0e9981719 100644 --- a/core/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java @@ -114,14 +114,14 @@ public class IndexNameExpressionResolverTests extends ESTestCase { String[] results = indexNameExpressionResolver.concreteIndices(context, Strings.EMPTY_ARRAY); assertEquals(3, results.length); - results = indexNameExpressionResolver.concreteIndices(context, null); + results = indexNameExpressionResolver.concreteIndices(context, (String[])null); assertEquals(3, results.length); context = new IndexNameExpressionResolver.Context(state, IndicesOptions.strictExpand()); results = indexNameExpressionResolver.concreteIndices(context, Strings.EMPTY_ARRAY); assertEquals(4, results.length); - results = indexNameExpressionResolver.concreteIndices(context, null); + results = indexNameExpressionResolver.concreteIndices(context, (String[])null); assertEquals(4, results.length); context = new IndexNameExpressionResolver.Context(state, IndicesOptions.strictExpandOpen()); @@ -348,7 +348,7 @@ public class IndexNameExpressionResolverTests extends ESTestCase { assertEquals(2, results.length); assertThat(results, arrayContainingInAnyOrder("foo", "foobar")); - results = indexNameExpressionResolver.concreteIndices(context, null); + results = indexNameExpressionResolver.concreteIndices(context, (String[])null); assertEquals(0, results.length); results = indexNameExpressionResolver.concreteIndices(context, Strings.EMPTY_ARRAY); diff --git a/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java b/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java index f91697884c0..fe3051b4111 100644 --- a/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java @@ -179,7 +179,7 @@ public class MultiDataPathUpgraderTests extends ESTestCase { OldIndexBackwardsCompatibilityIT.copyIndex(logger, src, indexName, multiDataPath); final ShardPath shardPath = new ShardPath(false, nodeEnvironment.availableShardPaths(new ShardId(indexName, 0))[0], nodeEnvironment.availableShardPaths(new ShardId(indexName, 0))[0], IndexMetaData.INDEX_UUID_NA_VALUE, new ShardId(indexName, 0)); - logger.info("{}", FileSystemUtils.files(shardPath.resolveIndex())); + logger.info("{}", (Object)FileSystemUtils.files(shardPath.resolveIndex())); MultiDataPathUpgrader helper = new MultiDataPathUpgrader(nodeEnvironment); helper.upgrade(new ShardId(indexName, 0), shardPath); 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 0bedb81a0c2..8892b574082 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -148,7 +148,7 @@ public class IndexShardTests extends ESSingleNodeTestCase { ensureGreen(); NodeEnvironment env = getInstanceFromNode(NodeEnvironment.class); Path[] shardPaths = env.availableShardPaths(new ShardId("test", 0)); - logger.info("--> paths: [{}]", shardPaths); + logger.info("--> paths: [{}]", (Object)shardPaths); // Should not be able to acquire the lock because it's already open try { NodeEnvironment.acquireFSLockForPaths(Settings.EMPTY, shardPaths); 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 c7ebedf1cb7..5d153c70524 100644 --- a/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java +++ b/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java @@ -390,7 +390,7 @@ public class TranslogTests extends ESTestCase { } public void testSnapshotOnClosedTranslog() throws IOException { - assertTrue(Files.exists(translogDir.resolve(translog.getFilename(1)))); + assertTrue(Files.exists(translogDir.resolve(Translog.getFilename(1)))); translog.add(new Translog.Create("test", "1", new byte[]{1})); translog.close(); try { @@ -436,14 +436,14 @@ public class TranslogTests extends ESTestCase { public void assertFileIsPresent(Translog translog, long id) { - if (Files.exists(translogDir.resolve(translog.getFilename(id)))) { + if (Files.exists(translogDir.resolve(Translog.getFilename(id)))) { return; } - fail(translog.getFilename(id) + " is not present in any location: " + translog.location()); + fail(Translog.getFilename(id) + " is not present in any location: " + translog.location()); } public void assertFileDeleted(Translog translog, long id) { - assertFalse("translog [" + id + "] still exists", Files.exists(translog.location().resolve(translog.getFilename(id)))); + assertFalse("translog [" + id + "] still exists", Files.exists(translog.location().resolve(Translog.getFilename(id)))); } static class LocationOperation { @@ -913,7 +913,7 @@ public class TranslogTests extends ESTestCase { final Translog.Location lastLocation = translog.add(new Translog.Create("test", "" + translogOperations, Integer.toString(translogOperations).getBytes(Charset.forName("UTF-8")))); final Checkpoint checkpoint = Checkpoint.read(translog.location().resolve(Translog.CHECKPOINT_FILE_NAME)); - try (final ImmutableTranslogReader reader = translog.openReader(translog.location().resolve(translog.getFilename(translog.currentFileGeneration())), checkpoint)) { + try (final ImmutableTranslogReader reader = translog.openReader(translog.location().resolve(Translog.getFilename(translog.currentFileGeneration())), checkpoint)) { assertEquals(lastSynced + 1, reader.totalOperations()); for (int op = 0; op < translogOperations; op++) { Translog.Location location = locations.get(op); diff --git a/core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java b/core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java index 9f2dca3d9e9..5556b674aa0 100644 --- a/core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java +++ b/core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java @@ -196,7 +196,7 @@ public class OpenCloseIndexIT extends ESIntegTestCase { @Test(expected = ActionRequestValidationException.class) public void testCloseNullIndex() { Client client = client(); - client.admin().indices().prepareClose(null).execute().actionGet(); + client.admin().indices().prepareClose((String[])null).execute().actionGet(); } @Test(expected = ActionRequestValidationException.class) @@ -208,7 +208,7 @@ public class OpenCloseIndexIT extends ESIntegTestCase { @Test(expected = ActionRequestValidationException.class) public void testOpenNullIndex() { Client client = client(); - client.admin().indices().prepareOpen(null).execute().actionGet(); + client.admin().indices().prepareOpen((String[])null).execute().actionGet(); } @Test diff --git a/core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java b/core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java index 4ffc09b22d5..8be22a8839e 100644 --- a/core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java +++ b/core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java @@ -263,7 +263,7 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { @Test public void testThatInvalidGetIndexTemplatesFails() throws Exception { logger.info("--> get template null"); - testExpectActionRequestValidationException(null); + testExpectActionRequestValidationException((String[])null); logger.info("--> get template empty"); testExpectActionRequestValidationException(""); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java index cdef370f1a4..54547575fcd 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java @@ -306,9 +306,8 @@ public class MinDocCountIT extends AbstractTermsTestCase { testMinDocCountOnTerms(field, script, order, include, false); } catch (Throwable secondFailure) { logger.error("exception on retry (will re-throw the original in a sec)", secondFailure); - } finally { - throw ae; } + throw ae; } } diff --git a/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java b/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java index 7fa543a30e5..21264cc49a0 100644 --- a/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java +++ b/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java @@ -1365,7 +1365,8 @@ public class SearchQueryIT extends ESIntegTestCase { assertHitCount(searchResponse, 1l); assertThat(searchResponse.getHits().hits().length, equalTo(1)); - searchResponse = client().prepareSearch().setQuery(constantScoreQuery(idsQuery(null).ids("1"))).get(); + // TODO: why do we even support passing null?? + searchResponse = client().prepareSearch().setQuery(constantScoreQuery(idsQuery((String[])null).ids("1"))).get(); assertHitCount(searchResponse, 1l); assertThat(searchResponse.getHits().hits().length, equalTo(1)); @@ -1403,7 +1404,7 @@ public class SearchQueryIT extends ESIntegTestCase { assertHitCount(searchResponse, 1l); assertThat(searchResponse.getHits().hits().length, equalTo(1)); - searchResponse = client().prepareSearch().setQuery(idsQuery(null).ids("1")).get(); + searchResponse = client().prepareSearch().setQuery(idsQuery((String[])null).ids("1")).get(); assertHitCount(searchResponse, 1l); assertThat(searchResponse.getHits().hits().length, equalTo(1)); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchIT.java b/core/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchIT.java index 83c8b362d8b..28a5a1b7601 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchIT.java @@ -170,7 +170,7 @@ public class ContextSuggestSearchIT extends ESIntegTestCase { .startObject("context") .startObject("location") .field("type", "geo") - .array("precision", precisions.toArray(new Integer[precisions.size()])) + .array("precision", (Object[])precisions.toArray(new Integer[precisions.size()])) .endObject() .endObject().endObject() .endObject().endObject(); @@ -185,7 +185,7 @@ public class ContextSuggestSearchIT extends ESIntegTestCase { .startObject("context") .startObject("location") .field("type", "geo") - .array("precision", precisions.toArray(new Integer[precisions.size()])) + .array("precision", (Object[])precisions.toArray(new Integer[precisions.size()])) .endObject() .endObject().endObject() .endObject().endObject(); diff --git a/core/src/test/java/org/elasticsearch/test/ESIntegTestCase.java b/core/src/test/java/org/elasticsearch/test/ESIntegTestCase.java index d96b3276f9b..73b6bf791c6 100644 --- a/core/src/test/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/core/src/test/java/org/elasticsearch/test/ESIntegTestCase.java @@ -1713,7 +1713,9 @@ public abstract class ESIntegTestCase extends ESTestCase { } /** Helper method to create list of plugins without specifying generic types. */ - protected static Collection> pluginList(Class... plugins) { + @SafeVarargs + @SuppressWarnings("varargs") // due to type erasure, the varargs type is non-reifiable, which casues this warning + protected final Collection> pluginList(Class... plugins) { return Arrays.asList(plugins); } diff --git a/plugins/analysis-icu/pom.xml b/plugins/analysis-icu/pom.xml index a9fced71b17..6f204d6dd91 100644 --- a/plugins/analysis-icu/pom.xml +++ b/plugins/analysis-icu/pom.xml @@ -18,6 +18,7 @@ org.elasticsearch.plugin.analysis.icu.AnalysisICUPlugin analysis_icu false + -Xlint:-deprecation diff --git a/plugins/analysis-phonetic/pom.xml b/plugins/analysis-phonetic/pom.xml index a2b47f17c95..dfd6c166c14 100644 --- a/plugins/analysis-phonetic/pom.xml +++ b/plugins/analysis-phonetic/pom.xml @@ -18,6 +18,7 @@ org.elasticsearch.plugin.analysis.AnalysisPhoneticPlugin analysis_phonetic false + -Xlint:-rawtypes,-unchecked diff --git a/plugins/cloud-azure/pom.xml b/plugins/cloud-azure/pom.xml index e5e19454a9f..08dcbd4300a 100644 --- a/plugins/cloud-azure/pom.xml +++ b/plugins/cloud-azure/pom.xml @@ -30,6 +30,8 @@ governing permissions and limitations under the License. --> 1 cloud_azure false + + -Xlint:-path,-serial,-static,-unchecked diff --git a/plugins/cloud-gce/pom.xml b/plugins/cloud-gce/pom.xml index 38fed6ea444..da987f8d45b 100644 --- a/plugins/cloud-gce/pom.xml +++ b/plugins/cloud-gce/pom.xml @@ -31,6 +31,7 @@ governing permissions and limitations under the License. --> cloud_gce false + -Xlint:-rawtypes,-unchecked diff --git a/plugins/delete-by-query/src/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryRequest.java b/plugins/delete-by-query/src/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryRequest.java index bb7bafa7f87..c54cdc590a9 100644 --- a/plugins/delete-by-query/src/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryRequest.java +++ b/plugins/delete-by-query/src/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryRequest.java @@ -113,7 +113,7 @@ public class DeleteByQueryRequest extends ActionRequest im } @Override - public DeleteByQueryRequest indices(String... indices) { + public DeleteByQueryRequest indices(String[] indices) { this.indices = indices; return this; } @@ -149,7 +149,7 @@ public class DeleteByQueryRequest extends ActionRequest im return this; } - public DeleteByQueryRequest source(Map querySource) { + public DeleteByQueryRequest source(Map querySource) { try { XContentBuilder builder = XContentFactory.contentBuilder(Requests.CONTENT_TYPE); builder.map(querySource); diff --git a/plugins/delete-by-query/src/test/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryActionTests.java b/plugins/delete-by-query/src/test/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryActionTests.java index 05f015b279c..c9d3f447b82 100644 --- a/plugins/delete-by-query/src/test/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryActionTests.java +++ b/plugins/delete-by-query/src/test/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryActionTests.java @@ -48,7 +48,7 @@ public class TransportDeleteByQueryActionTests extends ESSingleNodeTestCase { @Test public void testExecuteScanFailsOnMissingIndex() { - DeleteByQueryRequest delete = new DeleteByQueryRequest().indices("none"); + DeleteByQueryRequest delete = new DeleteByQueryRequest().indices(new String[]{"none"}); TestActionListener listener = new TestActionListener(); newAsyncAction(delete, listener).executeScan(); @@ -62,7 +62,7 @@ public class TransportDeleteByQueryActionTests extends ESSingleNodeTestCase { public void testExecuteScanFailsOnMalformedQuery() { createIndex("test"); - DeleteByQueryRequest delete = new DeleteByQueryRequest().indices("test").source("{...}"); + DeleteByQueryRequest delete = new DeleteByQueryRequest().indices(new String[]{"test"}).source("{...}"); TestActionListener listener = new TestActionListener(); newAsyncAction(delete, listener).executeScan(); @@ -83,7 +83,7 @@ public class TransportDeleteByQueryActionTests extends ESSingleNodeTestCase { assertHitCount(client().prepareCount("test").get(), numDocs); final long limit = randomIntBetween(0, numDocs); - DeleteByQueryRequest delete = new DeleteByQueryRequest().indices("test").source(boolQuery().must(rangeQuery("num").lte(limit)).buildAsBytes()); + DeleteByQueryRequest delete = new DeleteByQueryRequest().indices(new String[]{"test"}).source(boolQuery().must(rangeQuery("num").lte(limit)).buildAsBytes()); TestActionListener listener = new TestActionListener(); newAsyncAction(delete, listener).executeScan(); @@ -139,7 +139,7 @@ public class TransportDeleteByQueryActionTests extends ESSingleNodeTestCase { ClearScrollResponse clearScrollResponse = client().prepareClearScroll().addScrollId(scrollId).get(); assertTrue(clearScrollResponse.isSucceeded()); - DeleteByQueryRequest delete = new DeleteByQueryRequest().indices("test"); + DeleteByQueryRequest delete = new DeleteByQueryRequest().indices(new String[]{"test"}); TestActionListener listener = new TestActionListener(); newAsyncAction(delete, listener).executeScroll(searchResponse.getScrollId()); @@ -160,7 +160,7 @@ public class TransportDeleteByQueryActionTests extends ESSingleNodeTestCase { String scrollId = searchResponse.getScrollId(); assertTrue(Strings.hasText(scrollId)); - DeleteByQueryRequest delete = new DeleteByQueryRequest().indices("test").timeout(TimeValue.timeValueSeconds(1)); + DeleteByQueryRequest delete = new DeleteByQueryRequest().indices(new String[]{"test"}).timeout(TimeValue.timeValueSeconds(1)); TestActionListener listener = new TestActionListener(); final TransportDeleteByQueryAction.AsyncDeleteByQueryAction async = newAsyncAction(delete, listener); @@ -183,7 +183,7 @@ public class TransportDeleteByQueryActionTests extends ESSingleNodeTestCase { String scrollId = searchResponse.getScrollId(); assertTrue(Strings.hasText(scrollId)); - DeleteByQueryRequest delete = new DeleteByQueryRequest().indices("test"); + DeleteByQueryRequest delete = new DeleteByQueryRequest().indices(new String[]{"test"}); TestActionListener listener = new TestActionListener(); newAsyncAction(delete, listener).executeScroll(searchResponse.getScrollId()); @@ -219,7 +219,7 @@ public class TransportDeleteByQueryActionTests extends ESSingleNodeTestCase { assertTrue(Strings.hasText(scrollId)); assertThat(searchResponse.getHits().getTotalHits(), equalTo(limit)); - DeleteByQueryRequest delete = new DeleteByQueryRequest().indices("test").size(100).source(boolQuery().must(rangeQuery("num").lte(limit)).buildAsBytes()); + DeleteByQueryRequest delete = new DeleteByQueryRequest().indices(new String[]{"test"}).size(100).source(boolQuery().must(rangeQuery("num").lte(limit)).buildAsBytes()); TestActionListener listener = new TestActionListener(); newAsyncAction(delete, listener).executeScroll(searchResponse.getScrollId()); diff --git a/plugins/discovery-ec2/pom.xml b/plugins/discovery-ec2/pom.xml index 85958dd78e8..e6039917237 100644 --- a/plugins/discovery-ec2/pom.xml +++ b/plugins/discovery-ec2/pom.xml @@ -20,6 +20,7 @@ 1 discovery_ec2 false + -Xlint:-rawtypes diff --git a/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2UnicastHostsProvider.java b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2UnicastHostsProvider.java index ab115410c17..84faebed033 100644 --- a/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2UnicastHostsProvider.java +++ b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2UnicastHostsProvider.java @@ -79,7 +79,7 @@ public class AwsEc2UnicastHostsProvider extends AbstractComponent implements Uni this.tags = settings.getByPrefix("discovery.ec2.tag.").getAsMap(); - Set availabilityZones = new HashSet(); + Set availabilityZones = new HashSet<>(); availabilityZones.addAll(Arrays.asList(settings.getAsArray("discovery.ec2.availability_zones"))); if (settings.get("discovery.ec2.availability_zones") != null) { availabilityZones.addAll(Strings.commaDelimitedListToSet(settings.get("discovery.ec2.availability_zones"))); diff --git a/plugins/jvm-example/pom.xml b/plugins/jvm-example/pom.xml index aa7d8530728..96c9a0316c1 100644 --- a/plugins/jvm-example/pom.xml +++ b/plugins/jvm-example/pom.xml @@ -19,6 +19,7 @@ jvm_example false true + -Xlint:-rawtypes diff --git a/plugins/lang-javascript/pom.xml b/plugins/lang-javascript/pom.xml index a9851a824ad..69da06ec4d2 100644 --- a/plugins/lang-javascript/pom.xml +++ b/plugins/lang-javascript/pom.xml @@ -18,6 +18,7 @@ org.elasticsearch.plugin.javascript.JavaScriptPlugin lang_javascript false + -Xlint:-rawtypes,-unchecked diff --git a/plugins/lang-python/pom.xml b/plugins/lang-python/pom.xml index 03f34bf5d01..73742e2b5e3 100644 --- a/plugins/lang-python/pom.xml +++ b/plugins/lang-python/pom.xml @@ -18,6 +18,7 @@ org.elasticsearch.plugin.python.PythonPlugin lang_python false + -Xlint:-unchecked diff --git a/plugins/mapper-murmur3/pom.xml b/plugins/mapper-murmur3/pom.xml index 83dea67c2ad..2e78be25c09 100644 --- a/plugins/mapper-murmur3/pom.xml +++ b/plugins/mapper-murmur3/pom.xml @@ -29,6 +29,7 @@ governing permissions and limitations under the License. --> org.elasticsearch.plugin.mapper.MapperMurmur3Plugin mapper_murmur3 false + -Xlint:-rawtypes diff --git a/plugins/repository-s3/pom.xml b/plugins/repository-s3/pom.xml index 8b71e9207aa..100424baf45 100644 --- a/plugins/repository-s3/pom.xml +++ b/plugins/repository-s3/pom.xml @@ -20,6 +20,7 @@ 1 repository_s3 false + -Xlint:-rawtypes diff --git a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/TestAwsS3Service.java b/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/TestAwsS3Service.java index 81a0312e37f..959b03e2375 100644 --- a/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/TestAwsS3Service.java +++ b/plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/TestAwsS3Service.java @@ -38,7 +38,7 @@ public class TestAwsS3Service extends InternalAwsS3Service { return "plugs in mock s3 service"; } public void onModule(S3Module s3Module) { - s3Module.s3ServiceImpl = TestAwsS3Service.class; + S3Module.s3ServiceImpl = TestAwsS3Service.class; } } diff --git a/pom.xml b/pom.xml index bb2b7e788a8..cb4de2ac22c 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,9 @@ ${java.home}${file.separator}bin${file.separator}java 1.8 1.8 + + -Xlint:-path 5.4.0 @@ -574,8 +577,12 @@ be fixed in version > 3.1 --> false + true -XDignore.symbol.file + -Xlint:all + ${xlint.options} + -Werror