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) state.get("list")).add(1); })); scripts.put("state[param1] = param2", vars -> @@ -100,7 +100,7 @@ protected Map, Object>> pluginScripts() { ((Map) vars.get("vars")).put("multiplier", 3); Map state = (Map) vars.get("state"); - state.put("list", new ArrayList()); + state.put("list", new ArrayList<>()); return state; }); @@ -109,10 +109,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(XContentMapValues.extractValue("vars.multiplier", vars)); + ((List) state.get("list")).add(XContentMapValues.extractValue("vars.multiplier", vars)); })); // Equivalent to: @@ -128,12 +128,12 @@ protected Map, Object>> pluginScripts() { // return newaggregation" // scripts.put("sum state values as a new aggregation", vars -> { - List newAggregation = new ArrayList(); + List newAggregation = new ArrayList<>(); Map state = (Map) vars.get("state"); List list = (List) state.get("list"); if (list != null) { - Integer sum = 0; + int sum = 0; for (Object s : list) { sum += ((Number) s).intValue(); } @@ -142,13 +142,9 @@ protected Map, Object>> pluginScripts() { return newAggregation; }); - scripts.put("no-op aggregation", vars -> { - return (Map) vars.get("state"); - }); + scripts.put("no-op aggregation", vars -> vars.get("state")); - scripts.put("no-op list aggregation", vars -> { - return (List>) vars.get("states"); - }); + scripts.put("no-op list aggregation", vars -> vars.get("states")); // Equivalent to: // @@ -165,8 +161,8 @@ protected Map, Object>> pluginScripts() { // return newaggregation" // scripts.put("sum all states (lists) values as a new aggregation", vars -> { - List newAggregation = new ArrayList(); - Integer sum = 0; + List newAggregation = new ArrayList<>(); + int sum = 0; List> states = (List>) vars.get("states"); for (List list : states) { @@ -181,8 +177,8 @@ protected Map, Object>> pluginScripts() { }); scripts.put("sum all states' state.list values as a new aggregation", vars -> { - List newAggregation = new ArrayList(); - Integer sum = 0; + List newAggregation = new ArrayList<>(); + int sum = 0; List> states = (List>) vars.get("states"); @@ -218,8 +214,8 @@ protected Map, Object>> pluginScripts() { // scripts.put("multiplied sum all states (lists) values as a new aggregation", vars -> { Integer multiplier = (Integer) vars.get("multiplier"); - List newAggregation = new ArrayList(); - Integer sum = 0; + List newAggregation = new ArrayList<>(); + int sum = 0; List> states = (List>) vars.get("states"); for (List list : states) { @@ -253,8 +249,8 @@ protected Map, Object>> nonDeterministicPlu return scripts; } - @SuppressWarnings("unchecked") static Map aggScript(Map vars, Consumer> fn) { + @SuppressWarnings("unchecked") Map aggState = (Map) vars.get("state"); fn.accept(aggState); return aggState; @@ -377,7 +373,7 @@ public void testMap() { if (map.size() == 1) { assertThat(map.get("count"), notNullValue()); assertThat(map.get("count"), instanceOf(Number.class)); - assertThat(map.get("count"), equalTo((Number) 1)); + assertThat(map.get("count"), equalTo(1)); numShardsRun++; } } @@ -431,7 +427,7 @@ public void testMapWithParams() { String stringValue = (String) entry.getKey(); assertThat(stringValue, equalTo("12")); Number numberValue = (Number) entry.getValue(); - assertThat(numberValue, equalTo((Number) 1)); + assertThat(numberValue, equalTo(1)); numShardsRun++; } } @@ -476,6 +472,7 @@ public void testInitMutatesParams() { for (Object object : aggregationList) { assertThat(object, notNullValue()); assertThat(object, instanceOf(HashMap.class)); + @SuppressWarnings("unchecked") Map map = (Map) object; assertThat(map, hasKey("list")); assertThat(map.get("list"), instanceOf(List.class)); @@ -484,7 +481,7 @@ public void testInitMutatesParams() { assertThat(o, notNullValue()); assertThat(o, instanceOf(Number.class)); Number numberValue = (Number) o; - assertThat(numberValue, equalTo((Number) 3)); + assertThat(numberValue, equalTo(3)); totalCount += numberValue.longValue(); } } @@ -698,8 +695,8 @@ public void testInitMapCombineReduceGetProperty() throws Exception { assertThat(object, instanceOf(Number.class)); assertThat(((Number) object).longValue(), equalTo(numDocs * 3)); assertThat(((InternalAggregation)global).getProperty("scripted"), sameInstance(scriptedMetricAggregation)); - assertThat((List) ((InternalAggregation)global).getProperty("scripted.value"), sameInstance((List) aggregationList)); - assertThat((List) ((InternalAggregation)scriptedMetricAggregation).getProperty("value"), sameInstance((List) aggregationList)); + assertThat((List) ((InternalAggregation)global).getProperty("scripted.value"), sameInstance(aggregationList)); + assertThat((List) ((InternalAggregation)scriptedMetricAggregation).getProperty("value"), sameInstance(aggregationList)); } public void testMapCombineReduceWithParams() { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/MovAvgIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/MovAvgIT.java index 01a54223f3c08..06a156c82c5e4 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/MovAvgIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/MovAvgIT.java @@ -1248,7 +1248,7 @@ public void testPredictWithNonEmptyBuckets() throws Exception { } } - private void assertValidIterators(Iterator expectedBucketIter, Iterator expectedCountsIter, Iterator expectedValuesIter) { + private void assertValidIterators(Iterator expectedBucketIter, Iterator expectedCountsIter, Iterator expectedValuesIter) { if (expectedBucketIter.hasNext() == false) { fail("`expectedBucketIter` iterator ended before `actual` iterator, size mismatch"); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/SerialDiffIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/SerialDiffIT.java index 7cb75db75e502..66b44a18dd6c1 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/SerialDiffIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/SerialDiffIT.java @@ -81,7 +81,7 @@ public String toString(){ } } - private void assertValidIterators(Iterator expectedBucketIter, Iterator expectedCountsIter, Iterator expectedValuesIter) { + private void assertValidIterators(Iterator expectedBucketIter, Iterator expectedCountsIter, Iterator expectedValuesIter) { if (expectedBucketIter.hasNext() == false) { fail("`expectedBucketIter` iterator ended before `actual` iterator, size mismatch"); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/fields/SearchFieldsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/fields/SearchFieldsIT.java index fe9e82e7efef8..dde5fbe2bde78 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/fields/SearchFieldsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/fields/SearchFieldsIT.java @@ -85,27 +85,28 @@ protected Map, Object>> pluginScripts() { Map, Object>> scripts = new HashMap<>(); scripts.put("doc['num1'].value", vars -> { - Map doc = (Map) vars.get("doc"); + Map doc = (Map) vars.get("doc"); ScriptDocValues.Doubles num1 = (ScriptDocValues.Doubles) doc.get("num1"); return num1.getValue(); }); scripts.put("doc['num1'].value * factor", vars -> { - Map doc = (Map) vars.get("doc"); + Map doc = (Map) vars.get("doc"); ScriptDocValues.Doubles num1 = (ScriptDocValues.Doubles) doc.get("num1"); + @SuppressWarnings("unchecked") Map params = (Map) vars.get("params"); Double factor = (Double) params.get("factor"); return num1.getValue() * factor; }); scripts.put("doc['date'].date.millis", vars -> { - Map doc = (Map) vars.get("doc"); + Map doc = (Map) vars.get("doc"); ScriptDocValues.Dates dates = (ScriptDocValues.Dates) doc.get("date"); return dates.getValue().toInstant().toEpochMilli(); }); scripts.put("doc['date'].date.nanos", vars -> { - Map doc = (Map) vars.get("doc"); + Map doc = (Map) vars.get("doc"); ScriptDocValues.Dates dates = (ScriptDocValues.Dates) doc.get("date"); return DateUtils.toLong(dates.getValue().toInstant()); }); @@ -135,19 +136,19 @@ protected Map, Object>> pluginScripts() { } static Object fieldsScript(Map vars, String fieldName) { - Map fields = (Map) vars.get("_fields"); + Map fields = (Map) vars.get("_fields"); FieldLookup fieldLookup = (FieldLookup) fields.get(fieldName); return fieldLookup.getValue(); } - @SuppressWarnings("unchecked") static Object sourceScript(Map vars, String path) { - Map source = (Map) vars.get("_source"); + @SuppressWarnings("unchecked") + Map source = (Map) vars.get("_source"); return XContentMapValues.extractValue(path, source); } static Object docScript(Map vars, String fieldName) { - Map doc = (Map) vars.get("doc"); + Map doc = (Map) vars.get("doc"); ScriptDocValues values = (ScriptDocValues) doc.get(fieldName); return values; } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/query/ExistsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/query/ExistsIT.java index bb268718d1652..a264456ee5d37 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/ExistsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/ExistsIT.java @@ -79,7 +79,7 @@ public void testExists() throws Exception { Map barObject = new HashMap<>(); barObject.put("foo", "bar"); barObject.put("bar", singletonMap("bar", "foo")); - @SuppressWarnings("unchecked") + @SuppressWarnings({"rawtypes", "unchecked"}) final Map[] sources = new Map[] { // simple property singletonMap("foo", "bar"), diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/DuelScrollIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/DuelScrollIT.java index 4a23c7df6028d..867133f3ce694 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/DuelScrollIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/DuelScrollIT.java @@ -142,7 +142,7 @@ private TestContext create(SearchType... searchTypes) throws Exception { } refresh(); - final SortBuilder sort; + final SortBuilder sort; if (randomBoolean()) { if (randomBoolean()) { sort = SortBuilders.fieldSort("field1").missing(1); @@ -170,10 +170,10 @@ class TestContext { final int numDocs; final int scrollRequestSize; - final SortBuilder sort; + final SortBuilder sort; final SearchType searchType; - TestContext(int numDocs, int scrollRequestSize, SortBuilder sort, SearchType searchType) { + TestContext(int numDocs, int scrollRequestSize, SortBuilder sort, SearchType searchType) { this.numDocs = numDocs; this.scrollRequestSize = scrollRequestSize; this.sort = sort; diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/searchafter/SearchAfterIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/searchafter/SearchAfterIT.java index 273e92e2a06f8..cd08e12424744 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/searchafter/SearchAfterIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/searchafter/SearchAfterIT.java @@ -154,9 +154,9 @@ public void testWithSimpleTypes() throws Exception { for (int i = 0; i < numFields-1; i++) { types[i] = randomInt(6); } - List documents = new ArrayList<>(); + List> documents = new ArrayList<>(); for (int i = 0; i < NUM_DOCS; i++) { - List values = new ArrayList<>(); + List values = new ArrayList<>(); for (int type : types) { switch (type) { case 0: @@ -266,9 +266,9 @@ public void testWithCustomFormatSortValueOfDateField() throws Exception { containsString("failed to parse date field [23/04/2018] with format [epoch_millis]")); } - private static class ListComparator implements Comparator { + private static class ListComparator implements Comparator> { @Override - public int compare(List o1, List o2) { + public int compare(List o1, List o2) { if (o1.size() > o2.size()) { return 1; } @@ -283,6 +283,7 @@ public int compare(List o1, List o2) { } Object cmp1 = o1.get(i); Object cmp2 = o2.get(i); + @SuppressWarnings({"unchecked", "rawtypes"}) int cmp = ((Comparable)cmp1).compareTo(cmp2); if (cmp != 0) { return cmp; @@ -293,7 +294,8 @@ public int compare(List o1, List o2) { } private ListComparator LST_COMPARATOR = new ListComparator(); - private void assertSearchFromWithSortValues(String indexName, String typeName, List documents, int reqSize) throws Exception { + private void assertSearchFromWithSortValues(String indexName, String typeName, List> documents, int reqSize) + throws Exception { int numFields = documents.get(0).size(); { createIndexMappingsFromObjectType(indexName, typeName, documents.get(0)); @@ -325,7 +327,7 @@ private void assertSearchFromWithSortValues(String indexName, String typeName, L } SearchResponse searchResponse = req.get(); for (SearchHit hit : searchResponse.getHits()) { - List toCompare = convertSortValues(documents.get(offset++)); + List toCompare = convertSortValues(documents.get(offset++)); assertThat(LST_COMPARATOR.compare(toCompare, Arrays.asList(hit.getSortValues())), equalTo(0)); } sortValues = searchResponse.getHits().getHits()[searchResponse.getHits().getHits().length-1].getSortValues(); @@ -337,7 +339,7 @@ private void createIndexMappingsFromObjectType(String indexName, String typeName List mappings = new ArrayList<> (); int numFields = types.size(); for (int i = 0; i < numFields; i++) { - Class type = types.get(i).getClass(); + Class type = types.get(i).getClass(); if (type == Integer.class) { mappings.add("field" + Integer.toString(i)); mappings.add("type=integer"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java index 57edcbe2183a6..24dfa534058af 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java @@ -237,7 +237,7 @@ public void testOpenContexts() { protected int numAssignedShards(String... indices) { ClusterState state = client().admin().cluster().prepareState().get().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/search/suggest/ContextCompletionSuggestSearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java index 7546a62e45f15..e572813d047fa 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java @@ -600,7 +600,7 @@ public void testSkipDuplicatesWithContexts() throws Exception { assertSuggestions("suggestions", completionSuggestionBuilder, expectedModulo); } - public void assertSuggestions(String suggestionName, SuggestionBuilder suggestBuilder, String... suggestions) { + public void assertSuggestions(String suggestionName, SuggestionBuilder suggestBuilder, String... suggestions) { SearchResponse searchResponse = client().prepareSearch(INDEX).suggest( new SuggestBuilder().addSuggestion(suggestionName, suggestBuilder) ).get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CustomMetadataSnapshotIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CustomMetadataSnapshotIT.java index 03a38c70de2d8..98bf5449af936 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CustomMetadataSnapshotIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CustomMetadataSnapshotIT.java @@ -164,7 +164,7 @@ public TestCustomMetadataPlugin() { private void registerMetadataCustom( String name, Writeable.Reader reader, - Writeable.Reader diffReader, + Writeable.Reader> diffReader, CheckedFunction parser ) { namedWritables.add(new NamedWriteableRegistry.Entry(Metadata.Custom.class, name, reader)); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/update/UpdateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/update/UpdateIT.java index 157593a1f5795..d41d2fb812fdb 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/update/UpdateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/update/UpdateIT.java @@ -65,6 +65,11 @@ public class UpdateIT extends ESIntegTestCase { private static final String UPSERT_SCRIPT = "scripted_upsert"; private static final String EXTRACT_CTX_SCRIPT = "extract_ctx"; + @SuppressWarnings("unchecked") + private static Map get(Map source, String key) { + return (Map) source.get(key); + } + public static class UpdateScriptsPlugin extends MockScriptPlugin { @Override public String pluginScriptLang() { @@ -74,38 +79,39 @@ public String pluginScriptLang() { protected Map, Object>> pluginScripts() { Map, Object>> scripts = new HashMap<>(); scripts.put(PUT_VALUES_SCRIPT, vars -> { - Map ctx = (Map) vars.get("ctx"); + Map ctx = get(vars, "ctx"); assertNotNull(ctx); - Map params = new HashMap<>((Map) vars.get("params")); + Map params = new HashMap<>(get(vars, "params")); + @SuppressWarnings("unchecked") Map newCtx = (Map) params.remove("_ctx"); if (newCtx != null) { assertFalse(newCtx.containsKey("_source")); ctx.putAll(newCtx); } - Map source = (Map) ctx.get("_source"); + Map source = get(ctx, "_source"); params.remove("ctx"); source.putAll(params); return ctx; }); scripts.put(FIELD_INC_SCRIPT, vars -> { - Map params = (Map) vars.get("params"); + Map params = get(vars, "params"); String fieldname = (String) vars.get("field"); - Map ctx = (Map) vars.get("ctx"); + Map ctx = get(vars, "ctx"); assertNotNull(ctx); - Map source = (Map) ctx.get("_source"); + Map source = get(ctx, "_source"); Number currentValue = (Number) source.get(fieldname); Number inc = (Number) params.getOrDefault("inc", 1); source.put(fieldname, currentValue.longValue() + inc.longValue()); return ctx; }); scripts.put(UPSERT_SCRIPT, vars -> { - Map ctx = (Map) vars.get("ctx"); + Map ctx = get(vars, "ctx"); assertNotNull(ctx); - Map source = (Map) ctx.get("_source"); + Map source = get(ctx, "_source"); Number payment = (Number) vars.get("payment"); Number oldBalance = (Number) source.get("balance"); int deduction = "create".equals(ctx.get("op")) ? payment.intValue() / 2 : payment.intValue(); @@ -113,10 +119,10 @@ protected Map, Object>> pluginScripts() { return ctx; }); scripts.put(EXTRACT_CTX_SCRIPT, vars -> { - Map ctx = (Map) vars.get("ctx"); + Map ctx = get(vars, "ctx"); assertNotNull(ctx); - Map source = (Map) ctx.get("_source"); + Map source = get(ctx, "_source"); Map ctxWithoutSource = new HashMap<>(ctx); ctxWithoutSource.remove("_source"); source.put("update_context", ctxWithoutSource); @@ -392,12 +398,12 @@ public void testUpdate() throws Exception { .setDoc(XContentFactory.jsonBuilder().startObject().field("map", testMap3).endObject()).execute().actionGet(); for (int i = 0; i < 5; i++) { GetResponse getResponse = client().prepareGet("test", "type1", "1").execute().actionGet(); - Map map1 = (Map) getResponse.getSourceAsMap().get("map"); + Map map1 = get(getResponse.getSourceAsMap(), "map"); assertThat(map1.size(), equalTo(3)); assertThat(map1.containsKey("map1"), equalTo(true)); assertThat(map1.containsKey("map3"), equalTo(true)); assertThat(map1.containsKey("commonkey"), equalTo(true)); - Map map2 = (Map) map1.get("commonkey"); + Map map2 = get(map1, "commonkey"); assertThat(map2.size(), equalTo(3)); assertThat(map2.containsKey("map1"), equalTo(true)); assertThat(map2.containsKey("map2"), equalTo(true)); @@ -511,7 +517,7 @@ public void testContextVariables() throws Exception { assertEquals(2, updateResponse.getVersion()); GetResponse getResponse = client().prepareGet("test", "type1", "id1").setRouting("routing1").execute().actionGet(); - Map updateContext = (Map) getResponse.getSourceAsMap().get("update_context"); + Map updateContext = get(getResponse.getSourceAsMap(), "update_context"); assertEquals("test", updateContext.get("_index")); assertEquals("type1", updateContext.get("_type")); assertEquals("id1", updateContext.get("_id")); @@ -526,7 +532,7 @@ public void testContextVariables() throws Exception { assertEquals(2, updateResponse.getVersion()); getResponse = client().prepareGet("test", "type1", "id2").execute().actionGet(); - updateContext = (Map) getResponse.getSourceAsMap().get("update_context"); + updateContext = get(getResponse.getSourceAsMap(), "update_context"); assertEquals("test", updateContext.get("_index")); assertEquals("type1", updateContext.get("_type")); assertEquals("id2", updateContext.get("_id")); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java index ce914030968d6..4ffcef52d8f43 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java @@ -54,7 +54,7 @@ public void onFailure(Exception e) { client().admin().indices().prepareRefresh().execute().actionGet(); logger.info("done indexing, check all have the same field value"); - Map masterSource = client().prepareGet("test", "type1", "1").execute().actionGet().getSourceAsMap(); + Map masterSource = client().prepareGet("test", "type1", "1").execute().actionGet().getSourceAsMap(); for (int i = 0; i < (cluster().size() * 5); i++) { assertThat(client().prepareGet("test", "type1", "1").execute().actionGet().getSourceAsMap(), equalTo(masterSource)); } diff --git a/server/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java b/server/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java index 166705b563669..0a548a100d298 100644 --- a/server/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java +++ b/server/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java @@ -99,6 +99,7 @@ private static class MergeSortQueue extends PriorityQueue { final FieldComparator[] comparators; final int[] reverseMul; + @SuppressWarnings("rawtypes") MergeSortQueue(Sort sort, CollapseTopFieldDocs[] shardHits) { super(shardHits.length); this.shardHits = new ScoreDoc[shardHits.length][]; @@ -133,8 +134,10 @@ public boolean lessThan(ShardRef first, ShardRef second) { final FieldDoc secondFD = (FieldDoc) shardHits[second.shardIndex][second.hitIndex]; for (int compIDX = 0; compIDX < comparators.length; compIDX++) { + @SuppressWarnings("rawtypes") final FieldComparator comp = comparators[compIDX]; + @SuppressWarnings("unchecked") final int cmp = reverseMul[compIDX] * comp.compareValues(firstFD.fields[compIDX], secondFD.fields[compIDX]); diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java index 885a0caf8f534..c39288061b2ea 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java @@ -84,6 +84,7 @@ public static GetMappingsResponse fromXContent(XContentParser parser) throws IOE for (Map.Entry entry : parts.entrySet()) { final String indexName = entry.getKey(); assert entry.getValue() instanceof Map : "expected a map as type mapping, but got: " + entry.getValue().getClass(); + @SuppressWarnings("unchecked") final Map mapping = (Map) ((Map) entry.getValue()).get(MAPPINGS.getPreferredName()); ImmutableOpenMap.Builder typeBuilder = new ImmutableOpenMap.Builder<>(); @@ -91,6 +92,7 @@ public static GetMappingsResponse fromXContent(XContentParser parser) throws IOE final String typeName = typeEntry.getKey(); assert typeEntry.getValue() instanceof Map : "expected a map as inner type mapping, but got: " + typeEntry.getValue().getClass(); + @SuppressWarnings("unchecked") final Map fieldMappings = (Map) typeEntry.getValue(); MappingMetadata mmd = new MappingMetadata(typeName, fieldMappings); typeBuilder.put(typeName, mmd); diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverInfo.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverInfo.java index 7b589bc1855b0..638d04a933cc7 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverInfo.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverInfo.java @@ -24,6 +24,8 @@ import java.util.List; import java.util.Objects; +import static org.elasticsearch.core.Types.forciblyCast; + /** * Class for holding Rollover related information within an index */ @@ -54,7 +56,7 @@ public RolloverInfo(String alias, List> metConditions, long time) { public RolloverInfo(StreamInput in) throws IOException { this.alias = in.readString(); this.time = in.readVLong(); - this.metConditions = (List) in.readNamedWriteableList(Condition.class); + this.metConditions = forciblyCast(in.readNamedWriteableList(Condition.class)); } public static RolloverInfo parse(XContentParser parser, String alias) { diff --git a/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java b/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java index f37e3d8849c45..b20aee3f98ea5 100644 --- a/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java +++ b/server/src/main/java/org/elasticsearch/action/explain/ExplainResponse.java @@ -155,10 +155,12 @@ public void writeTo(StreamOutput out) throws IOException { PARSER.declareString(ConstructingObjectParser.constructorArg(), _ID); final ConstructingObjectParser explanationParser = new ConstructingObjectParser<>("explanation", true, arg -> { + @SuppressWarnings("unchecked") + final Collection details = (Collection) arg[2]; if ((float) arg[0] > 0) { - return Explanation.match((float) arg[0], (String) arg[1], (Collection) arg[2]); + return Explanation.match((float) arg[0], (String) arg[1], details); } else { - return Explanation.noMatch((String) arg[1], (Collection) arg[2]); + return Explanation.noMatch((String) arg[1], details); } }); explanationParser.declareFloat(ConstructingObjectParser.constructorArg(), VALUE); diff --git a/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java index d13ef4dca5517..c6da5ba0db358 100644 --- a/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java +++ b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java @@ -45,6 +45,7 @@ public class BroadcastResponse extends ActionResponse implements ToXContentObjec private DefaultShardOperationFailedException[] shardFailures = EMPTY; protected static void declareBroadcastFields(ConstructingObjectParser PARSER) { + @SuppressWarnings("unchecked") ConstructingObjectParser shardsParser = new ConstructingObjectParser<>("_shards", true, arg -> new BroadcastResponse((int) arg[0], (int) arg[1], (int) arg[2], (List) arg[3])); shardsParser.declareInt(constructorArg(), TOTAL_FIELD); diff --git a/server/src/main/java/org/elasticsearch/action/support/replication/TransportBroadcastReplicationAction.java b/server/src/main/java/org/elasticsearch/action/support/replication/TransportBroadcastReplicationAction.java index 25809df68e375..5decdfbf855d0 100644 --- a/server/src/main/java/org/elasticsearch/action/support/replication/TransportBroadcastReplicationAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/replication/TransportBroadcastReplicationAction.java @@ -38,6 +38,7 @@ * Base class for requests that should be executed on all shards of an index or several indices. * This action sends shard requests to all primary shards of the indices and they are then replicated like write requests */ +@SuppressWarnings("rawtypes") public abstract class TransportBroadcastReplicationAction, Response extends BroadcastResponse, ShardRequest extends ReplicationRequest, ShardResponse extends ReplicationResponse> extends HandledTransportAction { @@ -101,6 +102,7 @@ public void onFailure(Exception e) { } } + @SuppressWarnings("unchecked") protected void shardExecute(Task task, Request request, ShardId shardId, ActionListener shardActionListener) { ShardRequest shardRequest = newShardRequest(request, shardId); shardRequest.setParentTask(clusterService.localNode().getId(), task.getId()); diff --git a/server/src/main/java/org/elasticsearch/client/transport/TransportClient.java b/server/src/main/java/org/elasticsearch/client/transport/TransportClient.java index 9fc285350aa8b..e163a0b59530d 100644 --- a/server/src/main/java/org/elasticsearch/client/transport/TransportClient.java +++ b/server/src/main/java/org/elasticsearch/client/transport/TransportClient.java @@ -103,6 +103,8 @@ private static PluginsService newPluginService(final Settings settings, Collecti return new PluginsService(settingsBuilder.build(), null, null, null, plugins); } + @SafeVarargs + @SuppressWarnings("varargs") protected static Collection> addPlugins(Collection> collection, Class... plugins) { return addPlugins(collection, Arrays.asList(plugins)); @@ -206,7 +208,7 @@ private static ClientTemplate buildTemplate(Settings providedSettings, Settings // construct the list of client actions final List actionPlugins = pluginsService.filterPlugins(ActionPlugin.class); - final List clientActions = + final List> clientActions = actionPlugins.stream().flatMap(p -> p.getClientActions().stream()).collect(Collectors.toList()); // add all the base actions final List> baseActions = diff --git a/server/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java b/server/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java index 5de69f49d113c..e22213d1647ce 100644 --- a/server/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java +++ b/server/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java @@ -25,12 +25,13 @@ final class TransportProxyClient { private final TransportClientNodesService nodesService; - private final Map proxies; + private final Map, TransportActionNodeProxy> proxies; - TransportProxyClient(TransportService transportService, TransportClientNodesService nodesService, List actions) { + @SuppressWarnings({"rawtypes", "unchecked"}) + TransportProxyClient(TransportService transportService, TransportClientNodesService nodesService, List> actions) { this.nodesService = nodesService; - Map proxies = new HashMap<>(); - for (ActionType action : actions) { + Map, TransportActionNodeProxy> proxies = new HashMap<>(); + for (ActionType action : actions) { proxies.put(action, new TransportActionNodeProxy(action, transportService)); } this.proxies = unmodifiableMap(proxies); @@ -39,7 +40,8 @@ final class TransportProxyClient { public > void execute(final ActionType action, final Request request, ActionListener listener) { - final TransportActionNodeProxy proxy = proxies.get(action); + @SuppressWarnings("unchecked") + final TransportActionNodeProxy proxy = (TransportActionNodeProxy) proxies.get(action); assert proxy != null : "no proxy found for action: " + action; nodesService.execute((n, l) -> proxy.execute(n, request, l), listener); } diff --git a/server/src/main/java/org/elasticsearch/cluster/ClusterState.java b/server/src/main/java/org/elasticsearch/cluster/ClusterState.java index 7ded08c537d24..fb05e81bc7468 100644 --- a/server/src/main/java/org/elasticsearch/cluster/ClusterState.java +++ b/server/src/main/java/org/elasticsearch/cluster/ClusterState.java @@ -262,6 +262,7 @@ public ImmutableOpenMap getCustoms() { return this.customs; } + @SuppressWarnings("unchecked") public T custom(String type) { return (T) customs.get(type); } diff --git a/server/src/main/java/org/elasticsearch/cluster/DiffableUtils.java b/server/src/main/java/org/elasticsearch/cluster/DiffableUtils.java index 702a1da225426..2e215a90cb534 100644 --- a/server/src/main/java/org/elasticsearch/cluster/DiffableUtils.java +++ b/server/src/main/java/org/elasticsearch/cluster/DiffableUtils.java @@ -594,6 +594,7 @@ default boolean supportsVersion(V value, Version version) { * @param type of map values */ public abstract static class DiffableValueSerializer> implements ValueSerializer { + @SuppressWarnings("rawtypes") private static final DiffableValueSerializer WRITE_ONLY_INSTANCE = new DiffableValueSerializer() { @Override public Object read(StreamInput in, Object key) throws IOException { @@ -606,6 +607,7 @@ public Diff readDiff(StreamInput in, Object key) throws IOException { } }; + @SuppressWarnings("unchecked") private static > DiffableValueSerializer getWriteOnlyInstance() { return WRITE_ONLY_INSTANCE; } @@ -689,8 +691,10 @@ public Diff readDiff(StreamInput in, K key) throws IOException { * @param type of map key */ public static class StringSetValueSerializer extends NonDiffableValueSerializer> { + @SuppressWarnings("rawtypes") private static final StringSetValueSerializer INSTANCE = new StringSetValueSerializer(); + @SuppressWarnings("unchecked") public static StringSetValueSerializer getInstance() { return INSTANCE; } diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetadata.java index 6f9e64435c0cc..1c71f81ca4a3e 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetadata.java @@ -378,6 +378,7 @@ static void toInnerXContentWithTypes(IndexTemplateMetadata indexTemplateMetadata toInnerXContent(indexTemplateMetadata, builder, params, true); } + @SuppressWarnings("unchecked") private static void toInnerXContent(IndexTemplateMetadata indexTemplateMetadata, XContentBuilder builder, ToXContent.Params params, diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MappingMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MappingMetadata.java index 470a9cfeadddd..37af065461fe3 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/MappingMetadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MappingMetadata.java @@ -73,6 +73,7 @@ public MappingMetadata(DocumentMapper docMapper) { this.routing = new Routing(docMapper.routingFieldMapper().required()); } + @SuppressWarnings("unchecked") public MappingMetadata(CompressedXContent mapping) { this.source = mapping; Map mappingMap = XContentHelper.convertToMap(mapping.compressedReference(), true).v2(); @@ -83,6 +84,7 @@ public MappingMetadata(CompressedXContent mapping) { initMappers((Map) mappingMap.get(this.type)); } + @SuppressWarnings("unchecked") public MappingMetadata(String type, Map mapping) throws IOException { this.type = type; this.source = new CompressedXContent( @@ -94,6 +96,7 @@ public MappingMetadata(String type, Map mapping) throws IOExcept initMappers(withoutType); } + @SuppressWarnings("unchecked") private void initMappers(Map withoutType) { if (withoutType.containsKey("_routing")) { boolean required = false; @@ -133,6 +136,7 @@ public CompressedXContent source() { /** * Converts the serialized compressed form of the mappings into a parsed map. */ + @SuppressWarnings("unchecked") public Map sourceAsMap() throws ElasticsearchParseException { Map mapping = XContentHelper.convertToMap(source.compressedReference(), true).v2(); if (mapping.size() == 1 && mapping.containsKey(type())) { diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java index f4321a7a5aac8..48a0b6ccc1d01 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/Metadata.java @@ -801,6 +801,7 @@ public IndexGraveyard indexGraveyard() { return custom(IndexGraveyard.TYPE); } + @SuppressWarnings("unchecked") public T custom(String type) { return (T) customs.get(type); } diff --git a/server/src/main/java/org/elasticsearch/common/cache/Cache.java b/server/src/main/java/org/elasticsearch/common/cache/Cache.java index cea29f6be5349..6493b34057dfe 100644 --- a/server/src/main/java/org/elasticsearch/common/cache/Cache.java +++ b/server/src/main/java/org/elasticsearch/common/cache/Cache.java @@ -326,7 +326,8 @@ void eviction() { } public static final int NUMBER_OF_SEGMENTS = 256; - @SuppressWarnings("unchecked") private final CacheSegment[] segments = new CacheSegment[NUMBER_OF_SEGMENTS]; + @SuppressWarnings({"rawtypes", "unchecked"}) + private final CacheSegment[] segments = new CacheSegment[NUMBER_OF_SEGMENTS]; { for (int i = 0; i < segments.length; i++) { diff --git a/server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java b/server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java index 473fd0cc3cdd3..90d407b3ca0f3 100644 --- a/server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java +++ b/server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenIntMap.java @@ -150,7 +150,7 @@ public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - ImmutableOpenIntMap that = (ImmutableOpenIntMap) o; + @SuppressWarnings("rawtypes") ImmutableOpenIntMap that = (ImmutableOpenIntMap) o; if (map.equals(that.map) == false) return false; @@ -162,7 +162,7 @@ public int hashCode() { return map.hashCode(); } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) private static final ImmutableOpenIntMap EMPTY = new ImmutableOpenIntMap(new IntObjectHashMap()); @SuppressWarnings("unchecked") @@ -186,8 +186,8 @@ public static class Builder implements IntObjectMap { private IntObjectHashMap map; + @SuppressWarnings("unchecked") public Builder() { - //noinspection unchecked this(EMPTY); } diff --git a/server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java b/server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java index ff3345b4da1e7..6f62c57349173 100644 --- a/server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java +++ b/server/src/main/java/org/elasticsearch/common/collect/ImmutableOpenMap.java @@ -173,6 +173,7 @@ public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; + @SuppressWarnings("rawtypes") ImmutableOpenMap that = (ImmutableOpenMap) o; if (map.equals(that.map) == false) return false; @@ -185,7 +186,7 @@ public int hashCode() { return map.hashCode(); } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) private static final ImmutableOpenMap EMPTY = new ImmutableOpenMap(new ObjectObjectHashMap()); @SuppressWarnings("unchecked") @@ -217,8 +218,8 @@ public static Builder builder(ImmutableOpenMap implements ObjectObjectMap { private ObjectObjectHashMap map; + @SuppressWarnings("unchecked") public Builder() { - //noinspection unchecked this(EMPTY); } diff --git a/server/src/main/java/org/elasticsearch/common/document/DocumentField.java b/server/src/main/java/org/elasticsearch/common/document/DocumentField.java index d95c39795fc56..1a44712098139 100644 --- a/server/src/main/java/org/elasticsearch/common/document/DocumentField.java +++ b/server/src/main/java/org/elasticsearch/common/document/DocumentField.java @@ -57,6 +57,7 @@ public String getName() { /** * The first value of the hit. */ + @SuppressWarnings("unchecked") public V getValue() { if (values == null || values.isEmpty()) { return null; diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java b/server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java index c7056ad6e9610..ea89648c63847 100644 --- a/server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java +++ b/server/src/main/java/org/elasticsearch/common/io/stream/NamedWriteableRegistry.java @@ -62,7 +62,7 @@ public NamedWriteableRegistry(List entries) { Map, Map>> registry = new HashMap<>(); Map> readers = null; - Class currentCategory = null; + Class currentCategory = null; for (Entry entry : entries) { if (currentCategory != entry.categoryClass) { if (currentCategory != null) { diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java index d3a8ce40d787d..99e2997623807 100644 --- a/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java +++ b/server/src/main/java/org/elasticsearch/common/io/stream/StreamInput.java @@ -801,12 +801,12 @@ public final Instant readOptionalInstant() throws IOException { } @SuppressWarnings("unchecked") - private List readArrayList() throws IOException { + private List readArrayList() throws IOException { int size = readArraySize(); if (size == 0) { return Collections.emptyList(); } - List list = new ArrayList(size); + List list = new ArrayList<>(size); for (int i = 0; i < size; i++) { list.add(readGenericValue()); } @@ -850,7 +850,7 @@ private Map readLinkedHashMap() throws IOException { if (size9 == 0) { return Collections.emptyMap(); } - Map map9 = new LinkedHashMap(size9); + Map map9 = new LinkedHashMap<>(size9); for (int i = 0; i < size9; i++) { map9.put(readString(), readGenericValue()); } @@ -862,7 +862,7 @@ private Map readHashMap() throws IOException { if (size10 == 0) { return Collections.emptyMap(); } - Map map10 = new HashMap(size10); + Map map10 = new HashMap<>(size10); for (int i = 0; i < size10; i++) { map10.put(readString(), readGenericValue()); } diff --git a/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java index f063ed2a5d560..1be778625bdc5 100644 --- a/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java +++ b/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java @@ -250,6 +250,7 @@ public static void cleanLuceneIndex(Directory directory) throws IOException { } } + @SuppressWarnings("rawtypes") public static void checkSegmentInfoIntegrity(final Directory directory) throws IOException { new SegmentInfos.FindSegmentsFile(directory) { @@ -341,7 +342,8 @@ public static TopDocsAndMaxScore readTopDocs(StreamInput in) throws IOException } public static FieldDoc readFieldDoc(StreamInput in) throws IOException { - Comparable[] cFields = new Comparable[in.readVInt()]; + @SuppressWarnings("rawtypes") + Comparable[] cFields = new Comparable[in.readVInt()]; for (int j = 0; j < cFields.length; j++) { byte type = in.readByte(); if (type == 0) { @@ -373,7 +375,7 @@ public static FieldDoc readFieldDoc(StreamInput in) throws IOException { return new FieldDoc(in.readVInt(), in.readFloat(), cFields); } - public static Comparable readSortValue(StreamInput in) throws IOException { + public static Comparable readSortValue(StreamInput in) throws IOException { byte type = in.readByte(); if (type == 0) { return null; @@ -488,7 +490,7 @@ public static void writeSortValue(StreamOutput out, Object field) throws IOExcep if (field == null) { out.writeByte((byte) 0); } else { - Class type = field.getClass(); + Class type = field.getClass(); if (type == String.class) { out.writeByte((byte) 1); out.writeString((String) field); diff --git a/server/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java b/server/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java index 53944ba928c9b..ae0228609b7c1 100644 --- a/server/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java +++ b/server/src/main/java/org/elasticsearch/common/settings/AbstractScopedSettings.java @@ -306,7 +306,7 @@ public void apply(Map> values, Settings current, Settings pr *

