diff --git a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java b/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java index d01ee607..68dbfa05 100644 --- a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java +++ b/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java @@ -10,7 +10,7 @@ import org.opensearch.action.support.WriteRequest; import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.action.delete.DeleteRequest; import org.opensearch.action.delete.DeleteResponse; import org.opensearch.action.index.IndexRequest; diff --git a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java b/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java index b459db04..95114773 100644 --- a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java +++ b/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java @@ -17,7 +17,7 @@ import org.opensearch.jobscheduler.spi.utils.LockService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.service.ClusterService; import org.opensearch.plugins.Plugin; diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java b/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java index 19924da4..862f2d58 100644 --- a/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java +++ b/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java @@ -15,7 +15,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.ResourceAlreadyExistsException; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.action.DocWriteResponse; import org.opensearch.action.admin.indices.create.CreateIndexRequest; import org.opensearch.action.delete.DeleteRequest; diff --git a/spi/src/test/java/org/opensearch/jobscheduler/spi/utils/LockServiceIT.java b/spi/src/test/java/org/opensearch/jobscheduler/spi/utils/LockServiceIT.java index e52ba488..c926c657 100644 --- a/spi/src/test/java/org/opensearch/jobscheduler/spi/utils/LockServiceIT.java +++ b/spi/src/test/java/org/opensearch/jobscheduler/spi/utils/LockServiceIT.java @@ -11,7 +11,7 @@ import org.junit.Before; import org.junit.Ignore; import org.mockito.Mockito; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.cluster.service.ClusterService; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.jobscheduler.spi.JobDocVersion; @@ -81,7 +81,8 @@ public Long getLockDurationSeconds() { @Before public void setup() { - // the test cluster is an external cluster instead of internal cluster in new test framework, + // the test cluster is an external cluster instead of internal cluster in new + // test framework, // thus the OpenSearchIntegTestCase.clusterService() will throw exception. this.clusterService = Mockito.mock(ClusterService.class, Mockito.RETURNS_DEEP_STUBS); Mockito.when(this.clusterService.state().routingTable().hasIndex(".opendistro-job-scheduler-lock")) @@ -454,7 +455,8 @@ public void testRenewLock() throws Exception { lockService.acquireLockWithId(context.getJobIndexName(), LOCK_DURATION_SECONDS, lockID, ActionListener.wrap(lock -> { assertNotNull("Expected to successfully grab lock", lock); - // Set the time of LockService (the 'lockTime' of acquired locks) to a fixed time. + // Set the time of LockService (the 'lockTime' of acquired locks) to a fixed + // time. Instant now = Instant.now(); lockService.setTime(now); lockService.renewLock(lock, ActionListener.wrap(renewedLock -> { diff --git a/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsAction.java b/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsAction.java index bea184b4..cb3e9563 100644 --- a/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsAction.java +++ b/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsAction.java @@ -10,7 +10,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.client.node.NodeClient; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.core.xcontent.XContentParser; diff --git a/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetLockAction.java b/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetLockAction.java index bf50c4ee..81e44c9a 100644 --- a/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetLockAction.java +++ b/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetLockAction.java @@ -10,7 +10,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.client.node.NodeClient; import org.opensearch.core.xcontent.ToXContent; import org.opensearch.core.xcontent.XContentBuilder; diff --git a/src/main/java/org/opensearch/jobscheduler/rest/action/RestReleaseLockAction.java b/src/main/java/org/opensearch/jobscheduler/rest/action/RestReleaseLockAction.java index a9a90dfa..faf4836e 100644 --- a/src/main/java/org/opensearch/jobscheduler/rest/action/RestReleaseLockAction.java +++ b/src/main/java/org/opensearch/jobscheduler/rest/action/RestReleaseLockAction.java @@ -19,7 +19,7 @@ import java.util.concurrent.ExecutionException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.client.node.NodeClient; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.jobscheduler.JobSchedulerPlugin; diff --git a/src/main/java/org/opensearch/jobscheduler/sweeper/JobSweeper.java b/src/main/java/org/opensearch/jobscheduler/sweeper/JobSweeper.java index ca7d98b9..9fdcd0fa 100644 --- a/src/main/java/org/opensearch/jobscheduler/sweeper/JobSweeper.java +++ b/src/main/java/org/opensearch/jobscheduler/sweeper/JobSweeper.java @@ -22,7 +22,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.OpenSearchException; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.action.bulk.BackoffPolicy; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; diff --git a/src/main/java/org/opensearch/jobscheduler/transport/response/JobParameterResponse.java b/src/main/java/org/opensearch/jobscheduler/transport/response/JobParameterResponse.java index b181c393..1f703b10 100644 --- a/src/main/java/org/opensearch/jobscheduler/transport/response/JobParameterResponse.java +++ b/src/main/java/org/opensearch/jobscheduler/transport/response/JobParameterResponse.java @@ -10,7 +10,7 @@ import java.io.IOException; -import org.opensearch.action.ActionResponse; +import org.opensearch.core.action.ActionResponse; import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.core.common.io.stream.StreamOutput; import org.opensearch.jobscheduler.model.ExtensionJobParameter; diff --git a/src/main/java/org/opensearch/jobscheduler/transport/response/JobRunnerResponse.java b/src/main/java/org/opensearch/jobscheduler/transport/response/JobRunnerResponse.java index 31ebff7a..93cefd07 100644 --- a/src/main/java/org/opensearch/jobscheduler/transport/response/JobRunnerResponse.java +++ b/src/main/java/org/opensearch/jobscheduler/transport/response/JobRunnerResponse.java @@ -10,7 +10,7 @@ import java.io.IOException; -import org.opensearch.action.ActionResponse; +import org.opensearch.core.action.ActionResponse; import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.core.common.io.stream.StreamOutput; diff --git a/src/main/java/org/opensearch/jobscheduler/utils/JobDetailsService.java b/src/main/java/org/opensearch/jobscheduler/utils/JobDetailsService.java index b32f09ed..3af7cb3d 100644 --- a/src/main/java/org/opensearch/jobscheduler/utils/JobDetailsService.java +++ b/src/main/java/org/opensearch/jobscheduler/utils/JobDetailsService.java @@ -16,7 +16,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.ResourceAlreadyExistsException; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.action.DocWriteResponse; import org.opensearch.action.admin.indices.create.CreateIndexRequest; import org.opensearch.action.delete.DeleteRequest; diff --git a/src/test/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsActionTests.java b/src/test/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsActionTests.java index 68b35239..916eb745 100644 --- a/src/test/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsActionTests.java +++ b/src/test/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsActionTests.java @@ -16,7 +16,7 @@ import java.util.Map; import org.junit.Before; import org.mockito.Mockito; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.client.node.NodeClient; import org.opensearch.core.common.bytes.BytesArray; import org.opensearch.common.xcontent.XContentType; diff --git a/src/test/java/org/opensearch/jobscheduler/sweeper/JobSweeperTests.java b/src/test/java/org/opensearch/jobscheduler/sweeper/JobSweeperTests.java index 6f12290b..41ced15a 100644 --- a/src/test/java/org/opensearch/jobscheduler/sweeper/JobSweeperTests.java +++ b/src/test/java/org/opensearch/jobscheduler/sweeper/JobSweeperTests.java @@ -20,7 +20,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.util.BytesRef; import org.opensearch.Version; -import org.opensearch.action.ActionFuture; import org.opensearch.action.delete.DeleteResponse; import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; @@ -37,6 +36,7 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.core.common.bytes.BytesArray; import org.opensearch.core.common.bytes.BytesReference; +import org.opensearch.common.action.ActionFuture; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; diff --git a/src/test/java/org/opensearch/jobscheduler/utils/JobDetailsServiceIT.java b/src/test/java/org/opensearch/jobscheduler/utils/JobDetailsServiceIT.java index 0b154cb4..caa41649 100644 --- a/src/test/java/org/opensearch/jobscheduler/utils/JobDetailsServiceIT.java +++ b/src/test/java/org/opensearch/jobscheduler/utils/JobDetailsServiceIT.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeoutException; import org.junit.Before; import org.mockito.Mockito; -import org.opensearch.action.ActionListener; +import org.opensearch.core.action.ActionListener; import org.opensearch.cluster.service.ClusterService; import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.core.common.io.stream.BytesStreamInput;