diff --git a/server/build.gradle b/server/build.gradle
index 3d321d53d098a..25e380ca321e0 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -123,10 +123,6 @@ dependencies {
}
}
-tasks.withType(JavaCompile).configureEach {
- options.compilerArgs << "-Xlint:-cast,-rawtypes,-unchecked"
-}
-
// Until this project is always being formatted with spotless, we need to
// guard against `spotless()` not existing.
try {
@@ -383,7 +379,7 @@ tasks.named('splitPackagesAudit').configure {
'org.elasticsearch.cli.LoggingAwareMultiCommand',
// these should be temporary, query needs package private access to TermScorer though
- 'org.apache.lucene.search.XCombinedFieldQuery',
- 'org.apache.lucene.search.XMultiNormsLeafSimScorer'
+ 'org.apache.lucene.search.XCombinedFieldQuery',
+ 'org.apache.lucene.search.XMultiNormsLeafSimScorer'
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java
index ecf1b00bf6f08..56c29e2891812 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java
@@ -244,6 +244,7 @@ public void testDelayedMappingPropagationOnPrimary() throws Exception {
throw new AssertionError(e);
}
assertNotNull(properties);
+ @SuppressWarnings("unchecked")
Object fieldMapping = ((Map) properties).get("field");
assertNotNull(fieldMapping);
});
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/HiddenIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/HiddenIndexIT.java
index 17baf5661d3f4..92ebb7e071988 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/HiddenIndexIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/HiddenIndexIT.java
@@ -100,12 +100,15 @@ public void testGlobalTemplatesDoNotApply() {
assertThat(mappingsResponse.mappings().size(), is(1));
MappingMetadata mappingMetadata = mappingsResponse.mappings().get("a_hidden_index").get("_doc");
assertNotNull(mappingMetadata);
+ @SuppressWarnings("unchecked")
Map propertiesMap = (Map) mappingMetadata.getSourceAsMap().get("properties");
assertNotNull(propertiesMap);
assertThat(propertiesMap.size(), is(2));
+ @SuppressWarnings("unchecked")
Map barMap = (Map) propertiesMap.get("bar");
assertNotNull(barMap);
assertThat(barMap.get("type"), is("text"));
+ @SuppressWarnings("unchecked")
Map bazMap = (Map) propertiesMap.get("baz");
assertNotNull(bazMap);
assertThat(bazMap.get("type"), is("text"));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java
index 4916fc1764d6d..85fe5b9782b4f 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java
@@ -95,6 +95,7 @@ private static void assertMappingsHaveField(GetMappingsResponse mappings, String
MappingMetadata typeMappings = indexMappings.get(type);
assertNotNull(typeMappings);
Map typeMappingsMap = typeMappings.getSourceAsMap();
+ @SuppressWarnings("unchecked")
Map properties = (Map) typeMappingsMap.get("properties");
assertTrue("Could not find [" + field + "] in " + typeMappingsMap.toString(), properties.containsKey(field));
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java
index 843ef2a1ed76f..cbd8e400907b7 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java
@@ -542,7 +542,8 @@ public void testResolvePath() throws Exception {
nodeNameToNodeId.put(cursor.value.getName(), cursor.key);
}
- final GroupShardsIterator shardIterators = state.getRoutingTable().activePrimaryShardsGrouped(new String[]{indexName}, false);
+ final GroupShardsIterator shardIterators = state.getRoutingTable()
+ .activePrimaryShardsGrouped(new String[] { indexName }, false);
final List iterators = iterableAsArrayList(shardIterators);
final ShardRouting shardRouting = iterators.iterator().next().nextOrNull();
assertThat(shardRouting, notNullValue());
@@ -576,7 +577,8 @@ public void testResolvePath() throws Exception {
private Path getPathToShardData(String indexName, String dirSuffix) {
ClusterState state = client().admin().cluster().prepareState().get().getState();
- GroupShardsIterator shardIterators = state.getRoutingTable().activePrimaryShardsGrouped(new String[]{indexName}, false);
+ GroupShardsIterator shardIterators = state.getRoutingTable()
+ .activePrimaryShardsGrouped(new String[] { indexName }, false);
List iterators = iterableAsArrayList(shardIterators);
ShardIterator shardIterator = RandomPicks.randomFrom(random(), iterators);
ShardRouting shardRouting = shardIterator.nextOrNull();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java
index ed0ba46e8f73b..11a3ecbd1f36f 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java
@@ -602,7 +602,7 @@ public void testReplicaCorruption() throws Exception {
private int numShards(String... index) {
ClusterState state = client().admin().cluster().prepareState().get().getState();
- GroupShardsIterator shardIterators = state.getRoutingTable().activePrimaryShardsGrouped(index, false);
+ GroupShardsIterator> shardIterators = state.getRoutingTable().activePrimaryShardsGrouped(index, false);
return shardIterators.size();
}
@@ -630,7 +630,7 @@ private ShardRouting corruptRandomPrimaryFile() throws IOException {
private ShardRouting corruptRandomPrimaryFile(final boolean includePerCommitFiles) throws IOException {
ClusterState state = client().admin().cluster().prepareState().get().getState();
Index test = state.metadata().index("test").getIndex();
- GroupShardsIterator shardIterators = state.getRoutingTable().activePrimaryShardsGrouped(new String[]{"test"}, false);
+ GroupShardsIterator shardIterators = state.getRoutingTable().activePrimaryShardsGrouped(new String[]{"test"}, false);
List iterators = iterableAsArrayList(shardIterators);
ShardIterator shardIterator = RandomPicks.randomFrom(random(), iterators);
ShardRouting shardRouting = shardIterator.nextOrNull();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java
index e7f1ab3ecfbbf..3a06588b7cffd 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java
@@ -158,7 +158,7 @@ private Set nodeIdsWithIndex(String... indices) {
protected int numAssignedShards(String... indices) {
ClusterState state = client().admin().cluster().prepareState().execute().actionGet().getState();
- GroupShardsIterator allAssignedShardsGrouped = state.routingTable().allAssignedShardsGrouped(indices, true);
+ GroupShardsIterator> allAssignedShardsGrouped = state.routingTable().allAssignedShardsGrouped(indices, true);
return allAssignedShardsGrouped.size();
}
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java
index abd6ea7bb8c2c..f4fa201b66a00 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java
@@ -234,7 +234,10 @@ public void testUpdateMappingConcurrently() throws Throwable {
GetMappingsResponse getMappingResponse = client2.admin().indices().prepareGetMappings(indexName).get();
ImmutableOpenMap mappings = getMappingResponse.getMappings().get(indexName);
assertThat(mappings.containsKey(typeName), equalTo(true));
- assertThat(((Map) mappings.get(typeName).getSourceAsMap().get("properties")).keySet(),
+ @SuppressWarnings("unchecked")
+ final Set properties = ((Map) mappings.get(typeName).getSourceAsMap().get("properties"))
+ .keySet();
+ assertThat(properties,
Matchers.hasItem(fieldName));
}
} catch (Exception e) {
@@ -315,6 +318,7 @@ private void assertMappingOnMaster(final String index, final String type, final
assertTrue(mappingSource.containsKey("properties"));
for (String fieldName : fieldNames) {
+ @SuppressWarnings("unchecked")
Map mappingProperties = (Map) mappingSource.get("properties");
if (fieldName.indexOf('.') != -1) {
fieldName = fieldName.replace(".", ".properties.");
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java
index 8a67386f1f8a0..dc777859e0d3d 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java
@@ -173,7 +173,9 @@ public void testResolveSearchRouting() {
"test3", newSet("0", "1", "2", "tw ", " ltw ", " lw"))));
}
- private Set newSet(T... elements) {
+ @SafeVarargs
+ @SuppressWarnings("varargs")
+ private final Set newSet(T... elements) {
return newHashSet(elements);
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchWithRejectionsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchWithRejectionsIT.java
index 0a3cd1a9c761e..2ab5d3543aa85 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchWithRejectionsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchWithRejectionsIT.java
@@ -42,6 +42,7 @@ public void testOpenContextsAfterRejections() throws Exception {
refresh();
int numSearches = 10;
+ @SuppressWarnings({"rawtypes", "unchecked"})
Future[] responses = new Future[numSearches];
SearchType searchType = randomFrom(SearchType.DEFAULT, SearchType.QUERY_THEN_FETCH, SearchType.DFS_QUERY_THEN_FETCH);
logger.info("search type is {}", searchType);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MetadataIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MetadataIT.java
index a2d7ebb16459c..0214f46b45714 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MetadataIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MetadataIT.java
@@ -103,6 +103,7 @@ private void assertMetadata(Map returnedMetadata) {
Object nestedObject = returnedMetadata.get("complex");
assertNotNull(nestedObject);
+ @SuppressWarnings("unchecked")
Map nestedMap = (Map)nestedObject;
assertEquals("value", nestedMap.get("nested"));
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java
index 4db6face30911..fd8b3538777d7 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java
@@ -86,10 +86,10 @@ protected Map, Object>> pluginScripts() {
aggScript(vars, state -> {
// Lazily populate state.list for tests without an init script
if (state.containsKey("list") == false) {
- state.put("list", new ArrayList());
+ state.put("list", new ArrayList<>());
}
- ((List) state.get("list")).add(1);
+ ((List
*/
public synchronized void addAffixGroupUpdateConsumer(List> settings, BiConsumer consumer) {
- List affixUpdaters = new ArrayList<>(settings.size());
+ List> affixUpdaters = new ArrayList<>(settings.size());
for (Setting.AffixSetting> setting : settings) {
ensureSettingIsRegistered(setting);
affixUpdaters.add(setting.newAffixUpdater((a,b)-> {}, logger, (a,b)-> {}));
@@ -323,7 +323,7 @@ public boolean hasChanged(Settings current, Settings previous) {
public Map getValue(Settings current, Settings previous) {
Set namespaces = new HashSet<>();
for (Setting.AffixSetting> setting : settings) {
- SettingUpdater affixUpdaterA = setting.newAffixUpdater((k, v) -> namespaces.add(k), logger, (a, b) ->{});
+ SettingUpdater> affixUpdaterA = setting.newAffixUpdater((k, v) -> namespaces.add(k), logger, (a, b) ->{});
affixUpdaterA.apply(current, previous);
}
Map namespaceToSettings = new HashMap<>(namespaces.size());
@@ -506,7 +506,7 @@ void validate(final String key, final Settings settings, final boolean validateV
*/
void validate(
final String key, final Settings settings, final boolean validateValue, final boolean validateInternalOrPrivateIndex) {
- Setting setting = getRaw(key);
+ Setting> setting = getRaw(key);
if (setting == null) {
LevenshteinDistance ld = new LevenshteinDistance();
List> scoredKeys = new ArrayList<>();
diff --git a/server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java b/server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java
index cb31074ea478a..86b73635424e8 100644
--- a/server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java
+++ b/server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java
@@ -197,7 +197,7 @@ public IndexScopedSettings copy(Settings settings, IndexMetadata metadata) {
}
@Override
- protected void validateSettingKey(Setting setting) {
+ protected void validateSettingKey(Setting> setting) {
if (setting.getKey().startsWith("index.") == false) {
throw new IllegalArgumentException("illegal settings key: [" + setting.getKey() + "] must start with [index.]");
}
diff --git a/server/src/main/java/org/elasticsearch/common/settings/Settings.java b/server/src/main/java/org/elasticsearch/common/settings/Settings.java
index 60c2a38df5123..56deb5c891f2d 100644
--- a/server/src/main/java/org/elasticsearch/common/settings/Settings.java
+++ b/server/src/main/java/org/elasticsearch/common/settings/Settings.java
@@ -545,6 +545,7 @@ public static Settings readSettingsFromStream(StreamInput in) throws IOException
return builder.build();
}
+ @SuppressWarnings("unchecked")
public static void writeSettingsToStream(Settings settings, StreamOutput out) throws IOException {
// pull settings to exclude secure settings in size()
Set> entries = settings.settings.entrySet();
@@ -555,12 +556,12 @@ public static void writeSettingsToStream(Settings settings, StreamOutput out) th
out.writeGenericValue(entry.getValue());
}
} else {
- int size = entries.stream().mapToInt(e -> e.getValue() instanceof List ? ((List)e.getValue()).size() : 1).sum();
+ int size = entries.stream().mapToInt(e -> e.getValue() instanceof List ? ((List>) e.getValue()).size() : 1).sum();
out.writeVInt(size);
for (Map.Entry entry : entries) {
if (entry.getValue() instanceof List) {
int idx = 0;
- for (String value : (List)entry.getValue()) {
+ for (String value : (List) entry.getValue()) {
out.writeString(entry.getKey() + "." + idx++);
out.writeOptionalString(value);
}
diff --git a/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java b/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java
index 48f24cf7ac815..ed8c50caef9a7 100644
--- a/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java
+++ b/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java
@@ -269,12 +269,13 @@ public static int sortAndDedup(final BytesRefArray bytes, final int[] indices) {
}
+ @SuppressWarnings("unchecked")
public static ArrayList iterableAsArrayList(Iterable extends E> elements) {
if (elements == null) {
throw new NullPointerException("elements");
}
if (elements instanceof Collection) {
- return new ArrayList<>((Collection)elements);
+ return new ArrayList<>((Collection) elements);
} else {
ArrayList list = new ArrayList<>();
for (E element : elements) {
@@ -293,6 +294,8 @@ public static ArrayList arrayAsArrayList(E... elements) {
return new ArrayList<>(Arrays.asList(elements));
}
+ @SafeVarargs
+ @SuppressWarnings("varargs")
public static ArrayList asArrayList(E first, E... other) {
if (other == null) {
throw new NullPointerException("other");
@@ -303,6 +306,8 @@ public static ArrayList asArrayList(E first, E... other) {
return list;
}
+ @SafeVarargs
+ @SuppressWarnings("varargs")
public static ArrayList asArrayList(E first, E second, E... other) {
if (other == null) {
throw new NullPointerException("other");
diff --git a/server/src/main/java/org/elasticsearch/common/util/set/Sets.java b/server/src/main/java/org/elasticsearch/common/util/set/Sets.java
index 8b9165d222101..a7f9b3e203f40 100644
--- a/server/src/main/java/org/elasticsearch/common/util/set/Sets.java
+++ b/server/src/main/java/org/elasticsearch/common/util/set/Sets.java
@@ -40,9 +40,11 @@ public static HashSet newHashSet(Iterator iterator) {
public static HashSet newHashSet(Iterable iterable) {
Objects.requireNonNull(iterable);
- return iterable instanceof Collection ? new HashSet<>((Collection)iterable) : newHashSet(iterable.iterator());
+ return iterable instanceof Collection ? new HashSet<>((Collection) iterable) : newHashSet(iterable.iterator());
}
+ @SafeVarargs
+ @SuppressWarnings("varargs")
public static HashSet newHashSet(T... elements) {
Objects.requireNonNull(elements);
HashSet set = new HashSet<>(elements.length);
diff --git a/server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java b/server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java
index 989fa0d7d6712..a8e41d4b0fcd4 100644
--- a/server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java
+++ b/server/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java
@@ -289,20 +289,18 @@ public static void mergeDefaults(Map content, Map) content.get(defaultEntry.getKey()), (Map) defaultEntry.getValue());
} else if (content.get(defaultEntry.getKey()) instanceof List && defaultEntry.getValue() instanceof List) {
- List defaultList = (List) defaultEntry.getValue();
- List contentList = (List) content.get(defaultEntry.getKey());
+ List