diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlTasks.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlTasks.java index 9ac63f026b089..11dc2e77c27f4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlTasks.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlTasks.java @@ -193,7 +193,7 @@ public static Set unallocatedJobIds(@Nullable PersistentTasksCustomMetaD * @param nodes The cluster nodes * @return Unallocated job tasks */ - public static Collection unallocatedJobTasks( + public static Collection> unallocatedJobTasks( @Nullable PersistentTasksCustomMetaData tasks, DiscoveryNodes nodes) { if (tasks == null) { @@ -247,7 +247,7 @@ public static Set unallocatedDatafeedIds(@Nullable PersistentTasksCustom * @param nodes The cluster nodes * @return Unallocated datafeed tasks */ - public static Collection unallocatedDatafeedTasks( + public static Collection> unallocatedDatafeedTasks( @Nullable PersistentTasksCustomMetaData tasks, DiscoveryNodes nodes) { if (tasks == null) { diff --git a/x-pack/plugin/ml/build.gradle b/x-pack/plugin/ml/build.gradle index ec35e7fb8849f..c0f3d94b776e5 100644 --- a/x-pack/plugin/ml/build.gradle +++ b/x-pack/plugin/ml/build.gradle @@ -46,9 +46,6 @@ bundlePlugin { exclude 'platform/licenses/**' } -compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked" -compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked" - dependencies { compileOnly project(':modules:lang-painless:spi') compileOnly project(path: xpackModule('core'), configuration: 'default') diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlConfigMigrator.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlConfigMigrator.java index 1d230d93792fc..79ff292fb823a 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlConfigMigrator.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlConfigMigrator.java @@ -294,8 +294,8 @@ public static PersistentTasksCustomMetaData rewritePersistentTaskParams(Map unallocatedJobTasks = MlTasks.unallocatedJobTasks(currentTasks, nodes); - Collection unallocatedDatafeedsTasks = + Collection> unallocatedJobTasks = MlTasks.unallocatedJobTasks(currentTasks, nodes); + Collection> unallocatedDatafeedsTasks = MlTasks.unallocatedDatafeedTasks(currentTasks, nodes); if (unallocatedJobTasks.isEmpty() && unallocatedDatafeedsTasks.isEmpty()) { @@ -304,7 +304,7 @@ public static PersistentTasksCustomMetaData rewritePersistentTaskParams(Map jobTask : unallocatedJobTasks) { OpenJobAction.JobParams originalParams = (OpenJobAction.JobParams) jobTask.getParams(); if (originalParams.getJob() == null) { Job job = jobs.get(originalParams.getJobId()); @@ -325,7 +325,7 @@ public static PersistentTasksCustomMetaData rewritePersistentTaskParams(Map datafeedTask : unallocatedDatafeedsTasks) { StartDatafeedAction.DatafeedParams originalParams = (StartDatafeedAction.DatafeedParams) datafeedTask.getParams(); if (originalParams.getJobId() == null) { diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateModelSnapshotAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateModelSnapshotAction.java index 1847159b9be36..f81dc2ac3189f 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateModelSnapshotAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateModelSnapshotAction.java @@ -75,7 +75,7 @@ private static Result applyUpdate(UpdateModelSnapshotAction.Reque if (request.getRetain() != null) { updatedSnapshotBuilder.setRetain(request.getRetain()); } - return new Result(target.index, updatedSnapshotBuilder.build()); + return new Result<>(target.index, updatedSnapshotBuilder.build()); } private void indexModelSnapshot(Result modelSnapshot, Consumer handler, Consumer errorHandler) { diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/RollupDataExtractorFactory.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/RollupDataExtractorFactory.java index 6c27fba4156f6..94d0c6204ce00 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/RollupDataExtractorFactory.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/extractor/aggregation/RollupDataExtractorFactory.java @@ -117,7 +117,7 @@ public static void create(Client client, ); return; } - final List flattenedAggs = new ArrayList<>(); + final List> flattenedAggs = new ArrayList<>(); flattenAggregations(datafeed.getParsedAggregations(xContentRegistry) .getAggregatorFactories(), datafeedHistogramAggregation, flattenedAggs); @@ -148,7 +148,7 @@ private static boolean validInterval(long datafeedInterval, ParsedRollupCaps rol private static void flattenAggregations(final Collection datafeedAggregations, final AggregationBuilder datafeedHistogramAggregation, - final List flattenedAggregations) { + final List> flattenedAggregations) { for (AggregationBuilder aggregationBuilder : datafeedAggregations) { if (aggregationBuilder.equals(datafeedHistogramAggregation) == false) { flattenedAggregations.add((ValuesSourceAggregationBuilder)aggregationBuilder); @@ -157,8 +157,8 @@ private static void flattenAggregations(final Collection dat } } - private static boolean hasAggregations(ParsedRollupCaps rollupCaps, List datafeedAggregations) { - for (ValuesSourceAggregationBuilder aggregationBuilder : datafeedAggregations) { + private static boolean hasAggregations(ParsedRollupCaps rollupCaps, List> datafeedAggregations) { + for (ValuesSourceAggregationBuilder aggregationBuilder : datafeedAggregations) { String type = aggregationBuilder.getType(); String field = aggregationBuilder.field(); if (aggregationBuilder instanceof TermsAggregationBuilder) { diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/DataFrameAnalyticsIndex.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/DataFrameAnalyticsIndex.java index 661525623575d..c19472e22a84e 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/DataFrameAnalyticsIndex.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/DataFrameAnalyticsIndex.java @@ -168,6 +168,7 @@ private static void addMetaData(Map mappingsAsMap, String analyt metadata.put(ANALYTICS, analyticsId); } + @SuppressWarnings("unchecked") private static V getOrPutDefault(Map map, K key, Supplier valueSupplier) { V value = (V) map.get(key); if (value == null) { diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/DataFrameRowsJoiner.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/DataFrameRowsJoiner.java index 1b3dd2932ab9e..dbbb7f3cf2313 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/DataFrameRowsJoiner.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/DataFrameRowsJoiner.java @@ -104,7 +104,7 @@ private void checkChecksumsMatch(DataFrameDataExtractor.Row row, RowResults resu } private IndexRequest createIndexRequest(RowResults result, SearchHit hit) { - Map source = new LinkedHashMap(hit.getSourceAsMap()); + Map source = new LinkedHashMap<>(hit.getSourceAsMap()); source.putAll(result.getResults()); IndexRequest indexRequest = new IndexRequest(hit.getIndex()); indexRequest.id(hit.getId()); diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/results/RowResults.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/results/RowResults.java index ba4aebededa2e..f32e13703212d 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/results/RowResults.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/results/RowResults.java @@ -20,6 +20,7 @@ public class RowResults implements ToXContentObject { public static final ParseField CHECKSUM = new ParseField("checksum"); public static final ParseField RESULTS = new ParseField("results"); + @SuppressWarnings("unchecked") public static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>(TYPE.getPreferredName(), a -> new RowResults((Integer) a[0], (Map) a[1])); diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java index 62494a03f9c52..812b70dc6717c 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/rest/job/RestDeleteJobAction.java @@ -73,10 +73,10 @@ protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient // We do not want to log anything due to a delete action // The response or error will be returned to the client when called synchronously // or it will be stored in the task result when called asynchronously - private static TaskListener nullTaskListener() { - return new TaskListener() { + private static TaskListener nullTaskListener() { + return new TaskListener() { @Override - public void onResponse(Task task, Object o) {} + public void onResponse(Task task, T o) {} @Override public void onFailure(Task task, Throwable e) {} diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MachineLearningInfoTransportActionTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MachineLearningInfoTransportActionTests.java index 29f348c3857b9..b3d4cc4f94d59 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MachineLearningInfoTransportActionTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MachineLearningInfoTransportActionTests.java @@ -338,7 +338,7 @@ private void givenJobs(List jobs, List(jobs, jobs.size(), Job.RESULTS_FIELD)); return Void.TYPE; - }).when(jobManager).expandJobs(eq(MetaData.ALL), eq(true), any(ActionListener.class)); + }).when(jobManager).expandJobs(eq(MetaData.ALL), eq(true), any()); doAnswer(invocationOnMock -> { @SuppressWarnings("unchecked") diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportCloseJobActionTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportCloseJobActionTests.java index 1091395ea7ae7..c4deb22e7ae85 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportCloseJobActionTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportCloseJobActionTests.java @@ -279,6 +279,7 @@ clusterService, mock(Client.class), mock(Auditor.class), mock(PersistentTasksSer jobConfigProvider, datafeedConfigProvider); } + @SuppressWarnings("unchecked") private void mockDatafeedConfigFindDatafeeds(Set datafeedIds) { doAnswer(invocation -> { ActionListener> listener = (ActionListener>) invocation.getArguments()[1]; @@ -288,6 +289,7 @@ private void mockDatafeedConfigFindDatafeeds(Set datafeedIds) { }).when(datafeedConfigProvider).findDatafeedsForJobIds(any(), any(ActionListener.class)); } + @SuppressWarnings("unchecked") private void mockJobConfigProviderExpandIds(Set expandedIds) { doAnswer(invocation -> { ActionListener> listener = (ActionListener>) invocation.getArguments()[3]; diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportFinalizeJobExecutionActionTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportFinalizeJobExecutionActionTests.java index 11fdd9a2c09a4..010b5aa477032 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportFinalizeJobExecutionActionTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportFinalizeJobExecutionActionTests.java @@ -42,7 +42,7 @@ public class TransportFinalizeJobExecutionActionTests extends ESTestCase { private Client client; @Before - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) private void setupMocks() { ExecutorService executorService = mock(ExecutorService.class); threadPool = mock(ThreadPool.class); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportPreviewDatafeedActionTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportPreviewDatafeedActionTests.java index b2f1107590712..21f8d2678f134 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportPreviewDatafeedActionTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/action/TransportPreviewDatafeedActionTests.java @@ -45,6 +45,7 @@ public class TransportPreviewDatafeedActionTests extends ESTestCase { private Exception capturedFailure; @Before + @SuppressWarnings("unchecked") public void setUpTests() { dataExtractor = mock(DataExtractor.class); actionListener = mock(ActionListener.class); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedJobBuilderTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedJobBuilderTests.java index cd86241793240..609b0f8612efa 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedJobBuilderTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedJobBuilderTests.java @@ -54,6 +54,7 @@ public class DatafeedJobBuilderTests extends ESTestCase { private DatafeedJobBuilder datafeedJobBuilder; @Before + @SuppressWarnings("unchecked") public void init() { client = mock(Client.class); ThreadPool threadPool = mock(ThreadPool.class); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedManagerTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedManagerTests.java index 4f186164760aa..4ae2ba4d0953f 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedManagerTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedManagerTests.java @@ -428,13 +428,13 @@ public static Job.Builder createDatafeedJob() { return builder; } + @SuppressWarnings({"rawtypes", "unchecked"}) private static DatafeedTask createDatafeedTask(String datafeedId, long startTime, Long endTime) { DatafeedTask task = mock(DatafeedTask.class); when(task.getDatafeedId()).thenReturn(datafeedId); when(task.getDatafeedStartTime()).thenReturn(startTime); when(task.getEndTime()).thenReturn(endTime); doAnswer(invocationOnMock -> { - @SuppressWarnings("rawtypes") ActionListener listener = (ActionListener) invocationOnMock.getArguments()[1]; listener.onResponse(mock(PersistentTask.class)); return null; @@ -447,10 +447,10 @@ private Consumer mockConsumer() { return mock(Consumer.class); } + @SuppressWarnings({"rawtypes", "unchecked"}) private DatafeedTask spyDatafeedTask(DatafeedTask task) { task = spy(task); doAnswer(invocationOnMock -> { - @SuppressWarnings("rawtypes") ActionListener listener = (ActionListener) invocationOnMock.getArguments()[1]; listener.onResponse(mock(PersistentTask.class)); return null; diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/DataExtractorFactoryTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/DataExtractorFactoryTests.java index 67e48c11fd1c4..3c071df8c3b6f 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/DataExtractorFactoryTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/DataExtractorFactoryTests.java @@ -72,6 +72,7 @@ protected NamedXContentRegistry xContentRegistry() { } @Before + @SuppressWarnings({"rawtypes", "unchecked"}) public void setUpTests() { client = mock(Client.class); timingStatsReporter = mock(DatafeedTimingStatsReporter.class); @@ -86,14 +87,12 @@ public void setUpTests() { when(getRollupIndexResponse.getJobs()).thenReturn(new HashMap<>()); doAnswer(invocationMock -> { - @SuppressWarnings("raw_types") ActionListener listener = (ActionListener) invocationMock.getArguments()[2]; listener.onResponse(fieldsCapabilities); return null; }).when(client).execute(same(FieldCapabilitiesAction.INSTANCE), any(), any()); doAnswer(invocationMock -> { - @SuppressWarnings("raw_types") ActionListener listener = (ActionListener) invocationMock.getArguments()[2]; listener.onResponse(getRollupIndexResponse); return null; diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/scroll/ScrollDataExtractorTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/scroll/ScrollDataExtractorTests.java index eb1542ae814df..f4074b0f5b46d 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/scroll/ScrollDataExtractorTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/extractor/scroll/ScrollDataExtractorTests.java @@ -126,6 +126,7 @@ public Long getLastTimestamp() { } @Before + @SuppressWarnings("unchecked") public void setUpTests() { ThreadPool threadPool = mock(ThreadPool.class); when(threadPool.getThreadContext()).thenReturn(new ThreadContext(Settings.EMPTY)); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/extractor/DataFrameDataExtractorTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/extractor/DataFrameDataExtractorTests.java index 47c5aa26390a5..0d95d46804180 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/extractor/DataFrameDataExtractorTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/extractor/DataFrameDataExtractorTests.java @@ -61,6 +61,7 @@ public class DataFrameDataExtractorTests extends ESTestCase { private ActionFuture clearScrollFuture; @Before + @SuppressWarnings("unchecked") public void setUpTests() { ThreadPool threadPool = mock(ThreadPool.class); when(threadPool.getThreadContext()).thenReturn(new ThreadContext(Settings.EMPTY)); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/process/DataFrameRowsJoinerTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/process/DataFrameRowsJoinerTests.java index fd2b396d62541..a67ff4ab3374f 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/process/DataFrameRowsJoinerTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/process/DataFrameRowsJoinerTests.java @@ -67,7 +67,7 @@ public void testProcess_GivenSingleRowAndResult() throws IOException { String dataDoc = "{\"f_1\": \"foo\", \"f_2\": 42.0}"; String[] dataValues = {"42.0"}; DataFrameDataExtractor.Row row = newRow(newHit(dataDoc), dataValues, 1); - givenDataFrameBatches(Arrays.asList(row)); + givenDataFrameBatches(List.of(Arrays.asList(row))); Map resultFields = new HashMap<>(); resultFields.put("a", "1"); @@ -97,7 +97,7 @@ public void testProcess_GivenFullResultsBatch() throws IOException { IntStream.range(0, 1000).forEach(i -> firstBatch.add(newRow(newHit(dataDoc), dataValues, i))); List secondBatch = new ArrayList<>(1); secondBatch.add(newRow(newHit(dataDoc), dataValues, 1000)); - givenDataFrameBatches(firstBatch, secondBatch); + givenDataFrameBatches(List.of(firstBatch, secondBatch)); Map resultFields = new HashMap<>(); resultFields.put("a", "1"); @@ -118,7 +118,7 @@ public void testProcess_GivenSingleRowAndResultWithMismatchingIdHash() throws IO String dataDoc = "{\"f_1\": \"foo\", \"f_2\": 42.0}"; String[] dataValues = {"42.0"}; DataFrameDataExtractor.Row row = newRow(newHit(dataDoc), dataValues, 1); - givenDataFrameBatches(Arrays.asList(row)); + givenDataFrameBatches(List.of(Arrays.asList(row))); Map resultFields = new HashMap<>(); resultFields.put("a", "1"); @@ -136,7 +136,7 @@ public void testProcess_GivenSingleBatchWithSkippedRows() throws IOException { String dataDoc = "{\"f_1\": \"foo\", \"f_2\": 42.0}"; String[] dataValues = {"42.0"}; DataFrameDataExtractor.Row normalRow = newRow(newHit(dataDoc), dataValues, 2); - givenDataFrameBatches(Arrays.asList(skippedRow, normalRow)); + givenDataFrameBatches(List.of(Arrays.asList(skippedRow, normalRow))); Map resultFields = new HashMap<>(); resultFields.put("a", "1"); @@ -166,7 +166,7 @@ public void testProcess_GivenTwoBatchesWhereFirstEndsWithSkippedRow() throws IOE DataFrameDataExtractor.Row normalRow2 = newRow(newHit(dataDoc), dataValues, 2); DataFrameDataExtractor.Row skippedRow = newRow(newHit("{}"), null, 3); DataFrameDataExtractor.Row normalRow3 = newRow(newHit(dataDoc), dataValues, 4); - givenDataFrameBatches(Arrays.asList(normalRow1, normalRow2, skippedRow), Arrays.asList(normalRow3)); + givenDataFrameBatches(List.of(Arrays.asList(normalRow1, normalRow2, skippedRow), Arrays.asList(normalRow3))); Map resultFields = new HashMap<>(); resultFields.put("a", "1"); @@ -195,7 +195,7 @@ public void testProcess_GivenMoreResultsThanRows() throws IOException { String dataDoc = "{\"f_1\": \"foo\", \"f_2\": 42.0}"; String[] dataValues = {"42.0"}; DataFrameDataExtractor.Row row = newRow(newHit(dataDoc), dataValues, 1); - givenDataFrameBatches(Arrays.asList(row)); + givenDataFrameBatches(List.of(List.of(row))); Map resultFields = new HashMap<>(); resultFields.put("a", "1"); @@ -214,7 +214,7 @@ public void testProcess_GivenNoResults_ShouldCancelAndConsumeExtractor() throws String[] dataValues = {"42.0"}; DataFrameDataExtractor.Row row1 = newRow(newHit(dataDoc), dataValues, 1); DataFrameDataExtractor.Row row2 = newRow(newHit(dataDoc), dataValues, 1); - givenDataFrameBatches(Arrays.asList(row1), Arrays.asList(row2)); + givenDataFrameBatches(List.of(List.of(row1), List.of(row2))); givenProcessResults(Collections.emptyList()); @@ -229,8 +229,8 @@ private void givenProcessResults(List results) { } } - private void givenDataFrameBatches(List... batches) throws IOException { - DelegateStubDataExtractor delegateStubDataExtractor = new DelegateStubDataExtractor(Arrays.asList(batches)); + private void givenDataFrameBatches(List> batches) throws IOException { + DelegateStubDataExtractor delegateStubDataExtractor = new DelegateStubDataExtractor(batches); when(dataExtractor.hasNext()).thenAnswer(a -> delegateStubDataExtractor.hasNext()); when(dataExtractor.next()).thenAnswer(a -> delegateStubDataExtractor.next()); } @@ -254,6 +254,7 @@ private void givenClientHasNoFailures() { ThreadContext threadContext = new ThreadContext(Settings.EMPTY); ThreadPool threadPool = mock(ThreadPool.class); when(threadPool.getThreadContext()).thenReturn(threadContext); + @SuppressWarnings("unchecked") ActionFuture responseFuture = mock(ActionFuture.class); when(responseFuture.actionGet()).thenReturn(new BulkResponse(new BulkItemResponse[0], 0)); when(client.execute(same(BulkAction.INSTANCE), bulkRequestCaptor.capture())).thenReturn(responseFuture); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java index 95106385a9e22..7f5ae33bd3469 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java @@ -58,7 +58,7 @@ public void testCloseFailedJob() throws Exception { PersistentTasksCustomMetaData tasks = state.getMetaData().custom(PersistentTasksCustomMetaData.TYPE); assertEquals(1, tasks.taskMap().size()); // now just double check that the first job is still opened: - PersistentTasksCustomMetaData.PersistentTask task = tasks.getTask(MlTasks.jobTaskId("close-failed-job-1")); + PersistentTasksCustomMetaData.PersistentTask task = tasks.getTask(MlTasks.jobTaskId("close-failed-job-1")); assertEquals(JobState.OPENED, ((JobTaskState) task.getState()).getState()); } diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/JobManagerTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/JobManagerTests.java index 5c8f9e3f51a68..126b33c3058f3 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/JobManagerTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/JobManagerTests.java @@ -323,6 +323,7 @@ public void testNotifyFilterChangedGivenNoop() { Mockito.verifyNoMoreInteractions(auditor, updateJobProcessNotifier); } + @SuppressWarnings({"unchecked", "rawtypes"}) public void testNotifyFilterChanged() throws IOException { Detector.Builder detectorReferencingFilter = new Detector.Builder("count", null); detectorReferencingFilter.setByFieldName("foo"); @@ -531,7 +532,7 @@ public void testUpdateProcessOnCalendarChanged() { )); ArgumentCaptor updateParamsCaptor = ArgumentCaptor.forClass(UpdateParams.class); - verify(updateJobProcessNotifier, times(2)).submitJobUpdate(updateParamsCaptor.capture(), any(ActionListener.class)); + verify(updateJobProcessNotifier, times(2)).submitJobUpdate(updateParamsCaptor.capture(), any()); List capturedUpdateParams = updateParamsCaptor.getAllValues(); assertThat(capturedUpdateParams.size(), equalTo(2)); @@ -573,7 +574,7 @@ public void testUpdateProcessOnCalendarChanged_GivenGroups() throws IOException )); ArgumentCaptor updateParamsCaptor = ArgumentCaptor.forClass(UpdateParams.class); - verify(updateJobProcessNotifier, times(2)).submitJobUpdate(updateParamsCaptor.capture(), any(ActionListener.class)); + verify(updateJobProcessNotifier, times(2)).submitJobUpdate(updateParamsCaptor.capture(), any()); List capturedUpdateParams = updateParamsCaptor.getAllValues(); assertThat(capturedUpdateParams.size(), equalTo(2)); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/BatchedDocumentsIteratorTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/BatchedDocumentsIteratorTests.java index 2ff21243979be..5b81002d9326c 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/BatchedDocumentsIteratorTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/BatchedDocumentsIteratorTests.java @@ -162,7 +162,7 @@ ScrollResponsesMocker addBatch(String... hits) { return this; } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) void finishMock() { if (batches.isEmpty()) { givenInitialResponse(); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobDataDeleterTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobDataDeleterTests.java index f02bc5bf9f1e7..2cc53aec2bc89 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobDataDeleterTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobDataDeleterTests.java @@ -48,7 +48,7 @@ public void testDeleteDatafeedTimingStats() { ArgumentCaptor deleteRequestCaptor = ArgumentCaptor.forClass(DeleteByQueryRequest.class); verify(client).threadPool(); - verify(client).execute(eq(DeleteByQueryAction.INSTANCE), deleteRequestCaptor.capture(), any(ActionListener.class)); + verify(client).execute(eq(DeleteByQueryAction.INSTANCE), deleteRequestCaptor.capture(), any()); verifyNoMoreInteractions(client); DeleteByQueryRequest deleteRequest = deleteRequestCaptor.getValue(); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobResultsPersisterTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobResultsPersisterTests.java index abece0bc07ea0..b44b25cc92cec 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobResultsPersisterTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobResultsPersisterTests.java @@ -232,6 +232,7 @@ public void testPersistTimingStats() { verifyNoMoreInteractions(client); } + @SuppressWarnings({"unchecked", "rawtypes"}) public void testPersistDatafeedTimingStats() { Client client = mockClient(ArgumentCaptor.forClass(BulkRequest.class)); doAnswer( diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobResultsProviderTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobResultsProviderTests.java index aec8b72e8cb72..202e53e17bf15 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobResultsProviderTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/JobResultsProviderTests.java @@ -263,7 +263,7 @@ public void testBuckets_OneBucketNoInterim() throws IOException { BucketsQueryBuilder bq = new BucketsQueryBuilder().from(from).size(size).anomalyScoreThreshold(1.0); - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "rawtypes"}) QueryPage[] holder = new QueryPage[1]; provider.buckets(jobId, bq, r -> holder[0] = r, e -> {throw new RuntimeException(e);}, client); QueryPage buckets = holder[0]; @@ -297,7 +297,7 @@ public void testBuckets_OneBucketInterim() throws IOException { BucketsQueryBuilder bq = new BucketsQueryBuilder().from(from).size(size).anomalyScoreThreshold(5.1) .includeInterim(true); - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "rawtypes"}) QueryPage[] holder = new QueryPage[1]; provider.buckets(jobId, bq, r -> holder[0] = r, e -> {throw new RuntimeException(e);}, client); QueryPage buckets = holder[0]; @@ -333,7 +333,7 @@ public void testBuckets_UsingBuilder() throws IOException { bq.anomalyScoreThreshold(5.1); bq.includeInterim(true); - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "rawtypes"}) QueryPage[] holder = new QueryPage[1]; provider.buckets(jobId, bq, r -> holder[0] = r, e -> {throw new RuntimeException(e);}, client); QueryPage buckets = holder[0]; @@ -379,7 +379,7 @@ public void testBucket_OneBucketNoExpand() throws IOException { BucketsQueryBuilder bq = new BucketsQueryBuilder(); bq.timestamp(Long.toString(now.getTime())); - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "rawtypes"}) QueryPage[] bucketHolder = new QueryPage[1]; provider.buckets(jobId, bq, q -> bucketHolder[0] = q, e -> {}, client); assertThat(bucketHolder[0].count(), equalTo(1L)); @@ -420,7 +420,7 @@ public void testRecords() throws IOException { .epochEnd(String.valueOf(now.getTime())).includeInterim(true).sortField(sortfield) .recordScore(2.2); - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "rawtypes"}) QueryPage[] holder = new QueryPage[1]; provider.records(jobId, rqb, page -> holder[0] = page, RuntimeException::new, client); QueryPage recordPage = holder[0]; @@ -473,7 +473,7 @@ public void testRecords_UsingBuilder() throws IOException { rqb.sortField(sortfield); rqb.recordScore(2.2); - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "rawtypes"}) QueryPage[] holder = new QueryPage[1]; provider.records(jobId, rqb, page -> holder[0] = page, RuntimeException::new, client); QueryPage recordPage = holder[0]; @@ -518,7 +518,7 @@ public void testBucketRecords() throws IOException { Client client = getMockedClient(qb -> {}, response); JobResultsProvider provider = createProvider(client); - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "rawtypes"}) QueryPage[] holder = new QueryPage[1]; provider.bucketRecords(jobId, bucket, from, size, true, sortfield, true, page -> holder[0] = page, RuntimeException::new, client); @@ -579,7 +579,7 @@ public void testCategoryDefinitions() throws IOException { Client client = getMockedClient(q -> {}, response); JobResultsProvider provider = createProvider(client); - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "rawtypes"}) QueryPage[] holder = new QueryPage[1]; provider.categoryDefinitions(jobId, null, false, from, size, r -> holder[0] = r, e -> {throw new RuntimeException(e);}, client); @@ -601,7 +601,7 @@ public void testCategoryDefinition() throws IOException { SearchResponse response = createSearchResponse(Collections.singletonList(source)); Client client = getMockedClient(q -> {}, response); JobResultsProvider provider = createProvider(client); - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "rawtypes"}) QueryPage[] holder = new QueryPage[1]; provider.categoryDefinitions(jobId, categoryId, false, null, null, r -> holder[0] = r, e -> {throw new RuntimeException(e);}, client); @@ -643,7 +643,7 @@ public void testInfluencers_NoInterim() throws IOException { Client client = getMockedClient(q -> qbHolder[0] = q, response); JobResultsProvider provider = createProvider(client); - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "rawtypes"}) QueryPage[] holder = new QueryPage[1]; InfluencersQuery query = new InfluencersQueryBuilder().from(from).size(size).includeInterim(false).build(); provider.influencers(jobId, query, page -> holder[0] = page, RuntimeException::new, client); @@ -703,7 +703,7 @@ public void testInfluencers_WithInterim() throws IOException { Client client = getMockedClient(q -> qbHolder[0] = q, response); JobResultsProvider provider = createProvider(client); - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "rawtypes"}) QueryPage[] holder = new QueryPage[1]; InfluencersQuery query = new InfluencersQueryBuilder().from(from).size(size).start("0").end("0").sortField("sort") .sortDescending(true).influencerScoreThreshold(0.0).includeInterim(true).build(); @@ -758,7 +758,7 @@ public void testModelSnapshots() throws IOException { Client client = getMockedClient(qb -> {}, response); JobResultsProvider provider = createProvider(client); - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({"unchecked", "rawtypes"}) QueryPage[] holder = new QueryPage[1]; provider.modelSnapshots(jobId, from, size, r -> holder[0] = r, RuntimeException::new); QueryPage page = holder[0]; @@ -860,7 +860,7 @@ public void testTimingStats_Ok() throws IOException { verify(client).prepareSearch(indexName); verify(client).threadPool(); - verify(client).search(any(SearchRequest.class), any(ActionListener.class)); + verify(client).search(any(SearchRequest.class), any()); verifyNoMoreInteractions(client); } @@ -881,7 +881,7 @@ public void testTimingStats_NotFound() throws IOException { verify(client).prepareSearch(indexName); verify(client).threadPool(); - verify(client).search(any(SearchRequest.class), any(ActionListener.class)); + verify(client).search(any(SearchRequest.class), any()); verifyNoMoreInteractions(client); } @@ -948,7 +948,7 @@ public void testDatafeedTimingStats_MultipleDocumentsAtOnce() throws IOException verify(client).threadPool(); verify(client).prepareMultiSearch(); - verify(client).multiSearch(any(MultiSearchRequest.class), any(ActionListener.class)); + verify(client).multiSearch(any(MultiSearchRequest.class), any()); verify(client).prepareSearch(AnomalyDetectorsIndex.jobResultsAliasedName("foo")); verify(client).prepareSearch(AnomalyDetectorsIndex.jobResultsAliasedName("bar")); verifyNoMoreInteractions(client); @@ -976,7 +976,7 @@ public void testDatafeedTimingStats_Ok() throws IOException { verify(client).prepareSearch(indexName); verify(client).threadPool(); - verify(client).search(any(SearchRequest.class), any(ActionListener.class)); + verify(client).search(any(SearchRequest.class), any()); verifyNoMoreInteractions(client); } @@ -997,7 +997,7 @@ public void testDatafeedTimingStats_NotFound() throws IOException { verify(client).prepareSearch(indexName); verify(client).threadPool(); - verify(client).search(any(SearchRequest.class), any(ActionListener.class)); + verify(client).search(any(SearchRequest.class), any()); verifyNoMoreInteractions(client); } diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/MockClientBuilder.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/MockClientBuilder.java index b64bc42cb2c63..b325d3b33ca61 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/MockClientBuilder.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/MockClientBuilder.java @@ -151,6 +151,7 @@ public MockClientBuilder prepareGet(String index, String type, String id, GetRes return this; } + @SuppressWarnings("unchecked") public MockClientBuilder get(GetResponse response) { doAnswer(new Answer() { @Override @@ -382,6 +383,7 @@ public MockClientBuilder bulk(BulkResponse response) { return this; } + @SuppressWarnings("unchecked") public MockClientBuilder preparePutMapping(AcknowledgedResponse response, String type) { PutMappingRequestBuilder requestBuilder = mock(PutMappingRequestBuilder.class); when(requestBuilder.setType(eq(type))).thenReturn(requestBuilder); @@ -400,6 +402,7 @@ public Void answer(InvocationOnMock invocationOnMock) throws Throwable { return this; } + @SuppressWarnings("unchecked") public MockClientBuilder prepareGetMapping(GetMappingsResponse response) { GetMappingsRequestBuilder builder = mock(GetMappingsRequestBuilder.class); @@ -417,6 +420,7 @@ public Void answer(InvocationOnMock invocationOnMock) throws Throwable { return this; } + @SuppressWarnings("unchecked") public MockClientBuilder putTemplate(ArgumentCaptor requestCaptor) { doAnswer(new Answer() { @Override diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/NativeAutodetectProcessTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/NativeAutodetectProcessTests.java index 0935a4c628d6b..0d3932ece29f1 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/NativeAutodetectProcessTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/NativeAutodetectProcessTests.java @@ -53,6 +53,7 @@ public void initialize() { when(executorService.submit(any(Runnable.class))).thenReturn(mock(Future.class)); } + @SuppressWarnings("unchecked") public void testProcessStartTime() throws Exception { InputStream logStream = mock(InputStream.class); when(logStream.read(new byte[1024])).thenReturn(-1); @@ -74,6 +75,7 @@ public void testProcessStartTime() throws Exception { } } + @SuppressWarnings("unchecked") public void testWriteRecord() throws IOException { InputStream logStream = mock(InputStream.class); when(logStream.read(new byte[1024])).thenReturn(-1); @@ -109,6 +111,7 @@ bos, outputStream, mock(OutputStream.class), NUMBER_FIELDS, Collections.emptyLis } } + @SuppressWarnings("unchecked") public void testFlush() throws IOException { InputStream logStream = mock(InputStream.class); when(logStream.read(new byte[1024])).thenReturn(-1); @@ -141,6 +144,7 @@ public void testPersistJob() throws IOException { testWriteMessage(p -> p.persistState(), AutodetectControlMsgWriter.BACKGROUND_PERSIST_MESSAGE_CODE); } + @SuppressWarnings("unchecked") public void testConsumeAndCloseOutputStream() throws IOException { InputStream logStream = mock(InputStream.class); when(logStream.read(new byte[1024])).thenReturn(-1); @@ -157,6 +161,7 @@ processInStream, processOutStream, mock(OutputStream.class), NUMBER_FIELDS, Coll } } + @SuppressWarnings("unchecked") private void testWriteMessage(CheckedConsumer writeFunction, String expectedMessageCode) throws IOException { InputStream logStream = mock(InputStream.class); when(logStream.read(new byte[1024])).thenReturn(-1); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/CsvDataToProcessWriterTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/CsvDataToProcessWriterTests.java index 6e846b000237d..cf65eec4f04df 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/CsvDataToProcessWriterTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/writer/CsvDataToProcessWriterTests.java @@ -265,6 +265,7 @@ public void testWrite_NullByte() throws IOException { verify(dataCountsReporter).finishReporting(any()); } + @SuppressWarnings("unchecked") public void testWrite_EmptyInput() throws IOException { AnalysisConfig.Builder builder = new AnalysisConfig.Builder(Collections.singletonList(new Detector.Builder("metric", "value").build())); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/AbstractExpiredJobDataRemoverTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/AbstractExpiredJobDataRemoverTests.java index 7cb5b6ea8ca01..53242f07677a8 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/AbstractExpiredJobDataRemoverTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/AbstractExpiredJobDataRemoverTests.java @@ -86,6 +86,7 @@ private static SearchResponse createSearchResponse(List to return searchResponse; } + @SuppressWarnings("unchecked") public void testRemoveGivenNoJobs() throws IOException { SearchResponse response = createSearchResponse(Collections.emptyList()); @@ -102,7 +103,7 @@ public void testRemoveGivenNoJobs() throws IOException { assertEquals(remover.getRetentionDaysCallCount, 0); } - + @SuppressWarnings("unchecked") public void testRemoveGivenMulipleBatches() throws IOException { // This is testing AbstractExpiredJobDataRemover.WrappedBatchedJobsIterator int totalHits = 7; diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/ExpiredModelSnapshotsRemoverTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/ExpiredModelSnapshotsRemoverTests.java index 3a3775844d1dd..977828ac21075 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/ExpiredModelSnapshotsRemoverTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/ExpiredModelSnapshotsRemoverTests.java @@ -192,6 +192,7 @@ public void testRemove_GivenClientDeleteSnapshotRequestsFail() throws IOExceptio assertThat(deleteSnapshotRequest.getSnapshotId(), equalTo("snapshots-1_1")); } + @SuppressWarnings("unchecked") private void givenJobs(List jobs) throws IOException { SearchResponse response = AbstractExpiredJobDataRemoverTests.createSearchResponse(jobs); @@ -234,6 +235,7 @@ private void givenClientDeleteModelSnapshotRequestsFail() { givenClientRequests(true, false); } + @SuppressWarnings("unchecked") private void givenClientRequests(boolean shouldSearchRequestsSucceed, boolean shouldDeleteSnapshotRequestsSucceed) { doAnswer(new Answer() { int callCount = 0; diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/ExpiredResultsRemoverTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/ExpiredResultsRemoverTests.java index 0398882a8e35e..5bca7b36436ad 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/ExpiredResultsRemoverTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/ExpiredResultsRemoverTests.java @@ -46,6 +46,7 @@ public class ExpiredResultsRemoverTests extends ESTestCase { private ActionListener listener; @Before + @SuppressWarnings("unchecked") public void setUpTests() { capturedDeleteByQueryRequests = new ArrayList<>(); client = mock(Client.class); @@ -132,6 +133,7 @@ private void givenClientRequestsFailed() { givenClientRequests(false); } + @SuppressWarnings("unchecked") private void givenClientRequests(boolean shouldSucceed) { doAnswer(new Answer() { @Override @@ -151,6 +153,7 @@ public Void answer(InvocationOnMock invocationOnMock) throws Throwable { }).when(client).execute(same(DeleteByQueryAction.INSTANCE), any(), any()); } + @SuppressWarnings("unchecked") private void givenJobs(List jobs) throws IOException { SearchResponse response = AbstractExpiredJobDataRemoverTests.createSearchResponse(jobs); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/process/MlMemoryTrackerTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/process/MlMemoryTrackerTests.java index 07314948c043e..ed17be1f3dcdd 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/process/MlMemoryTrackerTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/process/MlMemoryTrackerTests.java @@ -113,7 +113,7 @@ public void testRefreshAll() { Consumer listener = (Consumer) invocation.getArguments()[3]; listener.accept(randomLongBetween(1000, 1000000)); return null; - }).when(jobResultsProvider).getEstablishedMemoryUsage(anyString(), any(), any(), any(Consumer.class), any()); + }).when(jobResultsProvider).getEstablishedMemoryUsage(anyString(), any(), any(), any(), any()); memoryTracker.refresh(persistentTasks, ActionListener.wrap(aVoid -> {}, ESTestCase::assertNull)); @@ -122,7 +122,7 @@ public void testRefreshAll() { String jobId = "job" + i; verify(jobResultsProvider, times(1)).getEstablishedMemoryUsage(eq(jobId), any(), any(), any(), any()); } - verify(configProvider, times(1)).getMultiple(eq(String.join(",", allIds)), eq(false), any(ActionListener.class)); + verify(configProvider, times(1)).getMultiple(eq(String.join(",", allIds)), eq(false), any()); } else { verify(jobResultsProvider, never()).getEstablishedMemoryUsage(anyString(), any(), any(), any(), any()); } @@ -154,7 +154,7 @@ public void testRefreshAllFailure() { Consumer listener = (Consumer) invocation.getArguments()[3]; listener.accept(randomLongBetween(1000, 1000000)); return null; - }).when(jobResultsProvider).getEstablishedMemoryUsage(anyString(), any(), any(), any(Consumer.class), any()); + }).when(jobResultsProvider).getEstablishedMemoryUsage(anyString(), any(), any(), any(), any()); // First run a refresh using a component that calls the onFailure method of the listener @@ -164,7 +164,7 @@ public void testRefreshAllFailure() { (ActionListener>) invocation.getArguments()[2]; listener.onFailure(new IllegalArgumentException("computer says no")); return null; - }).when(configProvider).getMultiple(anyString(), anyBoolean(), any(ActionListener.class)); + }).when(configProvider).getMultiple(anyString(), anyBoolean(), any()); AtomicBoolean gotErrorResponse = new AtomicBoolean(false); memoryTracker.refresh(persistentTasks, @@ -180,7 +180,7 @@ public void testRefreshAllFailure() { (ActionListener>) invocation.getArguments()[2]; listener.onResponse(Collections.emptyList()); return null; - }).when(configProvider).getMultiple(anyString(), anyBoolean(), any(ActionListener.class)); + }).when(configProvider).getMultiple(anyString(), anyBoolean(), any()); AtomicBoolean gotSuccessResponse = new AtomicBoolean(false); memoryTracker.refresh(persistentTasks, @@ -206,7 +206,7 @@ public void testRefreshOneAnomalyDetectorJob() { Consumer listener = (Consumer) invocation.getArguments()[3]; listener.accept(haveEstablishedModelMemory ? modelBytes : 0L); return null; - }).when(jobResultsProvider).getEstablishedMemoryUsage(eq(jobId), any(), any(), any(Consumer.class), any()); + }).when(jobResultsProvider).getEstablishedMemoryUsage(eq(jobId), any(), any(), any(), any()); boolean simulateVeryOldJob = randomBoolean(); long recentJobModelMemoryLimitMb = 2; @@ -217,7 +217,7 @@ public void testRefreshOneAnomalyDetectorJob() { ActionListener listener = (ActionListener) invocation.getArguments()[1]; listener.onResponse(job); return null; - }).when(jobManager).getJob(eq(jobId), any(ActionListener.class)); + }).when(jobManager).getJob(eq(jobId), any()); AtomicReference refreshedMemoryRequirement = new AtomicReference<>(); memoryTracker.refreshAnomalyDetectorJobMemory(jobId, ActionListener.wrap(refreshedMemoryRequirement::set, ESTestCase::assertNull));