Skip to content

Commit bbdf73a

Browse files
prudhvigodithiprudhvigodithi
authored
Rename org.opensearch.client to org.opensearch.transport.client (#17272)
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
1 parent 7bab481 commit bbdf73a

File tree

611 files changed

+832
-811
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

611 files changed

+832
-811
lines changed

‎CHANGELOG-3.0.md

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
3333
- Refactor `:libs` module `bootstrap` package to eliminate top level split packages for JPMS support ([#17117](https://github.com/opensearch-project/OpenSearch/pull/17117))
3434
- Refactor the codebase to eliminate top level split packages for JPMS support ([#17153](https://github.com/opensearch-project/OpenSearch/pull/17153)
3535
- 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))
36+
- Refactor the `:server` module `org.opensearch.client` to `org.opensearch.transport.client` to eliminate top level split packages for JPMS support ([#17272](https://github.com/opensearch-project/OpenSearch/pull/17272))
3637

3738
### Deprecated
3839

‎client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/action/bulk/RestNoopBulkAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
import org.opensearch.action.bulk.BulkShardRequest;
3939
import org.opensearch.action.support.ActiveShardCount;
4040
import org.opensearch.action.update.UpdateResponse;
41-
import org.opensearch.client.Requests;
42-
import org.opensearch.client.node.NodeClient;
4341
import org.opensearch.core.index.shard.ShardId;
4442
import org.opensearch.core.xcontent.XContentBuilder;
4543
import org.opensearch.rest.BaseRestHandler;
@@ -48,6 +46,8 @@
4846
import org.opensearch.rest.RestRequest;
4947
import org.opensearch.rest.RestResponse;
5048
import org.opensearch.rest.action.RestBuilderListener;
49+
import org.opensearch.transport.client.Requests;
50+
import org.opensearch.transport.client.node.NodeClient;
5151

5252
import java.io.IOException;
5353
import java.util.List;

‎client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/action/search/RestNoopSearchAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
package org.opensearch.plugin.noop.action.search;
3333

3434
import org.opensearch.action.search.SearchRequest;
35-
import org.opensearch.client.node.NodeClient;
3635
import org.opensearch.rest.BaseRestHandler;
3736
import org.opensearch.rest.RestRequest;
3837
import org.opensearch.rest.action.RestStatusToXContentListener;
38+
import org.opensearch.transport.client.node.NodeClient;
3939

4040
import java.util.List;
4141

‎client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ static Request bulk(BulkRequest bulkRequest) throws IOException {
180180
}
181181

182182
if (bulkContentType == null) {
183-
bulkContentType = MediaTypeRegistry.JSON;
183+
bulkContentType = REQUEST_BODY_CONTENT_TYPE;
184184
}
185185

186186
final byte separator = bulkContentType.xContent().streamSeparator();
@@ -424,7 +424,7 @@ static Request update(UpdateRequest updateRequest) throws IOException {
424424
}
425425
}
426426
if (mediaType == null) {
427-
mediaType = Requests.INDEX_CONTENT_TYPE;
427+
mediaType = REQUEST_BODY_CONTENT_TYPE;
428428
}
429429
request.addParameters(parameters.asMap());
430430
request.setEntity(createEntity(updateRequest, mediaType));
@@ -1256,7 +1256,7 @@ Params withWaitForEvents(Priority waitForEvents) {
12561256
*/
12571257
static MediaType enforceSameContentType(IndexRequest indexRequest, @Nullable MediaType mediaType) {
12581258
MediaType requestContentType = indexRequest.getContentType();
1259-
if (requestContentType != MediaTypeRegistry.JSON && requestContentType != MediaTypeRegistry.fromFormat("smile")) {
1259+
if (requestContentType != REQUEST_BODY_CONTENT_TYPE && requestContentType != MediaTypeRegistry.fromFormat("smile")) {
12601260
throw new IllegalArgumentException(
12611261
"Unsupported content-type found for request with content-type ["
12621262
+ requestContentType

‎client/rest-high-level/src/test/java/org/opensearch/client/core/tasks/GetTaskResponseTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232

3333
package org.opensearch.client.core.tasks;
3434

35-
import org.opensearch.client.Requests;
3635
import org.opensearch.client.tasks.GetTaskResponse;
3736
import org.opensearch.core.common.bytes.BytesReference;
3837
import org.opensearch.core.tasks.TaskId;
3938
import org.opensearch.core.tasks.resourcetracker.TaskResourceStats;
4039
import org.opensearch.core.tasks.resourcetracker.TaskResourceUsage;
4140
import org.opensearch.core.tasks.resourcetracker.TaskThreadUsage;
41+
import org.opensearch.core.xcontent.MediaTypeRegistry;
4242
import org.opensearch.core.xcontent.ToXContent;
4343
import org.opensearch.core.xcontent.XContentBuilder;
4444
import org.opensearch.tasks.RawTaskStatus;
@@ -125,7 +125,7 @@ private static TaskId randomTaskId() {
125125
}
126126

127127
private static RawTaskStatus randomRawTaskStatus() {
128-
try (XContentBuilder builder = XContentBuilder.builder(Requests.INDEX_CONTENT_TYPE.xContent())) {
128+
try (XContentBuilder builder = XContentBuilder.builder(MediaTypeRegistry.JSON.xContent())) {
129129
builder.startObject();
130130
int fields = between(0, 10);
131131
for (int f = 0; f < fields; f++) {

‎modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisModulePlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@
125125
import org.apache.lucene.analysis.tr.TurkishAnalyzer;
126126
import org.apache.lucene.analysis.util.ElisionFilter;
127127
import org.opensearch.Version;
128-
import org.opensearch.client.Client;
129128
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
130129
import org.opensearch.cluster.service.ClusterService;
131130
import org.opensearch.common.SetOnce;
@@ -156,6 +155,7 @@
156155
import org.opensearch.script.ScriptContext;
157156
import org.opensearch.script.ScriptService;
158157
import org.opensearch.threadpool.ThreadPool;
158+
import org.opensearch.transport.client.Client;
159159
import org.opensearch.watcher.ResourceWatcherService;
160160

161161
import java.util.ArrayList;

‎modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import java.util.Arrays;
5050
import java.util.Collection;
5151

52-
import static org.opensearch.client.Requests.searchRequest;
5352
import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
5453
import static org.opensearch.index.query.QueryBuilders.boolQuery;
5554
import static org.opensearch.index.query.QueryBuilders.matchAllQuery;
@@ -63,6 +62,7 @@
6362
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
6463
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHighlight;
6564
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount;
65+
import static org.opensearch.transport.client.Requests.searchRequest;
6666
import static org.hamcrest.Matchers.anyOf;
6767
import static org.hamcrest.Matchers.equalTo;
6868
import static org.hamcrest.Matchers.startsWith;

‎modules/cache-common/src/internalClusterTest/java/org/opensearch/cache/common/tier/TieredSpilloverCacheIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.opensearch.action.admin.indices.forcemerge.ForceMergeResponse;
1919
import org.opensearch.action.search.SearchResponse;
2020
import org.opensearch.action.search.SearchType;
21-
import org.opensearch.client.Client;
2221
import org.opensearch.cluster.metadata.IndexMetadata;
2322
import org.opensearch.common.cache.CacheType;
2423
import org.opensearch.common.cache.ICache;
@@ -33,6 +32,7 @@
3332
import org.opensearch.search.aggregations.bucket.histogram.DateHistogramInterval;
3433
import org.opensearch.test.OpenSearchIntegTestCase;
3534
import org.opensearch.test.hamcrest.OpenSearchAssertions;
35+
import org.opensearch.transport.client.Client;
3636
import org.junit.Assert;
3737

3838
import java.time.ZoneId;

‎modules/cache-common/src/internalClusterTest/java/org/opensearch/cache/common/tier/TieredSpilloverCacheStatsIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.opensearch.action.admin.indices.forcemerge.ForceMergeResponse;
1515
import org.opensearch.action.admin.indices.stats.CommonStatsFlags;
1616
import org.opensearch.action.search.SearchResponse;
17-
import org.opensearch.client.Client;
1817
import org.opensearch.cluster.metadata.IndexMetadata;
1918
import org.opensearch.common.cache.CacheType;
2019
import org.opensearch.common.cache.service.NodeCacheStats;
@@ -29,6 +28,7 @@
2928
import org.opensearch.plugins.Plugin;
3029
import org.opensearch.test.OpenSearchIntegTestCase;
3130
import org.opensearch.test.hamcrest.OpenSearchAssertions;
31+
import org.opensearch.transport.client.Client;
3232

3333
import java.io.IOException;
3434
import java.util.Arrays;

‎modules/ingest-common/src/main/java/org/opensearch/ingest/common/GrokProcessorGetAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.opensearch.action.ActionType;
3737
import org.opensearch.action.support.ActionFilters;
3838
import org.opensearch.action.support.HandledTransportAction;
39-
import org.opensearch.client.node.NodeClient;
4039
import org.opensearch.common.inject.Inject;
4140
import org.opensearch.core.action.ActionListener;
4241
import org.opensearch.core.action.ActionResponse;
@@ -50,6 +49,7 @@
5049
import org.opensearch.rest.action.RestToXContentListener;
5150
import org.opensearch.tasks.Task;
5251
import org.opensearch.transport.TransportService;
52+
import org.opensearch.transport.client.node.NodeClient;
5353

5454
import java.io.IOException;
5555
import java.util.List;

‎modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestMultiSearchTemplateAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232

3333
package org.opensearch.script.mustache;
3434

35-
import org.opensearch.client.node.NodeClient;
3635
import org.opensearch.common.settings.Settings;
3736
import org.opensearch.rest.BaseRestHandler;
3837
import org.opensearch.rest.RestRequest;
3938
import org.opensearch.rest.action.RestToXContentListener;
4039
import org.opensearch.rest.action.search.RestMultiSearchAction;
4140
import org.opensearch.rest.action.search.RestSearchAction;
41+
import org.opensearch.transport.client.node.NodeClient;
4242

4343
import java.io.IOException;
4444
import java.util.Collections;

‎modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestRenderSearchTemplateAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232

3333
package org.opensearch.script.mustache;
3434

35-
import org.opensearch.client.node.NodeClient;
3635
import org.opensearch.core.xcontent.XContentParser;
3736
import org.opensearch.rest.BaseRestHandler;
3837
import org.opensearch.rest.RestRequest;
3938
import org.opensearch.rest.action.RestToXContentListener;
4039
import org.opensearch.script.ScriptType;
40+
import org.opensearch.transport.client.node.NodeClient;
4141

4242
import java.io.IOException;
4343
import java.util.List;

‎modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestSearchTemplateAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
package org.opensearch.script.mustache;
3434

3535
import org.opensearch.action.search.SearchRequest;
36-
import org.opensearch.client.node.NodeClient;
3736
import org.opensearch.core.xcontent.XContentParser;
3837
import org.opensearch.rest.BaseRestHandler;
3938
import org.opensearch.rest.RestRequest;
4039
import org.opensearch.rest.action.RestStatusToXContentListener;
4140
import org.opensearch.rest.action.search.RestSearchAction;
41+
import org.opensearch.transport.client.node.NodeClient;
4242

4343
import java.io.IOException;
4444
import java.util.Arrays;

‎modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequestBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434

3535
import org.opensearch.action.ActionRequestBuilder;
3636
import org.opensearch.action.search.SearchRequest;
37-
import org.opensearch.client.OpenSearchClient;
3837
import org.opensearch.script.ScriptType;
38+
import org.opensearch.transport.client.OpenSearchClient;
3939

4040
import java.util.Map;
4141

‎modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportMultiSearchTemplateAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
import org.opensearch.action.search.SearchRequest;
3838
import org.opensearch.action.support.ActionFilters;
3939
import org.opensearch.action.support.HandledTransportAction;
40-
import org.opensearch.client.node.NodeClient;
4140
import org.opensearch.common.inject.Inject;
4241
import org.opensearch.core.action.ActionListener;
4342
import org.opensearch.core.xcontent.NamedXContentRegistry;
4443
import org.opensearch.script.ScriptService;
4544
import org.opensearch.tasks.Task;
4645
import org.opensearch.transport.TransportService;
46+
import org.opensearch.transport.client.node.NodeClient;
4747

4848
import java.util.ArrayList;
4949
import java.util.List;

‎modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportRenderSearchTemplateAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
package org.opensearch.script.mustache;
1010

1111
import org.opensearch.action.support.ActionFilters;
12-
import org.opensearch.client.node.NodeClient;
1312
import org.opensearch.common.inject.Inject;
1413
import org.opensearch.core.xcontent.NamedXContentRegistry;
1514
import org.opensearch.script.ScriptService;
1615
import org.opensearch.transport.TransportService;
16+
import org.opensearch.transport.client.node.NodeClient;
1717

1818
public class TransportRenderSearchTemplateAction extends TransportSearchTemplateAction {
1919

‎modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.opensearch.action.search.SearchResponse;
3737
import org.opensearch.action.support.ActionFilters;
3838
import org.opensearch.action.support.HandledTransportAction;
39-
import org.opensearch.client.node.NodeClient;
4039
import org.opensearch.common.inject.Inject;
4140
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
4241
import org.opensearch.core.action.ActionListener;
@@ -53,6 +52,7 @@
5352
import org.opensearch.search.internal.SearchContext;
5453
import org.opensearch.tasks.Task;
5554
import org.opensearch.transport.TransportService;
55+
import org.opensearch.transport.client.node.NodeClient;
5656

5757
import java.io.IOException;
5858
import java.util.Collections;

‎modules/lang-painless/src/main/java/org/opensearch/painless/PainlessModulePlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
package org.opensearch.painless;
3434

3535
import org.opensearch.action.ActionRequest;
36-
import org.opensearch.client.Client;
3736
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
3837
import org.opensearch.cluster.node.DiscoveryNodes;
3938
import org.opensearch.cluster.service.ClusterService;
@@ -69,6 +68,7 @@
6968
import org.opensearch.script.UpdateScript;
7069
import org.opensearch.search.aggregations.pipeline.MovingFunctionScript;
7170
import org.opensearch.threadpool.ThreadPool;
71+
import org.opensearch.transport.client.Client;
7272
import org.opensearch.watcher.ResourceWatcherService;
7373

7474
import java.util.ArrayList;

‎modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.opensearch.action.ActionType;
3838
import org.opensearch.action.support.ActionFilters;
3939
import org.opensearch.action.support.HandledTransportAction;
40-
import org.opensearch.client.node.NodeClient;
4140
import org.opensearch.common.inject.Inject;
4241
import org.opensearch.core.ParseField;
4342
import org.opensearch.core.action.ActionListener;
@@ -55,6 +54,7 @@
5554
import org.opensearch.script.ScriptContext;
5655
import org.opensearch.tasks.Task;
5756
import org.opensearch.transport.TransportService;
57+
import org.opensearch.transport.client.node.NodeClient;
5858

5959
import java.io.IOException;
6060
import java.util.ArrayList;

‎modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import org.opensearch.action.support.IndicesOptions;
5151
import org.opensearch.action.support.single.shard.SingleShardRequest;
5252
import org.opensearch.action.support.single.shard.TransportSingleShardAction;
53-
import org.opensearch.client.node.NodeClient;
5453
import org.opensearch.cluster.ClusterState;
5554
import org.opensearch.cluster.block.ClusterBlockException;
5655
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
@@ -92,6 +91,7 @@
9291
import org.opensearch.script.ScriptType;
9392
import org.opensearch.threadpool.ThreadPool;
9493
import org.opensearch.transport.TransportService;
94+
import org.opensearch.transport.client.node.NodeClient;
9595

9696
import java.io.IOException;
9797
import java.util.Collections;

‎modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/AbstractParentChildTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
import org.opensearch.action.index.IndexRequestBuilder;
3636
import org.opensearch.action.search.SearchRequestBuilder;
3737
import org.opensearch.action.search.SearchResponse;
38-
import org.opensearch.client.Requests;
3938
import org.opensearch.cluster.metadata.IndexMetadata;
4039
import org.opensearch.common.settings.Settings;
4140
import org.opensearch.join.query.ParentChildTestCase;
41+
import org.opensearch.transport.client.Requests;
4242
import org.junit.Before;
4343

4444
import java.util.ArrayList;

‎modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import org.opensearch.action.search.SearchRequestBuilder;
3939
import org.opensearch.action.search.SearchResponse;
4040
import org.opensearch.action.update.UpdateResponse;
41-
import org.opensearch.client.Requests;
4241
import org.opensearch.cluster.metadata.IndexMetadata;
4342
import org.opensearch.common.settings.Settings;
4443
import org.opensearch.search.SearchHit;
@@ -48,6 +47,7 @@
4847
import org.opensearch.search.aggregations.metrics.Sum;
4948
import org.opensearch.search.aggregations.metrics.TopHits;
5049
import org.opensearch.search.sort.SortOrder;
50+
import org.opensearch.transport.client.Requests;
5151

5252
import java.util.ArrayList;
5353
import java.util.Arrays;

‎modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalRequestBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
import org.opensearch.action.ActionRequestBuilder;
3636
import org.opensearch.action.ActionType;
37-
import org.opensearch.client.OpenSearchClient;
37+
import org.opensearch.transport.client.OpenSearchClient;
3838

3939
public class RankEvalRequestBuilder extends ActionRequestBuilder<RankEvalRequest, RankEvalResponse> {
4040

‎modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RestRankEvalAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434

3535
import org.opensearch.action.search.SearchType;
3636
import org.opensearch.action.support.IndicesOptions;
37-
import org.opensearch.client.node.NodeClient;
3837
import org.opensearch.core.common.Strings;
3938
import org.opensearch.core.xcontent.XContentParser;
4039
import org.opensearch.rest.BaseRestHandler;
4140
import org.opensearch.rest.RestRequest;
4241
import org.opensearch.rest.action.RestToXContentListener;
42+
import org.opensearch.transport.client.node.NodeClient;
4343

4444
import java.io.IOException;
4545
import java.util.List;

‎modules/rank-eval/src/main/java/org/opensearch/index/rankeval/TransportRankEvalAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import org.opensearch.action.search.SearchRequest;
3939
import org.opensearch.action.support.ActionFilters;
4040
import org.opensearch.action.support.HandledTransportAction;
41-
import org.opensearch.client.Client;
4241
import org.opensearch.common.inject.Inject;
4342
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
4443
import org.opensearch.core.action.ActionListener;
@@ -54,6 +53,7 @@
5453
import org.opensearch.search.builder.SearchSourceBuilder;
5554
import org.opensearch.tasks.Task;
5655
import org.opensearch.transport.TransportService;
56+
import org.opensearch.transport.client.Client;
5757

5858
import java.io.IOException;
5959
import java.util.ArrayList;

‎modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.opensearch.action.search.SearchType;
3838
import org.opensearch.action.support.ActionFilters;
3939
import org.opensearch.action.support.IndicesOptions;
40-
import org.opensearch.client.node.NodeClient;
4140
import org.opensearch.common.settings.Settings;
4241
import org.opensearch.core.action.ActionListener;
4342
import org.opensearch.core.xcontent.NamedXContentRegistry;
@@ -46,6 +45,7 @@
4645
import org.opensearch.search.builder.SearchSourceBuilder;
4746
import org.opensearch.test.OpenSearchTestCase;
4847
import org.opensearch.transport.TransportService;
48+
import org.opensearch.transport.client.node.NodeClient;
4949

5050
import java.util.ArrayList;
5151
import java.util.Arrays;

0 commit comments

Comments
 (0)