JPMS Refactoring

Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
prudhvigodithi · Feb 6, 2025 · ea4ed8f · ea4ed8f
1 parent b823d1f
commit ea4ed8f
Show file tree

Hide file tree

Showing 609 changed files with 829 additions and 804 deletions.
diff --git a/CHANGELOG-3.0.md b/CHANGELOG-3.0.md
@@ -33,6 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Refactor `:libs` module `bootstrap` package to eliminate top level split packages for JPMS support ([#17117](https://github.com/opensearch-project/OpenSearch/pull/17117))
 - Refactor the codebase to eliminate top level split packages for JPMS support ([#17153](https://github.com/opensearch-project/OpenSearch/pull/17153)
 - Refactor `:server` module `org.apacge.lucene` package to eliminate top level split packages for JPMS support ([#17241](https://github.com/opensearch-project/OpenSearch/pull/17241))
+- Refactor the `:server` module `org.opensearch.client` to `org.opensearch.client.server` to eliminate top level split packages for JPMS support ([#17272](https://github.com/opensearch-project/OpenSearch/pull/17272))
 
 ### Deprecated
 

diff --git a/...p-api-plugin/src/main/java/org/opensearch/plugin/noop/action/bulk/RestNoopBulkAction.java b/...p-api-plugin/src/main/java/org/opensearch/plugin/noop/action/bulk/RestNoopBulkAction.java
@@ -38,8 +38,8 @@
 import org.opensearch.action.bulk.BulkShardRequest;
 import org.opensearch.action.support.ActiveShardCount;
 import org.opensearch.action.update.UpdateResponse;
-import org.opensearch.client.Requests;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.Requests;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.core.index.shard.ShardId;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.rest.BaseRestHandler;

diff --git a/...i-plugin/src/main/java/org/opensearch/plugin/noop/action/search/RestNoopSearchAction.java b/...i-plugin/src/main/java/org/opensearch/plugin/noop/action/search/RestNoopSearchAction.java
@@ -32,7 +32,7 @@
 package org.opensearch.plugin.noop.action.search;
 
 import org.opensearch.action.search.SearchRequest;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestStatusToXContentListener;

diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java b/client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java
@@ -68,6 +68,7 @@
 import org.opensearch.client.core.MultiTermVectorsRequest;
 import org.opensearch.client.core.TermVectorsRequest;
 import org.opensearch.client.indices.AnalyzeRequest;
+import org.opensearch.client.server.Requests;
 import org.opensearch.client.tasks.TaskId;
 import org.opensearch.cluster.health.ClusterHealthStatus;
 import org.opensearch.common.Nullable;

diff --git a/.../rest-high-level/src/test/java/org/opensearch/client/core/tasks/GetTaskResponseTests.java b/.../rest-high-level/src/test/java/org/opensearch/client/core/tasks/GetTaskResponseTests.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.client.core.tasks;
 
-import org.opensearch.client.Requests;
+import org.opensearch.client.server.Requests;
 import org.opensearch.client.tasks.GetTaskResponse;
 import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.core.tasks.TaskId;

diff --git a/...lysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisModulePlugin.java b/...lysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisModulePlugin.java
@@ -125,7 +125,7 @@
 import org.apache.lucene.analysis.tr.TurkishAnalyzer;
 import org.apache.lucene.analysis.util.ElisionFilter;
 import org.opensearch.Version;
-import org.opensearch.client.Client;
+import org.opensearch.client.server.Client;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.SetOnce;

diff --git a/...is-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java b/...is-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java
@@ -49,7 +49,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import static org.opensearch.client.Requests.searchRequest;
+import static org.opensearch.client.server.Requests.searchRequest;
 import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.opensearch.index.query.QueryBuilders.boolQuery;
 import static org.opensearch.index.query.QueryBuilders.matchAllQuery;

diff --git a/...src/internalClusterTest/java/org/opensearch/cache/common/tier/TieredSpilloverCacheIT.java b/...src/internalClusterTest/java/org/opensearch/cache/common/tier/TieredSpilloverCacheIT.java
@@ -18,7 +18,7 @@
 import org.opensearch.action.admin.indices.forcemerge.ForceMergeResponse;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchType;
-import org.opensearch.client.Client;
+import org.opensearch.client.server.Client;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.cache.CacheType;
 import org.opensearch.common.cache.ICache;

diff --git a/...nternalClusterTest/java/org/opensearch/cache/common/tier/TieredSpilloverCacheStatsIT.java b/...nternalClusterTest/java/org/opensearch/cache/common/tier/TieredSpilloverCacheStatsIT.java
@@ -14,7 +14,7 @@
 import org.opensearch.action.admin.indices.forcemerge.ForceMergeResponse;
 import org.opensearch.action.admin.indices.stats.CommonStatsFlags;
 import org.opensearch.action.search.SearchResponse;
-import org.opensearch.client.Client;
+import org.opensearch.client.server.Client;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.cache.CacheType;
 import org.opensearch.common.cache.service.NodeCacheStats;

diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GrokProcessorGetAction.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GrokProcessorGetAction.java
@@ -36,7 +36,7 @@
 import org.opensearch.action.ActionType;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.action.ActionResponse;

diff --git a/...-mustache/src/main/java/org/opensearch/script/mustache/RestMultiSearchTemplateAction.java b/...-mustache/src/main/java/org/opensearch/script/mustache/RestMultiSearchTemplateAction.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.script.mustache;
 
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;

diff --git a/...mustache/src/main/java/org/opensearch/script/mustache/RestRenderSearchTemplateAction.java b/...mustache/src/main/java/org/opensearch/script/mustache/RestRenderSearchTemplateAction.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.script.mustache;
 
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;

diff --git a/.../lang-mustache/src/main/java/org/opensearch/script/mustache/RestSearchTemplateAction.java b/.../lang-mustache/src/main/java/org/opensearch/script/mustache/RestSearchTemplateAction.java
@@ -33,7 +33,7 @@
 package org.opensearch.script.mustache;
 
 import org.opensearch.action.search.SearchRequest;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;

diff --git a/...g-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequestBuilder.java b/...g-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequestBuilder.java
@@ -34,7 +34,7 @@
 
 import org.opensearch.action.ActionRequestBuilder;
 import org.opensearch.action.search.SearchRequest;
-import org.opensearch.client.OpenSearchClient;
+import org.opensearch.client.server.OpenSearchClient;
 import org.opensearch.script.ScriptType;
 
 import java.util.Map;

diff --git a/...ache/src/main/java/org/opensearch/script/mustache/TransportMultiSearchTemplateAction.java b/...ache/src/main/java/org/opensearch/script/mustache/TransportMultiSearchTemplateAction.java
@@ -37,7 +37,7 @@
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.xcontent.NamedXContentRegistry;

diff --git a/...che/src/main/java/org/opensearch/script/mustache/TransportRenderSearchTemplateAction.java b/...che/src/main/java/org/opensearch/script/mustache/TransportRenderSearchTemplateAction.java
@@ -9,7 +9,7 @@
 package org.opensearch.script.mustache;
 
 import org.opensearch.action.support.ActionFilters;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.script.ScriptService;

diff --git a/...-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java b/...-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java
@@ -36,7 +36,7 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
 import org.opensearch.core.action.ActionListener;

diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessModulePlugin.java b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessModulePlugin.java
@@ -33,7 +33,7 @@
 package org.opensearch.painless;
 
 import org.opensearch.action.ActionRequest;
-import org.opensearch.client.Client;
+import org.opensearch.client.server.Client;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.cluster.service.ClusterService;

diff --git a/...les/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextAction.java b/...les/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextAction.java
@@ -37,7 +37,7 @@
 import org.opensearch.action.ActionType;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.ParseField;
 import org.opensearch.core.action.ActionListener;

diff --git a/...les/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java b/...les/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java
@@ -50,7 +50,7 @@
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.action.support.single.shard.SingleShardRequest;
 import org.opensearch.action.support.single.shard.TransportSingleShardAction;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.block.ClusterBlockException;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;

diff --git a/...nternalClusterTest/java/org/opensearch/join/aggregations/AbstractParentChildTestCase.java b/...nternalClusterTest/java/org/opensearch/join/aggregations/AbstractParentChildTestCase.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.index.IndexRequestBuilder;
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.action.search.SearchResponse;
-import org.opensearch.client.Requests;
+import org.opensearch.client.server.Requests;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.join.query.ParentChildTestCase;

diff --git a/...parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java b/...parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java
@@ -38,7 +38,7 @@
 import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.update.UpdateResponse;
-import org.opensearch.client.Requests;
+import org.opensearch.client.server.Requests;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.search.SearchHit;

diff --git a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalRequestBuilder.java b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalRequestBuilder.java
@@ -34,7 +34,7 @@
 
 import org.opensearch.action.ActionRequestBuilder;
 import org.opensearch.action.ActionType;
-import org.opensearch.client.OpenSearchClient;
+import org.opensearch.client.server.OpenSearchClient;
 
 public class RankEvalRequestBuilder extends ActionRequestBuilder<RankEvalRequest, RankEvalResponse> {
 

diff --git a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RestRankEvalAction.java b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RestRankEvalAction.java
@@ -34,7 +34,7 @@
 
 import org.opensearch.action.search.SearchType;
 import org.opensearch.action.support.IndicesOptions;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.rest.BaseRestHandler;

diff --git a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/TransportRankEvalAction.java b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/TransportRankEvalAction.java
@@ -38,7 +38,7 @@
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.client.Client;
+import org.opensearch.client.server.Client;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
 import org.opensearch.core.action.ActionListener;

diff --git a/...s/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java b/...s/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java
@@ -37,7 +37,7 @@
 import org.opensearch.action.search.SearchType;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.IndicesOptions;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.xcontent.NamedXContentRegistry;

diff --git a/.../internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java b/.../internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java
@@ -34,7 +34,7 @@
 
 import org.opensearch.action.admin.cluster.node.tasks.get.GetTaskResponse;
 import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
-import org.opensearch.client.Client;
+import org.opensearch.client.server.Client;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.index.shard.ShardId;
 import org.opensearch.core.tasks.TaskId;

diff --git a/...s/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java b/...s/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java
@@ -48,7 +48,7 @@
 import org.opensearch.action.delete.DeleteRequest;
 import org.opensearch.action.index.IndexRequest;
 import org.opensearch.action.support.TransportAction;
-import org.opensearch.client.ParentTaskAssigningClient;
+import org.opensearch.client.server.ParentTaskAssigningClient;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.AbstractRunnable;

diff --git a/...es/reindex/src/main/java/org/opensearch/index/reindex/AbstractBaseReindexRestHandler.java b/...es/reindex/src/main/java/org/opensearch/index/reindex/AbstractBaseReindexRestHandler.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.ActionType;
 import org.opensearch.action.support.ActiveShardCount;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;

diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/AsyncDeleteByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/AsyncDeleteByQueryAction.java
@@ -34,7 +34,7 @@
 
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.delete.DeleteRequest;
-import org.opensearch.client.ParentTaskAssigningClient;
+import org.opensearch.client.server.ParentTaskAssigningClient;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.script.ScriptService;
 import org.opensearch.threadpool.ThreadPool;

diff --git a/...reindex/src/main/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelper.java b/...reindex/src/main/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelper.java
@@ -36,7 +36,7 @@
 import org.opensearch.action.admin.cluster.shards.ClusterSearchShardsRequest;
 import org.opensearch.action.admin.cluster.shards.ClusterSearchShardsResponse;
 import org.opensearch.action.search.SearchRequest;
-import org.opensearch.client.Client;
+import org.opensearch.client.server.Client;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.index.Index;

diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexModulePlugin.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexModulePlugin.java
@@ -35,7 +35,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.ActionRequest;
-import org.opensearch.client.Client;
+import org.opensearch.client.server.Client;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.cluster.service.ClusterService;

diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java
@@ -49,10 +49,10 @@
 import org.opensearch.action.bulk.BackoffPolicy;
 import org.opensearch.action.bulk.BulkItemResponse;
 import org.opensearch.action.index.IndexRequest;
-import org.opensearch.client.Client;
-import org.opensearch.client.ParentTaskAssigningClient;
 import org.opensearch.client.RestClient;
 import org.opensearch.client.RestClientBuilder;
+import org.opensearch.client.server.Client;
+import org.opensearch.client.server.ParentTaskAssigningClient;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.logging.Loggers;
 import org.opensearch.common.lucene.uid.Versions;

diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/RestDeleteByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestDeleteByQueryAction.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.index.reindex;
 
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.rest.RestRequest;
 

diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/RestReindexAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestReindexAction.java
@@ -33,7 +33,7 @@
 package org.opensearch.index.reindex;
 
 import org.opensearch.action.DocWriteRequest;
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.rest.RestRequest;

diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/RestRethrottleAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestRethrottleAction.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.index.reindex;
 
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.core.tasks.TaskId;
 import org.opensearch.rest.BaseRestHandler;

diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/RestUpdateByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestUpdateByQueryAction.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.index.reindex;
 
-import org.opensearch.client.node.NodeClient;
+import org.opensearch.client.server.node.NodeClient;
 import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.script.Script;

diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/RethrottleRequestBuilder.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/RethrottleRequestBuilder.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.ActionType;
 import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
 import org.opensearch.action.support.tasks.TasksRequestBuilder;
-import org.opensearch.client.OpenSearchClient;
+import org.opensearch.client.server.OpenSearchClient;
 
 /**
  * Java API support for changing the throttle on reindex tasks while they are running.

diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportDeleteByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportDeleteByQueryAction.java
@@ -34,8 +34,8 @@
 
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.client.Client;
-import org.opensearch.client.ParentTaskAssigningClient;
+import org.opensearch.client.server.Client;
+import org.opensearch.client.server.ParentTaskAssigningClient;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.action.ActionListener;

diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.AutoCreateIndex;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.client.Client;
+import org.opensearch.client.server.Client;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;

diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportRethrottleAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportRethrottleAction.java
@@ -38,7 +38,7 @@
 import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.tasks.TransportTasksAction;
-import org.opensearch.client.Client;
+import org.opensearch.client.server.Client;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.core.action.ActionListener;

diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportUpdateByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportUpdateByQueryAction.java
@@ -36,8 +36,8 @@
 import org.opensearch.action.index.IndexRequest;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
-import org.opensearch.client.Client;
-import org.opensearch.client.ParentTaskAssigningClient;
+import org.opensearch.client.server.Client;
+import org.opensearch.client.server.ParentTaskAssigningClient;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.inject.Inject;

diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java
@@ -64,9 +64,9 @@
 import org.opensearch.action.support.TransportAction;
 import org.opensearch.action.update.UpdateRequest;
 import org.opensearch.action.update.UpdateResponse;
-import org.opensearch.client.Client;
-import org.opensearch.client.FilterClient;
-import org.opensearch.client.ParentTaskAssigningClient;
+import org.opensearch.client.server.Client;
+import org.opensearch.client.server.FilterClient;
+import org.opensearch.client.server.ParentTaskAssigningClient;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.CheckedConsumer;
 import org.opensearch.common.settings.Settings;