From 2a04d92de7f55edbf9ecfeab88450170f2ecb098 Mon Sep 17 00:00:00 2001 From: Prudhvi Godithi Date: Mon, 10 Feb 2025 12:00:44 -0800 Subject: [PATCH] Fix JS with OpenSearch Refactoring Signed-off-by: Prudhvi Godithi --- build.gradle | 3 +++ .../jobscheduler/sampleextension/SampleExtensionPlugin.java | 2 +- .../sampleextension/SampleExtensionRestHandler.java | 2 +- .../jobscheduler/sampleextension/SampleJobRunner.java | 4 ++-- .../org/opensearch/jobscheduler/spi/utils/LockService.java | 2 +- .../java/org/opensearch/jobscheduler/JobSchedulerPlugin.java | 2 +- .../jobscheduler/rest/action/RestGetJobDetailsAction.java | 3 ++- .../jobscheduler/rest/action/RestGetLockAction.java | 3 ++- .../jobscheduler/rest/action/RestReleaseLockAction.java | 2 +- .../java/org/opensearch/jobscheduler/sweeper/JobSweeper.java | 2 +- .../org/opensearch/jobscheduler/utils/JobDetailsService.java | 2 +- .../rest/action/RestGetJobDetailsActionTests.java | 2 +- .../jobscheduler/rest/action/RestGetLockActionTests.java | 2 +- .../jobscheduler/rest/action/RestReleaseLockActionTests.java | 2 +- .../org/opensearch/jobscheduler/sweeper/JobSweeperTests.java | 2 +- 15 files changed, 20 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 489e405f..3055a441 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,9 @@ buildscript { // 2.2.0-SNAPSHOT -> 2.2.0.0-SNAPSHOT version_tokens = opensearch_version.tokenize('-') opensearch_build = version_tokens[0] + '.0' + if (buildVersionQualifier) { + opensearch_build += "-${buildVersionQualifier}" + } if (isSnapshot) { opensearch_build += "-SNAPSHOT" } diff --git a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java b/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java index 94ff42de..9c739195 100644 --- a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java +++ b/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java @@ -14,7 +14,6 @@ import org.opensearch.jobscheduler.spi.schedule.ScheduleParser; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.ClusterService; @@ -35,6 +34,7 @@ import org.opensearch.rest.RestHandler; import org.opensearch.script.ScriptService; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; import org.opensearch.watcher.ResourceWatcherService; import java.io.IOException; 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 68dbfa05..91b87a6d 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 @@ -15,13 +15,13 @@ import org.opensearch.action.delete.DeleteResponse; import org.opensearch.action.index.IndexRequest; import org.opensearch.action.index.IndexResponse; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestResponse; import org.opensearch.core.rest.RestStatus; +import org.opensearch.transport.client.node.NodeClient; import java.io.IOException; import java.time.Instant; 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 95114773..cd195faa 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 @@ -9,7 +9,6 @@ package org.opensearch.jobscheduler.sampleextension; import org.opensearch.action.index.IndexRequest; -import org.opensearch.client.Client; import org.opensearch.common.xcontent.XContentType; import org.opensearch.jobscheduler.spi.JobExecutionContext; import org.opensearch.jobscheduler.spi.ScheduledJobParameter; @@ -22,6 +21,7 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.plugins.Plugin; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; import java.util.List; import java.util.UUID; @@ -32,7 +32,7 @@ * The job runner should be a singleton class if it uses OpenSearch client or other objects passed * from OpenSearch. Because when registering the job runner to JobScheduler plugin, OpenSearch has * not invoke plugins' createComponents() method. That is saying the plugin is not completely initalized, - * and the OpenSearch {@link org.opensearch.client.Client}, {@link ClusterService} and other objects + * and the OpenSearch {@link Client}, {@link ClusterService} and other objects * are not available to plugin and this job runner. * * So we have to move this job runner intialization to {@link Plugin} createComponents() method, and using 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 19c5fb58..361c2b11 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 @@ -23,7 +23,6 @@ import org.opensearch.action.get.GetRequest; import org.opensearch.action.index.IndexRequest; import org.opensearch.action.update.UpdateRequest; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.opensearch.core.xcontent.MediaType; @@ -36,6 +35,7 @@ import org.opensearch.index.engine.DocumentMissingException; import org.opensearch.index.engine.VersionConflictEngineException; import org.opensearch.index.seqno.SequenceNumbers; +import org.opensearch.transport.client.Client; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java b/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java index 3873a4dc..63884528 100644 --- a/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java +++ b/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java @@ -27,7 +27,6 @@ import org.opensearch.jobscheduler.sweeper.JobSweeper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; import org.opensearch.core.ParseField; @@ -49,6 +48,7 @@ import org.opensearch.threadpool.ExecutorBuilder; import org.opensearch.threadpool.FixedExecutorBuilder; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; import org.opensearch.watcher.ResourceWatcherService; import java.util.HashMap; 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 cb3e9563..8525692f 100644 --- a/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsAction.java +++ b/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsAction.java @@ -11,7 +11,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.core.action.ActionListener; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.core.xcontent.XContentParser; import org.opensearch.jobscheduler.JobSchedulerPlugin; @@ -34,6 +33,8 @@ import java.util.concurrent.TimeoutException; import com.google.common.collect.ImmutableList; +import org.opensearch.transport.client.node.NodeClient; + import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken; import static org.opensearch.rest.RestRequest.Method.PUT; 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 81e44c9a..c650b500 100644 --- a/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetLockAction.java +++ b/src/main/java/org/opensearch/jobscheduler/rest/action/RestGetLockAction.java @@ -11,7 +11,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.core.action.ActionListener; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.xcontent.ToXContent; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.core.xcontent.XContentParser; @@ -35,6 +34,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import com.google.common.collect.ImmutableList; +import org.opensearch.transport.client.node.NodeClient; + import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken; import static org.opensearch.rest.RestRequest.Method.GET; 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 faf4836e..96e8104c 100644 --- a/src/main/java/org/opensearch/jobscheduler/rest/action/RestReleaseLockAction.java +++ b/src/main/java/org/opensearch/jobscheduler/rest/action/RestReleaseLockAction.java @@ -20,7 +20,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.core.action.ActionListener; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.jobscheduler.JobSchedulerPlugin; import org.opensearch.jobscheduler.spi.LockModel; @@ -31,6 +30,7 @@ import org.opensearch.rest.RestRequest; import static org.opensearch.rest.RestRequest.Method.PUT; import org.opensearch.core.rest.RestStatus; +import org.opensearch.transport.client.node.NodeClient; public class RestReleaseLockAction extends BaseRestHandler { diff --git a/src/main/java/org/opensearch/jobscheduler/sweeper/JobSweeper.java b/src/main/java/org/opensearch/jobscheduler/sweeper/JobSweeper.java index e2bb077c..d86ea1f2 100644 --- a/src/main/java/org/opensearch/jobscheduler/sweeper/JobSweeper.java +++ b/src/main/java/org/opensearch/jobscheduler/sweeper/JobSweeper.java @@ -26,7 +26,6 @@ import org.opensearch.action.bulk.BackoffPolicy; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterChangedEvent; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.ClusterStateListener; @@ -54,6 +53,7 @@ import org.opensearch.search.sort.FieldSortBuilder; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/opensearch/jobscheduler/utils/JobDetailsService.java b/src/main/java/org/opensearch/jobscheduler/utils/JobDetailsService.java index 4a112e1e..7da56923 100644 --- a/src/main/java/org/opensearch/jobscheduler/utils/JobDetailsService.java +++ b/src/main/java/org/opensearch/jobscheduler/utils/JobDetailsService.java @@ -23,7 +23,6 @@ import org.opensearch.action.get.GetRequest; import org.opensearch.action.index.IndexRequest; import org.opensearch.action.update.UpdateRequest; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.core.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentFactory; @@ -53,6 +52,7 @@ import org.opensearch.jobscheduler.transport.response.JobParameterResponse; import org.opensearch.jobscheduler.transport.request.JobRunnerRequest; import org.opensearch.jobscheduler.transport.response.JobRunnerResponse; +import org.opensearch.transport.client.Client; import java.nio.charset.StandardCharsets; import java.util.Set; 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 916eb745..a7401fb7 100644 --- a/src/test/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsActionTests.java +++ b/src/test/java/org/opensearch/jobscheduler/rest/action/RestGetJobDetailsActionTests.java @@ -17,7 +17,6 @@ import org.junit.Before; import org.mockito.Mockito; 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; import org.opensearch.jobscheduler.JobSchedulerPlugin; @@ -28,6 +27,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.transport.client.node.NodeClient; @ThreadLeakScope(ThreadLeakScope.Scope.NONE) public class RestGetJobDetailsActionTests extends OpenSearchTestCase { diff --git a/src/test/java/org/opensearch/jobscheduler/rest/action/RestGetLockActionTests.java b/src/test/java/org/opensearch/jobscheduler/rest/action/RestGetLockActionTests.java index 92e49cd9..afe7296e 100644 --- a/src/test/java/org/opensearch/jobscheduler/rest/action/RestGetLockActionTests.java +++ b/src/test/java/org/opensearch/jobscheduler/rest/action/RestGetLockActionTests.java @@ -17,7 +17,6 @@ import org.junit.Before; import org.mockito.Mockito; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.core.common.bytes.BytesArray; import org.opensearch.common.xcontent.LoggingDeprecationHandler; @@ -36,6 +35,7 @@ import org.opensearch.rest.RestRequest; import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.transport.client.node.NodeClient; @ThreadLeakScope(ThreadLeakScope.Scope.NONE) public class RestGetLockActionTests extends OpenSearchTestCase { diff --git a/src/test/java/org/opensearch/jobscheduler/rest/action/RestReleaseLockActionTests.java b/src/test/java/org/opensearch/jobscheduler/rest/action/RestReleaseLockActionTests.java index 122e0cab..f5f0ac1e 100644 --- a/src/test/java/org/opensearch/jobscheduler/rest/action/RestReleaseLockActionTests.java +++ b/src/test/java/org/opensearch/jobscheduler/rest/action/RestReleaseLockActionTests.java @@ -16,7 +16,6 @@ import java.util.Map; import org.junit.Before; import org.mockito.Mockito; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.jobscheduler.JobSchedulerPlugin; import org.opensearch.jobscheduler.spi.LockModel; @@ -26,6 +25,7 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.transport.client.Client; @ThreadLeakScope(ThreadLeakScope.Scope.NONE) public class RestReleaseLockActionTests extends OpenSearchTestCase { diff --git a/src/test/java/org/opensearch/jobscheduler/sweeper/JobSweeperTests.java b/src/test/java/org/opensearch/jobscheduler/sweeper/JobSweeperTests.java index 41ced15a..0c511437 100644 --- a/src/test/java/org/opensearch/jobscheduler/sweeper/JobSweeperTests.java +++ b/src/test/java/org/opensearch/jobscheduler/sweeper/JobSweeperTests.java @@ -21,7 +21,6 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.Version; import org.opensearch.action.delete.DeleteResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.OpenSearchAllocationTestCase; @@ -53,6 +52,7 @@ import org.junit.Before; import org.mockito.Mockito; import org.mockito.stubbing.OngoingStubbing; +import org.opensearch.transport.client.Client; import java.io.IOException; import java.nio.charset.Charset;