*/ 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 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> defaultList = (List>) defaultEntry.getValue(); + List> contentList = (List>) content.get(defaultEntry.getKey()); - List mergedList = new ArrayList(); + List> mergedList = new ArrayList<>(); if (allListValuesAreMapsOfOne(defaultList) && allListValuesAreMapsOfOne(contentList)) { // all are in the form of [ {"key1" : {}}, {"key2" : {}} ], merge based on keys Map> processed = new LinkedHashMap<>(); - for (Object o : contentList) { - Map map = (Map) o; + for (Map map : contentList) { Map.Entry entry = map.entrySet().iterator().next(); processed.put(entry.getKey(), map); } - for (Object o : defaultList) { - Map map = (Map) o; + for (Map map : defaultList) { Map.Entry entry = map.entrySet().iterator().next(); if (processed.containsKey(entry.getKey())) { mergeDefaults(processed.get(entry.getKey()), map); @@ -318,7 +316,7 @@ public static void mergeDefaults(Map content, Map o : contentList) { if (mergedList.contains(o) == false) { mergedList.add(o); } @@ -330,6 +328,7 @@ public static void mergeDefaults(Map content, Map diff, Version nodeVersion) throws IOException { BytesStreamOutput bStream = new BytesStreamOutput(); try (StreamOutput stream = new OutputStreamStreamOutput(CompressorFactory.COMPRESSOR.threadLocalOutputStream(bStream))) { stream.setVersion(nodeVersion); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java index 28ba89e843d37..f249c05936e92 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java @@ -124,6 +124,7 @@ public Mapper.Builder parse(String name, return builder; } + @SuppressWarnings("unchecked") protected static boolean parseObjectOrDocumentTypeProperties(String fieldName, Object fieldNode, MappingParserContext parserContext, ObjectMapper.Builder builder) { @@ -142,7 +143,7 @@ protected static boolean parseObjectOrDocumentTypeProperties(String fieldName, O builder.enabled(XContentMapValues.nodeBooleanValue(fieldNode, fieldName + ".enabled")); return true; } else if (fieldName.equals("properties")) { - if (fieldNode instanceof Collection && ((Collection) fieldNode).isEmpty()) { + if (fieldNode instanceof Collection && ((Collection) fieldNode).isEmpty()) { // nothing to do here, empty (to support "properties: []" case) } else if ((fieldNode instanceof Map) == false) { throw new ElasticsearchParseException("properties must be a map type"); diff --git a/server/src/main/java/org/elasticsearch/index/query/QueryBuilders.java b/server/src/main/java/org/elasticsearch/index/query/QueryBuilders.java index bb2432ffb00a1..f306fed363ac1 100644 --- a/server/src/main/java/org/elasticsearch/index/query/QueryBuilders.java +++ b/server/src/main/java/org/elasticsearch/index/query/QueryBuilders.java @@ -449,6 +449,7 @@ public static FunctionScoreQueryBuilder functionScoreQuery(FunctionScoreQueryBui * * @param function The function builder used to custom score */ + @SuppressWarnings("rawtypes") public static FunctionScoreQueryBuilder functionScoreQuery(ScoreFunctionBuilder function) { return new FunctionScoreQueryBuilder(function); } @@ -459,6 +460,7 @@ public static FunctionScoreQueryBuilder functionScoreQuery(ScoreFunctionBuilder * @param queryBuilder The query to custom score * @param function The function builder used to custom score */ + @SuppressWarnings("rawtypes") public static FunctionScoreQueryBuilder functionScoreQuery(QueryBuilder queryBuilder, ScoreFunctionBuilder function) { return (new FunctionScoreQueryBuilder(queryBuilder, function)); } diff --git a/server/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java b/server/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java index b8c03e1c691a5..2015c3e5de412 100644 --- a/server/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java +++ b/server/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java @@ -88,12 +88,12 @@ public boolean hasAsyncActions() { * Executes all registered async actions and notifies the listener once it's done. The value that is passed to the listener is always * null. The list of registered actions is cleared once this method returns. */ - public void executeAsyncActions(ActionListener listener) { + public void executeAsyncActions(ActionListener listener) { if (asyncActions.isEmpty()) { listener.onResponse(null); } else { CountDown countDown = new CountDown(asyncActions.size()); - ActionListener internalListener = new ActionListener() { + ActionListener internalListener = new ActionListener() { @Override public void onResponse(Object o) { if (countDown.countDown()) { diff --git a/server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java b/server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java index 62772275c054d..e8ebe13280ebf 100644 --- a/server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java +++ b/server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java @@ -288,6 +288,7 @@ public boolean allowExpensiveQueries() { return allowExpensiveQueries.getAsBoolean(); } + @SuppressWarnings("unchecked") public > IFD getForField(MappedFieldType fieldType) { return (IFD) indexFieldDataService.apply(fieldType, fullyQualifiedIndex.getName(), () -> this.lookup().forkAndTrackFieldReferences(fieldType.name())); @@ -589,7 +590,7 @@ public void registerAsyncAction(BiConsumer> asyncActio } @Override - public void executeAsyncActions(ActionListener listener) { + public void executeAsyncActions(ActionListener listener) { failIfFrozen(); super.executeAsyncActions(listener); } diff --git a/server/src/main/java/org/elasticsearch/plugins/PluginsService.java b/server/src/main/java/org/elasticsearch/plugins/PluginsService.java index 45bd7ff04af1c..872eacbf057ba 100644 --- a/server/src/main/java/org/elasticsearch/plugins/PluginsService.java +++ b/server/src/main/java/org/elasticsearch/plugins/PluginsService.java @@ -744,6 +744,7 @@ private Plugin loadPlugin(Class pluginClass, Settings settings throw new IllegalStateException(signatureMessage(pluginClass)); } + @SuppressWarnings("rawtypes") final Class[] parameterTypes = constructor.getParameterTypes(); try { if (constructor.getParameterCount() == 2 && parameterTypes[0] == Settings.class && parameterTypes[1] == Path.class) { @@ -770,6 +771,7 @@ private String signatureMessage(final Class clazz) { "()"); } + @SuppressWarnings("unchecked") public List filterPlugins(Class type) { return plugins.stream().filter(x -> type.isAssignableFrom(x.v2().getClass())) .map(p -> ((T)p.v2())).collect(Collectors.toList()); diff --git a/server/src/main/java/org/elasticsearch/plugins/SearchPlugin.java b/server/src/main/java/org/elasticsearch/plugins/SearchPlugin.java index 9709907fe5125..4642148e4a023 100644 --- a/server/src/main/java/org/elasticsearch/plugins/SearchPlugin.java +++ b/server/src/main/java/org/elasticsearch/plugins/SearchPlugin.java @@ -176,6 +176,7 @@ public SignificanceHeuristicSpec(String name, Writeable.Reader reader, BiFunc /** * Specification for a {@link Suggester}. */ + @SuppressWarnings("rawtypes") class SuggesterSpec> extends SearchExtensionSpec> { private Writeable.Reader suggestionReader; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java index 983188368434e..2176f64547ec5 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/AbstractPipelineAggregationBuilder.java @@ -125,6 +125,7 @@ public int hashCode() { public boolean equals(Object obj) { if (this == obj) return true; if (obj == null || getClass() != obj.getClass()) return false; + @SuppressWarnings("unchecked") AbstractPipelineAggregationBuilder other = (AbstractPipelineAggregationBuilder) obj; return Objects.equals(type, other.type) && Objects.equals(name, other.name) diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovAvgPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovAvgPipelineAggregator.java index 3d21519da1c5e..b78ff7e09f986 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovAvgPipelineAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/MovAvgPipelineAggregator.java @@ -80,6 +80,7 @@ public String getWriteableName() { @Override public InternalAggregation reduce(InternalAggregation aggregation, ReduceContext reduceContext) { + @SuppressWarnings("rawtypes") InternalMultiBucketAggregation histo = (InternalMultiBucketAggregation) aggregation; diff --git a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java index 4f1bf3b96b3aa..99223010f93c7 100644 --- a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java @@ -173,6 +173,7 @@ public static HighlightBuilder highlight() { private SuggestBuilder suggestBuilder; + @SuppressWarnings("rawtypes") private List rescoreBuilders; private List indexBoosts = new ArrayList<>(); @@ -203,6 +204,7 @@ public SearchSourceBuilder(StreamInput in) throws IOException { explain = in.readOptionalBoolean(); fetchSourceContext = in.readOptionalWriteable(FetchSourceContext::new); if (in.getVersion().before(Version.V_6_4_0)) { + @SuppressWarnings("unchecked") List dvFields = (List) in.readGenericValue(); if (dvFields == null) { docValueFields = null; @@ -760,6 +762,7 @@ public boolean profile() { /** * Gets the bytes representing the rescore builders for this request. */ + @SuppressWarnings("rawtypes") public List rescores() { return rescoreBuilders; } @@ -1062,6 +1065,7 @@ public SearchSourceBuilder rewrite(QueryRewriteContext context) throws IOExcepti } List> sorts = Rewriteable.rewrite(this.sorts, context); + @SuppressWarnings({"rawtypes", "unchecked"}) List rescoreBuilders = Rewriteable.rewrite(this.rescoreBuilders, context); HighlightBuilder highlightBuilder = this.highlightBuilder; if (highlightBuilder != null) { @@ -1090,7 +1094,8 @@ public SearchSourceBuilder shallowCopy() { */ private SearchSourceBuilder shallowCopy(QueryBuilder queryBuilder, QueryBuilder postQueryBuilder, AggregatorFactories.Builder aggregations, SliceBuilder slice, List> sorts, - List rescoreBuilders, HighlightBuilder highlightBuilder) { + @SuppressWarnings("rawtypes") List rescoreBuilders, + HighlightBuilder highlightBuilder) { SearchSourceBuilder rewrittenBuilder = new SearchSourceBuilder(); rewrittenBuilder.aggregations = aggregations; rewrittenBuilder.explain = explain; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/StoredFieldsContext.java b/server/src/main/java/org/elasticsearch/search/fetch/StoredFieldsContext.java index 21809a971c74f..8f255d67198cc 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/StoredFieldsContext.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/StoredFieldsContext.java @@ -53,6 +53,7 @@ public StoredFieldsContext(StoredFieldsContext other) { } } + @SuppressWarnings("unchecked") public StoredFieldsContext(StreamInput in) throws IOException { this.fetchFields = in.readBoolean(); if (fetchFields) { diff --git a/server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java index 76848dc516d22..e83e99c7f8987 100644 --- a/server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java +++ b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java @@ -58,6 +58,7 @@ * It provides all the methods that the {@link SearchContext} needs. * Provides a cache key based on its content that can be used to cache shard level response. */ +@SuppressWarnings("rawtypes") public class ShardSearchRequest extends TransportRequest implements IndicesRequest { private final String clusterAlias; private final ShardId shardId; diff --git a/server/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java b/server/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java index 7efe37d82ed57..2084833418062 100644 --- a/server/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java +++ b/server/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java @@ -228,7 +228,7 @@ public Object remove(Object key) { } @Override - public void putAll(Map m) { + public void putAll(Map m) { throw new UnsupportedOperationException(); } diff --git a/server/src/main/java/org/elasticsearch/search/suggest/Suggest.java b/server/src/main/java/org/elasticsearch/search/suggest/Suggest.java index 744309accece2..2e923106715d9 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/Suggest.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/Suggest.java @@ -74,6 +74,7 @@ public Suggest(List>> suggestions) this.hasScoreDocs = filter(CompletionSuggestion.class).stream().anyMatch(CompletionSuggestion::hasScoreDocs); } + @SuppressWarnings("unchecked") public Suggest(StreamInput in) throws IOException { // in older versions, Suggestion types were serialized as Streamable if (in.getVersion().before(Version.V_7_0_0)) { @@ -120,6 +121,7 @@ public int size() { return suggestions.size(); } + @SuppressWarnings("unchecked") public >> T getSuggestion(String name) { if (suggestions.isEmpty() || name == null) { return null; @@ -215,6 +217,7 @@ public static List>> reduce(MapsuggestionType contained in this {@link Suggest} instance */ + @SuppressWarnings({"rawtypes", "unchecked"}) public List filter(Class suggestionType) { return suggestions.stream() .filter(suggestion -> suggestion.getClass() == suggestionType) @@ -242,6 +245,7 @@ public int hashCode() { /** * The suggestion responses corresponding with the suggestions in the request. */ + @SuppressWarnings("rawtypes") public abstract static class Suggestion implements Iterable, NamedWriteable, ToXContentFragment { public static final int TYPE = 0; @@ -317,6 +321,7 @@ public int getSize() { * Merges the result of another suggestion into this suggestion. * For internal usage. */ + @SuppressWarnings("unchecked") public Suggestion reduce(List> toReduce) { if (toReduce.size() == 1) { return toReduce.get(0); @@ -400,6 +405,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws } @Override + @SuppressWarnings("rawtypes") public boolean equals(Object other) { if (this == other) { return true; diff --git a/server/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java b/server/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java index a37fd3f045220..40663c8f4caef 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/SuggestionSearchContext.java @@ -67,6 +67,7 @@ public void setRegex(BytesRef regex) { this.regex = regex; } + @SuppressWarnings("unchecked") public Suggester getSuggester() { return ((Suggester) suggester); } diff --git a/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java b/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java index 571689881246c..e62e24c4e01ed 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java @@ -169,7 +169,6 @@ boolean advanceToNextOption() { } } - @Override public CompletionSuggestion reduce(List> toReduce) { if (toReduce.isEmpty()) { return null; diff --git a/server/src/main/java/org/elasticsearch/transport/TransportMessageListener.java b/server/src/main/java/org/elasticsearch/transport/TransportMessageListener.java index a95ba20ea8455..717dba8dd1000 100644 --- a/server/src/main/java/org/elasticsearch/transport/TransportMessageListener.java +++ b/server/src/main/java/org/elasticsearch/transport/TransportMessageListener.java @@ -53,5 +53,6 @@ default void onRequestSent(DiscoveryNode node, long requestId, String action, Tr * @param requestId the request id for this response * @param context the response context or null if the context was already processed ie. due to a timeout. */ + @SuppressWarnings("rawtypes") default void onResponseReceived(long requestId, Transport.ResponseContext context) {} } diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/features/GetSnapshottableFeaturesResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/features/GetSnapshottableFeaturesResponseTests.java index 4e7d006d92ac1..5a1fb26866be9 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/features/GetSnapshottableFeaturesResponseTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/features/GetSnapshottableFeaturesResponseTests.java @@ -18,7 +18,7 @@ public class GetSnapshottableFeaturesResponseTests extends AbstractWireSerializingTestCase { @Override - protected Writeable.Reader instanceReader() { + protected Writeable.Reader instanceReader() { return GetSnapshottableFeaturesResponse::new; } diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushUnitTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushUnitTests.java index dcdca7cd437c2..67c1ac1628646 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushUnitTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushUnitTests.java @@ -41,6 +41,7 @@ private static class TestPlan { public SyncedFlushResponse result; } + @SuppressWarnings("unchecked") public void testIndicesSyncedFlushResult() throws IOException { final TestPlan testPlan = createTestPlan(); assertThat(testPlan.result.totalShards(), equalTo(testPlan.totalCounts.total)); diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java index a48082fd35951..7fa99b54d1909 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java @@ -732,6 +732,7 @@ private IndicesService mockIndicesServices() throws Exception { return mockIndicesServices(null); } + @SuppressWarnings({"rawtypes", "unchecked"}) private IndicesService mockIndicesServices(MappingLookup mappingLookup) throws Exception { /* * Throws Exception because Eclipse uses the lower bound for @@ -751,8 +752,7 @@ private IndicesService mockIndicesServices(MappingLookup mappingLookup) throws E when(indexService.getIndexEventListener()).thenReturn(new IndexEventListener() {}); when(indexService.getIndexSortSupplier()).thenReturn(() -> null); when(indexService.dateMathExpressionResolverAt(anyLong())).thenReturn(s -> s); - //noinspection unchecked - return ((CheckedFunction) invocationOnMock.getArguments()[1]).apply(indexService); + return ((CheckedFunction) invocationOnMock.getArguments()[1]).apply(indexService); }); return indicesService; } diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java index d1a8f74903055..7fc5724199702 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverActionTests.java @@ -70,6 +70,7 @@ import static java.util.Collections.emptyList; import static org.elasticsearch.action.admin.indices.rollover.TransportRolloverAction.buildStats; import static org.elasticsearch.action.admin.indices.rollover.TransportRolloverAction.evaluateConditions; +import static org.elasticsearch.test.ActionListenerUtils.anyActionListener; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.mockito.Matchers.any; @@ -233,10 +234,11 @@ public void testConditionEvaluationWhenAliasToWriteAndReadIndicesConsidersOnlyPr doAnswer(invocation -> { Object[] args = invocation.getArguments(); assert args.length == 3; + @SuppressWarnings("unchecked") ActionListener listener = (ActionListener) args[2]; listener.onResponse(statsResponse); return null; - }).when(mockClient).execute(eq(IndicesStatsAction.INSTANCE), any(ActionRequest.class), any(ActionListener.class)); + }).when(mockClient).execute(eq(IndicesStatsAction.INSTANCE), any(ActionRequest.class), anyActionListener()); assert statsResponse.getPrimaries().getDocs().getCount() == 500L; assert statsResponse.getTotal().getDocs().getCount() == (total + total); diff --git a/server/src/test/java/org/elasticsearch/action/bulk/BulkPrimaryExecutionContextTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkPrimaryExecutionContextTests.java index c5b6b437e7947..2d817d792394b 100644 --- a/server/src/test/java/org/elasticsearch/action/bulk/BulkPrimaryExecutionContextTests.java +++ b/server/src/test/java/org/elasticsearch/action/bulk/BulkPrimaryExecutionContextTests.java @@ -59,7 +59,7 @@ public void testAbortedSkipped() { private BulkShardRequest generateRandomRequest() { BulkItemRequest[] items = new BulkItemRequest[randomInt(20)]; for (int i = 0; i < items.length; i++) { - final DocWriteRequest request; + final DocWriteRequest request; switch (randomFrom(DocWriteRequest.OpType.values())) { case INDEX: request = new IndexRequest("index", "_doc", "id_" + i); diff --git a/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java b/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java index 5eaca2744c60c..efb7528c66bfe 100644 --- a/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java +++ b/server/src/test/java/org/elasticsearch/action/bulk/BulkProcessorTests.java @@ -217,7 +217,7 @@ concurrentBulkRequests, maxBatchSize, new ByteSizeValue(Integer.MAX_VALUE), null String bulkRequest = "{ \"index\" : { \"_index\" : \"test\", \"_id\" : \"1\" } }\n" + "{ \"field1\" : \"value1\" }\n"; BytesReference bytesReference = BytesReference.fromByteBuffers(new ByteBuffer[]{ ByteBuffer.wrap(bulkRequest.getBytes(StandardCharsets.UTF_8)) }); - List futures = new ArrayList<>(); + List> futures = new ArrayList<>(); for (final AtomicInteger i = new AtomicInteger(0); i.getAndIncrement() < maxDocuments; ) { futures.add(executorService.submit(() -> { try { @@ -238,7 +238,7 @@ concurrentBulkRequests, maxBatchSize, new ByteSizeValue(Integer.MAX_VALUE), null startGate.countDown(); startGate.await(); - for (Future f : futures) { + for (Future f : futures) { try { f.get(); } catch (Exception e) { @@ -321,7 +321,7 @@ concurrentBulkRequests, maxBatchSize, new ByteSizeValue(Integer.MAX_VALUE), String bulkRequest = "{ \"index\" : { \"_index\" : \"test\", \"_id\" : \"1\" } }\n" + "{ \"field1\" : \"value1\" }\n"; BytesReference bytesReference = BytesReference.fromByteBuffers(new ByteBuffer[]{ ByteBuffer.wrap(bulkRequest.getBytes(StandardCharsets.UTF_8)) }); - List futures = new ArrayList<>(); + List> futures = new ArrayList<>(); CountDownLatch startGate = new CountDownLatch(1 + concurrentClients); for (final AtomicInteger i = new AtomicInteger(0); i.getAndIncrement() < maxDocuments; ) { futures.add(executorService.submit(() -> { @@ -343,7 +343,7 @@ concurrentBulkRequests, maxBatchSize, new ByteSizeValue(Integer.MAX_VALUE), startGate.countDown(); startGate.await(); - for (Future f : futures) { + for (Future f : futures) { try { f.get(); } catch (Exception e) { diff --git a/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java index 34bde4d96541e..8e8696d1dbd3c 100644 --- a/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTests.java @@ -125,7 +125,7 @@ public void testDeleteNonExistingDocDoesNotCreateIndex() throws Exception { BulkResponse response = future.actionGet(); assertFalse(bulkAction.indexCreated); - BulkItemResponse[] bulkResponses = ((BulkResponse) response).getItems(); + BulkItemResponse[] bulkResponses = response.getItems(); assertEquals(bulkResponses.length, 1); assertTrue(bulkResponses[0].isFailed()); assertTrue(bulkResponses[0].getFailure().getCause() instanceof IndexNotFoundException); diff --git a/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java index fc3d0e07ecf69..49717cae46996 100644 --- a/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java +++ b/server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionTookTests.java @@ -101,6 +101,7 @@ private TransportBulkAction createAction(boolean controlled, AtomicLong expected NodeClient client = new NodeClient(Settings.EMPTY, threadPool) { @Override + @SuppressWarnings("unchecked") public void doExecute(ActionType action, Request request, ActionListener listener) { listener.onResponse((Response)new CreateIndexResponse(false, false, null)); diff --git a/server/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java b/server/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java index 27dd3325864ee..9ffbae9aa6aa7 100644 --- a/server/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java +++ b/server/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java @@ -158,6 +158,7 @@ public void testXContentHashSetSerialization() throws Exception { builder.endObject(); Map map = XContentHelper.convertToMap(BytesReference.bytes(builder), false, builder.contentType()).v2(); assertThat(map.get("doc"), is(instanceOf(Map.class))); + @SuppressWarnings("unchecked") Map source = (Map) ((Map) map.get("doc")).get("_source"); assertThat(source.get("key"), is(Arrays.asList("value"))); } diff --git a/server/src/test/java/org/elasticsearch/action/resync/TransportResyncReplicationActionTests.java b/server/src/test/java/org/elasticsearch/action/resync/TransportResyncReplicationActionTests.java index 62234be4d5051..67959d1f85f9c 100644 --- a/server/src/test/java/org/elasticsearch/action/resync/TransportResyncReplicationActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/resync/TransportResyncReplicationActionTests.java @@ -21,10 +21,10 @@ import org.elasticsearch.cluster.routing.ShardRoutingState; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; -import org.elasticsearch.core.Releasable; import org.elasticsearch.common.network.NetworkService; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.PageCacheRecycler; +import org.elasticsearch.core.Releasable; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.IndexSettings; @@ -53,13 +53,13 @@ import static java.util.Collections.emptyList; import static org.elasticsearch.action.support.replication.ClusterStateCreationUtils.state; +import static org.elasticsearch.test.ActionListenerUtils.anyActionListener; import static org.elasticsearch.test.ClusterServiceUtils.createClusterService; import static org.elasticsearch.test.ClusterServiceUtils.setState; import static org.elasticsearch.transport.TransportService.NOOP_TRANSPORT_INTERCEPTOR; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -119,11 +119,12 @@ public void testResyncDoesNotBlockOnPrimaryAction() throws Exception { when(indexShard.getOperationPrimaryTerm()).thenReturn(primaryTerm); when(indexShard.getActiveOperationsCount()).then(i -> acquiredPermits.get()); doAnswer(invocation -> { + @SuppressWarnings("unchecked") ActionListener callback = (ActionListener) invocation.getArguments()[0]; acquiredPermits.incrementAndGet(); callback.onResponse(acquiredPermits::decrementAndGet); return null; - }).when(indexShard).acquirePrimaryOperationPermit(any(ActionListener.class), anyString(), anyObject(), eq(true)); + }).when(indexShard).acquirePrimaryOperationPermit(anyActionListener(), anyString(), anyObject(), eq(true)); when(indexShard.getReplicationGroup()).thenReturn( new ReplicationGroup(shardRoutingTable, clusterService.state().metadata().index(index).inSyncAllocationIds(shardId.id()), diff --git a/server/src/test/java/org/elasticsearch/action/search/BottomSortValuesCollectorTests.java b/server/src/test/java/org/elasticsearch/action/search/BottomSortValuesCollectorTests.java index 281129c100ef3..acbff91f9566a 100644 --- a/server/src/test/java/org/elasticsearch/action/search/BottomSortValuesCollectorTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/BottomSortValuesCollectorTests.java @@ -240,7 +240,8 @@ private Object[] newDateNanoArray(String... values) { private TopFieldDocs createTopDocs(SortField sortField, int totalHits, Object[] values) { FieldDoc[] fieldDocs = new FieldDoc[values.length]; - FieldComparator cmp = sortField.getComparator(1, 0); + @SuppressWarnings("unchecked") + FieldComparator cmp = (FieldComparator) sortField.getComparator(1, 0); for (int i = 0; i < values.length; i++) { fieldDocs[i] = new FieldDoc(i, Float.NaN, new Object[] { values[i] }); } diff --git a/server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java index 586b2233b092d..44ef02055e3b4 100644 --- a/server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java @@ -78,7 +78,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -import java.util.stream.Stream; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; @@ -244,9 +243,8 @@ public void testMerge() { assertSame(searchPhaseResult.getSearchShardTarget(), hit.getShard()); } int suggestSize = 0; - for (Suggest.Suggestion s : reducedQueryPhase.suggest) { - Stream stream = s.getEntries().stream(); - suggestSize += stream.collect(Collectors.summingInt(e -> e.getOptions().size())); + for (Suggest.Suggestion s : reducedQueryPhase.suggest) { + suggestSize += s.getEntries().stream().mapToInt(e -> e.getOptions().size()).sum(); } assertThat(suggestSize, lessThanOrEqualTo(maxSuggestSize)); assertThat(mergedResponse.hits().getHits().length, equalTo(reducedQueryPhase.sortedTopDocs.scoreDocs.length - suggestSize)); diff --git a/server/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java b/server/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java index ba71bd4f036a4..0ab2723232f58 100644 --- a/server/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeActionTests.java @@ -328,7 +328,10 @@ public void testNoShardOperationsExecutedIfTaskCancelled() throws Exception { shards.add(shard); } } - final TransportBroadcastByNodeAction.BroadcastByNodeTransportRequestHandler handler = + final TransportBroadcastByNodeAction< + Request, + Response, + TransportBroadcastByNodeAction.EmptyResult>.BroadcastByNodeTransportRequestHandler handler = action.new BroadcastByNodeTransportRequestHandler(); final PlainActionFuture future = PlainActionFuture.newFuture(); @@ -390,7 +393,10 @@ public void testOperationExecution() throws Exception { shards.add(shard); } } - final TransportBroadcastByNodeAction.BroadcastByNodeTransportRequestHandler handler = + final TransportBroadcastByNodeAction< + Request, + Response, + TransportBroadcastByNodeAction.EmptyResult>.BroadcastByNodeTransportRequestHandler handler = action.new BroadcastByNodeTransportRequestHandler(); final PlainActionFuture future = PlainActionFuture.newFuture(); @@ -403,6 +409,7 @@ public void testOperationExecution() throws Exception { TransportResponse response = future.actionGet(); assertTrue(response instanceof TransportBroadcastByNodeAction.NodeResponse); + @SuppressWarnings("rawtypes") TransportBroadcastByNodeAction.NodeResponse nodeResponse = (TransportBroadcastByNodeAction.NodeResponse) response; // check the operation was executed on the correct node @@ -422,6 +429,7 @@ public void testOperationExecution() throws Exception { assertEquals("successful shards", successfulShards, nodeResponse.getSuccessfulShards()); assertEquals("total shards", action.getResults().size(), nodeResponse.getTotalShards()); assertEquals("failed shards", failedShards, nodeResponse.getExceptions().size()); + @SuppressWarnings("unchecked") List exceptions = nodeResponse.getExceptions(); for (BroadcastShardOperationFailedException exception : exceptions) { assertThat(exception.getMessage(), is("operation indices:admin/test failed")); @@ -482,8 +490,8 @@ public void testResultAggregation() throws ExecutionException, InterruptedExcept } } totalSuccessfulShards += shardResults.size(); - TransportBroadcastByNodeAction.NodeResponse nodeResponse = action.new NodeResponse(entry.getKey(), shards.size(), - shardResults, exceptions); + TransportBroadcastByNodeAction.NodeResponse nodeResponse = + action.new NodeResponse(entry.getKey(), shards.size(), shardResults, exceptions); transport.handleResponse(requestId, nodeResponse); } } diff --git a/server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java b/server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java index 6eb4091a2716b..c6e45f6d3e01b 100644 --- a/server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/nodes/TransportNodesActionTests.java @@ -63,7 +63,7 @@ public class TransportNodesActionTests extends ESTestCase { private TransportService transportService; public void testRequestIsSentToEachNode() throws Exception { - TransportNodesAction action = getTestTransportNodesAction(); + TransportNodesAction action = getTestTransportNodesAction(); TestNodesRequest request = new TestNodesRequest(); PlainActionFuture listener = new PlainActionFuture<>(); action.new AsyncAction(null, request, listener).start(); @@ -74,7 +74,7 @@ public void testRequestIsSentToEachNode() throws Exception { } public void testNodesSelectors() { - TransportNodesAction action = getTestTransportNodesAction(); + TransportNodesAction action = getTestTransportNodesAction(); int numSelectors = randomIntBetween(1, 5); Set nodeSelectors = new HashSet<>(); for (int i = 0; i < numSelectors; i++) { @@ -130,7 +130,8 @@ public void testNewResponse() { } public void testCustomResolving() throws Exception { - TransportNodesAction action = getDataNodesOnlyTransportNodesAction(transportService); + TransportNodesAction action = + getDataNodesOnlyTransportNodesAction(transportService); TestNodesRequest request = new TestNodesRequest(randomBoolean() ? null : generateRandomStringArray(10, 5, false, true)); PlainActionFuture listener = new PlainActionFuture<>(); action.new AsyncAction(null, request, listener).start(); diff --git a/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java index cacf97897c48a..f827ddfbf354b 100644 --- a/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationActionTests.java @@ -132,11 +132,11 @@ public class TransportReplicationActionTests extends ESTestCase { * * This will throw a {@link ClassCastException} if the request is of the wrong type. */ - public static R resolveRequest(TransportRequest requestOrWrappedRequest) { + @SuppressWarnings("unchecked") + public static > R resolveRequest(TransportRequest requestOrWrappedRequest) { if (requestOrWrappedRequest instanceof TransportReplicationAction.ConcreteShardRequest) { requestOrWrappedRequest = ((TransportReplicationAction.ConcreteShardRequest)requestOrWrappedRequest).getRequest(); } - //noinspection unchecked return (R) requestOrWrappedRequest; } @@ -333,6 +333,7 @@ public ClusterBlockLevel indexBlockLevel() { final TransportReplicationAction.ConcreteShardRequest primaryRequest = new TransportReplicationAction.ConcreteShardRequest<>(request, targetAllocationID, primaryTerm); + @SuppressWarnings("rawtypes") final TransportReplicationAction.AsyncPrimaryAction asyncPrimaryActionWithBlocks = actionWithBlocks.new AsyncPrimaryAction(primaryRequest, listener, task); asyncPrimaryActionWithBlocks.run(); @@ -670,7 +671,7 @@ protected void shardOperationOnPrimary(Request shardRequest, IndexShard primary, assertThat(requests.size(), equalTo(1)); assertThat("primary request was not delegated to relocation target", requests.get(0).action, equalTo("internal:testAction2[p]")); - //noinspection unchecked + @SuppressWarnings("unchecked") final TransportReplicationAction.ConcreteShardRequest concreteShardRequest = (TransportReplicationAction.ConcreteShardRequest) requests.get(0).request; assertThat("primary term not properly set on primary delegation", concreteShardRequest.getPrimaryTerm(), equalTo(primaryTerm)); @@ -828,8 +829,9 @@ public void testSeqNoIsSetOnPrimary() { when(shard.getPendingReplicationActions()).thenReturn(replicationActions); doAnswer(invocation -> { count.incrementAndGet(); - //noinspection unchecked - ((ActionListener)invocation.getArguments()[0]).onResponse(count::decrementAndGet); + @SuppressWarnings("unchecked") + ActionListener argument = (ActionListener) invocation.getArguments()[0]; + argument.onResponse(count::decrementAndGet); return null; }).when(shard).acquirePrimaryOperationPermit(any(), anyString(), anyObject(), eq(forceExecute)); when(shard.getActiveOperationsCount()).thenAnswer(i -> count.get()); @@ -846,9 +848,10 @@ public void testSeqNoIsSetOnPrimary() { action.handlePrimaryRequest(concreteShardRequest, createTransportChannel(listener), null); CapturingTransport.CapturedRequest[] requestsToReplicas = transport.capturedRequests(); assertThat(requestsToReplicas, arrayWithSize(1)); - //noinspection unchecked - assertThat(((TransportReplicationAction.ConcreteShardRequest) requestsToReplicas[0].request).getPrimaryTerm(), - equalTo(primaryTerm)); + @SuppressWarnings("unchecked") + TransportReplicationAction.ConcreteShardRequest shardRequest = (TransportReplicationAction.ConcreteShardRequest< + Request>) requestsToReplicas[0].request; + assertThat(shardRequest.getPrimaryTerm(), equalTo(primaryTerm)); } public void testCounterOnPrimary() throws Exception { diff --git a/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationAllPermitsAcquisitionTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationAllPermitsAcquisitionTests.java index fd8bc190e8002..ca9a8f7413032 100644 --- a/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationAllPermitsAcquisitionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationAllPermitsAcquisitionTests.java @@ -220,7 +220,7 @@ public void testTransportReplicationActionWithAllPermits() throws Exception { final CyclicBarrier delayedOperationsBarrier = new CyclicBarrier(delayedOperations + 1); final List threads = new ArrayList<>(delayedOperationsBarrier.getParties()); - @SuppressWarnings("unchecked") + @SuppressWarnings({"rawtypes", "unchecked"}) final PlainActionFuture[] futures = new PlainActionFuture[numOperations]; final TestAction[] actions = new TestAction[numOperations]; @@ -239,6 +239,7 @@ public void testTransportReplicationActionWithAllPermits() throws Exception { Thread thread = new Thread(() -> { final TransportReplicationAction.ConcreteShardRequest primaryRequest = new TransportReplicationAction.ConcreteShardRequest<>(request(), allocationId(), primaryTerm()); + @SuppressWarnings("rawtypes") TransportReplicationAction.AsyncPrimaryAction asyncPrimaryAction = singlePermitAction.new AsyncPrimaryAction(primaryRequest, listener, null) { @Override @@ -251,6 +252,7 @@ protected void doRun() throws Exception { } @Override + @SuppressWarnings({"rawtypes", "unchecked"}) void runWithPrimaryShardReference(final TransportReplicationAction.PrimaryShardReference reference) { assertThat(reference.indexShard.getActiveOperationsCount(), greaterThan(0)); assertSame(primary, reference.indexShard); @@ -290,11 +292,14 @@ private void assertBlockIsPresentForDelayedOp() { final PlainActionFuture allPermitFuture = new PlainActionFuture<>(); Thread thread = new Thread(() -> { + @SuppressWarnings("rawtypes") final TransportReplicationAction.ConcreteShardRequest primaryRequest = new TransportReplicationAction.ConcreteShardRequest<>(request(), allocationId(), primaryTerm()); + @SuppressWarnings("rawtypes") TransportReplicationAction.AsyncPrimaryAction asyncPrimaryAction = allPermitsAction.new AsyncPrimaryAction(primaryRequest, allPermitFuture, null) { @Override + @SuppressWarnings({"rawtypes", "unchecked"}) void runWithPrimaryShardReference(final TransportReplicationAction.PrimaryShardReference reference) { assertEquals("All permits must be acquired", IndexShard.OPERATIONS_BLOCKED, reference.indexShard.getActiveOperationsCount()); diff --git a/server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java index af6a09009b2e3..8901b619be72c 100644 --- a/server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/replication/TransportWriteActionTests.java @@ -66,6 +66,7 @@ import java.util.function.Consumer; import java.util.stream.Collectors; +import static org.elasticsearch.test.ActionListenerUtils.anyActionListener; import static org.elasticsearch.test.ClusterServiceUtils.createClusterService; import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.equalTo; @@ -447,13 +448,15 @@ final IndicesService mockIndicesService(ClusterService clusterService) { private IndexShard mockIndexShard(ShardId shardId, ClusterService clusterService) { final IndexShard indexShard = mock(IndexShard.class); doAnswer(invocation -> { + @SuppressWarnings("unchecked") ActionListener callback = (ActionListener) invocation.getArguments()[0]; count.incrementAndGet(); callback.onResponse(count::decrementAndGet); return null; - }).when(indexShard).acquirePrimaryOperationPermit(any(ActionListener.class), anyString(), anyObject()); + }).when(indexShard).acquirePrimaryOperationPermit(anyActionListener(), anyString(), anyObject()); doAnswer(invocation -> { long term = (Long)invocation.getArguments()[0]; + @SuppressWarnings("unchecked") ActionListener callback = (ActionListener) invocation.getArguments()[1]; final long primaryTerm = indexShard.getPendingPrimaryTerm(); if (term < primaryTerm) { @@ -464,7 +467,7 @@ private IndexShard mockIndexShard(ShardId shardId, ClusterService clusterService callback.onResponse(count::decrementAndGet); return null; }).when(indexShard) - .acquireReplicaOperationPermit(anyLong(), anyLong(), anyLong(), any(ActionListener.class), anyString(), anyObject()); + .acquireReplicaOperationPermit(anyLong(), anyLong(), anyLong(), anyActionListener(), anyString(), anyObject()); when(indexShard.routingEntry()).thenAnswer(invocationOnMock -> { final ClusterState state = clusterService.state(); final RoutingNode node = state.getRoutingNodes().node(state.nodes().getLocalNodeId()); diff --git a/server/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java b/server/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java index 2a8fcbc069034..3571b6e6e9ef5 100644 --- a/server/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java +++ b/server/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java @@ -45,7 +45,7 @@ public abstract class AbstractClientHeadersTestCase extends ESTestCase { .put(ThreadContext.PREFIX + ".key2", "val 2") .build(); - private static final ActionType[] ACTIONS = new ActionType[] { + private static final ActionType[] ACTIONS = new ActionType[] { // client actions GetAction.INSTANCE, SearchAction.INSTANCE, DeleteAction.INSTANCE, DeleteStoredScriptAction.INSTANCE, IndexAction.INSTANCE, diff --git a/server/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java b/server/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java index dee6b9a79a9c7..c1451d5f8c39a 100644 --- a/server/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java +++ b/server/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java @@ -77,6 +77,7 @@ public DiscoveryNode getNode() { } @Override + @SuppressWarnings({"rawtypes","unchecked"}) public void sendRequest(long requestId, String action, TransportRequest request, TransportRequestOptions options) throws TransportException { //we make sure that nodes get added to the connected ones when calling addTransportAddress, by returning proper nodes info diff --git a/server/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java b/server/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java index a6273287a251c..c662cf5cd9cb7 100644 --- a/server/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java +++ b/server/src/test/java/org/elasticsearch/client/transport/TransportClientHeadersTests.java @@ -67,7 +67,7 @@ public void tearDown() throws Exception { } @Override - protected Client buildClient(Settings headersSettings, ActionType[] testedActions) { + protected Client buildClient(Settings headersSettings, @SuppressWarnings("rawtypes") ActionType[] testedActions) { transportService = MockTransportService.createNewService(Settings.EMPTY, Version.CURRENT, threadPool, null); transportService.start(); transportService.acceptIncomingRequests(); @@ -147,6 +147,7 @@ public AsyncSender interceptSender(AsyncSender sender) { @Override public AsyncSender interceptSender(AsyncSender sender) { return new AsyncSender() { + @SuppressWarnings("unchecked") @Override public void sendRequest(Transport.Connection connection, String action, TransportRequest request, @@ -159,14 +160,13 @@ public void sendRequest(Transport.Connection conne new LivenessResponse(clusterName, connection.getNode())); } else if (ClusterStateAction.NAME.equals(action)) { assertHeaders(threadPool); - ClusterName cluster1 = clusterName; - ClusterState.Builder builder = ClusterState.builder(cluster1); + ClusterState.Builder builder = ClusterState.builder(clusterName); //the sniffer detects only data nodes builder.nodes(DiscoveryNodes.builder().add(new DiscoveryNode("node_id", "someId", "some_ephemeralId_id", address.address().getHostString(), address.getAddress(), address, Collections.emptyMap(), Collections.singleton(DiscoveryNodeRole.DATA_ROLE), Version.CURRENT))); ((TransportResponseHandler) handler) - .handleResponse(new ClusterStateResponse(cluster1, builder.build(), false)); + .handleResponse(new ClusterStateResponse(clusterName, builder.build(), false)); clusterStateLatch.countDown(); } else if (TransportService.HANDSHAKE_ACTION_NAME .equals(action)) { ((TransportResponseHandler) handler).handleResponse( diff --git a/server/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java b/server/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java index 866120fe2b0a6..69f9cfdcd11c4 100644 --- a/server/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java +++ b/server/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java @@ -138,6 +138,7 @@ protected ClusterState getMockClusterState(DiscoveryNode node) { @Override public AsyncSender interceptSender(AsyncSender sender) { return new AsyncSender() { + @SuppressWarnings("unchecked") @Override public void sendRequest(Transport.Connection connection, String action, TransportRequest request, @@ -170,7 +171,7 @@ public void sendRequest(Transport.Connection conne transportClientNodesService.addTransportAddresses(listNodeAddresses.toArray(new TransportAddress[0])); } - private TransportResponseHandler wrapLivenessResponseHandler(TransportResponseHandler handler, + private TransportResponseHandler wrapLivenessResponseHandler(TransportResponseHandler handler, DiscoveryNode node, ClusterName clusterName) { return new TransportResponseHandler() { diff --git a/server/src/test/java/org/elasticsearch/common/cache/CacheTests.java b/server/src/test/java/org/elasticsearch/common/cache/CacheTests.java index 83438df66cf5b..4bd8df7f50ecf 100644 --- a/server/src/test/java/org/elasticsearch/common/cache/CacheTests.java +++ b/server/src/test/java/org/elasticsearch/common/cache/CacheTests.java @@ -622,7 +622,7 @@ public void testComputeIfAbsentLoadsSuccessfully() { public void testComputeIfAbsentCallsOnce() throws BrokenBarrierException, InterruptedException { int numberOfThreads = randomIntBetween(2, 32); final Cache cache = CacheBuilder.builder().build(); - AtomicReferenceArray flags = new AtomicReferenceArray(numberOfEntries); + AtomicReferenceArray flags = new AtomicReferenceArray<>(numberOfEntries); for (int j = 0; j < numberOfEntries; j++) { flags.set(j, false); } diff --git a/server/src/test/java/org/elasticsearch/common/collect/IteratorsTests.java b/server/src/test/java/org/elasticsearch/common/collect/IteratorsTests.java index eb2d0467cd935..f44fa14d667d8 100644 --- a/server/src/test/java/org/elasticsearch/common/collect/IteratorsTests.java +++ b/server/src/test/java/org/elasticsearch/common/collect/IteratorsTests.java @@ -60,6 +60,7 @@ public void testRandomSingleton() { int numberOfIterators = randomIntBetween(1, 1000); int singletonIndex = randomIntBetween(0, numberOfIterators - 1); int value = randomInt(); + @SuppressWarnings({"rawtypes", "unchecked"}) Iterator[] iterators = new Iterator[numberOfIterators]; for (int i = 0; i < numberOfIterators; i++) { iterators[i] = i != singletonIndex ? empty() : singletonIterator(value); @@ -69,6 +70,7 @@ public void testRandomSingleton() { public void testRandomIterators() { int numberOfIterators = randomIntBetween(1, 1000); + @SuppressWarnings({"rawtypes", "unchecked"}) Iterator[] iterators = new Iterator[numberOfIterators]; List values = new ArrayList<>(); for (int i = 0; i < numberOfIterators; i++) { @@ -113,7 +115,9 @@ private Iterator singletonIterator(T value) { return Collections.singleton(value).iterator(); } - private void assertSingleton(T value, Iterator... iterators) { + @SafeVarargs + @SuppressWarnings({"unchecked", "varargs"}) + private final void assertSingleton(T value, Iterator... iterators) { Iterator concat = Iterators.concat(iterators); assertContainsInOrder(concat, value); } @@ -132,7 +136,9 @@ public T next() { }; } - private void assertContainsInOrder(Iterator iterator, T... values) { + @SafeVarargs + @SuppressWarnings({"varargs"}) + private final void assertContainsInOrder(Iterator iterator, T... values) { for (T value : values) { assertTrue(iterator.hasNext()); assertEquals(value, iterator.next()); diff --git a/server/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java index 68d5df490f10e..8944d90ec82c3 100644 --- a/server/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/common/geo/builders/EnvelopeBuilderTests.java @@ -36,7 +36,7 @@ protected EnvelopeBuilder createMutation(EnvelopeBuilder original) throws IOExce } static EnvelopeBuilder mutate(EnvelopeBuilder original) throws IOException { - EnvelopeBuilder mutation = (EnvelopeBuilder) copyShape(original); + EnvelopeBuilder mutation = copyShape(original); // move one corner to the middle of original switch (randomIntBetween(0, 3)) { case 0: diff --git a/server/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java index 99efd563a831b..97e3c766e8ee1 100644 --- a/server/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/common/geo/builders/MultiLineStringBuilderTests.java @@ -27,7 +27,7 @@ protected MultiLineStringBuilder createMutation(MultiLineStringBuilder original) } static MultiLineStringBuilder mutate(MultiLineStringBuilder original) throws IOException { - MultiLineStringBuilder mutation = (MultiLineStringBuilder) copyShape(original); + MultiLineStringBuilder mutation = copyShape(original); Coordinate[][] coordinates = mutation.coordinates(); if (coordinates.length > 0) { int lineToChange = randomInt(coordinates.length - 1); diff --git a/server/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java index 217aa5abffd76..e67c3fc916a33 100644 --- a/server/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/common/geo/builders/MultiPointBuilderTests.java @@ -39,7 +39,7 @@ protected MultiPointBuilder createMutation(MultiPointBuilder original) throws IO } static MultiPointBuilder mutate(MultiPointBuilder original) throws IOException { - MultiPointBuilder mutation = (MultiPointBuilder) copyShape(original); + MultiPointBuilder mutation = copyShape(original); Coordinate[] coordinates = original.coordinates(false); if (coordinates.length > 0) { Coordinate coordinate = randomFrom(coordinates); diff --git a/server/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java index 11f6a064a50eb..409d30a3e18cd 100644 --- a/server/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/common/geo/builders/MultiPolygonBuilderTests.java @@ -31,10 +31,10 @@ static MultiPolygonBuilder mutate(MultiPolygonBuilder original) throws IOExcepti if (randomBoolean()) { mutation = new MultiPolygonBuilder(original.orientation() == Orientation.LEFT ? Orientation.RIGHT : Orientation.LEFT); for (PolygonBuilder pb : original.polygons()) { - mutation.polygon((PolygonBuilder) copyShape(pb)); + mutation.polygon(copyShape(pb)); } } else { - mutation = (MultiPolygonBuilder) copyShape(original); + mutation = copyShape(original); if (mutation.polygons().size() > 0) { int polyToChange = randomInt(mutation.polygons().size() - 1); mutation.polygons().set(polyToChange, PolygonBuilderTests.mutatePolygonBuilder(mutation.polygons().get(polyToChange))); diff --git a/server/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java b/server/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java index af6b2eaeb22a5..baaf1ccbeba5f 100644 --- a/server/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/common/geo/builders/PolygonBuilderTests.java @@ -32,7 +32,7 @@ protected PolygonBuilder createMutation(PolygonBuilder original) throws IOExcept } static PolygonBuilder mutate(PolygonBuilder original) throws IOException { - PolygonBuilder mutation = (PolygonBuilder) copyShape(original); + PolygonBuilder mutation = copyShape(original); return mutatePolygonBuilder(mutation); } diff --git a/server/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java index a1312d7fa4daf..a5bac89efc1e7 100644 --- a/server/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java +++ b/server/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java @@ -161,6 +161,7 @@ public void testLinkedHashMap() throws IOException { } BytesStreamOutput out = new BytesStreamOutput(); out.writeGenericValue(write); + @SuppressWarnings("unchecked") LinkedHashMap read = (LinkedHashMap) out.bytes().streamInput().readGenericValue(); assertEquals(size, read.size()); int index = 0; diff --git a/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java b/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java index dccfbc7a3b75f..2f87c8e9b3fc7 100644 --- a/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java @@ -198,7 +198,7 @@ public void testDependentSettingsValidate() { new Setting.AffixSettingDependency() { @Override - public Setting.AffixSetting getSetting() { + public Setting.AffixSetting getSetting() { return stringSetting; } @@ -690,7 +690,7 @@ public void testApply() { public void testGet() { ClusterSettings settings = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS); // affix setting - complex matcher - Setting setting = settings.get("cluster.routing.allocation.require.value"); + Setting setting = settings.get("cluster.routing.allocation.require.value"); assertEquals(setting, FilterAllocationDecider.CLUSTER_ROUTING_REQUIRE_GROUP_SETTING.getConcreteSetting("cluster.routing.allocation.require.value")); diff --git a/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java b/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java index b1c73f6a42736..b2f4a5d583ba7 100644 --- a/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java +++ b/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java @@ -312,7 +312,12 @@ public void testFilteredTimeSetting() { Property.Filtered)); assertThat(e2, hasToString(containsString("failed to parse value for setting [foo], must be <= [3h]"))); - final Setting minSetting = Setting.timeSetting("foo", TimeValue.timeValueHours(3), TimeValue.timeValueHours(2), Property.Filtered); + final Setting minSetting = Setting.timeSetting( + "foo", + TimeValue.timeValueHours(3), + TimeValue.timeValueHours(2), + Property.Filtered + ); final Settings minSettings = Settings.builder() .put("foo", "not a time value") .build(); @@ -320,7 +325,7 @@ public void testFilteredTimeSetting() { assertThat(e3, hasToString(containsString("failed to parse value for setting [foo] as a time value"))); assertNull(e3.getCause()); - final Setting maxSetting = Setting.timeSetting("foo", TimeValue.timeValueHours(3), TimeValue.timeValueHours(2), + final Setting maxSetting = Setting.timeSetting("foo", TimeValue.timeValueHours(3), TimeValue.timeValueHours(2), TimeValue.timeValueHours(4), Property.Filtered); final Settings maxSettings = Settings.builder() .put("foo", "not a time value") @@ -331,7 +336,7 @@ public void testFilteredTimeSetting() { } public void testFilteredBooleanSetting() { - Setting setting = Setting.boolSetting("foo", false, Property.Filtered); + Setting setting = Setting.boolSetting("foo", false, Property.Filtered); final Settings settings = Settings.builder() .put("foo", "not a boolean value") .build(); @@ -341,17 +346,17 @@ public void testFilteredBooleanSetting() { assertNull(e.getCause()); } - private enum TestEnumSetting { + private enum TestEnum { ON, OFF } public void testThrowsIllegalArgumentExceptionOnInvalidEnumSetting() { - Setting setting = Setting.enumSetting(TestEnumSetting.class, "foo", TestEnumSetting.ON, Property.Filtered); + Setting setting = Setting.enumSetting(TestEnum.class, "foo", TestEnum.ON, Property.Filtered); final Settings settings = Settings.builder().put("foo", "bar").build(); final IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> setting.get(settings)); - assertThat(e, hasToString(containsString("No enum constant org.elasticsearch.common.settings.SettingTests.TestEnumSetting.BAR"))); + assertThat(e, hasToString(containsString("No enum constant org.elasticsearch.common.settings.SettingTests.TestEnum.BAR"))); } public void testUpdateNotDynamic() { @@ -622,7 +627,7 @@ public void testListSettingsDeprecated() { .build(); deprecatedListSetting.get(settings); nonDeprecatedListSetting.get(settings); - assertSettingDeprecationsAndWarnings(new Setting[]{deprecatedListSetting}); + assertSettingDeprecationsAndWarnings(new Setting[]{ deprecatedListSetting }); } public void testListSettings() { diff --git a/server/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java index 2d1d11c778c95..bf0653aa92fe8 100644 --- a/server/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java +++ b/server/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java @@ -278,7 +278,7 @@ public String toString() { * test with something like 10000 iterations. I suspect you could see "active threads = ". So * that is what we assert. */ - @SuppressWarnings("unchecked") + @SuppressWarnings({"rawtypes", "unchecked"}) Matcher[] activeThreads = new Matcher[pool + 1]; for (int p = 0; p <= pool; p++) { activeThreads[p] = containsString("active threads = " + p); diff --git a/server/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java b/server/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java index fe0acd2ccf4ef..b9ec287806da8 100644 --- a/server/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java +++ b/server/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java @@ -330,6 +330,7 @@ public void onRequestSent(DiscoveryNode node, long requestId, String action, Tra } } + @SuppressWarnings("rawtypes") @Override public void onResponseReceived(long requestId, Transport.ResponseContext context) { if (MasterFaultDetection.MASTER_PING_ACTION_NAME.equals(context.action())) { diff --git a/server/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java b/server/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java index 31e55b7a5954b..f2aed073f8f5a 100644 --- a/server/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java +++ b/server/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java @@ -540,6 +540,7 @@ public void testIncomingClusterStateValidation() throws Exception { ZenDiscovery.validateIncomingState(logger, state, higherVersionState); } + @SuppressWarnings("unchecked") public void testNotEnoughMasterNodesAfterRemove() throws Exception { final ElectMasterService electMasterService = mock(ElectMasterService.class); when(electMasterService.hasEnoughMasterNodes(any(Iterable.class))).thenReturn(false); diff --git a/server/src/test/java/org/elasticsearch/http/DefaultRestChannelTests.java b/server/src/test/java/org/elasticsearch/http/DefaultRestChannelTests.java index 61082cf0bdc88..00577bba2b038 100644 --- a/server/src/test/java/org/elasticsearch/http/DefaultRestChannelTests.java +++ b/server/src/test/java/org/elasticsearch/http/DefaultRestChannelTests.java @@ -285,7 +285,8 @@ public RestRequest.Method method() { final BytesReference content = new ReleasableBytesReference(BytesReference.fromByteArray(byteArray, 0) , byteArray); channel.sendResponse(new TestRestResponse(RestStatus.METHOD_NOT_ALLOWED, content)); - Class> listenerClass = (Class>) (Class) ActionListener.class; + @SuppressWarnings("unchecked") + Class> listenerClass = (Class>) (Class) ActionListener.class; ArgumentCaptor> listenerCaptor = ArgumentCaptor.forClass(listenerClass); verify(httpChannel).sendResponse(any(), listenerCaptor.capture()); ActionListener listener = listenerCaptor.getValue(); diff --git a/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java b/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java index 2904905cf12b4..38261081b76f1 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java @@ -638,6 +638,6 @@ public void testCustomDataPathDeprecated() { IndexMetadata metadata = newIndexMeta("test", settings); IndexSettings indexSettings = new IndexSettings(metadata, Settings.EMPTY); assertThat(indexSettings.hasCustomDataPath(), is(true)); - assertSettingDeprecationsAndWarnings(new Setting[] { IndexMetadata.INDEX_DATA_PATH_SETTING }); + assertSettingDeprecationsAndWarnings(new Setting[] { IndexMetadata.INDEX_DATA_PATH_SETTING }); } } diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java index ffbd93cfca5de..b01ed192fee4f 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java @@ -101,6 +101,7 @@ public > FD load(LeafRe } @Override + @SuppressWarnings("unchecked") public > IFD load(DirectoryReader indexReader, IFD indexFieldData) throws Exception { cachedGlobally++; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java index 612ef5934619e..baf76b8d22590 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java @@ -121,7 +121,7 @@ public void testDefaultConfiguration() throws IOException { assertThat(fieldMapper, instanceOf(CompletionFieldMapper.class)); MappedFieldType completionFieldType = ((CompletionFieldMapper) fieldMapper).fieldType(); - NamedAnalyzer indexAnalyzer = (NamedAnalyzer) ((CompletionFieldMapper) fieldMapper).indexAnalyzers().values().iterator().next(); + NamedAnalyzer indexAnalyzer = ((CompletionFieldMapper) fieldMapper).indexAnalyzers().values().iterator().next(); assertThat(indexAnalyzer.name(), equalTo("simple")); assertThat(indexAnalyzer.analyzer(), instanceOf(CompletionAnalyzer.class)); CompletionAnalyzer analyzer = (CompletionAnalyzer) indexAnalyzer.analyzer(); @@ -150,7 +150,7 @@ public void testCompletionAnalyzerSettings() throws Exception { assertThat(fieldMapper, instanceOf(CompletionFieldMapper.class)); MappedFieldType completionFieldType = ((CompletionFieldMapper) fieldMapper).fieldType(); - NamedAnalyzer indexAnalyzer = (NamedAnalyzer) ((CompletionFieldMapper) fieldMapper).indexAnalyzers().values().iterator().next(); + NamedAnalyzer indexAnalyzer = ((CompletionFieldMapper) fieldMapper).indexAnalyzers().values().iterator().next(); assertThat(indexAnalyzer.name(), equalTo("simple")); assertThat(indexAnalyzer.analyzer(), instanceOf(CompletionAnalyzer.class)); CompletionAnalyzer analyzer = (CompletionAnalyzer) indexAnalyzer.analyzer(); diff --git a/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java b/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java index 823f3699a94d2..c7b423fc31cf2 100644 --- a/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java @@ -128,6 +128,7 @@ public void testBuildAnonymousFieldType() { assertThat(context.buildAnonymousFieldType("long"), instanceOf(NumberFieldMapper.NumberFieldType.class)); } + @SuppressWarnings("rawtypes") public void testToQueryFails() { SearchExecutionContext context = createSearchExecutionContext(IndexMetadata.INDEX_UUID_NA_VALUE, null); Exception exc = expectThrows(Exception.class, diff --git a/server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java index 17bf1d9bf2e93..ecddbb6d39131 100644 --- a/server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java @@ -88,7 +88,7 @@ protected void doAssertLuceneQuery(SpanMultiTermQueryBuilder queryBuilder, Query assertThat(query, either(instanceOf(SpanMultiTermQueryWrapper.class)) .or(instanceOf(FieldMaskingSpanQuery.class))); if (query instanceof SpanMultiTermQueryWrapper) { - SpanMultiTermQueryWrapper wrapper = (SpanMultiTermQueryWrapper) query; + SpanMultiTermQueryWrapper wrapper = (SpanMultiTermQueryWrapper) query; Query innerQuery = queryBuilder.innerQuery().toQuery(context); if (queryBuilder.innerQuery().boost() != AbstractQueryBuilder.DEFAULT_BOOST) { assertThat(innerQuery, instanceOf(BoostQuery.class)); @@ -201,7 +201,7 @@ public void testToQueryInnerTermQuery() throws IOException { { Query query = new SpanMultiTermQueryBuilder(new PrefixQueryBuilder(fieldName, "f")).toQuery(context); assertThat(query, instanceOf(SpanMultiTermQueryWrapper.class)); - SpanMultiTermQueryWrapper wrapper = (SpanMultiTermQueryWrapper) query; + SpanMultiTermQueryWrapper wrapper = (SpanMultiTermQueryWrapper) query; assertThat(wrapper.getWrappedQuery(), instanceOf(PrefixQuery.class)); assertThat(wrapper.getField(), equalTo("prefix_field")); PrefixQuery prefixQuery = (PrefixQuery) wrapper.getWrappedQuery(); diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java index a0e66330feaf8..600f6302f89b2 100644 --- a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java @@ -92,7 +92,7 @@ public LeafFieldData load(LeafReaderContext context) { return new LeafFieldData() { @Override - public ScriptDocValues getScriptValues() { + public ScriptDocValues getScriptValues() { throw new UnsupportedOperationException(UNSUPPORTED); } @@ -199,7 +199,7 @@ public double nextValue() { } @Override - public ScriptDocValues getScriptValues() { + public ScriptDocValues getScriptValues() { throw new UnsupportedOperationException(UNSUPPORTED); } diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index e0bfd7b974022..7645a723d5b87 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -2461,7 +2461,7 @@ public void testReaderWrapperWorksWithGlobalOrdinals() throws IOException { new IndexFieldDataCache.Listener() {}); IndexFieldDataService indexFieldDataService = new IndexFieldDataService(shard.indexSettings, indicesFieldDataCache, new NoneCircuitBreakerService(), shard.mapperService()); - IndexFieldData.Global ifd = indexFieldDataService.getForField(foo, "test", () -> { + IndexFieldData.Global ifd = indexFieldDataService.getForField(foo, "test", () -> { throw new UnsupportedOperationException("search lookup not available"); }); FieldDataStats before = shard.fieldData().stats("foo"); diff --git a/server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java b/server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java index 06e9573f843be..b117a0569da0f 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java @@ -114,7 +114,7 @@ public void validateReaderContext(ReaderContext readerContext, TransportRequest SearchOperationListener throwingListener = (SearchOperationListener) Proxy.newProxyInstance( SearchOperationListener.class.getClassLoader(), - new Class[]{SearchOperationListener.class}, + new Class[]{SearchOperationListener.class}, (a,b,c) -> { throw new RuntimeException();}); int throwingListeners = 0; final List indexingOperationListeners = new ArrayList<>(Arrays.asList(listener, listener)); diff --git a/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java b/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java index cc4d450d330d9..e9b0be32f6d7e 100644 --- a/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java +++ b/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java @@ -139,7 +139,7 @@ public void testSyncFailsOnIndexClosedOrMissing() throws InterruptedException { final SyncedFlushService flushService = getInstanceFromNode(SyncedFlushService.class); - SyncedFlushUtil.LatchedListener listener = new SyncedFlushUtil.LatchedListener(); + SyncedFlushUtil.LatchedListener listener = new SyncedFlushUtil.LatchedListener<>(); flushService.attemptSyncedFlush(new ShardId(shard.shardId().getIndex(), 1), listener); listener.latch.await(); assertNotNull(listener.error); @@ -148,14 +148,14 @@ public void testSyncFailsOnIndexClosedOrMissing() throws InterruptedException { assertEquals("no such shard", listener.error.getMessage()); assertAcked(client().admin().indices().prepareClose("test")); - listener = new SyncedFlushUtil.LatchedListener(); + listener = new SyncedFlushUtil.LatchedListener<>(); flushService.attemptSyncedFlush(shardId, listener); listener.latch.await(); assertNotNull(listener.error); assertNull(listener.result); assertEquals("closed", listener.error.getMessage()); - listener = new SyncedFlushUtil.LatchedListener(); + listener = new SyncedFlushUtil.LatchedListener<>(); flushService.attemptSyncedFlush(new ShardId("index not found", "_na_", 0), listener); listener.latch.await(); assertNotNull(listener.error); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregationTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregationTests.java index c41c6d7021077..6ee3ccc9316ba 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregationTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregationTests.java @@ -129,8 +129,7 @@ public void testResolveToSpecificBucket() { List stringBuckets = Collections.singletonList(new StringTerms.Bucket( new BytesRef("foo".getBytes(StandardCharsets.UTF_8), 0, "foo".getBytes(StandardCharsets.UTF_8).length), 1, internalStringAggs, false, 0, DocValueFormat.RAW)); - - InternalTerms termsAgg = new StringTerms("string_terms", BucketOrder.count(false), BucketOrder.count(false), 1, 0, + InternalTerms termsAgg = new StringTerms("string_terms", BucketOrder.count(false), BucketOrder.count(false), 1, 0, Collections.emptyMap(), DocValueFormat.RAW, 1, false, 0, stringBuckets, 0L); InternalAggregations internalAggregations = InternalAggregations.from(Collections.singletonList(termsAgg)); LongTerms.Bucket bucket = new LongTerms.Bucket(19, 1, internalAggregations, false, 0, DocValueFormat.RAW); @@ -149,9 +148,9 @@ public void testResolveToMissingSpecificBucket() { List stringBuckets = Collections.singletonList(new StringTerms.Bucket( new BytesRef("foo".getBytes(StandardCharsets.UTF_8), 0, "foo".getBytes(StandardCharsets.UTF_8).length), 1, internalStringAggs, false, 0, DocValueFormat.RAW)); - - InternalTerms termsAgg = new StringTerms("string_terms", BucketOrder.count(false), BucketOrder.count(false), 1, 0, + InternalTerms termsAgg = new StringTerms("string_terms", BucketOrder.count(false), BucketOrder.count(false), 1, 0, Collections.emptyMap(), DocValueFormat.RAW, 1, false, 0, stringBuckets, 0L); + InternalAggregations internalAggregations = InternalAggregations.from(Collections.singletonList(termsAgg)); LongTerms.Bucket bucket = new LongTerms.Bucket(19, 1, internalAggregations, false, 0, DocValueFormat.RAW); buckets.add(bucket); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesCollectorQueueTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesCollectorQueueTests.java index 38dc40a66c4b6..5a08b7554f56e 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesCollectorQueueTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesCollectorQueueTests.java @@ -148,7 +148,7 @@ private void testRandomCase(boolean forceMerge, ClassAndName type = types[i]; final Comparable[] values; int numValues = randomIntBetween(1, numDocs * 2); - values = new Comparable[numValues]; + values = new Comparable[numValues]; if (type.clazz == Long.class) { if (i < indexSortSourcePrefix) { indexSortFields[i] = new SortedNumericSortField(type.fieldType.name(), SortField.Type.LONG); @@ -228,7 +228,7 @@ private void testRandomCase(boolean forceMerge, } IndexReader reader = DirectoryReader.open(directory); int size = keys.size() > 1 ? randomIntBetween(1, keys.size()) : 1; - SingleDimensionValuesSource[] sources = new SingleDimensionValuesSource[types.length]; + SingleDimensionValuesSource[] sources = new SingleDimensionValuesSource[types.length]; for (int i = 0; i < types.length; i++) { final MappedFieldType fieldType = types[i].fieldType; if (types[i].clazz == Long.class) { @@ -352,6 +352,7 @@ private static int compareKey(CompositeKey key1, CompositeKey key2) { } else if (key2.get(i) == null) { return 1; } + @SuppressWarnings("unchecked") Comparable cmp1 = (Comparable) key1.get(i); int cmp = cmp1.compareTo(key2.get(i)); if (cmp != 0) { @@ -363,7 +364,7 @@ private static int compareKey(CompositeKey key1, CompositeKey key2) { private static List createListCombinations(List>> values) { List keys = new ArrayList<>(); - createListCombinations(new Comparable[values.size()], values, 0, values.size(), keys); + createListCombinations(new Comparable[values.size()], values, 0, values.size(), keys); return keys; } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/InternalCompositeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/InternalCompositeTests.java index 1588414067ff8..ed0e734020cff 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/InternalCompositeTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/InternalCompositeTests.java @@ -127,7 +127,7 @@ private CompositeKey createCompositeKey() { private Comparator getKeyComparator() { return (o1, o2) -> { for (int i = 0; i < o1.size(); i++) { - int cmp = ((Comparable) o1.get(i)).compareTo(o2.get(i)) * reverseMuls[i]; + int cmp = o1.get(i).compareTo(o2.get(i)) * reverseMuls[i]; if (cmp != 0) { return cmp; } @@ -257,11 +257,11 @@ public void testReduceUnmapped() throws IOException { public void testCompareCompositeKeyBiggerFieldName() { InternalComposite.ArrayMap key1 = createMap( Arrays.asList("field1", "field2"), - new Comparable[]{1, 2} + new Comparable[]{1, 2} ); InternalComposite.ArrayMap key2 = createMap( Arrays.asList("field3", "field2"), - new Comparable[]{1, 2} + new Comparable[]{1, 2} ); assertThat(key1.compareTo(key2), lessThan(0)); } @@ -269,11 +269,11 @@ public void testCompareCompositeKeyBiggerFieldName() { public void testCompareCompositeKeySmallerFieldName() { InternalComposite.ArrayMap key1 = createMap( Arrays.asList("field3", "field2"), - new Comparable[]{1, 2} + new Comparable[]{1, 2} ); InternalComposite.ArrayMap key2 = createMap( Arrays.asList("field1", "field2"), - new Comparable[]{1, 2} + new Comparable[]{1, 2} ); assertThat(key1.compareTo(key2), greaterThan(0)); } @@ -281,11 +281,11 @@ public void testCompareCompositeKeySmallerFieldName() { public void testCompareCompositeKeyBiggerValue() { InternalComposite.ArrayMap key1 = createMap( Arrays.asList("field1", "field2"), - new Comparable[]{1, 2} + new Comparable[]{1, 2} ); InternalComposite.ArrayMap key2 = createMap( Arrays.asList("field3", "field2"), - new Comparable[]{2, 3} + new Comparable[]{2, 3} ); assertThat(key1.compareTo(key2), lessThan(0)); } @@ -293,11 +293,11 @@ public void testCompareCompositeKeyBiggerValue() { public void testCompareCompositeKeySmallerValue() { InternalComposite.ArrayMap key1 = createMap( Arrays.asList("field3", "field2"), - new Comparable[]{1, 2} + new Comparable[]{1, 2} ); InternalComposite.ArrayMap key2 = createMap( Arrays.asList("field1", "field2"), - new Comparable[]{2, 3} + new Comparable[]{2, 3} ); assertThat(key1.compareTo(key2), greaterThan(0)); } @@ -305,11 +305,11 @@ public void testCompareCompositeKeySmallerValue() { public void testCompareCompositeKeyNullValueIsSmaller1() { InternalComposite.ArrayMap key1 = createMap( Arrays.asList("field1", "field2"), - new Comparable[]{null, 20} + new Comparable[]{null, 20} ); InternalComposite.ArrayMap key2 = createMap( Arrays.asList("field1", "field2"), - new Comparable[]{1, 2} + new Comparable[]{1, 2} ); assertThat(key1.compareTo(key2), lessThan(0)); } @@ -317,11 +317,11 @@ public void testCompareCompositeKeyNullValueIsSmaller1() { public void testCompareCompositeKeyNullValueIsSmaller2() { InternalComposite.ArrayMap key1 = createMap( Arrays.asList("field1", "field2"), - new Comparable[]{1, 2} + new Comparable[]{1, 2} ); InternalComposite.ArrayMap key2 = createMap( Arrays.asList("field1", "field2"), - new Comparable[]{null, 20} + new Comparable[]{null, 20} ); assertThat(key1.compareTo(key2), greaterThan(0)); } @@ -329,29 +329,29 @@ public void testCompareCompositeKeyNullValueIsSmaller2() { public void testCompareCompositeKeyMoreFieldsIsGreater() { InternalComposite.ArrayMap key1 = createMap( Arrays.asList("field1", "field2"), - new Comparable[]{1, 2} + new Comparable[]{1, 2} ); - InternalComposite.ArrayMap key2 = createMap(Arrays.asList("field1", "field2", "field3"),new Comparable[]{1, 2, null}); + InternalComposite.ArrayMap key2 = createMap(Arrays.asList("field1", "field2", "field3"),new Comparable[]{1, 2, null}); assertThat(key1.compareTo(key2), lessThan(0)); } public void testCompareCompositeKeyLessFieldsIsLesser() { InternalComposite.ArrayMap key1 = createMap( Arrays.asList("field1", "field2", "field3"), - new Comparable[]{1, 2, null} + new Comparable[]{1, 2, null} ); - InternalComposite.ArrayMap key2 = createMap(Arrays.asList("field1", "field2"),new Comparable[]{1, 2}); + InternalComposite.ArrayMap key2 = createMap(Arrays.asList("field1", "field2"),new Comparable[]{1, 2}); assertThat(key1.compareTo(key2), greaterThan(0)); } public void testCompareCompositeKeyEqual() { InternalComposite.ArrayMap key1 = createMap( Arrays.asList("field1", "field2", "field3"), - new Comparable[]{null, 1, 2} + new Comparable[]{null, 1, 2} ); InternalComposite.ArrayMap key2 = createMap( Arrays.asList("field1", "field2", "field3"), - new Comparable[]{null, 1, 2} + new Comparable[]{null, 1, 2} ); assertThat(key1.compareTo(key1), equalTo(0)); assertThat(key1.equals(key1), is(true)); @@ -364,12 +364,12 @@ public void testCompareCompositeKeyEqual() { public void testCompareCompositeKeyValuesHaveDifferentTypes() { InternalComposite.ArrayMap key1 = createMap( Arrays.asList("field1", "field2"), - new Comparable[]{1, 2} + new Comparable[]{1, 2} ); InternalComposite.ArrayMap key2 = createMap( Arrays.asList("field1", "field2"), - new Comparable[]{"1", 2} + new Comparable[]{"1", 2} ); ClassCastException exception = expectThrows(ClassCastException.class, () -> key1.compareTo(key2)); @@ -409,7 +409,7 @@ public void testFormatDateEpochTimezone() { assertEquals("1622060077", actual.toString()); } - private InternalComposite.ArrayMap createMap(List fields, Comparable[] values) { + private InternalComposite.ArrayMap createMap(List fields, Comparable[] values) { List formats = IntStream.range(0, fields.size()) .mapToObj(i -> DocValueFormat.RAW).collect(Collectors.toList()); return new InternalComposite.ArrayMap( diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java index 25b420636cf18..7ab13c828721f 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java @@ -292,7 +292,9 @@ private void testCase(Query query, int precision, GeoBoundingBox geoBoundingBox, aggregator.preCollection(); indexSearcher.search(query, aggregator); aggregator.postCollection(); - verify.accept((InternalGeoGrid) aggregator.buildTopLevel()); + @SuppressWarnings("unchecked") + InternalGeoGrid topLevel = (InternalGeoGrid) aggregator.buildTopLevel(); + verify.accept(topLevel); indexReader.close(); directory.close(); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridTestCase.java index 74ef850efed4f..2221b9c924112 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridTestCase.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoGridTestCase.java @@ -72,6 +72,7 @@ protected void assertReduced(T reduced, List inputs) { Map> map = new HashMap<>(); for (T input : inputs) { for (GeoGrid.Bucket bucketBase : input.getBuckets()) { + @SuppressWarnings("unchecked") B bucket = (B) bucketBase; List buckets = map.get(bucket.hashAsLong); if (buckets == null) { @@ -144,7 +145,7 @@ protected T mutateInstance(T instance) { } public void testCreateFromBuckets() { - InternalGeoGrid original = createTestInstance(); + InternalGeoGrid original = createTestInstance(); assertThat(original, equalTo(original.create(original.buckets))); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java index c708a008c041c..8aede04387c97 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java @@ -758,7 +758,8 @@ public void testNestedWithPipeline() throws IOException { assertEquals(NESTED_AGG, nested.getName()); assertEquals(expectedNestedDocs, nested.getDocCount()); - InternalTerms terms = (InternalTerms) nested.getProperty("terms"); + @SuppressWarnings("unchecked") + InternalTerms terms = (InternalTerms) nested.getProperty("terms"); assertNotNull(terms); for (LongTerms.Bucket bucket : terms.getBuckets()) { diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java index 01aea11b8fdc6..2d57a2ce6836f 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java @@ -365,7 +365,7 @@ public void testUnmappedWithBadMissingField() { private void testBothResolutions( Query query, CheckedBiConsumer buildIndex, - Consumer> verify + Consumer>> verify ) throws IOException { testCase( query, @@ -383,7 +383,7 @@ private void testBothResolutions( private void testCase(Query query, CheckedConsumer buildIndex, - Consumer> verify, + Consumer>> verify, DateFieldMapper.Resolution resolution) throws IOException { DateFieldMapper.DateFieldType fieldType = new DateFieldMapper.DateFieldType(DATE_FIELD_NAME, true, false, true, DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER, resolution, null, null, Collections.emptyMap()); @@ -397,7 +397,7 @@ private void testCase(Query query, private void testCase(DateRangeAggregationBuilder aggregationBuilder, Query query, CheckedConsumer buildIndex, - Consumer> verify, + Consumer>> verify, MappedFieldType fieldType) throws IOException { try (Directory directory = newDirectory()) { RandomIndexWriter indexWriter = new RandomIndexWriter(random(), directory); @@ -407,7 +407,7 @@ private void testCase(DateRangeAggregationBuilder aggregationBuilder, try (IndexReader indexReader = DirectoryReader.open(directory)) { IndexSearcher indexSearcher = newSearcher(indexReader, true, true); - InternalRange agg = searchAndReduce(indexSearcher, + InternalRange> agg = searchAndReduce(indexSearcher, query, aggregationBuilder, fieldType); verify.accept(agg); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java index 7c4ff8fc491c6..d32f506dc183f 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalRangeTests.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; -public class InternalRangeTests extends InternalRangeTestCase { +public class InternalRangeTests extends InternalRangeTestCase> { private DocValueFormat format; private List> ranges; @@ -63,7 +63,7 @@ public void setUp() throws Exception { } @Override - protected InternalRange createTestInstance(String name, + protected InternalRange createTestInstance(String name, Map metadata, InternalAggregations aggregations, boolean keyed) { @@ -94,7 +94,7 @@ protected Class parsedRange } @Override - protected InternalRange mutateInstance(InternalRange instance) { + protected InternalRange mutateInstance(InternalRange instance) { String name = instance.getName(); DocValueFormat format = instance.format; boolean keyed = instance.keyed; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java index 4579adecb0457..1ae7f5bc921fe 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java @@ -50,6 +50,7 @@ private static int compare(BytesRef a, BytesRef b, int m) { : b == null ? m : a.compareTo(b); } + @SuppressWarnings({"rawtypes", "unchecked"}) public void testRanges() throws Exception { boolean v4 = randomBoolean(); IpRangeAggregationBuilder builder = new IpRangeAggregationBuilder("test_agg").field("field"); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorTests.java index ed8640e79f309..eb25ba373fc0e 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorTests.java @@ -583,9 +583,11 @@ public void execute() { ); } - private void testCase(Query query, - CheckedConsumer buildIndex, - Consumer> verify) throws IOException { + private void testCase( + Query query, + CheckedConsumer buildIndex, + Consumer>> verify + ) throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType( NUMBER_FIELD_NAME, NumberFieldMapper.NumberType.INTEGER, @@ -604,9 +606,11 @@ private void testCase(Query query, testCase(aggregationBuilder, query, buildIndex, verify, fieldType); } - private void simpleTestCase(RangeAggregationBuilder aggregationBuilder, - Query query, - Consumer> verify) throws IOException { + private void simpleTestCase( + RangeAggregationBuilder aggregationBuilder, + Query query, + Consumer>> verify + ) throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(NUMBER_FIELD_NAME, NumberFieldMapper.NumberType.INTEGER); testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> { @@ -619,7 +623,7 @@ private void simpleTestCase(RangeAggregationBuilder aggregationBuilder, private void testCase(RangeAggregationBuilder aggregationBuilder, Query query, CheckedConsumer buildIndex, - Consumer> verify, + Consumer>> verify, MappedFieldType fieldType) throws IOException { try (Directory directory = newDirectory()) { RandomIndexWriter indexWriter = new RandomIndexWriter(random(), directory); @@ -629,7 +633,7 @@ private void testCase(RangeAggregationBuilder aggregationBuilder, try (IndexReader indexReader = DirectoryReader.open(directory)) { IndexSearcher indexSearcher = newSearcher(indexReader, true, true); - InternalRange agg = searchAndReduce(indexSearcher, + InternalRange> agg = searchAndReduce(indexSearcher, query, aggregationBuilder, fieldType); verify.accept(agg); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/BinaryTermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/BinaryTermsAggregatorTests.java index 95aa30268412a..3eb1654d39709 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/BinaryTermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/BinaryTermsAggregatorTests.java @@ -102,7 +102,7 @@ public void testBadUserValueTypeHint() throws IOException { private void testSearchCase(Query query, List dataset, Consumer configure, - Consumer verify, ValueType valueType) throws IOException { + Consumer> verify, ValueType valueType) throws IOException { try (Directory directory = newDirectory()) { try (RandomIndexWriter indexWriter = new RandomIndexWriter(random(), directory)) { Document document = new Document(); @@ -126,7 +126,7 @@ private void testSearchCase(Query query, List dataset, MappedFieldType binaryFieldType = new BinaryFieldMapper.BinaryFieldType(BINARY_FIELD); - InternalMappedTerms rareTerms = searchAndReduce(indexSearcher, query, aggregationBuilder, binaryFieldType); + InternalMappedTerms rareTerms = searchAndReduce(indexSearcher, query, aggregationBuilder, binaryFieldType); verify.accept(rareTerms); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/InternalSignificantTermsTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/InternalSignificantTermsTestCase.java index b156f982faff5..f2431e9c05f1b 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/InternalSignificantTermsTestCase.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/InternalSignificantTermsTestCase.java @@ -36,7 +36,7 @@ public void setUp() throws Exception { } @Override - protected final InternalSignificantTerms createTestInstance(String name, + protected final InternalSignificantTerms createTestInstance(String name, Map metadata, InternalAggregations aggregations) { final int requiredSize = randomIntBetween(1, 5); @@ -62,7 +62,7 @@ protected final InternalSignificantTerms createTestInstance(String name, supersetSize, supersetDfs, significanceHeuristic); } - protected abstract InternalSignificantTerms createTestInstance(String name, + protected abstract InternalSignificantTerms createTestInstance(String name, Map metadata, InternalAggregations aggregations, int requiredSize, int numBuckets, @@ -71,7 +71,7 @@ protected abstract InternalSignificantTerms createTestInstance(String name, SignificanceHeuristic significanceHeuristic); @Override - protected InternalSignificantTerms createUnmappedInstance(String name, + protected InternalSignificantTerms createUnmappedInstance(String name, Map metadata) { InternalSignificantTerms testInstance = createTestInstance(name, metadata); return new UnmappedSignificantTerms(name, testInstance.requiredSize, testInstance.minDocCount, metadata); @@ -105,7 +105,7 @@ protected void assertMultiBucketsAggregation(MultiBucketsAggregation expected, M assertTrue(expected instanceof InternalSignificantTerms); assertTrue(actual instanceof ParsedSignificantTerms); - InternalSignificantTerms expectedSigTerms = (InternalSignificantTerms) expected; + InternalSignificantTerms expectedSigTerms = (InternalSignificantTerms) expected; ParsedSignificantTerms actualSigTerms = (ParsedSignificantTerms) actual; assertEquals(expectedSigTerms.getSubsetSize(), actualSigTerms.getSubsetSize()); assertEquals(expectedSigTerms.getSupersetSize(), actualSigTerms.getSupersetSize()); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/KeywordTermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/KeywordTermsAggregatorTests.java index 2b49d4fbcf9d7..74a998af782b7 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/KeywordTermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/KeywordTermsAggregatorTests.java @@ -88,7 +88,7 @@ public void testMatchAllDocs() throws IOException { private void testSearchCase(Query query, List dataset, Consumer configure, - Consumer verify, ValueType valueType) throws IOException { + Consumer> verify, ValueType valueType) throws IOException { MappedFieldType keywordFieldType = new KeywordFieldMapper.KeywordFieldType(KEYWORD_FIELD, randomBoolean(), true, Collections.emptyMap()); try (Directory directory = newDirectory()) { @@ -116,7 +116,7 @@ private void testSearchCase(Query query, List dataset, } - InternalMappedTerms rareTerms = searchAndReduce(indexSearcher, query, aggregationBuilder, keywordFieldType); + InternalMappedTerms rareTerms = searchAndReduce(indexSearcher, query, aggregationBuilder, keywordFieldType); verify.accept(rareTerms); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/NumericTermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/NumericTermsAggregatorTests.java index f25672864c93b..e4ca8de2f865f 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/NumericTermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/NumericTermsAggregatorTests.java @@ -114,7 +114,7 @@ public void testBadIncludeExclude() throws IOException { private void testSearchCase(Query query, List dataset, Consumer configure, - Consumer verify, ValueType valueType) throws IOException { + Consumer> verify, ValueType valueType) throws IOException { try (Directory directory = newDirectory()) { try (RandomIndexWriter indexWriter = new RandomIndexWriter(random(), directory)) { Document document = new Document(); @@ -140,7 +140,7 @@ private void testSearchCase(Query query, List dataset, MappedFieldType longFieldType = new NumberFieldMapper.NumberFieldType(LONG_FIELD, NumberFieldMapper.NumberType.LONG); - InternalMappedTerms rareTerms = searchAndReduce(indexSearcher, query, aggregationBuilder, longFieldType); + InternalMappedTerms rareTerms = searchAndReduce(indexSearcher, query, aggregationBuilder, longFieldType); verify.accept(rareTerms); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantLongTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantLongTermsTests.java index 2f30201fd97e6..e2b4cb8974f1c 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantLongTermsTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantLongTermsTests.java @@ -30,7 +30,7 @@ public void setUp() throws Exception { } @Override - protected InternalSignificantTerms createTestInstance(String name, + protected InternalSignificantTerms createTestInstance(String name, Map metadata, InternalAggregations aggs, int requiredSize, int numBuckets, diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantStringTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantStringTermsTests.java index f05d9be335467..31d28e078feb1 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantStringTermsTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantStringTermsTests.java @@ -23,7 +23,7 @@ public class SignificantStringTermsTests extends InternalSignificantTermsTestCase { @Override - protected InternalSignificantTerms createTestInstance(String name, + protected InternalSignificantTerms createTestInstance(String name, Map metadata, InternalAggregations aggs, int requiredSize, int numBuckets, diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java index 24f762380cf8c..b739feefe544b 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java @@ -624,6 +624,7 @@ private List doc(MappedFieldType ft1, MappedFieldType ft2, Strin return doc; } + @SuppressWarnings("unchecked") public void testNumericIncludeExclude() throws Exception { try (Directory directory = newDirectory()) { try (RandomIndexWriter indexWriter = new RandomIndexWriter(random(), directory)) { @@ -674,7 +675,7 @@ public void testNumericIncludeExclude() throws Exception { assertEquals(1L, result.getBuckets().get(0).getDocCount()); assertEquals(5L, result.getBuckets().get(1).getKey()); assertEquals(1L, result.getBuckets().get(1).getDocCount()); - assertTrue(AggregationInspectionHelper.hasValue((InternalTerms)result)); + assertTrue(AggregationInspectionHelper.hasValue((InternalTerms) result)); aggregationBuilder = new TermsAggregationBuilder("_name").userValueTypeHint(ValueType.LONG) .executionHint(executionHint) @@ -696,7 +697,7 @@ public void testNumericIncludeExclude() throws Exception { assertEquals(1L, result.getBuckets().get(2).getDocCount()); assertEquals(4L, result.getBuckets().get(3).getKey()); assertEquals(1L, result.getBuckets().get(3).getDocCount()); - assertTrue(AggregationInspectionHelper.hasValue((InternalTerms)result)); + assertTrue(AggregationInspectionHelper.hasValue((InternalTerms) result)); fieldType = new NumberFieldMapper.NumberFieldType("double_field", NumberFieldMapper.NumberType.DOUBLE); @@ -716,7 +717,7 @@ public void testNumericIncludeExclude() throws Exception { assertEquals(1L, result.getBuckets().get(0).getDocCount()); assertEquals(5.0, result.getBuckets().get(1).getKey()); assertEquals(1L, result.getBuckets().get(1).getDocCount()); - assertTrue(AggregationInspectionHelper.hasValue((InternalTerms)result)); + assertTrue(AggregationInspectionHelper.hasValue((InternalTerms) result)); aggregationBuilder = new TermsAggregationBuilder("_name").userValueTypeHint(ValueType.DOUBLE) .executionHint(executionHint) @@ -738,7 +739,7 @@ public void testNumericIncludeExclude() throws Exception { assertEquals(1L, result.getBuckets().get(2).getDocCount()); assertEquals(4.0, result.getBuckets().get(3).getKey()); assertEquals(1L, result.getBuckets().get(3).getDocCount()); - assertTrue(AggregationInspectionHelper.hasValue((InternalTerms)result)); + assertTrue(AggregationInspectionHelper.hasValue((InternalTerms) result)); } } } @@ -1082,7 +1083,7 @@ public void testUnmapped() throws Exception { Terms result = reduce(aggregator, context.bigArrays()); assertEquals("_name", result.getName()); assertEquals(0, result.getBuckets().size()); - assertFalse(AggregationInspectionHelper.hasValue((InternalTerms)result)); + assertFalse(AggregationInspectionHelper.hasValue((InternalTerms) result)); } } } @@ -1603,7 +1604,7 @@ public void testNumberToStringValueScript() throws IOException { for (int i = 0; i < numDocs; i++) { iw.addDocument(singleton(new NumericDocValuesField("number", i + 1))); } - }, (Consumer) terms -> { + }, (Consumer>) terms -> { assertTrue(AggregationInspectionHelper.hasValue(terms)); }, fieldType); } @@ -2215,7 +2216,9 @@ private T reduce(Aggregator agg, BigArrays bigAr InternalAggregation.ReduceContext context = InternalAggregation.ReduceContext.forFinalReduction( bigArrays, getMockScriptService(), reduceBucketConsumer, PipelineTree.EMPTY); + @SuppressWarnings("unchecked") T topLevel = (T) agg.buildTopLevel(); + @SuppressWarnings("unchecked") T result = (T) topLevel.reduce(Collections.singletonList(topLevel), context); doAssertReducedMultiBucketConsumer(result, reduceBucketConsumer); return result; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetricTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetricTests.java index 66c1325b7a29e..c8a5cdc595304 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetricTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalScriptedMetricTests.java @@ -43,13 +43,16 @@ public class InternalScriptedMetricTests extends InternalAggregationTestCase[] valueTypes; + @SuppressWarnings({"rawtypes", "unchecked"}) private final Supplier[] leafValueSuppliers = new Supplier[] { () -> randomInt(), () -> randomLong(), () -> randomDouble(), () -> randomFloat(), () -> randomBoolean(), () -> randomAlphaOfLength(5), () -> new GeoPoint(randomDouble(), randomDouble()), () -> null }; + @SuppressWarnings({"rawtypes", "unchecked"}) private final Supplier[] nestedValueSuppliers = new Supplier[] { () -> new HashMap(), () -> new ArrayList<>() }; @Override + @SuppressWarnings({"rawtypes", "unchecked"}) public void setUp() throws Exception { super.setUp(); hasReduceScript = randomBoolean(); @@ -183,24 +186,29 @@ private static void assertValues(Object expected, Object actual) { } else if (expected instanceof GeoPoint) { assertTrue(actual instanceof Map); GeoPoint point = (GeoPoint) expected; + @SuppressWarnings("unchecked") Map pointMap = (Map) actual; assertEquals(point.getLat(), pointMap.get("lat")); assertEquals(point.getLon(), pointMap.get("lon")); } else if (expected instanceof Map) { + @SuppressWarnings("unchecked") Map expectedMap = (Map) expected; + @SuppressWarnings("unchecked") Map actualMap = (Map) actual; assertEquals(expectedMap.size(), actualMap.size()); for (String key : expectedMap.keySet()) { assertValues(expectedMap.get(key), actualMap.get(key)); } } else if (expected instanceof List) { - List expectedList = (List) expected; - List actualList = (List) actual; - assertEquals(expectedList.size(), actualList.size()); - Iterator actualIterator = actualList.iterator(); - for (Object element : expectedList) { - assertValues(element, actualIterator.next()); - } + @SuppressWarnings("unchecked") + List expectedList = (List) expected; + @SuppressWarnings("unchecked") + List actualList = (List) actual; + assertEquals(expectedList.size(), actualList.size()); + Iterator actualIterator = actualList.iterator(); + for (Object element : expectedList) { + assertValues(element, actualIterator.next()); + } } else { assertEquals(expected, actual); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeAggregatorTests.java index ff32561a50697..91901faefd6be 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeAggregatorTests.java @@ -212,9 +212,9 @@ public void testSingleValueAggDerivative() throws IOException { List buckets = ((Histogram) histogram).getBuckets(); assertThat(buckets.size(), equalTo(numValueBuckets)); - Object[] propertiesKeys = (Object[]) ((InternalAggregation)histogram).getProperty("_key"); - Object[] propertiesDocCounts = (Object[]) ((InternalAggregation)histogram).getProperty("_count"); - Object[] propertiesSumCounts = (Object[]) ((InternalAggregation)histogram).getProperty("sum.value"); + Object[] propertiesKeys = (Object[]) histogram.getProperty("_key"); + Object[] propertiesDocCounts = (Object[]) histogram.getProperty("_count"); + Object[] propertiesSumCounts = (Object[]) histogram.getProperty("sum.value"); Long expectedSumPreviousBucket = Long.MIN_VALUE; // start value, gets // overwritten @@ -261,9 +261,9 @@ public void testMultiValueAggDerivative() throws IOException { assertThat(histogram, notNullValue()); assertThat(histogram.getName(), equalTo("histo")); - Object[] propertiesKeys = (Object[]) ((InternalAggregation)histogram).getProperty("_key"); - Object[] propertiesDocCounts = (Object[]) ((InternalAggregation)histogram).getProperty("_count"); - Object[] propertiesSumCounts = (Object[]) ((InternalAggregation)histogram).getProperty("stats.sum"); + Object[] propertiesKeys = (Object[]) histogram.getProperty("_key"); + Object[] propertiesDocCounts = (Object[]) histogram.getProperty("_count"); + Object[] propertiesSumCounts = (Object[]) histogram.getProperty("stats.sum"); Long expectedSumPreviousBucket = Long.MIN_VALUE; // start value, gets // overwritten diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceRegistryTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceRegistryTests.java index d971bc0fefb4a..059b36efd2a21 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceRegistryTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceRegistryTests.java @@ -47,7 +47,10 @@ public void testAggregatorNotFoundException() { null, CoreValuesSourceType.KEYWORD ); - ValuesSourceRegistry.RegistryKey key = new ValuesSourceRegistry.RegistryKey("bogus", HistogramAggregatorSupplier.class); + ValuesSourceRegistry.RegistryKey key = new ValuesSourceRegistry.RegistryKey<>( + "bogus", + HistogramAggregatorSupplier.class + ); ValuesSourceRegistry registry = new ValuesSourceRegistry( Collections.singletonMap(key, Collections.emptyList()), null diff --git a/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java index 92e1c6a15ad2a..048e468e76f9b 100644 --- a/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java @@ -597,7 +597,7 @@ public QueryBuilder doRewrite(QueryRewriteContext queryRewriteContext) throws IO } }; sortBuilder.setNestedPath("path").setNestedFilter(rangeQuery); - GeoDistanceSortBuilder rewritten = (GeoDistanceSortBuilder) sortBuilder + GeoDistanceSortBuilder rewritten = sortBuilder .rewrite(createMockSearchExecutionContext()); assertNotSame(rangeQuery, rewritten.getNestedFilter()); } diff --git a/server/src/test/java/org/elasticsearch/transport/RemoteClusterSettingsTests.java b/server/src/test/java/org/elasticsearch/transport/RemoteClusterSettingsTests.java index c8d7a83132395..0a7b574fb2536 100644 --- a/server/src/test/java/org/elasticsearch/transport/RemoteClusterSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/transport/RemoteClusterSettingsTests.java @@ -41,6 +41,7 @@ import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.not; +@SuppressWarnings("rawtypes") public class RemoteClusterSettingsTests extends ESTestCase { public void testConnectionsPerClusterFallback() { diff --git a/test/framework/src/main/java/org/elasticsearch/transport/MockTransportClient.java b/test/framework/src/main/java/org/elasticsearch/transport/MockTransportClient.java index deb7f0f83412d..2948b1fba0169 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/MockTransportClient.java +++ b/test/framework/src/main/java/org/elasticsearch/transport/MockTransportClient.java @@ -18,12 +18,13 @@ import java.util.Arrays; import java.util.Collection; -@SuppressWarnings({"unchecked","varargs"}) @Deprecated public class MockTransportClient extends TransportClient { private static final Settings DEFAULT_SETTINGS = Settings.builder().put("transport.type.default", MockNioTransportPlugin.MOCK_NIO_TRANSPORT_NAME).build(); + @SafeVarargs + @SuppressWarnings("varargs") public MockTransportClient(Settings settings, Class... plugins) { this(settings, Arrays.asList(plugins)); }