Skip to content

Commit d74afdd

Browse files
prudhvigodithiprudhvigodithi
committed
JPMS Refactoring
Signed-off-by: Prudhvi Godithi <[email protected]>
1 parent b823d1f commit d74afdd

File tree

611 files changed

+832
-809
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
-809
lines changed

‎CHANGELOG-3.0.md‎

Lines changed: 1 addition & 0 deletions
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.internal.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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
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;
43+
import org.opensearch.internal.client.Requests;
44+
import org.opensearch.internal.client.node.NodeClient;
4545
import org.opensearch.rest.BaseRestHandler;
4646
import org.opensearch.rest.BytesRestResponse;
4747
import org.opensearch.rest.RestChannel;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
package org.opensearch.plugin.noop.action.search;
3333

3434
import org.opensearch.action.search.SearchRequest;
35-
import org.opensearch.client.node.NodeClient;
35+
import org.opensearch.internal.client.node.NodeClient;
3636
import org.opensearch.rest.BaseRestHandler;
3737
import org.opensearch.rest.RestRequest;
3838
import org.opensearch.rest.action.RestStatusToXContentListener;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@
113113
import java.util.Map;
114114
import java.util.StringJoiner;
115115

116+
import static org.opensearch.internal.client.Requests.INDEX_CONTENT_TYPE;
117+
116118
/**
117119
* Converts OpenSearch writeable requests to an HTTP Request
118120
*
@@ -424,7 +426,7 @@ static Request update(UpdateRequest updateRequest) throws IOException {
424426
}
425427
}
426428
if (mediaType == null) {
427-
mediaType = Requests.INDEX_CONTENT_TYPE;
429+
mediaType = INDEX_CONTENT_TYPE;
428430
}
429431
request.addParameters(parameters.asMap());
430432
request.setEntity(createEntity(updateRequest, mediaType));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
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;
@@ -51,6 +50,7 @@
5150
import java.util.HashMap;
5251
import java.util.Map;
5352

53+
import static org.opensearch.internal.client.Requests.INDEX_CONTENT_TYPE;
5454
import static org.opensearch.test.AbstractXContentTestCase.xContentTester;
5555

5656
public class GetTaskResponseTests extends OpenSearchTestCase {
@@ -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(INDEX_CONTENT_TYPE.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‎

Lines changed: 1 addition & 1 deletion
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;
@@ -148,6 +147,7 @@
148147
import org.opensearch.indices.analysis.AnalysisModule;
149148
import org.opensearch.indices.analysis.AnalysisModule.AnalysisProvider;
150149
import org.opensearch.indices.analysis.PreBuiltCacheFactory.CachingStrategy;
150+
import org.opensearch.internal.client.Client;
151151
import org.opensearch.lucene.analysis.miscellaneous.DisableGraphAttribute;
152152
import org.opensearch.plugins.AnalysisPlugin;
153153
import org.opensearch.plugins.Plugin;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@
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;
5655
import static org.opensearch.index.query.QueryBuilders.matchPhrasePrefixQuery;
5756
import static org.opensearch.index.query.QueryBuilders.matchPhraseQuery;
5857
import static org.opensearch.index.query.QueryBuilders.matchQuery;
5958
import static org.opensearch.index.query.QueryBuilders.termQuery;
59+
import static org.opensearch.internal.client.Requests.searchRequest;
6060
import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
6161
import static org.opensearch.search.builder.SearchSourceBuilder.highlight;
6262
import static org.opensearch.search.builder.SearchSourceBuilder.searchSource;

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

Lines changed: 1 addition & 1 deletion
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;
@@ -27,6 +26,7 @@
2726
import org.opensearch.index.cache.request.RequestCacheStats;
2827
import org.opensearch.index.query.QueryBuilders;
2928
import org.opensearch.indices.IndicesRequestCache;
29+
import org.opensearch.internal.client.Client;
3030
import org.opensearch.plugins.CachePlugin;
3131
import org.opensearch.plugins.Plugin;
3232
import org.opensearch.plugins.PluginInfo;

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

Lines changed: 1 addition & 1 deletion
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;
@@ -26,6 +25,7 @@
2625
import org.opensearch.index.cache.request.RequestCacheStats;
2726
import org.opensearch.index.query.QueryBuilders;
2827
import org.opensearch.indices.IndicesRequestCache;
28+
import org.opensearch.internal.client.Client;
2929
import org.opensearch.plugins.Plugin;
3030
import org.opensearch.test.OpenSearchIntegTestCase;
3131
import org.opensearch.test.hamcrest.OpenSearchAssertions;

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

Lines changed: 1 addition & 1 deletion
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;
@@ -45,6 +44,7 @@
4544
import org.opensearch.core.xcontent.ToXContentObject;
4645
import org.opensearch.core.xcontent.XContentBuilder;
4746
import org.opensearch.grok.Grok;
47+
import org.opensearch.internal.client.node.NodeClient;
4848
import org.opensearch.rest.BaseRestHandler;
4949
import org.opensearch.rest.RestRequest;
5050
import org.opensearch.rest.action.RestToXContentListener;

0 commit comments

Comments
 (0)