From 452f6e1b815bdb96f7a285f386b45bc0050def09 Mon Sep 17 00:00:00 2001 From: Nick Knize Date: Fri, 12 Mar 2021 16:25:00 -0600 Subject: [PATCH] [Rename] server cli and client (#254) This commit refactors the o.e.cli and o.e.client packages from elasticsearch to o.opensearch.cli and o.opensearch.client packages in the server module, respectively. Signed-off-by: Nicholas Knize --- .../transport/TransportClientBenchmark.java | 2 +- .../noop/action/bulk/RestNoopBulkAction.java | 4 +- .../action/search/RestNoopSearchAction.java | 2 +- .../core/tasks/GetTaskResponseTests.java | 2 +- .../client/PreBuiltTransportClient.java | 2 +- .../client/PreBuiltTransportClientTests.java | 2 +- .../settings/CreateKeyStoreCommand.java | 2 +- .../common/settings/KeyStoreCli.java | 2 +- .../plugins/InstallPluginCommand.java | 2 +- .../plugins/ListPluginsCommand.java | 2 +- .../org/elasticsearch/plugins/PluginCli.java | 2 +- .../plugins/RemovePluginCommand.java | 2 +- .../analysis/common/CommonAnalysisPlugin.java | 14 ++-- .../common/HighlighterWithAnalyzersTests.java | 2 +- .../ingest/common/GrokProcessorGetAction.java | 2 +- .../RestMultiSearchTemplateAction.java | 2 +- .../RestRenderSearchTemplateAction.java | 2 +- .../mustache/RestSearchTemplateAction.java | 2 +- .../SearchTemplateRequestBuilder.java | 2 +- .../TransportMultiSearchTemplateAction.java | 2 +- .../TransportSearchTemplateAction.java | 2 +- .../opensearch/painless/PainlessPlugin.java | 10 +-- .../action/PainlessContextAction.java | 2 +- .../action/PainlessExecuteAction.java | 2 +- .../join/aggregations/ChildrenIT.java | 2 +- .../rankeval/RankEvalRequestBuilder.java | 2 +- .../index/rankeval/RestRankEvalAction.java | 2 +- .../rankeval/TransportRankEvalAction.java | 2 +- .../TransportRankEvalActionTests.java | 2 +- .../documentation/ReindexDocumentationIT.java | 2 +- .../AbstractAsyncBulkByScrollAction.java | 2 +- .../AbstractBaseReindexRestHandler.java | 2 +- .../reindex/AsyncDeleteByQueryAction.java | 2 +- .../BulkByScrollParallelizationHelper.java | 4 +- .../index/reindex/ReindexPlugin.java | 6 +- .../opensearch/index/reindex/Reindexer.java | 4 +- .../reindex/RestDeleteByQueryAction.java | 2 +- .../index/reindex/RestReindexAction.java | 2 +- .../index/reindex/RestRethrottleAction.java | 2 +- .../reindex/RestUpdateByQueryAction.java | 2 +- .../reindex/RethrottleRequestBuilder.java | 2 +- .../reindex/TransportDeleteByQueryAction.java | 4 +- .../index/reindex/TransportReindexAction.java | 4 +- .../reindex/TransportRethrottleAction.java | 2 +- .../reindex/TransportUpdateByQueryAction.java | 4 +- .../reindex/AsyncBulkByScrollActionTests.java | 6 +- .../ClientScrollableHitSourceTests.java | 4 +- .../ReindexFromRemoteWithAuthTests.java | 8 +-- .../opensearch/index/reindex/RetryTests.java | 2 +- .../TransportRethrottleActionTests.java | 2 +- .../url/URLSnapshotRestoreIT.java | 2 +- .../org/opensearch/systemd/SystemdPlugin.java | 6 +- .../rest/discovery/Zen2RestApiIT.java | 2 +- ...Netty4TransportMultiPortIntegrationIT.java | 2 +- .../elasticsearch/OpenSearchException.java | 68 +++++++++---------- .../action/delete/DeleteRequest.java | 6 +- .../action/delete/DeleteRequestBuilder.java | 2 +- .../action/delete/DeleteResponse.java | 2 +- .../action/explain/ExplainRequestBuilder.java | 2 +- .../FieldCapabilitiesRequestBuilder.java | 2 +- .../TransportFieldCapabilitiesAction.java | 2 +- .../elasticsearch/action/get/GetRequest.java | 6 +- .../action/get/GetRequestBuilder.java | 2 +- .../elasticsearch/action/get/GetResponse.java | 2 +- .../action/get/MultiGetRequestBuilder.java | 2 +- .../action/index/IndexRequest.java | 8 +-- .../action/index/IndexRequestBuilder.java | 2 +- .../action/index/IndexResponse.java | 2 +- .../ingest/DeletePipelineRequestBuilder.java | 2 +- .../ingest/GetPipelineRequestBuilder.java | 2 +- .../ingest/PutPipelineRequestBuilder.java | 2 +- .../ingest/PutPipelineTransportAction.java | 4 +- .../SimulatePipelineRequestBuilder.java | 2 +- .../action/main/MainRequestBuilder.java | 2 +- .../search/ClearScrollRequestBuilder.java | 2 +- .../search/MultiSearchRequestBuilder.java | 2 +- .../action/search/SearchRequest.java | 6 +- .../action/search/SearchRequestBuilder.java | 2 +- .../search/SearchScrollRequestBuilder.java | 2 +- .../search/TransportMultiSearchAction.java | 2 +- .../action/search/TransportSearchAction.java | 6 +- .../BroadcastOperationRequestBuilder.java | 2 +- .../master/AcknowledgedRequestBuilder.java | 2 +- .../MasterNodeOperationRequestBuilder.java | 2 +- ...MasterNodeReadOperationRequestBuilder.java | 2 +- .../info/ClusterInfoRequestBuilder.java | 2 +- .../nodes/NodesOperationRequestBuilder.java | 2 +- .../ReplicationRequestBuilder.java | 2 +- .../TransportReplicationAction.java | 2 +- .../InstanceShardOperationRequestBuilder.java | 2 +- .../SingleShardOperationRequestBuilder.java | 2 +- .../support/tasks/TasksRequestBuilder.java | 2 +- .../MultiTermVectorsRequestBuilder.java | 2 +- .../TermVectorsRequestBuilder.java | 2 +- .../action/update/TransportUpdateAction.java | 2 +- .../action/update/UpdateHelper.java | 2 +- .../action/update/UpdateRequestBuilder.java | 2 +- .../elasticsearch/bootstrap/Bootstrap.java | 2 +- .../elasticsearch/bootstrap/OpenSearch.java | 2 +- .../allocation/DiskThresholdMonitor.java | 2 +- .../cluster/service/MasterService.java | 4 +- .../common/settings/BaseKeyStoreCommand.java | 2 +- .../common/settings/ClusterSettings.java | 4 +- .../settings/HasPasswordKeyStoreCommand.java | 2 +- .../common/util/concurrent/ThreadContext.java | 2 +- .../transport/RemoteClusterAwareClient.java | 4 +- .../transport/RemoteClusterService.java | 2 +- .../transport/TransportService.java | 4 +- .../org/opensearch/action/ActionModule.java | 26 +++---- .../action/ActionRequestBuilder.java | 2 +- ...lusterAllocationExplainRequestBuilder.java | 2 +- .../health/ClusterHealthRequestBuilder.java | 4 +- .../NodesHotThreadsRequestBuilder.java | 2 +- .../node/info/NodesInfoRequestBuilder.java | 2 +- ...desReloadSecureSettingsRequestBuilder.java | 2 +- .../node/stats/NodesStatsRequestBuilder.java | 2 +- .../cancel/CancelTasksRequestBuilder.java | 2 +- .../node/tasks/get/GetTaskRequestBuilder.java | 2 +- .../tasks/get/TransportGetTaskAction.java | 8 +-- .../tasks/list/ListTasksRequestBuilder.java | 2 +- .../node/usage/NodesUsageRequestBuilder.java | 2 +- .../remote/RemoteInfoRequestBuilder.java | 2 +- .../CleanupRepositoryRequestBuilder.java | 2 +- .../DeleteRepositoryRequestBuilder.java | 2 +- .../get/GetRepositoriesRequestBuilder.java | 2 +- .../put/PutRepositoryRequestBuilder.java | 2 +- .../VerifyRepositoryRequestBuilder.java | 2 +- .../reroute/ClusterRerouteRequestBuilder.java | 2 +- .../ClusterUpdateSettingsRequestBuilder.java | 2 +- .../ClusterSearchShardsRequestBuilder.java | 2 +- .../clone/CloneSnapshotRequestBuilder.java | 2 +- .../create/CreateSnapshotRequestBuilder.java | 2 +- .../delete/DeleteSnapshotRequestBuilder.java | 2 +- .../get/GetSnapshotsRequestBuilder.java | 2 +- .../RestoreSnapshotRequestBuilder.java | 2 +- .../status/SnapshotsStatusRequestBuilder.java | 2 +- .../state/ClusterStateRequestBuilder.java | 2 +- .../stats/ClusterStatsRequestBuilder.java | 2 +- .../DeleteStoredScriptRequestBuilder.java | 2 +- .../GetStoredScriptRequestBuilder.java | 2 +- .../PutStoredScriptRequestBuilder.java | 2 +- .../PendingClusterTasksRequestBuilder.java | 2 +- .../alias/IndicesAliasesRequestBuilder.java | 2 +- .../exists/AliasesExistRequestBuilder.java | 2 +- .../alias/get/BaseAliasesRequestBuilder.java | 2 +- .../alias/get/GetAliasesRequestBuilder.java | 2 +- .../analyze/AnalyzeRequestBuilder.java | 2 +- .../ClearIndicesCacheRequestBuilder.java | 2 +- .../close/CloseIndexRequestBuilder.java | 2 +- .../indices/create/CreateIndexRequest.java | 6 +- .../create/CreateIndexRequestBuilder.java | 4 +- .../TransportDeleteDanglingIndexAction.java | 2 +- .../TransportImportDanglingIndexAction.java | 8 +-- .../indices/delete/DeleteIndexRequest.java | 2 +- .../delete/DeleteIndexRequestBuilder.java | 2 +- .../indices/IndicesExistsRequestBuilder.java | 2 +- .../types/TypesExistsRequestBuilder.java | 2 +- .../admin/indices/flush/FlushRequest.java | 6 +- .../indices/flush/FlushRequestBuilder.java | 2 +- .../indices/flush/SyncedFlushRequest.java | 6 +- .../flush/SyncedFlushRequestBuilder.java | 2 +- .../indices/forcemerge/ForceMergeRequest.java | 4 +- .../forcemerge/ForceMergeRequestBuilder.java | 2 +- .../indices/get/GetIndexRequestBuilder.java | 2 +- .../get/GetFieldMappingsRequestBuilder.java | 2 +- .../get/GetMappingsRequestBuilder.java | 2 +- .../mapping/put/PutMappingRequest.java | 6 +- .../mapping/put/PutMappingRequestBuilder.java | 2 +- .../indices/open/OpenIndexRequestBuilder.java | 4 +- .../readonly/AddIndexBlockRequestBuilder.java | 2 +- .../recovery/RecoveryRequestBuilder.java | 2 +- .../admin/indices/refresh/RefreshRequest.java | 4 +- .../refresh/RefreshRequestBuilder.java | 2 +- .../indices/resolve/ResolveIndexAction.java | 2 +- .../rollover/RolloverRequestBuilder.java | 4 +- .../rollover/TransportRolloverAction.java | 6 +- .../IndicesSegmentsRequestBuilder.java | 2 +- .../get/GetSettingsRequestBuilder.java | 2 +- .../put/UpdateSettingsRequestBuilder.java | 2 +- .../IndicesShardStoreRequestBuilder.java | 2 +- .../indices/shrink/ResizeRequestBuilder.java | 4 +- .../indices/shrink/TransportResizeAction.java | 4 +- .../stats/IndicesStatsRequestBuilder.java | 2 +- .../DeleteIndexTemplateRequestBuilder.java | 2 +- .../get/GetIndexTemplatesRequestBuilder.java | 2 +- .../put/PutIndexTemplateRequestBuilder.java | 2 +- .../get/UpgradeStatusRequestBuilder.java | 2 +- .../upgrade/post/TransportUpgradeAction.java | 8 +-- .../indices/upgrade/post/UpgradeRequest.java | 4 +- .../upgrade/post/UpgradeRequestBuilder.java | 2 +- .../post/UpgradeSettingsRequestBuilder.java | 2 +- .../query/ValidateQueryRequestBuilder.java | 2 +- .../opensearch/action/bulk/BulkProcessor.java | 4 +- .../opensearch/action/bulk/BulkRequest.java | 6 +- .../action/bulk/BulkRequestBuilder.java | 6 +- .../action/bulk/TransportBulkAction.java | 16 ++--- .../support/ThreadedActionListener.java | 4 +- .../cli/CommandLoggingConfigurator.java | 4 +- .../cli/EnvironmentAwareCommand.java | 8 +-- .../cli/KeyStoreAwareCommand.java | 9 +-- .../cli/LoggingAwareCommand.java | 6 +- .../cli/LoggingAwareMultiCommand.java | 6 +- .../client/AdminClient.java | 6 +- .../client/Client.java | 16 ++--- .../client/ClusterAdminClient.java | 32 ++++----- .../client/FilterClient.java | 6 +- .../client/IndicesAdminClient.java | 50 +++++++------- .../client/OpenSearchClient.java | 4 +- .../client/OriginSettingClient.java | 4 +- .../client/ParentTaskAssigningClient.java | 4 +- .../client/Requests.java | 58 ++++++++-------- .../client/node/NodeClient.java | 8 +-- .../client/package-info.java | 4 +- .../client/support/AbstractClient.java | 20 +++--- .../transport/NoNodeAvailableException.java | 4 +- .../client/transport/TransportClient.java | 26 +++---- .../TransportClientNodesService.java | 6 +- .../transport/TransportProxyClient.java | 4 +- .../org/opensearch/cluster/ClusterState.java | 2 +- .../cluster/InternalClusterInfoService.java | 4 +- .../action/index/MappingUpdatedAction.java | 4 +- .../cluster/coordination/NodeToolCli.java | 2 +- .../coordination/OpenSearchNodeCommand.java | 2 +- .../cluster/metadata/IndexMetadata.java | 2 +- .../metadata/TemplateUpgradeService.java | 2 +- .../org/opensearch/index/IndexModule.java | 16 ++--- .../org/opensearch/index/IndexService.java | 18 ++--- .../org/opensearch/index/IndexSettings.java | 4 +- .../fielddata/IndexFieldDataService.java | 4 +- .../index/mapper/DocumentMapperParser.java | 2 +- .../index/mapper/MapperService.java | 4 +- .../query/AbstractGeometryQueryBuilder.java | 2 +- .../index/query/MoreLikeThisQueryBuilder.java | 2 +- .../index/query/QueryRewriteContext.java | 2 +- .../index/query/QueryShardContext.java | 2 +- .../index/query/TermsQueryBuilder.java | 2 +- .../AbstractBulkByScrollRequestBuilder.java | 2 +- ...stractBulkIndexByScrollRequestBuilder.java | 2 +- .../reindex/ClientScrollableHitSource.java | 4 +- .../reindex/DeleteByQueryRequestBuilder.java | 2 +- .../index/reindex/ReindexRequestBuilder.java | 2 +- .../reindex/UpdateByQueryRequestBuilder.java | 2 +- .../opensearch/index/shard/IndexShard.java | 20 +++--- .../opensearch/index/shard/ShardToolCli.java | 2 +- .../org/opensearch/rest/BaseRestHandler.java | 2 +- .../rest/DeprecationRestHandler.java | 2 +- .../org/opensearch/rest/RestController.java | 2 +- .../java/org/opensearch/rest/RestHandler.java | 2 +- .../action/RestCancellableNodeClient.java | 8 +-- .../action/RestFieldCapabilitiesAction.java | 2 +- .../rest/action/RestMainAction.java | 2 +- .../RestAddVotingConfigExclusionAction.java | 2 +- .../admin/cluster/RestCancelTasksAction.java | 2 +- .../cluster/RestCleanupRepositoryAction.java | 4 +- ...RestClearVotingConfigExclusionsAction.java | 2 +- .../cluster/RestCloneSnapshotAction.java | 2 +- .../RestClusterAllocationExplainAction.java | 2 +- .../cluster/RestClusterGetSettingsAction.java | 4 +- .../cluster/RestClusterHealthAction.java | 4 +- .../cluster/RestClusterRerouteAction.java | 4 +- .../RestClusterSearchShardsAction.java | 4 +- .../admin/cluster/RestClusterStateAction.java | 4 +- .../admin/cluster/RestClusterStatsAction.java | 2 +- .../RestClusterUpdateSettingsAction.java | 4 +- .../cluster/RestCreateSnapshotAction.java | 4 +- .../cluster/RestDeleteRepositoryAction.java | 4 +- .../cluster/RestDeleteSnapshotAction.java | 4 +- .../cluster/RestDeleteStoredScriptAction.java | 2 +- .../cluster/RestGetRepositoriesAction.java | 4 +- .../cluster/RestGetScriptContextAction.java | 2 +- .../cluster/RestGetScriptLanguageAction.java | 2 +- .../admin/cluster/RestGetSnapshotsAction.java | 4 +- .../cluster/RestGetStoredScriptAction.java | 2 +- .../admin/cluster/RestGetTaskAction.java | 2 +- .../admin/cluster/RestListTasksAction.java | 2 +- .../cluster/RestNodesHotThreadsAction.java | 2 +- .../admin/cluster/RestNodesInfoAction.java | 2 +- .../admin/cluster/RestNodesStatsAction.java | 2 +- .../admin/cluster/RestNodesUsageAction.java | 2 +- .../RestPendingClusterTasksAction.java | 2 +- .../cluster/RestPutRepositoryAction.java | 4 +- .../cluster/RestPutStoredScriptAction.java | 2 +- .../RestReloadSecureSettingsAction.java | 2 +- .../cluster/RestRemoteClusterInfoAction.java | 2 +- .../cluster/RestRestoreSnapshotAction.java | 4 +- .../cluster/RestSnapshotsStatusAction.java | 4 +- .../cluster/RestVerifyRepositoryAction.java | 4 +- .../RestDeleteDanglingIndexAction.java | 2 +- .../RestImportDanglingIndexAction.java | 2 +- .../RestListDanglingIndicesAction.java | 2 +- .../indices/RestAddIndexBlockAction.java | 2 +- .../admin/indices/RestAnalyzeAction.java | 2 +- .../indices/RestClearIndicesCacheAction.java | 2 +- .../admin/indices/RestCloseIndexAction.java | 2 +- .../indices/RestCreateDataStreamAction.java | 2 +- .../admin/indices/RestCreateIndexAction.java | 2 +- .../indices/RestDataStreamsStatsAction.java | 2 +- .../RestDeleteComponentTemplateAction.java | 2 +- ...stDeleteComposableIndexTemplateAction.java | 2 +- .../indices/RestDeleteDataStreamAction.java | 2 +- .../admin/indices/RestDeleteIndexAction.java | 2 +- .../RestDeleteIndexTemplateAction.java | 2 +- .../action/admin/indices/RestFlushAction.java | 2 +- .../admin/indices/RestForceMergeAction.java | 2 +- .../admin/indices/RestGetAliasesAction.java | 2 +- .../RestGetComponentTemplateAction.java | 2 +- .../RestGetComposableIndexTemplateAction.java | 2 +- .../indices/RestGetDataStreamsAction.java | 2 +- .../indices/RestGetFieldMappingAction.java | 2 +- .../indices/RestGetIndexTemplateAction.java | 2 +- .../admin/indices/RestGetIndicesAction.java | 2 +- .../admin/indices/RestGetMappingAction.java | 4 +- .../admin/indices/RestGetSettingsAction.java | 2 +- .../indices/RestIndexDeleteAliasesAction.java | 2 +- .../indices/RestIndexPutAliasAction.java | 2 +- .../indices/RestIndicesAliasesAction.java | 2 +- .../indices/RestIndicesSegmentsAction.java | 2 +- .../indices/RestIndicesShardStoresAction.java | 2 +- .../admin/indices/RestIndicesStatsAction.java | 2 +- .../admin/indices/RestOpenIndexAction.java | 2 +- .../RestPutComponentTemplateAction.java | 2 +- .../RestPutComposableIndexTemplateAction.java | 2 +- .../indices/RestPutIndexTemplateAction.java | 2 +- .../admin/indices/RestPutMappingAction.java | 4 +- .../admin/indices/RestRecoveryAction.java | 2 +- .../admin/indices/RestRefreshAction.java | 2 +- .../admin/indices/RestResizeHandler.java | 2 +- .../admin/indices/RestResolveIndexAction.java | 2 +- .../indices/RestRolloverIndexAction.java | 2 +- .../RestSimulateIndexTemplateAction.java | 2 +- .../indices/RestSimulateTemplateAction.java | 2 +- .../admin/indices/RestSyncedFlushAction.java | 2 +- .../indices/RestUpdateSettingsAction.java | 4 +- .../admin/indices/RestUpgradeAction.java | 2 +- .../indices/RestUpgradeStatusAction.java | 2 +- .../indices/RestValidateQueryAction.java | 2 +- .../rest/action/cat/AbstractCatAction.java | 2 +- .../rest/action/cat/RestAliasAction.java | 2 +- .../rest/action/cat/RestAllocationAction.java | 2 +- .../rest/action/cat/RestCatAction.java | 2 +- .../action/cat/RestCatRecoveryAction.java | 2 +- .../rest/action/cat/RestCountAction.java | 2 +- .../rest/action/cat/RestFielddataAction.java | 2 +- .../rest/action/cat/RestHealthAction.java | 2 +- .../rest/action/cat/RestIndicesAction.java | 4 +- .../rest/action/cat/RestMasterAction.java | 2 +- .../rest/action/cat/RestNodeAttrsAction.java | 4 +- .../rest/action/cat/RestNodesAction.java | 18 ++--- .../cat/RestPendingClusterTasksAction.java | 2 +- .../rest/action/cat/RestPluginsAction.java | 4 +- .../action/cat/RestRepositoriesAction.java | 2 +- .../rest/action/cat/RestSegmentsAction.java | 2 +- .../rest/action/cat/RestShardsAction.java | 2 +- .../rest/action/cat/RestSnapshotAction.java | 2 +- .../rest/action/cat/RestTasksAction.java | 2 +- .../rest/action/cat/RestTemplatesAction.java | 2 +- .../rest/action/cat/RestThreadPoolAction.java | 4 +- .../rest/action/document/RestBulkAction.java | 4 +- .../action/document/RestDeleteAction.java | 2 +- .../rest/action/document/RestGetAction.java | 2 +- .../action/document/RestGetSourceAction.java | 2 +- .../rest/action/document/RestIndexAction.java | 4 +- .../action/document/RestMultiGetAction.java | 2 +- .../document/RestMultiTermVectorsAction.java | 2 +- .../document/RestTermVectorsAction.java | 2 +- .../action/document/RestUpdateAction.java | 2 +- .../ingest/RestDeletePipelineAction.java | 2 +- .../action/ingest/RestGetPipelineAction.java | 2 +- .../action/ingest/RestPutPipelineAction.java | 2 +- .../ingest/RestSimulatePipelineAction.java | 2 +- .../action/search/RestClearScrollAction.java | 2 +- .../rest/action/search/RestCountAction.java | 2 +- .../rest/action/search/RestExplainAction.java | 2 +- .../action/search/RestMultiSearchAction.java | 2 +- .../rest/action/search/RestSearchAction.java | 2 +- .../action/search/RestSearchScrollAction.java | 2 +- .../java/org/opensearch/tasks/TaskResult.java | 2 +- .../opensearch/tasks/TaskResultsService.java | 6 +- .../cluster/FeatureAwareTests.java | 2 +- .../index/MappingUpdatedActionTests.java | 6 +- .../metadata/TemplateUpgradeServiceTests.java | 6 +- .../reindex/BulkByScrollResponseTests.java | 2 +- .../PersistentTasksCustomMetadataTests.java | 2 +- .../PersistentTasksNodeServiceTests.java | 2 +- .../persistent/TestPersistentTasksPlugin.java | 4 +- .../scroll/RestClearScrollActionTests.java | 2 +- .../scroll/RestSearchScrollActionTests.java | 2 +- .../transport/RemoteClusterClientTests.java | 2 +- .../TransportServiceHandshakeTests.java | 6 +- .../blobstore/BlobStoreRepositoryTests.java | 8 +-- .../opensearch/rest/BaseRestHandlerTests.java | 2 +- .../rest/DeprecationRestHandlerTests.java | 2 +- .../opensearch/rest/RestControllerTests.java | 2 +- .../rest/RestHttpResponseHeadersTests.java | 2 +- .../RestCancellableNodeClientTests.java | 2 +- .../cluster/RestNodesStatsActionTests.java | 2 +- .../admin/indices/RestAnalyzeActionTests.java | 2 +- .../indices/RestCreateIndexActionTests.java | 2 +- .../indices/RestGetIndicesActionTests.java | 2 +- .../indices/RestGetMappingActionTests.java | 2 +- .../indices/RestIndicesStatsActionTests.java | 2 +- .../RestPutIndexTemplateActionTests.java | 2 +- .../admin/indices/RestResizeHandlerTests.java | 2 +- .../indices/RestValidateQueryActionTests.java | 2 +- .../rest/action/cat/RestNodesActionTests.java | 2 +- .../action/document/RestBulkActionTests.java | 2 +- .../document/RestUpdateActionTests.java | 2 +- .../snapshots/SnapshotResiliencyTests.java | 4 +- .../org/opensearch/tasks/TaskInfoTests.java | 2 +- .../opensearch/usage/UsageServiceTests.java | 2 +- .../MockInternalClusterInfoService.java | 6 +- .../java/org/elasticsearch/node/MockNode.java | 2 +- .../test/AbstractBuilderTestCase.java | 24 +++---- .../test/AbstractMultiClustersTestCase.java | 2 +- .../elasticsearch/test/BackgroundIndexer.java | 2 +- .../elasticsearch/test/ESIntegTestCase.java | 24 +++---- .../test/ESSingleNodeTestCase.java | 4 +- .../org/elasticsearch/test/ESTestCase.java | 2 +- .../test/ExternalTestCluster.java | 6 +- .../test/InternalTestCluster.java | 4 +- .../org/elasticsearch/test/TestCluster.java | 4 +- .../elasticsearch/test/client/NoOpClient.java | 4 +- .../test/client/NoOpNodeClient.java | 4 +- .../test/client/RandomizingClient.java | 4 +- .../test/rest/RestActionTestCase.java | 3 +- .../transport/MockTransportClient.java | 2 +- .../ESBlobStoreRepositoryIntegTestCase.java | 2 +- .../test/test/InternalTestClusterIT.java | 2 +- .../test/test/InternalTestClusterTests.java | 4 +- 429 files changed, 788 insertions(+), 794 deletions(-) rename server/src/main/java/org/{elasticsearch => opensearch}/cli/CommandLoggingConfigurator.java (95%) rename server/src/main/java/org/{elasticsearch => opensearch}/cli/EnvironmentAwareCommand.java (96%) rename server/src/main/java/org/{elasticsearch => opensearch}/cli/KeyStoreAwareCommand.java (91%) rename server/src/main/java/org/{elasticsearch => opensearch}/cli/LoggingAwareCommand.java (92%) rename server/src/main/java/org/{elasticsearch => opensearch}/cli/LoggingAwareMultiCommand.java (92%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/AdminClient.java (89%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/Client.java (96%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/ClusterAdminClient.java (96%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/FilterClient.java (94%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/IndicesAdminClient.java (94%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/OpenSearchClient.java (96%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/OriginSettingClient.java (96%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/ParentTaskAssigningClient.java (96%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/Requests.java (88%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/node/NodeClient.java (96%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/package-info.java (90%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/support/AbstractClient.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/transport/NoNodeAvailableException.java (93%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/transport/TransportClient.java (96%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/transport/TransportClientNodesService.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/client/transport/TransportProxyClient.java (96%) diff --git a/client/benchmark/src/main/java/org/opensearch/client/benchmark/transport/TransportClientBenchmark.java b/client/benchmark/src/main/java/org/opensearch/client/benchmark/transport/TransportClientBenchmark.java index 501d1cf95e2..ba463c60783 100644 --- a/client/benchmark/src/main/java/org/opensearch/client/benchmark/transport/TransportClientBenchmark.java +++ b/client/benchmark/src/main/java/org/opensearch/client/benchmark/transport/TransportClientBenchmark.java @@ -27,7 +27,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.opensearch.client.benchmark.AbstractBenchmark; import org.opensearch.client.benchmark.ops.bulk.BulkRequestExecutor; import org.opensearch.client.benchmark.ops.search.SearchRequestExecutor; -import org.elasticsearch.client.transport.TransportClient; +import org.opensearch.client.transport.TransportClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.common.xcontent.XContentType; diff --git a/client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/action/bulk/RestNoopBulkAction.java b/client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/action/bulk/RestNoopBulkAction.java index 0b45e26b1e6..6bff8f9664a 100644 --- a/client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/action/bulk/RestNoopBulkAction.java +++ b/client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/action/bulk/RestNoopBulkAction.java @@ -25,8 +25,8 @@ import org.opensearch.action.bulk.BulkRequest; import org.opensearch.action.bulk.BulkShardRequest; import org.opensearch.action.support.ActiveShardCount; import org.elasticsearch.action.update.UpdateResponse; -import org.elasticsearch.client.Requests; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.Requests; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.shard.ShardId; import org.opensearch.rest.BaseRestHandler; diff --git a/client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/action/search/RestNoopSearchAction.java b/client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/action/search/RestNoopSearchAction.java index ff8e139842d..b553efe683e 100644 --- a/client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/action/search/RestNoopSearchAction.java +++ b/client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/action/search/RestNoopSearchAction.java @@ -19,7 +19,7 @@ package org.opensearch.plugin.noop.action.search; import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.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/test/java/org/elasticsearch/client/core/tasks/GetTaskResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/core/tasks/GetTaskResponseTests.java index 459f1dde119..3a64bb4892a 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/core/tasks/GetTaskResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/core/tasks/GetTaskResponseTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.client.core.tasks; -import org.elasticsearch.client.Requests; +import org.opensearch.client.Requests; import org.elasticsearch.client.tasks.GetTaskResponse; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java b/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java index b40dfa86599..eac27e465ea 100644 --- a/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java +++ b/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java @@ -22,7 +22,7 @@ package org.opensearch.transport.client; import io.netty.util.ThreadDeathWatcher; import io.netty.util.concurrent.GlobalEventExecutor; -import org.elasticsearch.client.transport.TransportClient; +import org.opensearch.client.transport.TransportClient; import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; diff --git a/client/transport/src/test/java/org/opensearch/transport/client/PreBuiltTransportClientTests.java b/client/transport/src/test/java/org/opensearch/transport/client/PreBuiltTransportClientTests.java index f33811681ef..fb3c3a1902e 100644 --- a/client/transport/src/test/java/org/opensearch/transport/client/PreBuiltTransportClientTests.java +++ b/client/transport/src/test/java/org/opensearch/transport/client/PreBuiltTransportClientTests.java @@ -20,7 +20,7 @@ package org.opensearch.transport.client; import com.carrotsearch.randomizedtesting.RandomizedTest; -import org.elasticsearch.client.transport.TransportClient; +import org.opensearch.client.transport.TransportClient; import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; import org.opensearch.index.reindex.ReindexPlugin; diff --git a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java index 688f51188c4..404d40e0ece 100644 --- a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java +++ b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java @@ -26,7 +26,7 @@ import java.util.Arrays; import joptsimple.OptionSet; import joptsimple.OptionSpec; import org.opensearch.cli.ExitCodes; -import org.elasticsearch.cli.KeyStoreAwareCommand; +import org.opensearch.cli.KeyStoreAwareCommand; import org.opensearch.cli.Terminal; import org.opensearch.cli.UserException; import org.elasticsearch.env.Environment; diff --git a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/KeyStoreCli.java b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/KeyStoreCli.java index 9c7ff5b6369..f01045c83b5 100644 --- a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/KeyStoreCli.java +++ b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/KeyStoreCli.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.settings; -import org.elasticsearch.cli.LoggingAwareMultiCommand; +import org.opensearch.cli.LoggingAwareMultiCommand; import org.opensearch.cli.Terminal; /** diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java index f4cfda6e004..026e71ac94a 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java @@ -38,7 +38,7 @@ import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProv import org.elasticsearch.Build; import org.elasticsearch.Version; import org.elasticsearch.bootstrap.JarHell; -import org.elasticsearch.cli.EnvironmentAwareCommand; +import org.opensearch.cli.EnvironmentAwareCommand; import org.opensearch.cli.ExitCodes; import org.opensearch.cli.Terminal; import org.opensearch.cli.UserException; diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java index c9bb0ef2de0..24b2dfef561 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java @@ -21,7 +21,7 @@ package org.elasticsearch.plugins; import joptsimple.OptionSet; import org.elasticsearch.Version; -import org.elasticsearch.cli.EnvironmentAwareCommand; +import org.opensearch.cli.EnvironmentAwareCommand; import org.opensearch.cli.Terminal; import org.elasticsearch.env.Environment; diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/PluginCli.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/PluginCli.java index e9958230665..b40b94668ae 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/PluginCli.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/PluginCli.java @@ -21,7 +21,7 @@ package org.elasticsearch.plugins; import org.elasticsearch.core.internal.io.IOUtils; import org.opensearch.cli.Command; -import org.elasticsearch.cli.LoggingAwareMultiCommand; +import org.opensearch.cli.LoggingAwareMultiCommand; import org.opensearch.cli.Terminal; import java.io.IOException; diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/RemovePluginCommand.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/RemovePluginCommand.java index a955212974d..a08743cb238 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/RemovePluginCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/RemovePluginCommand.java @@ -21,7 +21,7 @@ package org.elasticsearch.plugins; import joptsimple.OptionSet; import joptsimple.OptionSpec; -import org.elasticsearch.cli.EnvironmentAwareCommand; +import org.opensearch.cli.EnvironmentAwareCommand; import org.opensearch.cli.ExitCodes; import org.opensearch.cli.Terminal; import org.opensearch.cli.UserException; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java index 2c28cedd3b2..f87b1dd27fe 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java @@ -112,7 +112,7 @@ import org.apache.lucene.analysis.tr.TurkishAnalyzer; import org.apache.lucene.analysis.util.ElisionFilter; import org.apache.lucene.util.SetOnce; import org.elasticsearch.Version; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; @@ -131,11 +131,11 @@ import org.elasticsearch.index.analysis.PreConfiguredTokenFilter; import org.elasticsearch.index.analysis.PreConfiguredTokenizer; import org.elasticsearch.index.analysis.TokenFilterFactory; import org.elasticsearch.index.analysis.TokenizerFactory; -import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider; -import org.elasticsearch.indices.analysis.PreBuiltCacheFactory.CachingStrategy; -import org.elasticsearch.plugins.AnalysisPlugin; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.ScriptPlugin; +import org.opensearch.indices.analysis.AnalysisModule.AnalysisProvider; +import org.opensearch.indices.analysis.PreBuiltCacheFactory.CachingStrategy; +import org.opensearch.plugins.AnalysisPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.ScriptPlugin; import org.opensearch.repositories.RepositoriesService; import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptService; @@ -152,7 +152,7 @@ import java.util.Map; import java.util.TreeMap; import java.util.function.Supplier; -import static org.elasticsearch.plugins.AnalysisPlugin.requiresAnalysisSettings; +import static org.opensearch.plugins.AnalysisPlugin.requiresAnalysisSettings; public class CommonAnalysisPlugin extends Plugin implements AnalysisPlugin, ScriptPlugin { diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java index cf3095e2471..bc2a23923ce 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java @@ -34,7 +34,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collection; -import static org.elasticsearch.client.Requests.searchRequest; +import static org.opensearch.client.Requests.searchRequest; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.boolQuery; import static org.elasticsearch.index.query.QueryBuilders.matchPhrasePrefixQuery; 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 index 560dad99138..2a6fc5f8051 100644 --- 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 @@ -26,7 +26,7 @@ import org.opensearch.action.ActionResponse; import org.opensearch.action.ActionType; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestMultiSearchTemplateAction.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestMultiSearchTemplateAction.java index 81a2f8d545b..2a73ab46975 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestMultiSearchTemplateAction.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestMultiSearchTemplateAction.java @@ -19,7 +19,7 @@ package org.opensearch.script.mustache; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.settings.Settings; import org.opensearch.rest.BaseRestHandler; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestRenderSearchTemplateAction.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestRenderSearchTemplateAction.java index 157161785eb..fcb46c6cc9b 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestRenderSearchTemplateAction.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestRenderSearchTemplateAction.java @@ -19,7 +19,7 @@ package org.opensearch.script.mustache; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestSearchTemplateAction.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestSearchTemplateAction.java index 0408a769cc5..c171190659d 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestSearchTemplateAction.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/RestSearchTemplateAction.java @@ -20,7 +20,7 @@ package org.opensearch.script.mustache; import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequestBuilder.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequestBuilder.java index 3eb1a21e213..3c874dc0c8c 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequestBuilder.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/SearchTemplateRequestBuilder.java @@ -21,7 +21,7 @@ package org.opensearch.script.mustache; import org.opensearch.action.ActionRequestBuilder; import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.opensearch.script.ScriptType; import java.util.Map; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportMultiSearchTemplateAction.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportMultiSearchTemplateAction.java index 3cd115f33e4..a6532add4a8 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportMultiSearchTemplateAction.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportMultiSearchTemplateAction.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.search.MultiSearchResponse; import org.elasticsearch.action.search.SearchRequest; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.opensearch.script.ScriptService; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java index d8c9cd213fe..18f96d396c1 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.xcontent.LoggingDeprecationHandler; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java index c02166ebc4f..e3676d43088 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java @@ -23,7 +23,7 @@ package org.opensearch.painless; import org.apache.lucene.util.SetOnce; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.service.ClusterService; @@ -41,10 +41,10 @@ import org.opensearch.painless.action.PainlessExecuteAction; import org.opensearch.painless.spi.PainlessExtension; import org.opensearch.painless.spi.Whitelist; import org.opensearch.painless.spi.WhitelistLoader; -import org.elasticsearch.plugins.ActionPlugin; -import org.elasticsearch.plugins.ExtensiblePlugin; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.ScriptPlugin; +import org.opensearch.plugins.ActionPlugin; +import org.opensearch.plugins.ExtensiblePlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.ScriptPlugin; import org.opensearch.repositories.RepositoriesService; import org.opensearch.rest.RestController; import org.opensearch.rest.RestHandler; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextAction.java b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextAction.java index 2043be5f044..73c46e300ff 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextAction.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextAction.java @@ -26,7 +26,7 @@ import org.opensearch.action.ActionResponse; import org.opensearch.action.ActionType; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java index 776e69a9647..e3e6b95dee7 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java @@ -39,7 +39,7 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.single.shard.SingleShardRequest; import org.elasticsearch.action.support.single.shard.TransportSingleShardAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.block.ClusterBlockException; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; diff --git a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java index daa4e65c121..ba753ddd4a8 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java +++ b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java @@ -22,7 +22,7 @@ import org.apache.lucene.search.join.ScoreMode; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.update.UpdateResponse; -import org.elasticsearch.client.Requests; +import org.opensearch.client.Requests; import org.opensearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.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 index 3b0a0d67c21..b9740915b25 100644 --- 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 @@ -21,7 +21,7 @@ package org.opensearch.index.rankeval; import org.opensearch.action.ActionType; import org.opensearch.action.ActionRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class RankEvalRequestBuilder extends ActionRequestBuilder { 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 index a5e13fc75d8..7ef72331bbb 100644 --- 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 @@ -21,7 +21,7 @@ package org.opensearch.index.rankeval; import org.elasticsearch.action.search.SearchType; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.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 index 5dbe95a2dd7..70ab9ee4a9e 100644 --- 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 @@ -26,7 +26,7 @@ import org.elasticsearch.action.search.MultiSearchResponse.Item; import org.elasticsearch.action.search.SearchRequest; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.io.stream.Writeable; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java index 9ca175aab6d..3c11c7a7783 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.search.MultiSearchResponse; import org.elasticsearch.action.search.SearchType; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.env.Environment; diff --git a/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java b/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java index ee2c1db2830..2b1301e612d 100644 --- a/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java +++ b/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java @@ -22,7 +22,7 @@ package org.opensearch.client.documentation; import org.opensearch.action.ActionListener; import org.opensearch.action.admin.cluster.node.tasks.get.GetTaskResponse; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.index.IndexModule; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.query.QueryBuilders; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java index 915eabd76e0..37de59ac0e1 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java @@ -35,7 +35,7 @@ import org.opensearch.action.bulk.Retry; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; import org.opensearch.action.support.TransportAction; -import org.elasticsearch.client.ParentTaskAssigningClient; +import org.opensearch.client.ParentTaskAssigningClient; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.unit.TimeValue; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractBaseReindexRestHandler.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractBaseReindexRestHandler.java index 7904eca93cd..67456bfb7a6 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractBaseReindexRestHandler.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractBaseReindexRestHandler.java @@ -22,7 +22,7 @@ package org.opensearch.index.reindex; import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.ActionType; import org.opensearch.action.support.ActiveShardCount; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.rest.BaseRestHandler; 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 index 86b1543edad..c7c24936422 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/AsyncDeleteByQueryAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/AsyncDeleteByQueryAction.java @@ -22,7 +22,7 @@ package org.opensearch.index.reindex; import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; import org.elasticsearch.action.delete.DeleteRequest; -import org.elasticsearch.client.ParentTaskAssigningClient; +import org.opensearch.client.ParentTaskAssigningClient; import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.BulkByScrollTask; import org.elasticsearch.index.reindex.DeleteByQueryRequest; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelper.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelper.java index da67f3655f9..4a5c8f5cac9 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelper.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelper.java @@ -24,7 +24,9 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.admin.cluster.shards.ClusterSearchShardsRequest; import org.opensearch.action.admin.cluster.shards.ClusterSearchShardsResponse; import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; +import org.opensearch.cluster.node.DiscoveryNode; +import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.index.Index; import org.elasticsearch.index.mapper.IdFieldMapper; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java index 61b9a3b3266..c4a0c5236ab 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java @@ -21,7 +21,7 @@ package org.opensearch.index.reindex; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.service.ClusterService; @@ -38,8 +38,8 @@ import org.elasticsearch.index.reindex.BulkByScrollTask; import org.elasticsearch.index.reindex.DeleteByQueryAction; import org.elasticsearch.index.reindex.ReindexAction; import org.elasticsearch.index.reindex.UpdateByQueryAction; -import org.elasticsearch.plugins.ActionPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.ActionPlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.repositories.RepositoriesService; import org.opensearch.rest.RestController; import org.opensearch.rest.RestHandler; 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 index 3a190054b54..be135c687aa 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java @@ -34,8 +34,8 @@ import org.opensearch.action.DocWriteRequest; import org.opensearch.action.bulk.BackoffPolicy; import org.opensearch.action.bulk.BulkItemResponse; import org.elasticsearch.action.index.IndexRequest; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.ParentTaskAssigningClient; +import org.opensearch.client.Client; +import org.opensearch.client.ParentTaskAssigningClient; import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClientBuilder; import org.elasticsearch.cluster.service.ClusterService; 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 index 56ea501af81..4afa44d48aa 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/RestDeleteByQueryAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestDeleteByQueryAction.java @@ -19,7 +19,7 @@ package org.opensearch.index.reindex; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.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 index dd240ee9b04..1ba110762fa 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/RestReindexAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestReindexAction.java @@ -20,7 +20,7 @@ package org.opensearch.index.reindex; import org.opensearch.action.DocWriteRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.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 index 413ef9973f8..2ac76092ec8 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/RestRethrottleAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestRethrottleAction.java @@ -19,7 +19,7 @@ package org.opensearch.index.reindex; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; 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 index c29390073c9..af42c0c168f 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/RestUpdateByQueryAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestUpdateByQueryAction.java @@ -19,7 +19,7 @@ package org.opensearch.index.reindex; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.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 index ac4c7c70b04..c51299a6aa9 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/RethrottleRequestBuilder.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/RethrottleRequestBuilder.java @@ -22,7 +22,7 @@ package org.opensearch.index.reindex; import org.opensearch.action.ActionType; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; import org.elasticsearch.action.support.tasks.TasksRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.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 index f19eb227743..0f7d3843ab2 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportDeleteByQueryAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportDeleteByQueryAction.java @@ -22,8 +22,8 @@ package org.opensearch.index.reindex; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.ParentTaskAssigningClient; +import org.opensearch.client.Client; +import org.opensearch.client.ParentTaskAssigningClient; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.io.stream.Writeable; 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 index 1d8c7198448..f2f9d13c46c 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java @@ -23,7 +23,9 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.AutoCreateIndex; import org.opensearch.action.support.HandledTransportAction; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; +import org.opensearch.cluster.metadata.IndexNameExpressionResolver; +import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.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 index 3993efff7ec..fd5e9f6efd4 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportRethrottleAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportRethrottleAction.java @@ -26,7 +26,7 @@ import org.opensearch.action.TaskOperationFailure; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; import org.opensearch.action.support.ActionFilters; import org.elasticsearch.action.support.tasks.TransportTasksAction; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.index.reindex.BulkByScrollTask; 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 index 01ebf8fccc7..9aa9f0c6857 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportUpdateByQueryAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportUpdateByQueryAction.java @@ -25,8 +25,8 @@ import org.opensearch.action.ActionListener; import org.elasticsearch.action.index.IndexRequest; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.ParentTaskAssigningClient; +import org.opensearch.client.Client; +import org.opensearch.client.ParentTaskAssigningClient; import org.opensearch.cluster.ClusterState; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.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 index dd347d6863b..9b817fca938 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java @@ -53,9 +53,9 @@ import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.TransportAction; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.action.update.UpdateResponse; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.FilterClient; -import org.elasticsearch.client.ParentTaskAssigningClient; +import org.opensearch.client.Client; +import org.opensearch.client.FilterClient; +import org.opensearch.client.ParentTaskAssigningClient; import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.CheckedConsumer; import org.elasticsearch.common.bytes.BytesArray; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java index 5be8a670894..a5443976660 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java @@ -30,8 +30,8 @@ import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchScrollAction; import org.elasticsearch.action.search.SearchScrollRequest; -import org.elasticsearch.client.ParentTaskAssigningClient; -import org.elasticsearch.client.support.AbstractClient; +import org.opensearch.client.ParentTaskAssigningClient; +import org.opensearch.client.support.AbstractClient; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.text.Text; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java index e16fc5bc430..8d556de4f8a 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.action.search.SearchAction; import org.opensearch.action.support.ActionFilter; import org.opensearch.action.support.ActionFilterChain; import org.opensearch.action.support.WriteRequest.RefreshPolicy; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.bytes.BytesArray; @@ -42,12 +42,12 @@ import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.env.Environment; import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.http.HttpInfo; +import org.opensearch.http.HttpInfo; import org.elasticsearch.index.reindex.ReindexAction; import org.elasticsearch.index.reindex.ReindexRequestBuilder; import org.elasticsearch.index.reindex.RemoteInfo; -import org.elasticsearch.plugins.ActionPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.ActionPlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.repositories.RepositoriesService; import org.opensearch.rest.RestHeaderDefinition; import org.opensearch.rest.RestStatus; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java index a7e26cec33b..c0fda9f1318 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java @@ -26,7 +26,7 @@ import org.opensearch.action.bulk.BackoffPolicy; import org.opensearch.action.bulk.BulkRequestBuilder; import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.bulk.Retry; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.TransportAddress; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java index 243ea64a8d9..823da00f56b 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.FailedNodeException; import org.opensearch.action.TaskOperationFailure; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.BulkByScrollTask; import org.opensearch.tasks.TaskId; diff --git a/modules/repository-url/src/internalClusterTest/java/org/opensearch/repositories/url/URLSnapshotRestoreIT.java b/modules/repository-url/src/internalClusterTest/java/org/opensearch/repositories/url/URLSnapshotRestoreIT.java index b7579f27343..b54e30f97f4 100644 --- a/modules/repository-url/src/internalClusterTest/java/org/opensearch/repositories/url/URLSnapshotRestoreIT.java +++ b/modules/repository-url/src/internalClusterTest/java/org/opensearch/repositories/url/URLSnapshotRestoreIT.java @@ -23,7 +23,7 @@ import org.opensearch.action.admin.cluster.snapshots.create.CreateSnapshotRespon import org.opensearch.action.admin.cluster.snapshots.get.GetSnapshotsResponse; import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeUnit; import org.opensearch.plugin.repository.url.URLRepositoryPlugin; diff --git a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java index 76842eb10cd..e180aca7a45 100644 --- a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java +++ b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.util.SetOnce; import org.elasticsearch.Build; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; @@ -31,8 +31,8 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.env.Environment; import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.plugins.ClusterPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.ClusterPlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.repositories.RepositoriesService; import org.opensearch.script.ScriptService; import org.opensearch.threadpool.Scheduler; diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java index 87728c4bec2..5b264276966 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java @@ -22,7 +22,7 @@ package org.opensearch.rest.discovery; import org.apache.http.HttpHost; import org.opensearch.OpenSearchNetty4IntegTestCase; import org.opensearch.action.admin.cluster.health.ClusterHealthResponse; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.client.Node; import org.elasticsearch.client.Request; import org.elasticsearch.client.Response; diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java index 19b1930cc7b..d2689c3ee32 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java @@ -22,7 +22,7 @@ import org.opensearch.OpenSearchNetty4IntegTestCase; import org.opensearch.action.admin.cluster.health.ClusterHealthResponse; import org.opensearch.action.admin.cluster.node.info.NodeInfo; import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse; -import org.elasticsearch.client.transport.TransportClient; +import org.opensearch.client.transport.TransportClient; import org.opensearch.cluster.health.ClusterHealthStatus; import org.elasticsearch.common.network.NetworkAddress; import org.elasticsearch.common.network.NetworkModule; diff --git a/server/src/main/java/org/elasticsearch/OpenSearchException.java b/server/src/main/java/org/elasticsearch/OpenSearchException.java index 1b951af4b6d..b8ba8120e1f 100644 --- a/server/src/main/java/org/elasticsearch/OpenSearchException.java +++ b/server/src/main/java/org/elasticsearch/OpenSearchException.java @@ -744,10 +744,10 @@ public class OpenSearchException extends RuntimeException implements ToXContentF org.elasticsearch.OpenSearchSecurityException::new, 4, UNKNOWN_VERSION_ADDED), INDEX_SHARD_RESTORE_EXCEPTION(org.elasticsearch.index.snapshots.IndexShardRestoreException.class, org.elasticsearch.index.snapshots.IndexShardRestoreException::new, 5, UNKNOWN_VERSION_ADDED), - INDEX_CLOSED_EXCEPTION(org.elasticsearch.indices.IndexClosedException.class, - org.elasticsearch.indices.IndexClosedException::new, 6, UNKNOWN_VERSION_ADDED), - BIND_HTTP_EXCEPTION(org.elasticsearch.http.BindHttpException.class, - org.elasticsearch.http.BindHttpException::new, 7, UNKNOWN_VERSION_ADDED), + INDEX_CLOSED_EXCEPTION(org.opensearch.indices.IndexClosedException.class, + org.opensearch.indices.IndexClosedException::new, 6, UNKNOWN_VERSION_ADDED), + BIND_HTTP_EXCEPTION(org.opensearch.http.BindHttpException.class, + org.opensearch.http.BindHttpException::new, 7, UNKNOWN_VERSION_ADDED), REDUCE_SEARCH_PHASE_EXCEPTION(org.elasticsearch.action.search.ReduceSearchPhaseException.class, org.elasticsearch.action.search.ReduceSearchPhaseException::new, 8, UNKNOWN_VERSION_ADDED), NODE_CLOSED_EXCEPTION(org.opensearch.node.NodeClosedException.class, @@ -762,8 +762,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF org.elasticsearch.transport.NotSerializableTransportException::new, 13, UNKNOWN_VERSION_ADDED), RESPONSE_HANDLER_FAILURE_TRANSPORT_EXCEPTION(org.elasticsearch.transport.ResponseHandlerFailureTransportException.class, org.elasticsearch.transport.ResponseHandlerFailureTransportException::new, 14, UNKNOWN_VERSION_ADDED), - INDEX_CREATION_EXCEPTION(org.elasticsearch.indices.IndexCreationException.class, - org.elasticsearch.indices.IndexCreationException::new, 15, UNKNOWN_VERSION_ADDED), + INDEX_CREATION_EXCEPTION(org.opensearch.indices.IndexCreationException.class, + org.opensearch.indices.IndexCreationException::new, 15, UNKNOWN_VERSION_ADDED), INDEX_NOT_FOUND_EXCEPTION(org.elasticsearch.index.IndexNotFoundException.class, org.elasticsearch.index.IndexNotFoundException::new, 16, UNKNOWN_VERSION_ADDED), ILLEGAL_SHARD_ROUTING_STATE_EXCEPTION(org.elasticsearch.cluster.routing.IllegalShardRoutingStateException.class, @@ -791,12 +791,12 @@ public class OpenSearchException extends RuntimeException implements ToXContentF org.elasticsearch.index.engine.DocumentMissingException::new, 29, UNKNOWN_VERSION_ADDED), SNAPSHOT_EXCEPTION(org.opensearch.snapshots.SnapshotException.class, org.opensearch.snapshots.SnapshotException::new, 30, UNKNOWN_VERSION_ADDED), - INVALID_ALIAS_NAME_EXCEPTION(org.elasticsearch.indices.InvalidAliasNameException.class, - org.elasticsearch.indices.InvalidAliasNameException::new, 31, UNKNOWN_VERSION_ADDED), - INVALID_INDEX_NAME_EXCEPTION(org.elasticsearch.indices.InvalidIndexNameException.class, - org.elasticsearch.indices.InvalidIndexNameException::new, 32, UNKNOWN_VERSION_ADDED), - INDEX_PRIMARY_SHARD_NOT_ALLOCATED_EXCEPTION(org.elasticsearch.indices.IndexPrimaryShardNotAllocatedException.class, - org.elasticsearch.indices.IndexPrimaryShardNotAllocatedException::new, 33, UNKNOWN_VERSION_ADDED), + INVALID_ALIAS_NAME_EXCEPTION(org.opensearch.indices.InvalidAliasNameException.class, + org.opensearch.indices.InvalidAliasNameException::new, 31, UNKNOWN_VERSION_ADDED), + INVALID_INDEX_NAME_EXCEPTION(org.opensearch.indices.InvalidIndexNameException.class, + org.opensearch.indices.InvalidIndexNameException::new, 32, UNKNOWN_VERSION_ADDED), + INDEX_PRIMARY_SHARD_NOT_ALLOCATED_EXCEPTION(org.opensearch.indices.IndexPrimaryShardNotAllocatedException.class, + org.opensearch.indices.IndexPrimaryShardNotAllocatedException::new, 33, UNKNOWN_VERSION_ADDED), TRANSPORT_EXCEPTION(org.elasticsearch.transport.TransportException.class, org.elasticsearch.transport.TransportException::new, 34, UNKNOWN_VERSION_ADDED), ELASTICSEARCH_PARSE_EXCEPTION(org.elasticsearch.OpenSearchParseException.class, @@ -805,20 +805,20 @@ public class OpenSearchException extends RuntimeException implements ToXContentF org.elasticsearch.search.SearchException::new, 36, UNKNOWN_VERSION_ADDED), MAPPER_EXCEPTION(org.elasticsearch.index.mapper.MapperException.class, org.elasticsearch.index.mapper.MapperException::new, 37, UNKNOWN_VERSION_ADDED), - INVALID_TYPE_NAME_EXCEPTION(org.elasticsearch.indices.InvalidTypeNameException.class, - org.elasticsearch.indices.InvalidTypeNameException::new, 38, UNKNOWN_VERSION_ADDED), + INVALID_TYPE_NAME_EXCEPTION(org.opensearch.indices.InvalidTypeNameException.class, + org.opensearch.indices.InvalidTypeNameException::new, 38, UNKNOWN_VERSION_ADDED), SNAPSHOT_RESTORE_EXCEPTION(org.opensearch.snapshots.SnapshotRestoreException.class, org.opensearch.snapshots.SnapshotRestoreException::new, 39, UNKNOWN_VERSION_ADDED), PARSING_EXCEPTION(org.elasticsearch.common.ParsingException.class, org.elasticsearch.common.ParsingException::new, 40, UNKNOWN_VERSION_ADDED), INDEX_SHARD_CLOSED_EXCEPTION(org.elasticsearch.index.shard.IndexShardClosedException.class, org.elasticsearch.index.shard.IndexShardClosedException::new, 41, UNKNOWN_VERSION_ADDED), - RECOVER_FILES_RECOVERY_EXCEPTION(org.elasticsearch.indices.recovery.RecoverFilesRecoveryException.class, - org.elasticsearch.indices.recovery.RecoverFilesRecoveryException::new, 42, UNKNOWN_VERSION_ADDED), + RECOVER_FILES_RECOVERY_EXCEPTION(org.opensearch.indices.recovery.RecoverFilesRecoveryException.class, + org.opensearch.indices.recovery.RecoverFilesRecoveryException::new, 42, UNKNOWN_VERSION_ADDED), TRUNCATED_TRANSLOG_EXCEPTION(org.elasticsearch.index.translog.TruncatedTranslogException.class, org.elasticsearch.index.translog.TruncatedTranslogException::new, 43, UNKNOWN_VERSION_ADDED), - RECOVERY_FAILED_EXCEPTION(org.elasticsearch.indices.recovery.RecoveryFailedException.class, - org.elasticsearch.indices.recovery.RecoveryFailedException::new, 44, UNKNOWN_VERSION_ADDED), + RECOVERY_FAILED_EXCEPTION(org.opensearch.indices.recovery.RecoveryFailedException.class, + org.opensearch.indices.recovery.RecoveryFailedException::new, 44, UNKNOWN_VERSION_ADDED), INDEX_SHARD_RELOCATED_EXCEPTION(org.elasticsearch.index.shard.IndexShardRelocatedException.class, org.elasticsearch.index.shard.IndexShardRelocatedException::new, 45, UNKNOWN_VERSION_ADDED), NODE_SHOULD_NOT_CONNECT_EXCEPTION(org.elasticsearch.transport.NodeShouldNotConnectException.class, @@ -840,8 +840,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF UNKNOWN_VERSION_ADDED), SETTINGS_EXCEPTION(org.elasticsearch.common.settings.SettingsException.class, org.elasticsearch.common.settings.SettingsException::new, 56, UNKNOWN_VERSION_ADDED), - INDEX_TEMPLATE_MISSING_EXCEPTION(org.elasticsearch.indices.IndexTemplateMissingException.class, - org.elasticsearch.indices.IndexTemplateMissingException::new, 57, UNKNOWN_VERSION_ADDED), + INDEX_TEMPLATE_MISSING_EXCEPTION(org.opensearch.indices.IndexTemplateMissingException.class, + org.opensearch.indices.IndexTemplateMissingException::new, 57, UNKNOWN_VERSION_ADDED), SEND_REQUEST_TRANSPORT_EXCEPTION(org.elasticsearch.transport.SendRequestTransportException.class, org.elasticsearch.transport.SendRequestTransportException::new, 58, UNKNOWN_VERSION_ADDED), // 59 used to be EsRejectedExecutionException @@ -849,14 +849,14 @@ public class OpenSearchException extends RuntimeException implements ToXContentF // 61 used to be for RoutingValidationException NOT_SERIALIZABLE_EXCEPTION_WRAPPER(org.elasticsearch.common.io.stream.NotSerializableExceptionWrapper.class, org.elasticsearch.common.io.stream.NotSerializableExceptionWrapper::new, 62, UNKNOWN_VERSION_ADDED), - ALIAS_FILTER_PARSING_EXCEPTION(org.elasticsearch.indices.AliasFilterParsingException.class, - org.elasticsearch.indices.AliasFilterParsingException::new, 63, UNKNOWN_VERSION_ADDED), + ALIAS_FILTER_PARSING_EXCEPTION(org.opensearch.indices.AliasFilterParsingException.class, + org.opensearch.indices.AliasFilterParsingException::new, 63, UNKNOWN_VERSION_ADDED), // 64 was DeleteByQueryFailedEngineException, which was removed in 5.0 - GATEWAY_EXCEPTION(org.elasticsearch.gateway.GatewayException.class, org.elasticsearch.gateway.GatewayException::new, 65, + GATEWAY_EXCEPTION(org.opensearch.gateway.GatewayException.class, org.opensearch.gateway.GatewayException::new, 65, UNKNOWN_VERSION_ADDED), INDEX_SHARD_NOT_RECOVERING_EXCEPTION(org.elasticsearch.index.shard.IndexShardNotRecoveringException.class, org.elasticsearch.index.shard.IndexShardNotRecoveringException::new, 66, UNKNOWN_VERSION_ADDED), - HTTP_EXCEPTION(org.elasticsearch.http.HttpException.class, org.elasticsearch.http.HttpException::new, 67, UNKNOWN_VERSION_ADDED), + HTTP_EXCEPTION(org.opensearch.http.HttpException.class, org.opensearch.http.HttpException::new, 67, UNKNOWN_VERSION_ADDED), ELASTICSEARCH_EXCEPTION(OpenSearchException.class, OpenSearchException::new, 68, UNKNOWN_VERSION_ADDED), SNAPSHOT_MISSING_EXCEPTION(org.opensearch.snapshots.SnapshotMissingException.class, @@ -894,17 +894,17 @@ public class OpenSearchException extends RuntimeException implements ToXContentF AGGREGATION_EXECUTION_EXCEPTION(org.elasticsearch.search.aggregations.AggregationExecutionException.class, org.elasticsearch.search.aggregations.AggregationExecutionException::new, 86, UNKNOWN_VERSION_ADDED), // 87 used to be for MergeMappingException - INVALID_INDEX_TEMPLATE_EXCEPTION(org.elasticsearch.indices.InvalidIndexTemplateException.class, - org.elasticsearch.indices.InvalidIndexTemplateException::new, 88, UNKNOWN_VERSION_ADDED), + INVALID_INDEX_TEMPLATE_EXCEPTION(org.opensearch.indices.InvalidIndexTemplateException.class, + org.opensearch.indices.InvalidIndexTemplateException::new, 88, UNKNOWN_VERSION_ADDED), REFRESH_FAILED_ENGINE_EXCEPTION(org.elasticsearch.index.engine.RefreshFailedEngineException.class, org.elasticsearch.index.engine.RefreshFailedEngineException::new, 90, UNKNOWN_VERSION_ADDED), AGGREGATION_INITIALIZATION_EXCEPTION(org.elasticsearch.search.aggregations.AggregationInitializationException.class, org.elasticsearch.search.aggregations.AggregationInitializationException::new, 91, UNKNOWN_VERSION_ADDED), - DELAY_RECOVERY_EXCEPTION(org.elasticsearch.indices.recovery.DelayRecoveryException.class, - org.elasticsearch.indices.recovery.DelayRecoveryException::new, 92, UNKNOWN_VERSION_ADDED), + DELAY_RECOVERY_EXCEPTION(org.opensearch.indices.recovery.DelayRecoveryException.class, + org.opensearch.indices.recovery.DelayRecoveryException::new, 92, UNKNOWN_VERSION_ADDED), // 93 used to be for IndexWarmerMissingException - NO_NODE_AVAILABLE_EXCEPTION(org.elasticsearch.client.transport.NoNodeAvailableException.class, - org.elasticsearch.client.transport.NoNodeAvailableException::new, 94, UNKNOWN_VERSION_ADDED), + NO_NODE_AVAILABLE_EXCEPTION(org.opensearch.client.transport.NoNodeAvailableException.class, + org.opensearch.client.transport.NoNodeAvailableException::new, 94, UNKNOWN_VERSION_ADDED), INVALID_SNAPSHOT_NAME_EXCEPTION(org.opensearch.snapshots.InvalidSnapshotNameException.class, org.opensearch.snapshots.InvalidSnapshotNameException::new, 96, UNKNOWN_VERSION_ADDED), ILLEGAL_INDEX_SHARD_STATE_EXCEPTION(org.elasticsearch.index.shard.IllegalIndexShardStateException.class, @@ -981,8 +981,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF RETRY_ON_REPLICA_EXCEPTION(org.elasticsearch.action.support.replication.TransportReplicationAction.RetryOnReplicaException.class, org.elasticsearch.action.support.replication.TransportReplicationAction.RetryOnReplicaException::new, 136, UNKNOWN_VERSION_ADDED), - TYPE_MISSING_EXCEPTION(org.elasticsearch.indices.TypeMissingException.class, - org.elasticsearch.indices.TypeMissingException::new, 137, UNKNOWN_VERSION_ADDED), + TYPE_MISSING_EXCEPTION(org.opensearch.indices.TypeMissingException.class, + org.opensearch.indices.TypeMissingException::new, 137, UNKNOWN_VERSION_ADDED), FAILED_TO_COMMIT_CLUSTER_STATE_EXCEPTION(org.opensearch.cluster.coordination.FailedToCommitClusterStateException.class, org.opensearch.cluster.coordination.FailedToCommitClusterStateException::new, 140, UNKNOWN_VERSION_ADDED), QUERY_SHARD_EXCEPTION(org.elasticsearch.index.query.QueryShardException.class, @@ -1034,8 +1034,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF 157, Version.V_7_5_0), PEER_RECOVERY_NOT_FOUND_EXCEPTION( - org.elasticsearch.indices.recovery.PeerRecoveryNotFound.class, - org.elasticsearch.indices.recovery.PeerRecoveryNotFound::new, + org.opensearch.indices.recovery.PeerRecoveryNotFound.class, + org.opensearch.indices.recovery.PeerRecoveryNotFound::new, 158, Version.V_7_9_0), NODE_HEALTH_CHECK_FAILURE_EXCEPTION( diff --git a/server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java b/server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java index d3a996d32a4..30ae7009dbe 100644 --- a/server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java +++ b/server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java @@ -42,14 +42,14 @@ import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; /** * A request to delete a document from an index based on its type and id. Best created using - * {@link org.elasticsearch.client.Requests#deleteRequest(String)}. + * {@link org.opensearch.client.Requests#deleteRequest(String)}. *

* The operation requires the {@link #index()}, {@link #type(String)} and {@link #id(String)} to * be set. * * @see DeleteResponse - * @see org.elasticsearch.client.Client#delete(DeleteRequest) - * @see org.elasticsearch.client.Requests#deleteRequest(String) + * @see org.opensearch.client.Client#delete(DeleteRequest) + * @see org.opensearch.client.Requests#deleteRequest(String) */ public class DeleteRequest extends ReplicatedWriteRequest implements DocWriteRequest, CompositeIndicesRequest { diff --git a/server/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java index b77f61a9040..b40191e81c1 100644 --- a/server/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java @@ -21,7 +21,7 @@ package org.elasticsearch.action.delete; import org.opensearch.action.support.WriteRequestBuilder; import org.elasticsearch.action.support.replication.ReplicationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.Nullable; import org.elasticsearch.index.VersionType; diff --git a/server/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java b/server/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java index dc7d3c1bce0..948fe3e4ead 100644 --- a/server/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java +++ b/server/src/main/java/org/elasticsearch/action/delete/DeleteResponse.java @@ -33,7 +33,7 @@ import static org.elasticsearch.common.xcontent.XContentParserUtils.ensureExpect * The response of the delete action. * * @see org.elasticsearch.action.delete.DeleteRequest - * @see org.elasticsearch.client.Client#delete(DeleteRequest) + * @see org.opensearch.client.Client#delete(DeleteRequest) */ public class DeleteResponse extends DocWriteResponse { diff --git a/server/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java index 272b01b24a5..538c62f6d32 100644 --- a/server/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/explain/ExplainRequestBuilder.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.explain; import org.elasticsearch.action.support.single.shard.SingleShardOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.index.query.QueryBuilder; diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestBuilder.java index 6aac9019e2f..567e9f9a973 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestBuilder.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.fieldcaps; import org.opensearch.action.ActionRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.index.query.QueryBuilder; public class FieldCapabilitiesRequestBuilder extends ActionRequestBuilder { diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java index ed98a9dfce2..925c9779116 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.OriginalIndices; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.service.ClusterService; diff --git a/server/src/main/java/org/elasticsearch/action/get/GetRequest.java b/server/src/main/java/org/elasticsearch/action/get/GetRequest.java index 4323abb4e25..0ecde078ac9 100644 --- a/server/src/main/java/org/elasticsearch/action/get/GetRequest.java +++ b/server/src/main/java/org/elasticsearch/action/get/GetRequest.java @@ -39,14 +39,14 @@ import static org.opensearch.action.ValidateActions.addValidationError; /** * A request to get a document (its source) from an index based on its id. Best created using - * {@link org.elasticsearch.client.Requests#getRequest(String)}. + * {@link org.opensearch.client.Requests#getRequest(String)}. *

* The operation requires the {@link #index()}, {@link #type(String)} and {@link #id(String)} * to be set. * * @see org.elasticsearch.action.get.GetResponse - * @see org.elasticsearch.client.Requests#getRequest(String) - * @see org.elasticsearch.client.Client#get(GetRequest) + * @see org.opensearch.client.Requests#getRequest(String) + * @see org.opensearch.client.Client#get(GetRequest) */ public class GetRequest extends SingleShardRequest implements RealtimeRequest { diff --git a/server/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java index abc5050cdac..359c22a5f5d 100644 --- a/server/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.get; import org.elasticsearch.action.support.single.shard.SingleShardOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.index.VersionType; diff --git a/server/src/main/java/org/elasticsearch/action/get/GetResponse.java b/server/src/main/java/org/elasticsearch/action/get/GetResponse.java index 7148480b47b..747616495ea 100644 --- a/server/src/main/java/org/elasticsearch/action/get/GetResponse.java +++ b/server/src/main/java/org/elasticsearch/action/get/GetResponse.java @@ -42,7 +42,7 @@ import java.util.Objects; * The response of a get action. * * @see GetRequest - * @see org.elasticsearch.client.Client#get(GetRequest) + * @see org.opensearch.client.Client#get(GetRequest) */ public class GetResponse extends ActionResponse implements Iterable, ToXContentObject { diff --git a/server/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java index b9f9dfb54c8..d20658dd038 100644 --- a/server/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.get; import org.opensearch.action.ActionRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.Nullable; /** diff --git a/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java b/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java index 539426b647c..e8d38b1170f 100644 --- a/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java +++ b/server/src/main/java/org/elasticsearch/action/index/IndexRequest.java @@ -29,7 +29,7 @@ import org.opensearch.action.RoutingMissingException; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.replication.ReplicatedWriteRequest; import org.elasticsearch.action.support.replication.ReplicationRequest; -import org.elasticsearch.client.Requests; +import org.opensearch.client.Requests; import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.cluster.metadata.Metadata; import org.elasticsearch.common.Nullable; @@ -61,7 +61,7 @@ import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; /** * Index request to index a typed JSON document into a specific index and make it searchable. Best - * created using {@link org.elasticsearch.client.Requests#indexRequest(String)}. + * created using {@link org.opensearch.client.Requests#indexRequest(String)}. * * The index requires the {@link #index()}, {@link #type(String)}, {@link #id(String)} and * {@link #source(byte[], XContentType)} to be set. @@ -73,8 +73,8 @@ import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; * If the {@link #id(String)} is not set, it will be automatically generated. * * @see IndexResponse - * @see org.elasticsearch.client.Requests#indexRequest(String) - * @see org.elasticsearch.client.Client#index(IndexRequest) + * @see org.opensearch.client.Requests#indexRequest(String) + * @see org.opensearch.client.Client#index(IndexRequest) */ public class IndexRequest extends ReplicatedWriteRequest implements DocWriteRequest, CompositeIndicesRequest { diff --git a/server/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java index f464d924409..3d987eaf040 100644 --- a/server/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java @@ -22,7 +22,7 @@ package org.elasticsearch.action.index; import org.opensearch.action.DocWriteRequest; import org.opensearch.action.support.WriteRequestBuilder; import org.elasticsearch.action.support.replication.ReplicationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/elasticsearch/action/index/IndexResponse.java b/server/src/main/java/org/elasticsearch/action/index/IndexResponse.java index cf2bbc344c1..45bbb292640 100644 --- a/server/src/main/java/org/elasticsearch/action/index/IndexResponse.java +++ b/server/src/main/java/org/elasticsearch/action/index/IndexResponse.java @@ -34,7 +34,7 @@ import static org.elasticsearch.common.xcontent.XContentParserUtils.ensureExpect * A response of an index operation, * * @see org.elasticsearch.action.index.IndexRequest - * @see org.elasticsearch.client.Client#index(IndexRequest) + * @see org.opensearch.client.Client#index(IndexRequest) */ public class IndexResponse extends DocWriteResponse { diff --git a/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java index 58bcbb29df9..293bf4f0a5d 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java @@ -21,7 +21,7 @@ package org.elasticsearch.action.ingest; import org.opensearch.action.ActionRequestBuilder; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class DeletePipelineRequestBuilder extends ActionRequestBuilder { diff --git a/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java index e1b5691326b..15c0cbb21cd 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.ingest; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class GetPipelineRequestBuilder extends MasterNodeReadOperationRequestBuilder { diff --git a/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java index 5e0d1de1f3f..9e03a39d594 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java @@ -21,7 +21,7 @@ package org.elasticsearch.action.ingest; import org.opensearch.action.ActionRequestBuilder; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentType; diff --git a/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java index 3b2fffd3fcb..b5a99d30cbf 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java @@ -25,8 +25,8 @@ import org.opensearch.action.admin.cluster.node.info.NodesInfoRequest; import org.opensearch.action.support.ActionFilters; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.action.support.master.TransportMasterNodeAction; -import org.elasticsearch.client.OriginSettingClient; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.OriginSettingClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.block.ClusterBlockException; import org.opensearch.cluster.block.ClusterBlockLevel; diff --git a/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java index 90614dd7e19..c3454a126c3 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.ingest; import org.opensearch.action.ActionRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentType; diff --git a/server/src/main/java/org/elasticsearch/action/main/MainRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/main/MainRequestBuilder.java index 7e4076cd263..73fdf945865 100644 --- a/server/src/main/java/org/elasticsearch/action/main/MainRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/main/MainRequestBuilder.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.main; import org.opensearch.action.ActionRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class MainRequestBuilder extends ActionRequestBuilder { diff --git a/server/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java index db1df64c7c1..9992cf9a11f 100644 --- a/server/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/search/ClearScrollRequestBuilder.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.search; import org.opensearch.action.ActionRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import java.util.List; diff --git a/server/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java index 62ff75953a8..89db78cf2ae 100644 --- a/server/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/search/MultiSearchRequestBuilder.java @@ -21,7 +21,7 @@ package org.elasticsearch.action.search; import org.opensearch.action.ActionRequestBuilder; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; /** * A request builder for multiple search requests. diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java index 81749d77ff3..0cabc2de1a7 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java @@ -46,14 +46,14 @@ import static org.opensearch.action.ValidateActions.addValidationError; /** * A request to execute search against one or more indices (or all). Best created using - * {@link org.elasticsearch.client.Requests#searchRequest(String...)}. + * {@link org.opensearch.client.Requests#searchRequest(String...)}. *

* Note, the search {@link #source(org.elasticsearch.search.builder.SearchSourceBuilder)} * is required. The search source is the different search options, including aggregations and such. *

* - * @see org.elasticsearch.client.Requests#searchRequest(String...) - * @see org.elasticsearch.client.Client#search(SearchRequest) + * @see org.opensearch.client.Requests#searchRequest(String...) + * @see org.opensearch.client.Client#search(SearchRequest) * @see SearchResponse */ public class SearchRequest extends ActionRequest implements IndicesRequest.Replaceable { diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java index a4973c77330..7d52f2b0e92 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java @@ -21,7 +21,7 @@ package org.elasticsearch.action.search; import org.opensearch.action.ActionRequestBuilder; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.query.QueryBuilder; diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java index 6aee3fd1631..70d17a46782 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.search; import org.opensearch.action.ActionRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.search.Scroll; diff --git a/server/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java index 6747fbdbfce..66ed0bb0906 100644 --- a/server/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java +++ b/server/src/main/java/org/elasticsearch/action/search/TransportMultiSearchAction.java @@ -22,7 +22,7 @@ package org.elasticsearch.action.search; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.block.ClusterBlockLevel; import org.elasticsearch.cluster.service.ClusterService; diff --git a/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java index c1a4e72918b..0db2c008cfc 100644 --- a/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java +++ b/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java @@ -28,9 +28,9 @@ import org.opensearch.action.admin.cluster.shards.ClusterSearchShardsResponse; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.OriginSettingClient; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.Client; +import org.opensearch.client.OriginSettingClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.block.ClusterBlockException; import org.opensearch.cluster.block.ClusterBlockLevel; diff --git a/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java index ae323f33032..23e3cc3e837 100644 --- a/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java @@ -22,7 +22,7 @@ package org.elasticsearch.action.support.broadcast; import org.opensearch.action.ActionType; import org.opensearch.action.ActionRequestBuilder; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public abstract class BroadcastOperationRequestBuilder< Request extends BroadcastRequest, diff --git a/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java index 2236c5e39c6..2f4cce43b31 100644 --- a/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequestBuilder.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.support.master; import org.opensearch.action.ActionType; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.unit.TimeValue; /** diff --git a/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java index 78126acf082..a37860448d7 100644 --- a/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java @@ -22,7 +22,7 @@ package org.elasticsearch.action.support.master; import org.opensearch.action.ActionType; import org.opensearch.action.ActionRequestBuilder; import org.opensearch.action.ActionResponse; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.unit.TimeValue; /** diff --git a/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java index 0a0141d3ba3..ba549c09ae3 100644 --- a/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java @@ -21,7 +21,7 @@ package org.elasticsearch.action.support.master; import org.opensearch.action.ActionType; import org.opensearch.action.ActionResponse; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; /** * Base request builder for master node read operations that can be executed on the local node as well diff --git a/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java index b4c0c4e93cf..994cb2a3516 100644 --- a/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java @@ -22,7 +22,7 @@ import org.opensearch.action.ActionType; import org.opensearch.action.ActionResponse; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.util.ArrayUtils; public abstract class ClusterInfoRequestBuilder, Response extends ActionResponse, diff --git a/server/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java index 26376f34a46..4da487e08fb 100644 --- a/server/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java @@ -21,7 +21,7 @@ package org.elasticsearch.action.support.nodes; import org.opensearch.action.ActionType; import org.opensearch.action.ActionRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.unit.TimeValue; public abstract class NodesOperationRequestBuilder, Response extends BaseNodesResponse, diff --git a/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java index 12081b66f79..5c42cc4687a 100644 --- a/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequestBuilder.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionType; import org.opensearch.action.ActionRequestBuilder; import org.opensearch.action.ActionResponse; import org.opensearch.action.support.ActiveShardCount; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.unit.TimeValue; public abstract class ReplicationRequestBuilder, Response extends ActionResponse, diff --git a/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java b/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java index 39da93a3a71..c6fa7e56b90 100644 --- a/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java @@ -34,7 +34,7 @@ import org.opensearch.action.support.ActiveShardCount; import org.opensearch.action.support.ChannelActionListener; import org.opensearch.action.support.TransportAction; import org.opensearch.action.support.TransportActions; -import org.elasticsearch.client.transport.NoNodeAvailableException; +import org.opensearch.client.transport.NoNodeAvailableException; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.ClusterStateObserver; import org.opensearch.cluster.action.shard.ShardStateAction; diff --git a/server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java index 5def82a6e7f..939ad2d6d9b 100644 --- a/server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java @@ -22,7 +22,7 @@ package org.elasticsearch.action.support.single.instance; import org.opensearch.action.ActionType; import org.opensearch.action.ActionRequestBuilder; import org.opensearch.action.ActionResponse; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.unit.TimeValue; public abstract class InstanceShardOperationRequestBuilder, diff --git a/server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java index 4d2c0eda869..edc494b4b96 100644 --- a/server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java @@ -22,7 +22,7 @@ package org.elasticsearch.action.support.single.shard; import org.opensearch.action.ActionType; import org.opensearch.action.ActionRequestBuilder; import org.opensearch.action.ActionResponse; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public abstract class SingleShardOperationRequestBuilder, Response extends ActionResponse, RequestBuilder extends SingleShardOperationRequestBuilder> diff --git a/server/src/main/java/org/elasticsearch/action/support/tasks/TasksRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/support/tasks/TasksRequestBuilder.java index 773122a4e19..48090db8181 100644 --- a/server/src/main/java/org/elasticsearch/action/support/tasks/TasksRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/support/tasks/TasksRequestBuilder.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.support.tasks; import org.opensearch.action.ActionType; import org.opensearch.action.ActionRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.unit.TimeValue; import org.opensearch.tasks.TaskId; diff --git a/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java index 6e6bec4f01f..80ea8dba8ef 100644 --- a/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequestBuilder.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.termvectors; import org.opensearch.action.ActionRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.Nullable; public class MultiTermVectorsRequestBuilder extends ActionRequestBuilder { diff --git a/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java index 86edd34a321..e02ec5a24b5 100644 --- a/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequestBuilder.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.termvectors; import org.opensearch.action.ActionRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.VersionType; diff --git a/server/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java b/server/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java index eff1e9323a9..eb3043f3fa9 100644 --- a/server/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java +++ b/server/src/main/java/org/elasticsearch/action/update/TransportUpdateAction.java @@ -34,7 +34,7 @@ import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.AutoCreateIndex; import org.elasticsearch.action.support.TransportActions; import org.elasticsearch.action.support.single.instance.TransportInstanceSingleOperationAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.metadata.Metadata; diff --git a/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java b/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java index f28df2f656e..4b80e463084 100644 --- a/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java +++ b/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java @@ -25,7 +25,7 @@ import org.elasticsearch.OpenSearchException; import org.opensearch.action.DocWriteResponse; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; -import org.elasticsearch.client.Requests; +import org.opensearch.client.Requests; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.Tuple; diff --git a/server/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java index bbcee45c475..558abe52d56 100644 --- a/server/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.support.ActiveShardCount; import org.elasticsearch.action.support.WriteRequestBuilder; import org.elasticsearch.action.support.replication.ReplicationRequest; import org.elasticsearch.action.support.single.instance.InstanceShardOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; diff --git a/server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java b/server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java index dba09f4a3df..3aa15af0c35 100644 --- a/server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java +++ b/server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java @@ -29,7 +29,7 @@ import org.apache.lucene.util.Constants; import org.apache.lucene.util.StringHelper; import org.elasticsearch.OpenSearchException; import org.elasticsearch.Version; -import org.elasticsearch.cli.KeyStoreAwareCommand; +import org.opensearch.cli.KeyStoreAwareCommand; import org.opensearch.cli.Terminal; import org.opensearch.cli.UserException; import org.elasticsearch.common.PidFile; diff --git a/server/src/main/java/org/elasticsearch/bootstrap/OpenSearch.java b/server/src/main/java/org/elasticsearch/bootstrap/OpenSearch.java index 687e26a4601..bb51dcb71ca 100644 --- a/server/src/main/java/org/elasticsearch/bootstrap/OpenSearch.java +++ b/server/src/main/java/org/elasticsearch/bootstrap/OpenSearch.java @@ -24,7 +24,7 @@ import joptsimple.OptionSpec; import joptsimple.OptionSpecBuilder; import joptsimple.util.PathConverter; import org.elasticsearch.Build; -import org.elasticsearch.cli.EnvironmentAwareCommand; +import org.opensearch.cli.EnvironmentAwareCommand; import org.opensearch.cli.ExitCodes; import org.opensearch.cli.Terminal; import org.opensearch.cli.UserException; diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitor.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitor.java index bb56e7577b0..6d61294fc84 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitor.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitor.java @@ -27,7 +27,7 @@ import org.apache.logging.log4j.message.ParameterizedMessage; import org.elasticsearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.support.GroupedActionListener; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.ClusterInfo; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.DiskUsage; diff --git a/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java index ad984b4c2ad..87641480e52 100644 --- a/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java +++ b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.elasticsearch.Assertions; -import org.elasticsearch.action.support.PlainActionFuture; +import org.opensearch.action.support.PlainActionFuture; import org.opensearch.cluster.AckedClusterStateTaskListener; import org.opensearch.cluster.ClusterChangedEvent; import org.opensearch.cluster.ClusterState; @@ -54,7 +54,7 @@ import org.elasticsearch.common.util.concurrent.FutureUtils; import org.elasticsearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.discovery.Discovery; -import org.elasticsearch.node.Node; +import org.opensearch.node.Node; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/elasticsearch/common/settings/BaseKeyStoreCommand.java b/server/src/main/java/org/elasticsearch/common/settings/BaseKeyStoreCommand.java index c9b3b5e1fb6..3ee5a850576 100644 --- a/server/src/main/java/org/elasticsearch/common/settings/BaseKeyStoreCommand.java +++ b/server/src/main/java/org/elasticsearch/common/settings/BaseKeyStoreCommand.java @@ -22,7 +22,7 @@ package org.elasticsearch.common.settings; import joptsimple.OptionSet; import joptsimple.OptionSpec; import org.opensearch.cli.ExitCodes; -import org.elasticsearch.cli.KeyStoreAwareCommand; +import org.opensearch.cli.KeyStoreAwareCommand; import org.opensearch.cli.Terminal; import org.opensearch.cli.UserException; import org.elasticsearch.env.Environment; diff --git a/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java b/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java index 03c25f71a07..ea8e427082a 100644 --- a/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java +++ b/server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java @@ -27,8 +27,8 @@ import org.elasticsearch.action.support.AutoCreateIndex; import org.elasticsearch.action.support.DestructiveOperations; import org.elasticsearch.action.support.replication.TransportReplicationAction; import org.elasticsearch.bootstrap.BootstrapSettings; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.transport.TransportClient; +import org.opensearch.client.Client; +import org.opensearch.client.transport.TransportClient; import org.opensearch.cluster.ClusterModule; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.InternalClusterInfoService; diff --git a/server/src/main/java/org/elasticsearch/common/settings/HasPasswordKeyStoreCommand.java b/server/src/main/java/org/elasticsearch/common/settings/HasPasswordKeyStoreCommand.java index 0edaacd4e09..5b352de9dac 100644 --- a/server/src/main/java/org/elasticsearch/common/settings/HasPasswordKeyStoreCommand.java +++ b/server/src/main/java/org/elasticsearch/common/settings/HasPasswordKeyStoreCommand.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.settings; import joptsimple.OptionSet; -import org.elasticsearch.cli.KeyStoreAwareCommand; +import org.opensearch.cli.KeyStoreAwareCommand; import org.opensearch.cli.Terminal; import org.opensearch.cli.UserException; import org.elasticsearch.env.Environment; diff --git a/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java b/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java index 965b015284e..06dbf595ba1 100644 --- a/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java +++ b/server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java @@ -21,7 +21,7 @@ package org.elasticsearch.common.util.concurrent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.action.support.ContextPreservingActionListener; -import org.elasticsearch.client.OriginSettingClient; +import org.opensearch.client.OriginSettingClient; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/elasticsearch/transport/RemoteClusterAwareClient.java b/server/src/main/java/org/elasticsearch/transport/RemoteClusterAwareClient.java index 812980aecbf..258d65c314b 100644 --- a/server/src/main/java/org/elasticsearch/transport/RemoteClusterAwareClient.java +++ b/server/src/main/java/org/elasticsearch/transport/RemoteClusterAwareClient.java @@ -23,8 +23,8 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.ActionListenerResponseHandler; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.support.AbstractClient; +import org.opensearch.client.Client; +import org.opensearch.client.support.AbstractClient; import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.settings.Settings; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java b/server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java index 13fc87df775..c15ed40afd8 100644 --- a/server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java +++ b/server/src/main/java/org/elasticsearch/transport/RemoteClusterService.java @@ -27,7 +27,7 @@ import org.opensearch.action.OriginalIndices; import org.opensearch.action.support.GroupedActionListener; import org.opensearch.action.support.IndicesOptions; import org.opensearch.action.support.PlainActionFuture; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; import org.elasticsearch.common.Strings; diff --git a/server/src/main/java/org/elasticsearch/transport/TransportService.java b/server/src/main/java/org/elasticsearch/transport/TransportService.java index febf34a08fa..a39f6ab8290 100644 --- a/server/src/main/java/org/elasticsearch/transport/TransportService.java +++ b/server/src/main/java/org/elasticsearch/transport/TransportService.java @@ -26,8 +26,8 @@ import org.elasticsearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionListenerResponseHandler; import org.opensearch.action.support.PlainActionFuture; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.transport.TransportClient; +import org.opensearch.client.Client; +import org.opensearch.client.transport.TransportClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.Nullable; diff --git a/server/src/main/java/org/opensearch/action/ActionModule.java b/server/src/main/java/org/opensearch/action/ActionModule.java index b053f717416..29a0fef8ab0 100644 --- a/server/src/main/java/org/opensearch/action/ActionModule.java +++ b/server/src/main/java/org/opensearch/action/ActionModule.java @@ -232,10 +232,10 @@ import org.elasticsearch.action.search.TransportClearScrollAction; import org.elasticsearch.action.search.TransportMultiSearchAction; import org.elasticsearch.action.search.TransportSearchAction; import org.elasticsearch.action.search.TransportSearchScrollAction; -import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.AutoCreateIndex; -import org.elasticsearch.action.support.DestructiveOperations; -import org.elasticsearch.action.support.TransportAction; +import org.opensearch.action.support.ActionFilters; +import org.opensearch.action.support.AutoCreateIndex; +import org.opensearch.action.support.DestructiveOperations; +import org.opensearch.action.support.TransportAction; import org.elasticsearch.action.termvectors.MultiTermVectorsAction; import org.elasticsearch.action.termvectors.TermVectorsAction; import org.elasticsearch.action.termvectors.TransportMultiTermVectorsAction; @@ -243,7 +243,7 @@ import org.elasticsearch.action.termvectors.TransportShardMultiTermsVectorAction import org.elasticsearch.action.termvectors.TransportTermVectorsAction; import org.elasticsearch.action.update.TransportUpdateAction; import org.elasticsearch.action.update.UpdateAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNodes; import org.elasticsearch.common.NamedRegistry; @@ -255,14 +255,14 @@ import org.elasticsearch.common.settings.IndexScopedSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsFilter; import org.elasticsearch.index.seqno.RetentionLeaseActions; -import org.elasticsearch.indices.SystemIndices; -import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.persistent.CompletionPersistentTaskAction; -import org.elasticsearch.persistent.RemovePersistentTaskAction; -import org.elasticsearch.persistent.StartPersistentTaskAction; -import org.elasticsearch.persistent.UpdatePersistentTaskStatusAction; -import org.elasticsearch.plugins.ActionPlugin; -import org.elasticsearch.plugins.ActionPlugin.ActionHandler; +import org.opensearch.indices.SystemIndices; +import org.opensearch.indices.breaker.CircuitBreakerService; +import org.opensearch.persistent.CompletionPersistentTaskAction; +import org.opensearch.persistent.RemovePersistentTaskAction; +import org.opensearch.persistent.StartPersistentTaskAction; +import org.opensearch.persistent.UpdatePersistentTaskStatusAction; +import org.opensearch.plugins.ActionPlugin; +import org.opensearch.plugins.ActionPlugin.ActionHandler; import org.opensearch.rest.RestController; import org.opensearch.rest.RestHandler; import org.opensearch.rest.RestHeaderDefinition; diff --git a/server/src/main/java/org/opensearch/action/ActionRequestBuilder.java b/server/src/main/java/org/opensearch/action/ActionRequestBuilder.java index 236a8724f6f..f557beb1242 100644 --- a/server/src/main/java/org/opensearch/action/ActionRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/ActionRequestBuilder.java @@ -19,7 +19,7 @@ package org.opensearch.action; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.unit.TimeValue; import java.util.Objects; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestBuilder.java index 929e8faf13b..5b3a869deb6 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplainRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.cluster.allocation; import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; /** * Builder for requests to explain the allocation of a shard in the cluster diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java index 570204adbed..da59ca59e05 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java @@ -19,10 +19,10 @@ package org.opensearch.action.admin.cluster.health; -import org.elasticsearch.action.support.ActiveShardCount; +import org.opensearch.action.support.ActiveShardCount; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.opensearch.cluster.health.ClusterHealthStatus; import org.elasticsearch.common.Priority; import org.elasticsearch.common.unit.TimeValue; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java index d90f2e9c97d..afdcd01050a 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.cluster.node.hotthreads; import org.elasticsearch.action.support.nodes.NodesOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.unit.TimeValue; public class NodesHotThreadsRequestBuilder diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java index f10f09988a5..37b9e11f185 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.cluster.node.info; import org.elasticsearch.action.support.nodes.NodesOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class NodesInfoRequestBuilder extends NodesOperationRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequestBuilder.java index 36670988ac7..2b7009e9efb 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.cluster.node.reload; import org.elasticsearch.action.support.nodes.NodesOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.settings.SecureString; /** diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java index 17d8474fc50..abb14a77957 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java @@ -21,7 +21,7 @@ package org.opensearch.action.admin.cluster.node.stats; import org.opensearch.action.admin.indices.stats.CommonStatsFlags; import org.elasticsearch.action.support.nodes.NodesOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class NodesStatsRequestBuilder extends NodesOperationRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequestBuilder.java index 2721acecc6f..95018ceac9a 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/cancel/CancelTasksRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.cluster.node.tasks.cancel; import org.elasticsearch.action.support.tasks.TasksRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; /** * Builder for the request to cancel tasks running on the specified nodes diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java index 12cb39338f7..eac71d05866 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.cluster.node.tasks.get; import org.opensearch.action.ActionRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.unit.TimeValue; import org.opensearch.tasks.TaskId; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java index 1e47e1b8ed0..1a8f1c91a1f 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java @@ -26,10 +26,10 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.ActionListenerResponseHandler; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; -import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.HandledTransportAction; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.OriginSettingClient; +import org.opensearch.action.support.ActionFilters; +import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.client.Client; +import org.opensearch.client.OriginSettingClient; import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.inject.Inject; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/list/ListTasksRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/list/ListTasksRequestBuilder.java index af03f28e93c..1162f046358 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/list/ListTasksRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/list/ListTasksRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.cluster.node.tasks.list; import org.elasticsearch.action.support.tasks.TasksRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; /** * Builder for the request to retrieve the list of tasks running on the specified nodes diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/usage/NodesUsageRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/usage/NodesUsageRequestBuilder.java index d31ea828327..658a34ee890 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/usage/NodesUsageRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/usage/NodesUsageRequestBuilder.java @@ -21,7 +21,7 @@ package org.opensearch.action.admin.cluster.node.usage; import org.opensearch.action.ActionType; import org.elasticsearch.action.support.nodes.NodesOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class NodesUsageRequestBuilder extends NodesOperationRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/remote/RemoteInfoRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/remote/RemoteInfoRequestBuilder.java index 5b5e02210bd..c833b22593e 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/remote/RemoteInfoRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/remote/RemoteInfoRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.cluster.remote; import org.opensearch.action.ActionRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public final class RemoteInfoRequestBuilder extends ActionRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryRequestBuilder.java index 90cf6954aa6..d7f7543fc3e 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/repositories/cleanup/CleanupRepositoryRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.cluster.repositories.cleanup; import org.opensearch.action.ActionType; import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class CleanupRepositoryRequestBuilder extends MasterNodeOperationRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/clone/CloneSnapshotRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/clone/CloneSnapshotRequestBuilder.java index 45aa81169e0..1424edc3692 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/clone/CloneSnapshotRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/clone/CloneSnapshotRequestBuilder.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionType; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.Strings; public class CloneSnapshotRequestBuilder extends MasterNodeOperationRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequestBuilder.java index 137251c6c06..d60de986d2c 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/DeleteStoredScriptRequestBuilder.java @@ -21,7 +21,7 @@ package org.opensearch.action.admin.cluster.storedscripts; import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class DeleteStoredScriptRequestBuilder extends AcknowledgedRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetStoredScriptRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetStoredScriptRequestBuilder.java index 4d769c495f5..5f120f6109a 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetStoredScriptRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/GetStoredScriptRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.cluster.storedscripts; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class GetStoredScriptRequestBuilder extends MasterNodeReadOperationRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/PutStoredScriptRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/PutStoredScriptRequestBuilder.java index a5c207e39cd..835e99fd6c8 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/PutStoredScriptRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/PutStoredScriptRequestBuilder.java @@ -21,7 +21,7 @@ package org.opensearch.action.admin.cluster.storedscripts; import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentType; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java index 52421d12030..b4eaefa7765 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/tasks/PendingClusterTasksRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.cluster.tasks; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class PendingClusterTasksRequestBuilder extends MasterNodeReadOperationRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java index a633a24c182..453b61af6c1 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java @@ -21,7 +21,7 @@ package org.opensearch.action.admin.indices.alias; import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.index.query.QueryBuilder; import java.util.Map; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java index 7463dc62132..d46a7daafb9 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/alias/exists/AliasesExistRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.indices.alias.exists; import org.opensearch.action.admin.indices.alias.get.BaseAliasesRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class AliasesExistRequestBuilder extends BaseAliasesRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java index 178dd52f0ec..9ee21cc0d8f 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionType; import org.opensearch.action.ActionResponse; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.util.ArrayUtils; public abstract class BaseAliasesRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java index a18291f0062..7ebbc379413 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java @@ -19,7 +19,7 @@ package org.opensearch.action.admin.indices.analyze; import org.elasticsearch.action.support.single.shard.SingleShardOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import java.util.Map; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java index baace883467..f4b4aea50ed 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.indices.cache.clear; import org.elasticsearch.action.support.broadcast.BroadcastOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class ClearIndicesCacheRequestBuilder extends BroadcastOperationRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/close/CloseIndexRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/close/CloseIndexRequestBuilder.java index 6f451d06a6b..697e3faaa08 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/close/CloseIndexRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/close/CloseIndexRequestBuilder.java @@ -22,7 +22,7 @@ package org.opensearch.action.admin.indices.close; import org.elasticsearch.action.support.ActiveShardCount; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; /** * Builder for close index request diff --git a/server/src/main/java/org/opensearch/action/admin/indices/create/CreateIndexRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/create/CreateIndexRequest.java index 6e05b45ed6c..dbb3de36bd7 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/create/CreateIndexRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/create/CreateIndexRequest.java @@ -61,12 +61,12 @@ import static org.elasticsearch.common.settings.Settings.readSettingsFromStream; import static org.elasticsearch.common.settings.Settings.writeSettingsToStream; /** - * A request to create an index. Best created with {@link org.elasticsearch.client.Requests#createIndexRequest(String)}. + * A request to create an index. Best created with {@link org.opensearch.client.Requests#createIndexRequest(String)}. *

* The index created can optionally be created with {@link #settings(org.elasticsearch.common.settings.Settings)}. * - * @see org.elasticsearch.client.IndicesAdminClient#create(CreateIndexRequest) - * @see org.elasticsearch.client.Requests#createIndexRequest(String) + * @see org.opensearch.client.IndicesAdminClient#create(CreateIndexRequest) + * @see org.opensearch.client.Requests#createIndexRequest(String) * @see CreateIndexResponse */ public class CreateIndexRequest extends AcknowledgedRequest implements IndicesRequest, ToXContentObject { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/create/CreateIndexRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/create/CreateIndexRequestBuilder.java index 6597a9f6d95..adc2aeb6b95 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/create/CreateIndexRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/create/CreateIndexRequestBuilder.java @@ -20,9 +20,9 @@ package org.opensearch.action.admin.indices.create; import org.opensearch.action.admin.indices.alias.Alias; -import org.elasticsearch.action.support.ActiveShardCount; +import org.opensearch.action.support.ActiveShardCount; import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.LoggingDeprecationHandler; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/dangling/delete/TransportDeleteDanglingIndexAction.java b/server/src/main/java/org/opensearch/action/admin/indices/dangling/delete/TransportDeleteDanglingIndexAction.java index 60c7e68c0d9..5f4e83049f3 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/dangling/delete/TransportDeleteDanglingIndexAction.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/dangling/delete/TransportDeleteDanglingIndexAction.java @@ -33,7 +33,7 @@ import org.opensearch.action.admin.indices.dangling.list.NodeListDanglingIndices import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.action.support.master.TransportMasterNodeAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.AckedClusterStateUpdateTask; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.block.ClusterBlockException; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/dangling/import_index/TransportImportDanglingIndexAction.java b/server/src/main/java/org/opensearch/action/admin/indices/dangling/import_index/TransportImportDanglingIndexAction.java index 761496bc2b3..b79413e7ac2 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/dangling/import_index/TransportImportDanglingIndexAction.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/dangling/import_index/TransportImportDanglingIndexAction.java @@ -35,13 +35,13 @@ import org.opensearch.action.admin.indices.dangling.find.FindDanglingIndexAction import org.opensearch.action.admin.indices.dangling.find.FindDanglingIndexRequest; import org.opensearch.action.admin.indices.dangling.find.FindDanglingIndexResponse; import org.opensearch.action.admin.indices.dangling.find.NodeFindDanglingIndexResponse; -import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.HandledTransportAction; +import org.opensearch.action.support.ActionFilters; +import org.opensearch.action.support.HandledTransportAction; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.inject.Inject; -import org.elasticsearch.gateway.LocalAllocateDangledIndices; +import org.opensearch.gateway.LocalAllocateDangledIndices; import org.opensearch.tasks.Task; import org.elasticsearch.transport.TransportService; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/delete/DeleteIndexRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/delete/DeleteIndexRequest.java index 80ac3364737..833a3f35bc8 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/delete/DeleteIndexRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/delete/DeleteIndexRequest.java @@ -32,7 +32,7 @@ import java.io.IOException; import static org.opensearch.action.ValidateActions.addValidationError; /** - * A request to delete an index. Best created with {@link org.elasticsearch.client.Requests#deleteIndexRequest(String)}. + * A request to delete an index. Best created with {@link org.opensearch.client.Requests#deleteIndexRequest(String)}. */ public class DeleteIndexRequest extends AcknowledgedRequest implements IndicesRequest.Replaceable { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java index fcfeae85ebb..ed0ee184eb5 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java @@ -22,7 +22,7 @@ package org.opensearch.action.admin.indices.delete; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class DeleteIndexRequestBuilder extends AcknowledgedRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java index 325fb6d9c62..8f7e49b675f 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/exists/indices/IndicesExistsRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.indices.exists.indices; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class IndicesExistsRequestBuilder extends MasterNodeReadOperationRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java index 01543209d48..e6b9c26a6c0 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/exists/types/TypesExistsRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.indices.exists.types; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.Strings; /** diff --git a/server/src/main/java/org/opensearch/action/admin/indices/flush/FlushRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/flush/FlushRequest.java index e7b460d2c6b..3f4e50705bb 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/flush/FlushRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/flush/FlushRequest.java @@ -33,10 +33,10 @@ import static org.opensearch.action.ValidateActions.addValidationError; * by flushing data to the index storage and clearing the internal transaction log. By default, Elasticsearch uses * memory heuristics in order to automatically trigger flush operations as required in order to clear memory. *

- * Best created with {@link org.elasticsearch.client.Requests#flushRequest(String...)}. + * Best created with {@link org.opensearch.client.Requests#flushRequest(String...)}. * - * @see org.elasticsearch.client.Requests#flushRequest(String...) - * @see org.elasticsearch.client.IndicesAdminClient#flush(FlushRequest) + * @see org.opensearch.client.Requests#flushRequest(String...) + * @see org.opensearch.client.IndicesAdminClient#flush(FlushRequest) * @see FlushResponse */ public class FlushRequest extends BroadcastRequest { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/flush/FlushRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/flush/FlushRequestBuilder.java index bad5622b4ec..a00777bb9fd 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/flush/FlushRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/flush/FlushRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.indices.flush; import org.elasticsearch.action.support.broadcast.BroadcastOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class FlushRequestBuilder extends BroadcastOperationRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/flush/SyncedFlushRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/flush/SyncedFlushRequest.java index faccb085c96..7d3756ad8ed 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/flush/SyncedFlushRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/flush/SyncedFlushRequest.java @@ -29,10 +29,10 @@ import java.util.Arrays; * A synced flush request to sync flush one or more indices. The synced flush process of an index performs a flush * and writes the same sync id to primary and all copies. * - *

Best created with {@link org.elasticsearch.client.Requests#syncedFlushRequest(String...)}.

+ *

Best created with {@link org.opensearch.client.Requests#syncedFlushRequest(String...)}.

* - * @see org.elasticsearch.client.Requests#flushRequest(String...) - * @see org.elasticsearch.client.IndicesAdminClient#syncedFlush(SyncedFlushRequest) + * @see org.opensearch.client.Requests#flushRequest(String...) + * @see org.opensearch.client.IndicesAdminClient#syncedFlush(SyncedFlushRequest) * @see SyncedFlushResponse */ public class SyncedFlushRequest extends BroadcastRequest { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/flush/SyncedFlushRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/flush/SyncedFlushRequestBuilder.java index 2492f7728da..adbd888fa55 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/flush/SyncedFlushRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/flush/SyncedFlushRequestBuilder.java @@ -21,7 +21,7 @@ package org.opensearch.action.admin.indices.flush; import org.opensearch.action.ActionRequestBuilder; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class SyncedFlushRequestBuilder extends ActionRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/forcemerge/ForceMergeRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/forcemerge/ForceMergeRequest.java index bc61f0601e4..6796c77ed54 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/forcemerge/ForceMergeRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/forcemerge/ForceMergeRequest.java @@ -37,8 +37,8 @@ import java.util.Arrays; * to force merge down to. Defaults to simply checking if a merge needs * to execute, and if so, executes it * - * @see org.elasticsearch.client.Requests#forceMergeRequest(String...) - * @see org.elasticsearch.client.IndicesAdminClient#forceMerge(ForceMergeRequest) + * @see org.opensearch.client.Requests#forceMergeRequest(String...) + * @see org.opensearch.client.IndicesAdminClient#forceMerge(ForceMergeRequest) * @see ForceMergeResponse */ public class ForceMergeRequest extends BroadcastRequest { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/forcemerge/ForceMergeRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/forcemerge/ForceMergeRequestBuilder.java index 98d82bc3896..496589ab11b 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/forcemerge/ForceMergeRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/forcemerge/ForceMergeRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.indices.forcemerge; import org.elasticsearch.action.support.broadcast.BroadcastOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; /** * A request to force merge one or more indices. In order to force merge all diff --git a/server/src/main/java/org/opensearch/action/admin/indices/get/GetIndexRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/get/GetIndexRequestBuilder.java index ff665b75edb..337b1019879 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/get/GetIndexRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/get/GetIndexRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.indices.get; import org.elasticsearch.action.support.master.info.ClusterInfoRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class GetIndexRequestBuilder extends ClusterInfoRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java index f817f55fb8d..dd281758d0e 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java @@ -21,7 +21,7 @@ package org.opensearch.action.admin.indices.mapping.get; import org.opensearch.action.ActionRequestBuilder; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.util.ArrayUtils; /** A helper class to build {@link GetFieldMappingsRequest} objects */ diff --git a/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java index 1c45fa3cecd..50b43183254 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetMappingsRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.indices.mapping.get; import org.elasticsearch.action.support.master.info.ClusterInfoRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class GetMappingsRequestBuilder extends ClusterInfoRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/mapping/put/PutMappingRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/mapping/put/PutMappingRequest.java index d8b53af4d6b..74699178091 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/mapping/put/PutMappingRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/mapping/put/PutMappingRequest.java @@ -51,13 +51,13 @@ import static org.opensearch.action.ValidateActions.addValidationError; /** * Puts mapping definition registered under a specific type into one or more indices. Best created with - * {@link org.elasticsearch.client.Requests#putMappingRequest(String...)}. + * {@link org.opensearch.client.Requests#putMappingRequest(String...)}. *

* If the mappings already exists, the new mappings will be merged with the new one. If there are elements * that can't be merged are detected, the request will be rejected. * - * @see org.elasticsearch.client.Requests#putMappingRequest(String...) - * @see org.elasticsearch.client.IndicesAdminClient#putMapping(PutMappingRequest) + * @see org.opensearch.client.Requests#putMappingRequest(String...) + * @see org.opensearch.client.IndicesAdminClient#putMapping(PutMappingRequest) * @see AcknowledgedResponse */ public class PutMappingRequest extends AcknowledgedRequest implements IndicesRequest.Replaceable, ToXContentObject { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java index cc95c1dd299..4d73320484e 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java @@ -22,7 +22,7 @@ package org.opensearch.action.admin.indices.mapping.put; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.Index; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/open/OpenIndexRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/open/OpenIndexRequestBuilder.java index 75bf90f72e7..e1f635f18b6 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/open/OpenIndexRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/open/OpenIndexRequestBuilder.java @@ -19,10 +19,10 @@ package org.opensearch.action.admin.indices.open; -import org.elasticsearch.action.support.ActiveShardCount; +import org.opensearch.action.support.ActiveShardCount; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; /** * Builder for for open index request diff --git a/server/src/main/java/org/opensearch/action/admin/indices/readonly/AddIndexBlockRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/readonly/AddIndexBlockRequestBuilder.java index 38c58352912..ad124f10c0e 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/readonly/AddIndexBlockRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/readonly/AddIndexBlockRequestBuilder.java @@ -21,7 +21,7 @@ package org.opensearch.action.admin.indices.readonly; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.opensearch.cluster.metadata.IndexMetadata.APIBlock; /** diff --git a/server/src/main/java/org/opensearch/action/admin/indices/recovery/RecoveryRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/recovery/RecoveryRequestBuilder.java index 4a088772a73..5517cc43ce7 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/recovery/RecoveryRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/recovery/RecoveryRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.indices.recovery; import org.elasticsearch.action.support.broadcast.BroadcastOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; /** * Recovery information request builder. diff --git a/server/src/main/java/org/opensearch/action/admin/indices/refresh/RefreshRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/refresh/RefreshRequest.java index a1995f7346c..e83ff65a73d 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/refresh/RefreshRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/refresh/RefreshRequest.java @@ -29,8 +29,8 @@ import java.io.IOException; * capabilities depends on the index engine used. For example, the internal one requires refresh to be called, but by * default a refresh is scheduled periodically. * - * @see org.elasticsearch.client.Requests#refreshRequest(String...) - * @see org.elasticsearch.client.IndicesAdminClient#refresh(RefreshRequest) + * @see org.opensearch.client.Requests#refreshRequest(String...) + * @see org.opensearch.client.IndicesAdminClient#refresh(RefreshRequest) * @see RefreshResponse */ public class RefreshRequest extends BroadcastRequest { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/refresh/RefreshRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/refresh/RefreshRequestBuilder.java index fc793dd20b9..f292b3d4675 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/refresh/RefreshRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/refresh/RefreshRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.indices.refresh; import org.elasticsearch.action.support.broadcast.BroadcastOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; /** * A refresh request making all operations performed since the last refresh available for search. The (near) real-time diff --git a/server/src/main/java/org/opensearch/action/admin/indices/resolve/ResolveIndexAction.java b/server/src/main/java/org/opensearch/action/admin/indices/resolve/ResolveIndexAction.java index 9282f3a046a..8844d71b3c5 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/resolve/ResolveIndexAction.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/resolve/ResolveIndexAction.java @@ -29,7 +29,7 @@ import org.opensearch.action.OriginalIndices; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexAbstraction; import org.opensearch.cluster.metadata.IndexAbstractionResolver; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverRequestBuilder.java index f2166666432..092818e53d2 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverRequestBuilder.java @@ -19,9 +19,9 @@ package org.opensearch.action.admin.indices.rollover; import org.opensearch.action.admin.indices.alias.Alias; -import org.elasticsearch.action.support.ActiveShardCount; +import org.opensearch.action.support.ActiveShardCount; import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.unit.TimeValue; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/rollover/TransportRolloverAction.java b/server/src/main/java/org/opensearch/action/admin/indices/rollover/TransportRolloverAction.java index 7ed157d7c58..9009b5dcb7e 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/rollover/TransportRolloverAction.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/rollover/TransportRolloverAction.java @@ -24,11 +24,11 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.admin.indices.stats.IndicesStatsAction; import org.opensearch.action.admin.indices.stats.IndicesStatsRequest; import org.opensearch.action.admin.indices.stats.IndicesStatsResponse; -import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.ActiveShardsObserver; +import org.opensearch.action.support.ActionFilters; +import org.opensearch.action.support.ActiveShardsObserver; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.TransportMasterNodeAction; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.ClusterStateUpdateTask; import org.opensearch.cluster.block.ClusterBlockException; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java index 0a0f310278d..91161d09069 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.indices.segments; import org.elasticsearch.action.support.broadcast.BroadcastOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class IndicesSegmentsRequestBuilder extends BroadcastOperationRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java index 40644219063..0ad95276c51 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/settings/get/GetSettingsRequestBuilder.java @@ -21,7 +21,7 @@ package org.opensearch.action.admin.indices.settings.get; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.util.ArrayUtils; public class GetSettingsRequestBuilder diff --git a/server/src/main/java/org/opensearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java index e0a2cb6ce8c..33252d89079 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/settings/put/UpdateSettingsRequestBuilder.java @@ -22,7 +22,7 @@ package org.opensearch.action.admin.indices.settings.put; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentType; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoreRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoreRequestBuilder.java index 072d7039823..9f8821cc3ac 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoreRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoreRequestBuilder.java @@ -22,7 +22,7 @@ package org.opensearch.action.admin.indices.shards; import org.opensearch.action.ActionType; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.opensearch.cluster.health.ClusterHealthStatus; /** diff --git a/server/src/main/java/org/opensearch/action/admin/indices/shrink/ResizeRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/shrink/ResizeRequestBuilder.java index 038b47072cb..891995c755a 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/shrink/ResizeRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/shrink/ResizeRequestBuilder.java @@ -20,9 +20,9 @@ package org.opensearch.action.admin.indices.shrink; import org.opensearch.action.ActionType; import org.opensearch.action.admin.indices.create.CreateIndexRequest; -import org.elasticsearch.action.support.ActiveShardCount; +import org.opensearch.action.support.ActiveShardCount; import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.settings.Settings; public class ResizeRequestBuilder extends AcknowledgedRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java index 96c85d53fb3..61b2f74ab49 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetIndexTemplatesRequestBuilder.java @@ -19,7 +19,7 @@ package org.opensearch.action.admin.indices.template.get; import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class GetIndexTemplatesRequestBuilder extends MasterNodeReadOperationRequestBuilder< GetIndexTemplatesRequest, diff --git a/server/src/main/java/org/opensearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java index c6a1346c13e..e7ac6fd5066 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java @@ -21,7 +21,7 @@ package org.opensearch.action.admin.indices.template.put; import org.opensearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java index 7d6bf642dfc..0665f179b34 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.indices.upgrade.get; import org.elasticsearch.action.support.broadcast.BroadcastOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class UpgradeStatusRequestBuilder extends BroadcastOperationRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java index 46c64dbda41..dfbad236a1c 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java @@ -22,10 +22,10 @@ package org.opensearch.action.admin.indices.upgrade.post; import org.elasticsearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.PrimaryMissingActionException; -import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.DefaultShardOperationFailedException; +import org.opensearch.action.support.ActionFilters; +import org.opensearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.node.TransportBroadcastByNodeAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.block.ClusterBlockException; import org.opensearch.cluster.block.ClusterBlockLevel; @@ -40,7 +40,7 @@ import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.indices.IndicesService; +import org.opensearch.indices.IndicesService; import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeRequest.java index 4f7e6bec159..98b1d30fdae 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeRequest.java @@ -28,8 +28,8 @@ import java.io.IOException; /** * A request to upgrade one or more indices. In order to update all indices, pass an empty array or * {@code null} for the indices. - * @see org.elasticsearch.client.Requests#upgradeRequest(String...) - * @see org.elasticsearch.client.IndicesAdminClient#upgrade(UpgradeRequest) + * @see org.opensearch.client.Requests#upgradeRequest(String...) + * @see org.opensearch.client.IndicesAdminClient#upgrade(UpgradeRequest) * @see UpgradeResponse */ public class UpgradeRequest extends BroadcastRequest { diff --git a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java index e0bab47838d..bab05558ac0 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.indices.upgrade.post; import org.elasticsearch.action.support.broadcast.BroadcastOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; /** * A request to upgrade one or more indices. In order to optimize on all the indices, pass an empty array or diff --git a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java index 8d4ba3e416d..c93250845ca 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java @@ -22,7 +22,7 @@ package org.opensearch.action.admin.indices.upgrade.post; import org.elasticsearch.Version; import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.collect.Tuple; import java.util.Map; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java index 697860c072b..fc2418a42cd 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.indices.validate.query; import org.elasticsearch.action.support.broadcast.BroadcastOperationRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.index.query.QueryBuilder; public class ValidateQueryRequestBuilder diff --git a/server/src/main/java/org/opensearch/action/bulk/BulkProcessor.java b/server/src/main/java/org/opensearch/action/bulk/BulkProcessor.java index c6a30d146ba..52cb91ddc5f 100644 --- a/server/src/main/java/org/opensearch/action/bulk/BulkProcessor.java +++ b/server/src/main/java/org/opensearch/action/bulk/BulkProcessor.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.DocWriteRequest; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.Tuple; @@ -216,7 +216,7 @@ public class BulkProcessor implements Closeable { * @param listener The BulkProcessor listener that gets called on bulk events * @return the builder for BulkProcessor * @deprecated Use {@link #builder(java.util.function.BiConsumer, org.opensearch.action.bulk.BulkProcessor.Listener)} - * with client::bulk as the first argument, or {@link #builder(org.elasticsearch.client.Client, + * with client::bulk as the first argument, or {@link #builder(org.opensearch.client.Client, * org.opensearch.action.bulk.BulkProcessor.Listener, org.opensearch.threadpool.Scheduler, * org.opensearch.threadpool.Scheduler, java.lang.Runnable)} and manage the flush and retry schedulers explicitly */ diff --git a/server/src/main/java/org/opensearch/action/bulk/BulkRequest.java b/server/src/main/java/org/opensearch/action/bulk/BulkRequest.java index 3a29e7bc801..4b5d570884d 100644 --- a/server/src/main/java/org/opensearch/action/bulk/BulkRequest.java +++ b/server/src/main/java/org/opensearch/action/bulk/BulkRequest.java @@ -27,8 +27,8 @@ import org.opensearch.action.CompositeIndicesRequest; import org.opensearch.action.DocWriteRequest; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; -import org.elasticsearch.action.support.ActiveShardCount; -import org.elasticsearch.action.support.WriteRequest; +import org.opensearch.action.support.ActiveShardCount; +import org.opensearch.action.support.WriteRequest; import org.elasticsearch.action.support.replication.ReplicationRequest; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.common.Nullable; @@ -57,7 +57,7 @@ import static org.opensearch.action.ValidateActions.addValidationError; * and allows to executes it in a single batch. * * Note that we only support refresh on the bulk request not per item. - * @see org.elasticsearch.client.Client#bulk(BulkRequest) + * @see org.opensearch.client.Client#bulk(BulkRequest) */ public class BulkRequest extends ActionRequest implements CompositeIndicesRequest, WriteRequest, Accountable { diff --git a/server/src/main/java/org/opensearch/action/bulk/BulkRequestBuilder.java b/server/src/main/java/org/opensearch/action/bulk/BulkRequestBuilder.java index 245a4c6d6da..f7ad49a5ca5 100644 --- a/server/src/main/java/org/opensearch/action/bulk/BulkRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/bulk/BulkRequestBuilder.java @@ -24,12 +24,12 @@ import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.delete.DeleteRequestBuilder; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.index.IndexRequestBuilder; -import org.elasticsearch.action.support.ActiveShardCount; -import org.elasticsearch.action.support.WriteRequestBuilder; +import org.opensearch.action.support.ActiveShardCount; +import org.opensearch.action.support.WriteRequestBuilder; import org.elasticsearch.action.support.replication.ReplicationRequest; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.action.update.UpdateRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; diff --git a/server/src/main/java/org/opensearch/action/bulk/TransportBulkAction.java b/server/src/main/java/org/opensearch/action/bulk/TransportBulkAction.java index b284fec9fd6..804c73e7abc 100644 --- a/server/src/main/java/org/opensearch/action/bulk/TransportBulkAction.java +++ b/server/src/main/java/org/opensearch/action/bulk/TransportBulkAction.java @@ -37,13 +37,13 @@ import org.opensearch.action.admin.indices.create.CreateIndexRequest; import org.opensearch.action.admin.indices.create.CreateIndexResponse; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.ingest.IngestActionForwarder; -import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.AutoCreateIndex; -import org.elasticsearch.action.support.HandledTransportAction; +import org.opensearch.action.support.ActionFilters; +import org.opensearch.action.support.AutoCreateIndex; +import org.opensearch.action.support.HandledTransportAction; import org.elasticsearch.action.update.TransportUpdateAction; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.action.update.UpdateResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.ClusterStateObserver; import org.opensearch.cluster.block.ClusterBlockException; @@ -65,10 +65,10 @@ import org.elasticsearch.index.IndexingPressure; import org.elasticsearch.index.VersionType; import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.indices.IndexClosedException; -import org.elasticsearch.indices.SystemIndices; -import org.elasticsearch.ingest.IngestService; -import org.elasticsearch.node.NodeClosedException; +import org.opensearch.indices.IndexClosedException; +import org.opensearch.indices.SystemIndices; +import org.opensearch.ingest.IngestService; +import org.opensearch.node.NodeClosedException; import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPool.Names; diff --git a/server/src/main/java/org/opensearch/action/support/ThreadedActionListener.java b/server/src/main/java/org/opensearch/action/support/ThreadedActionListener.java index bcc274aeff3..21874302cd4 100644 --- a/server/src/main/java/org/opensearch/action/support/ThreadedActionListener.java +++ b/server/src/main/java/org/opensearch/action/support/ThreadedActionListener.java @@ -23,8 +23,8 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRunnable; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.transport.TransportClient; +import org.opensearch.client.Client; +import org.opensearch.client.transport.TransportClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/elasticsearch/cli/CommandLoggingConfigurator.java b/server/src/main/java/org/opensearch/cli/CommandLoggingConfigurator.java similarity index 95% rename from server/src/main/java/org/elasticsearch/cli/CommandLoggingConfigurator.java rename to server/src/main/java/org/opensearch/cli/CommandLoggingConfigurator.java index 419b7c4f43a..b7897d369a7 100644 --- a/server/src/main/java/org/elasticsearch/cli/CommandLoggingConfigurator.java +++ b/server/src/main/java/org/opensearch/cli/CommandLoggingConfigurator.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cli; +package org.opensearch.cli; import org.apache.logging.log4j.Level; import org.elasticsearch.common.logging.LogConfigurator; diff --git a/server/src/main/java/org/elasticsearch/cli/EnvironmentAwareCommand.java b/server/src/main/java/org/opensearch/cli/EnvironmentAwareCommand.java similarity index 96% rename from server/src/main/java/org/elasticsearch/cli/EnvironmentAwareCommand.java rename to server/src/main/java/org/opensearch/cli/EnvironmentAwareCommand.java index b59bdba8c76..c990a4054af 100644 --- a/server/src/main/java/org/elasticsearch/cli/EnvironmentAwareCommand.java +++ b/server/src/main/java/org/opensearch/cli/EnvironmentAwareCommand.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cli; +package org.opensearch.cli; import joptsimple.OptionSet; import joptsimple.OptionSpec; @@ -26,10 +26,6 @@ import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.node.InternalSettingsPreparer; -import org.opensearch.cli.Command; -import org.opensearch.cli.ExitCodes; -import org.opensearch.cli.Terminal; -import org.opensearch.cli.UserException; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/server/src/main/java/org/elasticsearch/cli/KeyStoreAwareCommand.java b/server/src/main/java/org/opensearch/cli/KeyStoreAwareCommand.java similarity index 91% rename from server/src/main/java/org/elasticsearch/cli/KeyStoreAwareCommand.java rename to server/src/main/java/org/opensearch/cli/KeyStoreAwareCommand.java index 6b5d19fce25..cf585085ecd 100644 --- a/server/src/main/java/org/elasticsearch/cli/KeyStoreAwareCommand.java +++ b/server/src/main/java/org/opensearch/cli/KeyStoreAwareCommand.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,22 +17,19 @@ * under the License. */ -package org.elasticsearch.cli; +package org.opensearch.cli; import joptsimple.OptionSet; import org.elasticsearch.common.settings.KeyStoreWrapper; import org.elasticsearch.common.settings.SecureString; import org.elasticsearch.env.Environment; -import org.opensearch.cli.ExitCodes; -import org.opensearch.cli.Terminal; -import org.opensearch.cli.UserException; import java.io.IOException; import java.security.GeneralSecurityException; import java.util.Arrays; /** - * An {@link org.elasticsearch.cli.EnvironmentAwareCommand} that needs to access the elasticsearch keystore, possibly + * An {@link org.opensearch.cli.EnvironmentAwareCommand} that needs to access the elasticsearch keystore, possibly * decrypting it if it is password protected. */ public abstract class KeyStoreAwareCommand extends EnvironmentAwareCommand { diff --git a/server/src/main/java/org/elasticsearch/cli/LoggingAwareCommand.java b/server/src/main/java/org/opensearch/cli/LoggingAwareCommand.java similarity index 92% rename from server/src/main/java/org/elasticsearch/cli/LoggingAwareCommand.java rename to server/src/main/java/org/opensearch/cli/LoggingAwareCommand.java index 2f81ebe5b7a..b1a6166a12d 100644 --- a/server/src/main/java/org/elasticsearch/cli/LoggingAwareCommand.java +++ b/server/src/main/java/org/opensearch/cli/LoggingAwareCommand.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,9 +17,7 @@ * under the License. */ -package org.elasticsearch.cli; - -import org.opensearch.cli.Command; +package org.opensearch.cli; /** * A command that is aware of logging. This class should be preferred over the base {@link Command} class for any CLI tools that depend on diff --git a/server/src/main/java/org/elasticsearch/cli/LoggingAwareMultiCommand.java b/server/src/main/java/org/opensearch/cli/LoggingAwareMultiCommand.java similarity index 92% rename from server/src/main/java/org/elasticsearch/cli/LoggingAwareMultiCommand.java rename to server/src/main/java/org/opensearch/cli/LoggingAwareMultiCommand.java index 30b32a0939d..a94f8b12c0f 100644 --- a/server/src/main/java/org/elasticsearch/cli/LoggingAwareMultiCommand.java +++ b/server/src/main/java/org/opensearch/cli/LoggingAwareMultiCommand.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,9 +17,7 @@ * under the License. */ -package org.elasticsearch.cli; - -import org.opensearch.cli.MultiCommand; +package org.opensearch.cli; /** * A multi-command that is aware of logging. This class should be preferred over the base {@link MultiCommand} class for any CLI tools that diff --git a/server/src/main/java/org/elasticsearch/client/AdminClient.java b/server/src/main/java/org/opensearch/client/AdminClient.java similarity index 89% rename from server/src/main/java/org/elasticsearch/client/AdminClient.java rename to server/src/main/java/org/opensearch/client/AdminClient.java index 1fc3261b4f6..00cd71e0972 100644 --- a/server/src/main/java/org/elasticsearch/client/AdminClient.java +++ b/server/src/main/java/org/opensearch/client/AdminClient.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; /** * Administrative actions/operations against the cluster or the indices. * * - * @see org.elasticsearch.client.Client#admin() + * @see org.opensearch.client.Client#admin() */ public interface AdminClient { diff --git a/server/src/main/java/org/elasticsearch/client/Client.java b/server/src/main/java/org/opensearch/client/Client.java similarity index 96% rename from server/src/main/java/org/elasticsearch/client/Client.java rename to server/src/main/java/org/opensearch/client/Client.java index 07770c38b9d..2a59a5cb1f8 100644 --- a/server/src/main/java/org/elasticsearch/client/Client.java +++ b/server/src/main/java/org/opensearch/client/Client.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.opensearch.action.ActionFuture; import org.opensearch.action.ActionListener; @@ -77,11 +77,11 @@ import java.util.Map; * simply returns an {@link org.opensearch.action.ActionFuture}, while the second accepts an * {@link ActionListener}. *

- * A client can either be retrieved from a {@link org.elasticsearch.node.Node} started, or connected remotely - * to one or more nodes using {@link org.elasticsearch.client.transport.TransportClient}. + * A client can either be retrieved from a {@link org.opensearch.node.Node} started, or connected remotely + * to one or more nodes using {@link org.opensearch.client.transport.TransportClient}. * - * @see org.elasticsearch.node.Node#client() - * @see org.elasticsearch.client.transport.TransportClient + * @see org.opensearch.node.Node#client() + * @see org.opensearch.client.transport.TransportClient */ public interface Client extends OpenSearchClient, Releasable { @@ -214,7 +214,7 @@ public interface Client extends OpenSearchClient, Releasable { * * @param request The bulk request * @return The result future - * @see org.elasticsearch.client.Requests#bulkRequest() + * @see Requests#bulkRequest() */ ActionFuture bulk(BulkRequest request); @@ -223,7 +223,7 @@ public interface Client extends OpenSearchClient, Releasable { * * @param request The bulk request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#bulkRequest() + * @see Requests#bulkRequest() */ void bulk(BulkRequest request, ActionListener listener); diff --git a/server/src/main/java/org/elasticsearch/client/ClusterAdminClient.java b/server/src/main/java/org/opensearch/client/ClusterAdminClient.java similarity index 96% rename from server/src/main/java/org/elasticsearch/client/ClusterAdminClient.java rename to server/src/main/java/org/opensearch/client/ClusterAdminClient.java index d81b37db3da..e58de96f739 100644 --- a/server/src/main/java/org/elasticsearch/client/ClusterAdminClient.java +++ b/server/src/main/java/org/opensearch/client/ClusterAdminClient.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.opensearch.action.ActionFuture; import org.opensearch.action.ActionListener; @@ -215,7 +215,7 @@ public interface ClusterAdminClient extends OpenSearchClient { * * @param request The nodes info request * @return The result future - * @see org.elasticsearch.client.Requests#nodesInfoRequest(String...) + * @see org.opensearch.client.Requests#nodesInfoRequest(String...) */ ActionFuture nodesInfo(NodesInfoRequest request); @@ -224,7 +224,7 @@ public interface ClusterAdminClient extends OpenSearchClient { * * @param request The nodes info request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#nodesInfoRequest(String...) + * @see org.opensearch.client.Requests#nodesInfoRequest(String...) */ void nodesInfo(NodesInfoRequest request, ActionListener listener); @@ -238,7 +238,7 @@ public interface ClusterAdminClient extends OpenSearchClient { * * @param request The cluster stats request * @return The result future - * @see org.elasticsearch.client.Requests#clusterStatsRequest + * @see org.opensearch.client.Requests#clusterStatsRequest */ ActionFuture clusterStats(ClusterStatsRequest request); @@ -247,7 +247,7 @@ public interface ClusterAdminClient extends OpenSearchClient { * * @param request The cluster stats request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#clusterStatsRequest() + * @see org.opensearch.client.Requests#clusterStatsRequest() */ void clusterStats(ClusterStatsRequest request, ActionListener listener); @@ -258,7 +258,7 @@ public interface ClusterAdminClient extends OpenSearchClient { * * @param request The nodes stats request * @return The result future - * @see org.elasticsearch.client.Requests#nodesStatsRequest(String...) + * @see org.opensearch.client.Requests#nodesStatsRequest(String...) */ ActionFuture nodesStats(NodesStatsRequest request); @@ -267,7 +267,7 @@ public interface ClusterAdminClient extends OpenSearchClient { * * @param request The nodes info request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#nodesStatsRequest(String...) + * @see org.opensearch.client.Requests#nodesStatsRequest(String...) */ void nodesStats(NodesStatsRequest request, ActionListener listener); @@ -284,7 +284,7 @@ public interface ClusterAdminClient extends OpenSearchClient { * @param request * The nodes usage request * @return The result future - * @see org.elasticsearch.client.Requests#nodesUsageRequest(String...) + * @see org.opensearch.client.Requests#nodesUsageRequest(String...) */ ActionFuture nodesUsage(NodesUsageRequest request); @@ -295,7 +295,7 @@ public interface ClusterAdminClient extends OpenSearchClient { * The nodes usage request * @param listener * A listener to be notified with a result - * @see org.elasticsearch.client.Requests#nodesUsageRequest(String...) + * @see org.opensearch.client.Requests#nodesUsageRequest(String...) */ void nodesUsage(NodesUsageRequest request, ActionListener listener); @@ -328,7 +328,7 @@ public interface ClusterAdminClient extends OpenSearchClient { * * @param request The nodes tasks request * @return The result future - * @see org.elasticsearch.client.Requests#listTasksRequest() + * @see org.opensearch.client.Requests#listTasksRequest() */ ActionFuture listTasks(ListTasksRequest request); @@ -337,7 +337,7 @@ public interface ClusterAdminClient extends OpenSearchClient { * * @param request The nodes tasks request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#listTasksRequest() + * @see org.opensearch.client.Requests#listTasksRequest() */ void listTasks(ListTasksRequest request, ActionListener listener); @@ -351,7 +351,7 @@ public interface ClusterAdminClient extends OpenSearchClient { * * @param request the request * @return the result future - * @see org.elasticsearch.client.Requests#getTaskRequest() + * @see org.opensearch.client.Requests#getTaskRequest() */ ActionFuture getTask(GetTaskRequest request); @@ -360,7 +360,7 @@ public interface ClusterAdminClient extends OpenSearchClient { * * @param request the request * @param listener A listener to be notified with the result - * @see org.elasticsearch.client.Requests#getTaskRequest() + * @see org.opensearch.client.Requests#getTaskRequest() */ void getTask(GetTaskRequest request, ActionListener listener); @@ -379,7 +379,7 @@ public interface ClusterAdminClient extends OpenSearchClient { * * @param request The nodes tasks request * @return The result future - * @see org.elasticsearch.client.Requests#cancelTasksRequest() + * @see org.opensearch.client.Requests#cancelTasksRequest() */ ActionFuture cancelTasks(CancelTasksRequest request); @@ -388,7 +388,7 @@ public interface ClusterAdminClient extends OpenSearchClient { * * @param request The nodes tasks request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#cancelTasksRequest() + * @see org.opensearch.client.Requests#cancelTasksRequest() */ void cancelTasks(CancelTasksRequest request, ActionListener listener); diff --git a/server/src/main/java/org/elasticsearch/client/FilterClient.java b/server/src/main/java/org/opensearch/client/FilterClient.java similarity index 94% rename from server/src/main/java/org/elasticsearch/client/FilterClient.java rename to server/src/main/java/org/opensearch/client/FilterClient.java index 868c6879a17..e7e220b2610 100644 --- a/server/src/main/java/org/elasticsearch/client/FilterClient.java +++ b/server/src/main/java/org/opensearch/client/FilterClient.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.opensearch.action.ActionType; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; -import org.elasticsearch.client.support.AbstractClient; +import org.opensearch.client.support.AbstractClient; import org.elasticsearch.common.settings.Settings; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/elasticsearch/client/IndicesAdminClient.java b/server/src/main/java/org/opensearch/client/IndicesAdminClient.java similarity index 94% rename from server/src/main/java/org/elasticsearch/client/IndicesAdminClient.java rename to server/src/main/java/org/opensearch/client/IndicesAdminClient.java index f0bd8ee5012..69b75f4bb26 100644 --- a/server/src/main/java/org/elasticsearch/client/IndicesAdminClient.java +++ b/server/src/main/java/org/opensearch/client/IndicesAdminClient.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.opensearch.action.ActionFuture; import org.opensearch.action.ActionListener; @@ -263,7 +263,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The create index request * @return The result future - * @see org.elasticsearch.client.Requests#createIndexRequest(String) + * @see org.opensearch.client.Requests#createIndexRequest(String) */ ActionFuture create(CreateIndexRequest request); @@ -272,7 +272,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The create index request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#createIndexRequest(String) + * @see org.opensearch.client.Requests#createIndexRequest(String) */ void create(CreateIndexRequest request, ActionListener listener); @@ -288,7 +288,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The delete index request * @return The result future - * @see org.elasticsearch.client.Requests#deleteIndexRequest(String) + * @see org.opensearch.client.Requests#deleteIndexRequest(String) */ ActionFuture delete(DeleteIndexRequest request); @@ -297,7 +297,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The delete index request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#deleteIndexRequest(String) + * @see org.opensearch.client.Requests#deleteIndexRequest(String) */ void delete(DeleteIndexRequest request, ActionListener listener); @@ -313,7 +313,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The close index request * @return The result future - * @see org.elasticsearch.client.Requests#closeIndexRequest(String) + * @see org.opensearch.client.Requests#closeIndexRequest(String) */ ActionFuture close(CloseIndexRequest request); @@ -322,7 +322,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The close index request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#closeIndexRequest(String) + * @see org.opensearch.client.Requests#closeIndexRequest(String) */ void close(CloseIndexRequest request, ActionListener listener); @@ -338,7 +338,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The close index request * @return The result future - * @see org.elasticsearch.client.Requests#openIndexRequest(String) + * @see org.opensearch.client.Requests#openIndexRequest(String) */ ActionFuture open(OpenIndexRequest request); @@ -347,7 +347,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The close index request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#openIndexRequest(String) + * @see org.opensearch.client.Requests#openIndexRequest(String) */ void open(OpenIndexRequest request, ActionListener listener); @@ -364,7 +364,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The add index block request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#openIndexRequest(String) + * @see org.opensearch.client.Requests#openIndexRequest(String) */ void addBlock(AddIndexBlockRequest request, ActionListener listener); @@ -380,7 +380,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The refresh request * @return The result future - * @see org.elasticsearch.client.Requests#refreshRequest(String...) + * @see org.opensearch.client.Requests#refreshRequest(String...) */ ActionFuture refresh(RefreshRequest request); @@ -389,7 +389,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The refresh request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#refreshRequest(String...) + * @see org.opensearch.client.Requests#refreshRequest(String...) */ void refresh(RefreshRequest request, ActionListener listener); @@ -403,7 +403,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The flush request * @return A result future - * @see org.elasticsearch.client.Requests#flushRequest(String...) + * @see org.opensearch.client.Requests#flushRequest(String...) */ ActionFuture flush(FlushRequest request); @@ -412,7 +412,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The flush request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#flushRequest(String...) + * @see org.opensearch.client.Requests#flushRequest(String...) */ void flush(FlushRequest request, ActionListener listener); @@ -426,7 +426,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The sync flush request * @return A result future - * @see org.elasticsearch.client.Requests#syncedFlushRequest(String...) + * @see org.opensearch.client.Requests#syncedFlushRequest(String...) */ ActionFuture syncedFlush(SyncedFlushRequest request); @@ -435,7 +435,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The sync flush request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#syncedFlushRequest(String...) + * @see org.opensearch.client.Requests#syncedFlushRequest(String...) */ void syncedFlush(SyncedFlushRequest request, ActionListener listener); @@ -449,7 +449,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The optimize request * @return A result future - * @see org.elasticsearch.client.Requests#forceMergeRequest(String...) + * @see org.opensearch.client.Requests#forceMergeRequest(String...) */ ActionFuture forceMerge(ForceMergeRequest request); @@ -458,7 +458,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The force merge request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#forceMergeRequest(String...) + * @see org.opensearch.client.Requests#forceMergeRequest(String...) */ void forceMerge(ForceMergeRequest request, ActionListener listener); @@ -472,7 +472,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The upgrade request * @return A result future - * @see org.elasticsearch.client.Requests#upgradeRequest(String...) + * @see org.opensearch.client.Requests#upgradeRequest(String...) */ ActionFuture upgrade(UpgradeRequest request); @@ -481,7 +481,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The upgrade request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#upgradeRequest(String...) + * @see org.opensearch.client.Requests#upgradeRequest(String...) */ void upgrade(UpgradeRequest request, ActionListener listener); @@ -495,7 +495,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The upgrade request * @return A result future - * @see org.elasticsearch.client.Requests#upgradeRequest(String...) + * @see org.opensearch.client.Requests#upgradeRequest(String...) */ ActionFuture upgradeStatus(UpgradeStatusRequest request); @@ -504,7 +504,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The upgrade request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#upgradeRequest(String...) + * @see org.opensearch.client.Requests#upgradeRequest(String...) */ void upgradeStatus(UpgradeStatusRequest request, ActionListener listener); @@ -548,7 +548,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The create mapping request * @return A result future - * @see org.elasticsearch.client.Requests#putMappingRequest(String...) + * @see org.opensearch.client.Requests#putMappingRequest(String...) */ ActionFuture putMapping(PutMappingRequest request); @@ -557,7 +557,7 @@ public interface IndicesAdminClient extends OpenSearchClient { * * @param request The create mapping request * @param listener A listener to be notified with a result - * @see org.elasticsearch.client.Requests#putMappingRequest(String...) + * @see org.opensearch.client.Requests#putMappingRequest(String...) */ void putMapping(PutMappingRequest request, ActionListener listener); diff --git a/server/src/main/java/org/elasticsearch/client/OpenSearchClient.java b/server/src/main/java/org/opensearch/client/OpenSearchClient.java similarity index 96% rename from server/src/main/java/org/elasticsearch/client/OpenSearchClient.java rename to server/src/main/java/org/opensearch/client/OpenSearchClient.java index 8ca0d2d553c..ae0334028fe 100644 --- a/server/src/main/java/org/elasticsearch/client/OpenSearchClient.java +++ b/server/src/main/java/org/opensearch/client/OpenSearchClient.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.opensearch.action.ActionType; diff --git a/server/src/main/java/org/elasticsearch/client/OriginSettingClient.java b/server/src/main/java/org/opensearch/client/OriginSettingClient.java similarity index 96% rename from server/src/main/java/org/elasticsearch/client/OriginSettingClient.java rename to server/src/main/java/org/opensearch/client/OriginSettingClient.java index 401d1a0ac5b..e39a3f04038 100644 --- a/server/src/main/java/org/elasticsearch/client/OriginSettingClient.java +++ b/server/src/main/java/org/opensearch/client/OriginSettingClient.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.opensearch.action.ActionType; import org.opensearch.action.ActionListener; diff --git a/server/src/main/java/org/elasticsearch/client/ParentTaskAssigningClient.java b/server/src/main/java/org/opensearch/client/ParentTaskAssigningClient.java similarity index 96% rename from server/src/main/java/org/elasticsearch/client/ParentTaskAssigningClient.java rename to server/src/main/java/org/opensearch/client/ParentTaskAssigningClient.java index 22371e25913..df738051a67 100644 --- a/server/src/main/java/org/elasticsearch/client/ParentTaskAssigningClient.java +++ b/server/src/main/java/org/opensearch/client/ParentTaskAssigningClient.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.opensearch.action.ActionType; import org.opensearch.action.ActionListener; diff --git a/server/src/main/java/org/elasticsearch/client/Requests.java b/server/src/main/java/org/opensearch/client/Requests.java similarity index 88% rename from server/src/main/java/org/elasticsearch/client/Requests.java rename to server/src/main/java/org/opensearch/client/Requests.java index db515626475..ffd7c4d66de 100644 --- a/server/src/main/java/org/elasticsearch/client/Requests.java +++ b/server/src/main/java/org/opensearch/client/Requests.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.opensearch.action.admin.cluster.health.ClusterHealthRequest; import org.opensearch.action.admin.cluster.node.info.NodesInfoRequest; @@ -90,7 +90,7 @@ public class Requests { * * @param index The index name to index the request against * @return The index request - * @see org.elasticsearch.client.Client#index(org.elasticsearch.action.index.IndexRequest) + * @see org.opensearch.client.Client#index(org.elasticsearch.action.index.IndexRequest) */ public static IndexRequest indexRequest(String index) { return new IndexRequest(index); @@ -102,7 +102,7 @@ public class Requests { * * @param index The index name to delete from * @return The delete request - * @see org.elasticsearch.client.Client#delete(org.elasticsearch.action.delete.DeleteRequest) + * @see org.opensearch.client.Client#delete(org.elasticsearch.action.delete.DeleteRequest) */ public static DeleteRequest deleteRequest(String index) { return new DeleteRequest(index); @@ -121,7 +121,7 @@ public class Requests { * * @param index The index to get the JSON source from * @return The get request - * @see org.elasticsearch.client.Client#get(org.elasticsearch.action.get.GetRequest) + * @see org.opensearch.client.Client#get(org.elasticsearch.action.get.GetRequest) */ public static GetRequest getRequest(String index) { return new GetRequest(index); @@ -133,7 +133,7 @@ public class Requests { * * @param indices The indices to search against. Use {@code null} or {@code _all} to execute against all indices * @return The search request - * @see org.elasticsearch.client.Client#search(org.elasticsearch.action.search.SearchRequest) + * @see org.opensearch.client.Client#search(org.elasticsearch.action.search.SearchRequest) */ public static SearchRequest searchRequest(String... indices) { return new SearchRequest(indices); @@ -144,7 +144,7 @@ public class Requests { * * @param scrollId The scroll id representing the scrollable search * @return The search scroll request - * @see org.elasticsearch.client.Client#searchScroll(org.elasticsearch.action.search.SearchScrollRequest) + * @see org.opensearch.client.Client#searchScroll(org.elasticsearch.action.search.SearchScrollRequest) */ public static SearchScrollRequest searchScrollRequest(String scrollId) { return new SearchScrollRequest(scrollId); @@ -158,7 +158,7 @@ public class Requests { * Creates an indices shard stores info request. * @param indices The indices to get shard store information on * @return The indices shard stores request - * @see org.elasticsearch.client.IndicesAdminClient#shardStores(IndicesShardStoresRequest) + * @see org.opensearch.client.IndicesAdminClient#shardStores(IndicesShardStoresRequest) */ public static IndicesShardStoresRequest indicesShardStoresRequest(String... indices) { return new IndicesShardStoresRequest(indices); @@ -168,7 +168,7 @@ public class Requests { * * @param indices The indices to check if they exists or not. * @return The indices exists request - * @see org.elasticsearch.client.IndicesAdminClient#exists(IndicesExistsRequest) + * @see org.opensearch.client.IndicesAdminClient#exists(IndicesExistsRequest) */ public static IndicesExistsRequest indicesExistsRequest(String... indices) { return new IndicesExistsRequest(indices); @@ -179,7 +179,7 @@ public class Requests { * * @param index The index to create * @return The index create request - * @see org.elasticsearch.client.IndicesAdminClient#create(CreateIndexRequest) + * @see org.opensearch.client.IndicesAdminClient#create(CreateIndexRequest) */ public static CreateIndexRequest createIndexRequest(String index) { return new CreateIndexRequest(index); @@ -190,7 +190,7 @@ public class Requests { * * @param index The index to delete * @return The delete index request - * @see org.elasticsearch.client.IndicesAdminClient#delete(DeleteIndexRequest) + * @see org.opensearch.client.IndicesAdminClient#delete(DeleteIndexRequest) */ public static DeleteIndexRequest deleteIndexRequest(String index) { return new DeleteIndexRequest(index); @@ -201,7 +201,7 @@ public class Requests { * * @param index The index to close * @return The delete index request - * @see org.elasticsearch.client.IndicesAdminClient#close(CloseIndexRequest) + * @see org.opensearch.client.IndicesAdminClient#close(CloseIndexRequest) */ public static CloseIndexRequest closeIndexRequest(String index) { return new CloseIndexRequest(index); @@ -212,7 +212,7 @@ public class Requests { * * @param index The index to open * @return The delete index request - * @see org.elasticsearch.client.IndicesAdminClient#open(OpenIndexRequest) + * @see org.opensearch.client.IndicesAdminClient#open(OpenIndexRequest) */ public static OpenIndexRequest openIndexRequest(String index) { return new OpenIndexRequest(index); @@ -223,7 +223,7 @@ public class Requests { * * @param indices The indices to create mapping. Use {@code null} or {@code _all} to execute against all indices * @return The create mapping request - * @see org.elasticsearch.client.IndicesAdminClient#putMapping(PutMappingRequest) + * @see org.opensearch.client.IndicesAdminClient#putMapping(PutMappingRequest) */ public static PutMappingRequest putMappingRequest(String... indices) { return new PutMappingRequest(indices); @@ -243,7 +243,7 @@ public class Requests { * * @param indices The indices to refresh. Use {@code null} or {@code _all} to execute against all indices * @return The refresh request - * @see org.elasticsearch.client.IndicesAdminClient#refresh(RefreshRequest) + * @see org.opensearch.client.IndicesAdminClient#refresh(RefreshRequest) */ public static RefreshRequest refreshRequest(String... indices) { return new RefreshRequest(indices); @@ -254,7 +254,7 @@ public class Requests { * * @param indices The indices to flush. Use {@code null} or {@code _all} to execute against all indices * @return The flush request - * @see org.elasticsearch.client.IndicesAdminClient#flush(FlushRequest) + * @see org.opensearch.client.IndicesAdminClient#flush(FlushRequest) */ public static FlushRequest flushRequest(String... indices) { return new FlushRequest(indices); @@ -265,7 +265,7 @@ public class Requests { * * @param indices The indices to sync flush. Use {@code null} or {@code _all} to execute against all indices * @return The synced flush request - * @see org.elasticsearch.client.IndicesAdminClient#syncedFlush(SyncedFlushRequest) + * @see org.opensearch.client.IndicesAdminClient#syncedFlush(SyncedFlushRequest) */ public static SyncedFlushRequest syncedFlushRequest(String... indices) { return new SyncedFlushRequest(indices); @@ -276,7 +276,7 @@ public class Requests { * * @param indices The indices to force merge. Use {@code null} or {@code _all} to execute against all indices * @return The force merge request - * @see org.elasticsearch.client.IndicesAdminClient#forceMerge(ForceMergeRequest) + * @see org.opensearch.client.IndicesAdminClient#forceMerge(ForceMergeRequest) */ public static ForceMergeRequest forceMergeRequest(String... indices) { return new ForceMergeRequest(indices); @@ -287,7 +287,7 @@ public class Requests { * * @param indices The indices to upgrade. Use {@code null} or {@code _all} to execute against all indices * @return The upgrade request - * @see org.elasticsearch.client.IndicesAdminClient#upgrade(UpgradeRequest) + * @see org.opensearch.client.IndicesAdminClient#upgrade(UpgradeRequest) */ public static UpgradeRequest upgradeRequest(String... indices) { return new UpgradeRequest(indices); @@ -317,7 +317,7 @@ public class Requests { * Creates a cluster state request. * * @return The cluster state request. - * @see org.elasticsearch.client.ClusterAdminClient#state(ClusterStateRequest) + * @see org.opensearch.client.ClusterAdminClient#state(ClusterStateRequest) */ public static ClusterStateRequest clusterStateRequest() { return new ClusterStateRequest(); @@ -337,7 +337,7 @@ public class Requests { * @param indices The indices to provide additional cluster health information for. * Use {@code null} or {@code _all} to execute against all indices * @return The cluster health request - * @see org.elasticsearch.client.ClusterAdminClient#health(ClusterHealthRequest) + * @see org.opensearch.client.ClusterAdminClient#health(ClusterHealthRequest) */ public static ClusterHealthRequest clusterHealthRequest(String... indices) { return new ClusterHealthRequest(indices); @@ -361,7 +361,7 @@ public class Requests { * Creates a nodes info request against all the nodes. * * @return The nodes info request - * @see org.elasticsearch.client.ClusterAdminClient#nodesInfo(NodesInfoRequest) + * @see org.opensearch.client.ClusterAdminClient#nodesInfo(NodesInfoRequest) */ public static NodesInfoRequest nodesInfoRequest() { return new NodesInfoRequest(); @@ -372,7 +372,7 @@ public class Requests { * * @param nodesIds The nodes ids to get the status for * @return The nodes info request - * @see org.elasticsearch.client.ClusterAdminClient#nodesStats(NodesStatsRequest) + * @see org.opensearch.client.ClusterAdminClient#nodesStats(NodesStatsRequest) */ public static NodesInfoRequest nodesInfoRequest(String... nodesIds) { return new NodesInfoRequest(nodesIds); @@ -383,7 +383,7 @@ public class Requests { * * @param nodesIds The nodes ids to get the stats for * @return The nodes info request - * @see org.elasticsearch.client.ClusterAdminClient#nodesStats(NodesStatsRequest) + * @see org.opensearch.client.ClusterAdminClient#nodesStats(NodesStatsRequest) */ public static NodesStatsRequest nodesStatsRequest(String... nodesIds) { return new NodesStatsRequest(nodesIds); @@ -396,7 +396,7 @@ public class Requests { * @param nodesIds * The nodes ids to get the usage for * @return The nodes usage request - * @see org.elasticsearch.client.ClusterAdminClient#nodesUsage(NodesUsageRequest) + * @see org.opensearch.client.ClusterAdminClient#nodesUsage(NodesUsageRequest) */ public static NodesUsageRequest nodesUsageRequest(String... nodesIds) { return new NodesUsageRequest(nodesIds); @@ -406,7 +406,7 @@ public class Requests { * Creates a cluster stats request. * * @return The cluster stats request - * @see org.elasticsearch.client.ClusterAdminClient#clusterStats(ClusterStatsRequest) + * @see org.opensearch.client.ClusterAdminClient#clusterStats(ClusterStatsRequest) */ public static ClusterStatsRequest clusterStatsRequest() { return new ClusterStatsRequest(); @@ -416,7 +416,7 @@ public class Requests { * Creates a nodes tasks request against all the nodes. * * @return The nodes tasks request - * @see org.elasticsearch.client.ClusterAdminClient#listTasks(ListTasksRequest) + * @see org.opensearch.client.ClusterAdminClient#listTasks(ListTasksRequest) */ public static ListTasksRequest listTasksRequest() { return new ListTasksRequest(); @@ -426,7 +426,7 @@ public class Requests { * Creates a get task request. * * @return The nodes tasks request - * @see org.elasticsearch.client.ClusterAdminClient#getTask(GetTaskRequest) + * @see org.opensearch.client.ClusterAdminClient#getTask(GetTaskRequest) */ public static GetTaskRequest getTaskRequest() { return new GetTaskRequest(); @@ -436,7 +436,7 @@ public class Requests { * Creates a nodes tasks request against one or more nodes. Pass {@code null} or an empty array for all nodes. * * @return The nodes tasks request - * @see org.elasticsearch.client.ClusterAdminClient#cancelTasks(CancelTasksRequest) + * @see org.opensearch.client.ClusterAdminClient#cancelTasks(CancelTasksRequest) */ public static CancelTasksRequest cancelTasksRequest() { return new CancelTasksRequest(); diff --git a/server/src/main/java/org/elasticsearch/client/node/NodeClient.java b/server/src/main/java/org/opensearch/client/node/NodeClient.java similarity index 96% rename from server/src/main/java/org/elasticsearch/client/node/NodeClient.java rename to server/src/main/java/org/opensearch/client/node/NodeClient.java index 191d10502fe..9e873e67671 100644 --- a/server/src/main/java/org/elasticsearch/client/node/NodeClient.java +++ b/server/src/main/java/org/opensearch/client/node/NodeClient.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.client.node; +package org.opensearch.client.node; import org.opensearch.action.ActionType; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; import org.opensearch.action.support.TransportAction; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.support.AbstractClient; +import org.opensearch.client.Client; +import org.opensearch.client.support.AbstractClient; import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.settings.Settings; diff --git a/server/src/main/java/org/elasticsearch/client/package-info.java b/server/src/main/java/org/opensearch/client/package-info.java similarity index 90% rename from server/src/main/java/org/elasticsearch/client/package-info.java rename to server/src/main/java/org/opensearch/client/package-info.java index cd350022aed..be93178c330 100644 --- a/server/src/main/java/org/elasticsearch/client/package-info.java +++ b/server/src/main/java/org/opensearch/client/package-info.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -20,4 +20,4 @@ /** * The client module allowing to easily perform actions/operations. */ -package org.elasticsearch.client; \ No newline at end of file +package org.opensearch.client; diff --git a/server/src/main/java/org/elasticsearch/client/support/AbstractClient.java b/server/src/main/java/org/opensearch/client/support/AbstractClient.java similarity index 99% rename from server/src/main/java/org/elasticsearch/client/support/AbstractClient.java rename to server/src/main/java/org/opensearch/client/support/AbstractClient.java index 1b479b067d0..9e5c91cf3a3 100644 --- a/server/src/main/java/org/elasticsearch/client/support/AbstractClient.java +++ b/server/src/main/java/org/opensearch/client/support/AbstractClient.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.support; +package org.opensearch.client.support; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -333,8 +333,8 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchScrollAction; import org.elasticsearch.action.search.SearchScrollRequest; import org.elasticsearch.action.search.SearchScrollRequestBuilder; -import org.elasticsearch.action.support.PlainActionFuture; -import org.elasticsearch.action.support.ThreadedActionListener; +import org.opensearch.action.support.PlainActionFuture; +import org.opensearch.action.support.ThreadedActionListener; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.action.termvectors.MultiTermVectorsAction; import org.elasticsearch.action.termvectors.MultiTermVectorsRequest; @@ -348,12 +348,12 @@ import org.elasticsearch.action.update.UpdateAction; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.elasticsearch.action.update.UpdateResponse; -import org.elasticsearch.client.AdminClient; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.ClusterAdminClient; -import org.elasticsearch.client.OpenSearchClient; -import org.elasticsearch.client.FilterClient; -import org.elasticsearch.client.IndicesAdminClient; +import org.opensearch.client.AdminClient; +import org.opensearch.client.Client; +import org.opensearch.client.ClusterAdminClient; +import org.opensearch.client.OpenSearchClient; +import org.opensearch.client.FilterClient; +import org.opensearch.client.IndicesAdminClient; import org.opensearch.cluster.metadata.IndexMetadata.APIBlock; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.bytes.BytesReference; diff --git a/server/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java b/server/src/main/java/org/opensearch/client/transport/NoNodeAvailableException.java similarity index 93% rename from server/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java rename to server/src/main/java/org/opensearch/client/transport/NoNodeAvailableException.java index 4e2200f7926..8b4f9265919 100644 --- a/server/src/main/java/org/elasticsearch/client/transport/NoNodeAvailableException.java +++ b/server/src/main/java/org/opensearch/client/transport/NoNodeAvailableException.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.transport; +package org.opensearch.client.transport; import org.elasticsearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/elasticsearch/client/transport/TransportClient.java b/server/src/main/java/org/opensearch/client/transport/TransportClient.java similarity index 96% rename from server/src/main/java/org/elasticsearch/client/transport/TransportClient.java rename to server/src/main/java/org/opensearch/client/transport/TransportClient.java index 23f07622aff..0dfcf3220d7 100644 --- a/server/src/main/java/org/elasticsearch/client/transport/TransportClient.java +++ b/server/src/main/java/org/opensearch/client/transport/TransportClient.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.client.transport; +package org.opensearch.client.transport; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionModule; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; import org.opensearch.action.ActionType; -import org.elasticsearch.client.support.AbstractClient; +import org.opensearch.client.support.AbstractClient; import org.opensearch.cluster.ClusterModule; import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.UUIDs; @@ -46,16 +46,16 @@ import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.PageCacheRecycler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.core.internal.io.IOUtils; -import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.indices.SystemIndices; -import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.node.InternalSettingsPreparer; -import org.elasticsearch.node.Node; -import org.elasticsearch.plugins.ActionPlugin; -import org.elasticsearch.plugins.NetworkPlugin; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.PluginsService; -import org.elasticsearch.plugins.SearchPlugin; +import org.opensearch.indices.IndicesModule; +import org.opensearch.indices.SystemIndices; +import org.opensearch.indices.breaker.CircuitBreakerService; +import org.opensearch.node.InternalSettingsPreparer; +import org.opensearch.node.Node; +import org.opensearch.plugins.ActionPlugin; +import org.opensearch.plugins.NetworkPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.PluginsService; +import org.opensearch.plugins.SearchPlugin; import org.elasticsearch.search.SearchModule; import org.opensearch.threadpool.ExecutorBuilder; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java b/server/src/main/java/org/opensearch/client/transport/TransportClientNodesService.java similarity index 99% rename from server/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java rename to server/src/main/java/org/opensearch/client/transport/TransportClientNodesService.java index 9a01b2bd8be..014e8cbbe2e 100644 --- a/server/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java +++ b/server/src/main/java/org/opensearch/client/transport/TransportClientNodesService.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.transport; +package org.opensearch.client.transport; import com.carrotsearch.hppc.cursors.ObjectCursor; import org.apache.logging.log4j.LogManager; @@ -33,7 +33,7 @@ import org.opensearch.action.admin.cluster.node.liveness.LivenessResponse; import org.opensearch.action.admin.cluster.node.liveness.TransportLivenessAction; import org.opensearch.action.admin.cluster.state.ClusterStateAction; import org.opensearch.action.admin.cluster.state.ClusterStateResponse; -import org.elasticsearch.client.Requests; +import org.opensearch.client.Requests; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.Randomness; diff --git a/server/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java b/server/src/main/java/org/opensearch/client/transport/TransportProxyClient.java similarity index 96% rename from server/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java rename to server/src/main/java/org/opensearch/client/transport/TransportProxyClient.java index bbdb29f7eb8..f4479b66150 100644 --- a/server/src/main/java/org/elasticsearch/client/transport/TransportProxyClient.java +++ b/server/src/main/java/org/opensearch/client/transport/TransportProxyClient.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.transport; +package org.opensearch.client.transport; import org.opensearch.action.ActionType; import org.opensearch.action.ActionListener; diff --git a/server/src/main/java/org/opensearch/cluster/ClusterState.java b/server/src/main/java/org/opensearch/cluster/ClusterState.java index 7f5713e40f5..0ccba8cb52a 100644 --- a/server/src/main/java/org/opensearch/cluster/ClusterState.java +++ b/server/src/main/java/org/opensearch/cluster/ClusterState.java @@ -23,7 +23,7 @@ import com.carrotsearch.hppc.cursors.ObjectCursor; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import org.elasticsearch.Version; -import org.elasticsearch.client.transport.TransportClient; +import org.opensearch.client.transport.TransportClient; import org.opensearch.cluster.block.ClusterBlock; import org.opensearch.cluster.block.ClusterBlocks; import org.opensearch.cluster.coordination.CoordinationMetadata; diff --git a/server/src/main/java/org/opensearch/cluster/InternalClusterInfoService.java b/server/src/main/java/org/opensearch/cluster/InternalClusterInfoService.java index 483c5c7bae7..0803b306e11 100644 --- a/server/src/main/java/org/opensearch/cluster/InternalClusterInfoService.java +++ b/server/src/main/java/org/opensearch/cluster/InternalClusterInfoService.java @@ -32,7 +32,7 @@ import org.opensearch.action.admin.indices.stats.IndicesStatsRequest; import org.opensearch.action.admin.indices.stats.IndicesStatsResponse; import org.opensearch.action.admin.indices.stats.ShardStats; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.block.ClusterBlockException; import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.ShardRouting; @@ -47,7 +47,7 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.elasticsearch.index.store.StoreStats; -import org.elasticsearch.monitor.fs.FsInfo; +import org.opensearch.monitor.fs.FsInfo; import org.opensearch.threadpool.ThreadPool; import org.elasticsearch.transport.ReceiveTimeoutTransportException; diff --git a/server/src/main/java/org/opensearch/cluster/action/index/MappingUpdatedAction.java b/server/src/main/java/org/opensearch/cluster/action/index/MappingUpdatedAction.java index 1f02dda04bb..9e8fa0dd788 100644 --- a/server/src/main/java/org/opensearch/cluster/action/index/MappingUpdatedAction.java +++ b/server/src/main/java/org/opensearch/cluster/action/index/MappingUpdatedAction.java @@ -25,8 +25,8 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.admin.indices.mapping.put.AutoPutMappingAction; import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest; import org.elasticsearch.action.support.master.MasterNodeRequest; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.IndicesAdminClient; +import org.opensearch.client.Client; +import org.opensearch.client.IndicesAdminClient; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.ClusterSettings; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/NodeToolCli.java b/server/src/main/java/org/opensearch/cluster/coordination/NodeToolCli.java index 16597c4f4a8..045f872ce25 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/NodeToolCli.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/NodeToolCli.java @@ -18,7 +18,7 @@ */ package org.opensearch.cluster.coordination; -import org.elasticsearch.cli.CommandLoggingConfigurator; +import org.opensearch.cli.CommandLoggingConfigurator; import org.opensearch.cli.MultiCommand; import org.opensearch.cli.Terminal; import org.elasticsearch.env.NodeRepurposeCommand; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/OpenSearchNodeCommand.java b/server/src/main/java/org/opensearch/cluster/coordination/OpenSearchNodeCommand.java index 7d3bdb29a42..17ffe7a92d9 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/OpenSearchNodeCommand.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/OpenSearchNodeCommand.java @@ -27,7 +27,7 @@ import org.apache.lucene.store.LockObtainFailedException; import org.elasticsearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.action.admin.indices.rollover.Condition; -import org.elasticsearch.cli.EnvironmentAwareCommand; +import org.opensearch.cli.EnvironmentAwareCommand; import org.opensearch.cli.Terminal; import org.opensearch.cli.UserException; import org.opensearch.cluster.ClusterModule; diff --git a/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java b/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java index a0ad437f175..12bdf6cad2f 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java @@ -51,7 +51,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.gateway.MetadataStateFormat; +import org.opensearch.gateway.MetadataStateFormat; import org.elasticsearch.index.Index; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.seqno.SequenceNumbers; diff --git a/server/src/main/java/org/opensearch/cluster/metadata/TemplateUpgradeService.java b/server/src/main/java/org/opensearch/cluster/metadata/TemplateUpgradeService.java index 5884190a55d..8dc5a803bb6 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/TemplateUpgradeService.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/TemplateUpgradeService.java @@ -28,7 +28,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest; import org.opensearch.action.admin.indices.template.put.PutIndexTemplateRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.ClusterChangedEvent; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.ClusterStateListener; diff --git a/server/src/main/java/org/opensearch/index/IndexModule.java b/server/src/main/java/org/opensearch/index/IndexModule.java index 7784b02abd0..b75912a1902 100644 --- a/server/src/main/java/org/opensearch/index/IndexModule.java +++ b/server/src/main/java/org/opensearch/index/IndexModule.java @@ -29,7 +29,7 @@ import org.apache.lucene.store.MMapDirectory; import org.apache.lucene.util.Constants; import org.apache.lucene.util.SetOnce; import org.elasticsearch.Version; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.CheckedFunction; @@ -55,12 +55,12 @@ import org.elasticsearch.index.shard.IndexingOperationListener; import org.elasticsearch.index.shard.SearchOperationListener; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.index.store.FsDirectoryFactory; -import org.elasticsearch.indices.IndicesQueryCache; -import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; -import org.elasticsearch.indices.mapper.MapperRegistry; -import org.elasticsearch.indices.recovery.RecoveryState; -import org.elasticsearch.plugins.IndexStorePlugin; +import org.opensearch.indices.IndicesQueryCache; +import org.opensearch.indices.breaker.CircuitBreakerService; +import org.opensearch.indices.fielddata.cache.IndicesFieldDataCache; +import org.opensearch.indices.mapper.MapperRegistry; +import org.opensearch.indices.recovery.RecoveryState; +import org.opensearch.plugins.IndexStorePlugin; import org.opensearch.script.ScriptService; import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry; import org.opensearch.threadpool.ThreadPool; @@ -144,7 +144,7 @@ public final class IndexModule { /** * Construct the index module for the index with the specified index settings. The index module contains extension points for plugins - * via {@link org.elasticsearch.plugins.PluginsService#onIndexModule(IndexModule)}. + * via {@link org.opensearch.plugins.PluginsService#onIndexModule(IndexModule)}. * * @param indexSettings the index settings * @param analysisRegistry the analysis registry diff --git a/server/src/main/java/org/opensearch/index/IndexService.java b/server/src/main/java/org/opensearch/index/IndexService.java index 59c0764a1ae..ade87218535 100644 --- a/server/src/main/java/org/opensearch/index/IndexService.java +++ b/server/src/main/java/org/opensearch/index/IndexService.java @@ -29,7 +29,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.Accountable; import org.elasticsearch.Assertions; import org.elasticsearch.Version; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNode; @@ -50,8 +50,8 @@ import org.elasticsearch.core.internal.io.IOUtils; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.env.ShardLock; import org.elasticsearch.env.ShardLockObtainFailedException; -import org.elasticsearch.gateway.MetadataStateFormat; -import org.elasticsearch.gateway.WriteStateException; +import org.opensearch.gateway.MetadataStateFormat; +import org.opensearch.gateway.WriteStateException; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.cache.IndexCache; import org.elasticsearch.index.cache.bitset.BitsetFilterCache; @@ -76,12 +76,12 @@ import org.elasticsearch.index.shard.ShardPath; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.index.store.Store; import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.indices.cluster.IndicesClusterStateService; -import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; -import org.elasticsearch.indices.mapper.MapperRegistry; -import org.elasticsearch.indices.recovery.RecoveryState; -import org.elasticsearch.plugins.IndexStorePlugin; +import org.opensearch.indices.breaker.CircuitBreakerService; +import org.opensearch.indices.cluster.IndicesClusterStateService; +import org.opensearch.indices.fielddata.cache.IndicesFieldDataCache; +import org.opensearch.indices.mapper.MapperRegistry; +import org.opensearch.indices.recovery.RecoveryState; +import org.opensearch.plugins.IndexStorePlugin; import org.opensearch.script.ScriptService; import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/opensearch/index/IndexSettings.java b/server/src/main/java/org/opensearch/index/IndexSettings.java index 47cffe5b034..1b9f3df7a97 100644 --- a/server/src/main/java/org/opensearch/index/IndexSettings.java +++ b/server/src/main/java/org/opensearch/index/IndexSettings.java @@ -32,8 +32,8 @@ import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.ingest.IngestService; -import org.elasticsearch.node.Node; +import org.opensearch.ingest.IngestService; +import org.opensearch.node.Node; import java.util.Collections; import java.util.List; diff --git a/server/src/main/java/org/opensearch/index/fielddata/IndexFieldDataService.java b/server/src/main/java/org/opensearch/index/fielddata/IndexFieldDataService.java index aef27a1eb60..7550ad67767 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/IndexFieldDataService.java +++ b/server/src/main/java/org/opensearch/index/fielddata/IndexFieldDataService.java @@ -28,8 +28,8 @@ import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; +import org.opensearch.indices.breaker.CircuitBreakerService; +import org.opensearch.indices.fielddata.cache.IndicesFieldDataCache; import org.elasticsearch.search.lookup.SearchLookup; import java.io.Closeable; diff --git a/server/src/main/java/org/opensearch/index/mapper/DocumentMapperParser.java b/server/src/main/java/org/opensearch/index/mapper/DocumentMapperParser.java index fe2d0068b33..aef3358167e 100644 --- a/server/src/main/java/org/opensearch/index/mapper/DocumentMapperParser.java +++ b/server/src/main/java/org/opensearch/index/mapper/DocumentMapperParser.java @@ -32,7 +32,7 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.similarity.SimilarityService; -import org.elasticsearch.indices.mapper.MapperRegistry; +import org.opensearch.indices.mapper.MapperRegistry; import org.opensearch.script.ScriptService; import java.util.HashMap; diff --git a/server/src/main/java/org/opensearch/index/mapper/MapperService.java b/server/src/main/java/org/opensearch/index/mapper/MapperService.java index 74b2725c096..39a3d2486e6 100644 --- a/server/src/main/java/org/opensearch/index/mapper/MapperService.java +++ b/server/src/main/java/org/opensearch/index/mapper/MapperService.java @@ -53,8 +53,8 @@ import org.elasticsearch.index.analysis.TokenizerFactory; import org.elasticsearch.index.mapper.Mapper.BuilderContext; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.similarity.SimilarityService; -import org.elasticsearch.indices.InvalidTypeNameException; -import org.elasticsearch.indices.mapper.MapperRegistry; +import org.opensearch.indices.InvalidTypeNameException; +import org.opensearch.indices.mapper.MapperRegistry; import org.opensearch.script.ScriptService; import java.io.Closeable; diff --git a/server/src/main/java/org/opensearch/index/query/AbstractGeometryQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/AbstractGeometryQueryBuilder.java index 81b8ed08856..1638ca7f459 100644 --- a/server/src/main/java/org/opensearch/index/query/AbstractGeometryQueryBuilder.java +++ b/server/src/main/java/org/opensearch/index/query/AbstractGeometryQueryBuilder.java @@ -26,7 +26,7 @@ import org.elasticsearch.Version; import org.opensearch.action.ActionListener; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParsingException; diff --git a/server/src/main/java/org/opensearch/index/query/MoreLikeThisQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/MoreLikeThisQueryBuilder.java index 49c9b772e47..1eef11ba88a 100644 --- a/server/src/main/java/org/opensearch/index/query/MoreLikeThisQueryBuilder.java +++ b/server/src/main/java/org/opensearch/index/query/MoreLikeThisQueryBuilder.java @@ -32,7 +32,7 @@ import org.elasticsearch.action.termvectors.MultiTermVectorsRequest; import org.elasticsearch.action.termvectors.MultiTermVectorsResponse; import org.elasticsearch.action.termvectors.TermVectorsRequest; import org.elasticsearch.action.termvectors.TermVectorsResponse; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParsingException; diff --git a/server/src/main/java/org/opensearch/index/query/QueryRewriteContext.java b/server/src/main/java/org/opensearch/index/query/QueryRewriteContext.java index bf63d50094c..e9b1346bdf7 100644 --- a/server/src/main/java/org/opensearch/index/query/QueryRewriteContext.java +++ b/server/src/main/java/org/opensearch/index/query/QueryRewriteContext.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.query; import org.opensearch.action.ActionListener; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.util.concurrent.CountDown; import org.elasticsearch.common.xcontent.NamedXContentRegistry; diff --git a/server/src/main/java/org/opensearch/index/query/QueryShardContext.java b/server/src/main/java/org/opensearch/index/query/QueryShardContext.java index 4dd110b4a25..8ef5c4d86f2 100644 --- a/server/src/main/java/org/opensearch/index/query/QueryShardContext.java +++ b/server/src/main/java/org/opensearch/index/query/QueryShardContext.java @@ -28,7 +28,7 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.util.SetOnce; import org.elasticsearch.Version; import org.opensearch.action.ActionListener; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.common.CheckedFunction; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.Strings; diff --git a/server/src/main/java/org/opensearch/index/query/TermsQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/TermsQueryBuilder.java index df1bb350190..5289112e0cf 100644 --- a/server/src/main/java/org/opensearch/index/query/TermsQueryBuilder.java +++ b/server/src/main/java/org/opensearch/index/query/TermsQueryBuilder.java @@ -27,7 +27,7 @@ import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.SetOnce; import org.opensearch.action.ActionListener; import org.elasticsearch.action.get.GetRequest; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; diff --git a/server/src/main/java/org/opensearch/index/reindex/AbstractBulkByScrollRequestBuilder.java b/server/src/main/java/org/opensearch/index/reindex/AbstractBulkByScrollRequestBuilder.java index 8f9490cbf34..47787225a62 100644 --- a/server/src/main/java/org/opensearch/index/reindex/AbstractBulkByScrollRequestBuilder.java +++ b/server/src/main/java/org/opensearch/index/reindex/AbstractBulkByScrollRequestBuilder.java @@ -24,7 +24,7 @@ import org.opensearch.action.ActionRequestBuilder; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.support.ActiveShardCount; import org.elasticsearch.action.support.replication.ReplicationRequest; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.query.QueryBuilder; diff --git a/server/src/main/java/org/opensearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java b/server/src/main/java/org/opensearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java index 85cdf73245a..f0e3a5cd945 100644 --- a/server/src/main/java/org/opensearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java +++ b/server/src/main/java/org/opensearch/index/reindex/AbstractBulkIndexByScrollRequestBuilder.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.reindex; import org.opensearch.action.ActionType; import org.elasticsearch.action.search.SearchRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; import org.opensearch.script.Script; public abstract class AbstractBulkIndexByScrollRequestBuilder< diff --git a/server/src/main/java/org/opensearch/index/reindex/ClientScrollableHitSource.java b/server/src/main/java/org/opensearch/index/reindex/ClientScrollableHitSource.java index c768e0af310..bc3d2c08345 100644 --- a/server/src/main/java/org/opensearch/index/reindex/ClientScrollableHitSource.java +++ b/server/src/main/java/org/opensearch/index/reindex/ClientScrollableHitSource.java @@ -30,8 +30,8 @@ import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchScrollRequest; import org.elasticsearch.action.search.ShardSearchFailure; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.ParentTaskAssigningClient; +import org.opensearch.client.Client; +import org.opensearch.client.ParentTaskAssigningClient; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.document.DocumentField; import org.elasticsearch.common.unit.TimeValue; diff --git a/server/src/main/java/org/opensearch/index/reindex/DeleteByQueryRequestBuilder.java b/server/src/main/java/org/opensearch/index/reindex/DeleteByQueryRequestBuilder.java index 46858088394..382821337c7 100644 --- a/server/src/main/java/org/opensearch/index/reindex/DeleteByQueryRequestBuilder.java +++ b/server/src/main/java/org/opensearch/index/reindex/DeleteByQueryRequestBuilder.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.reindex; import org.opensearch.action.ActionType; import org.elasticsearch.action.search.SearchAction; import org.elasticsearch.action.search.SearchRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class DeleteByQueryRequestBuilder extends AbstractBulkByScrollRequestBuilder { diff --git a/server/src/main/java/org/opensearch/index/reindex/ReindexRequestBuilder.java b/server/src/main/java/org/opensearch/index/reindex/ReindexRequestBuilder.java index 7187efd9a5d..165e2718c08 100644 --- a/server/src/main/java/org/opensearch/index/reindex/ReindexRequestBuilder.java +++ b/server/src/main/java/org/opensearch/index/reindex/ReindexRequestBuilder.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.index.IndexAction; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchAction; import org.elasticsearch.action.search.SearchRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class ReindexRequestBuilder extends AbstractBulkIndexByScrollRequestBuilder { diff --git a/server/src/main/java/org/opensearch/index/reindex/UpdateByQueryRequestBuilder.java b/server/src/main/java/org/opensearch/index/reindex/UpdateByQueryRequestBuilder.java index 0eb4962ba8f..41250f99ea6 100644 --- a/server/src/main/java/org/opensearch/index/reindex/UpdateByQueryRequestBuilder.java +++ b/server/src/main/java/org/opensearch/index/reindex/UpdateByQueryRequestBuilder.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.reindex; import org.opensearch.action.ActionType; import org.elasticsearch.action.search.SearchAction; import org.elasticsearch.action.search.SearchRequestBuilder; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.OpenSearchClient; public class UpdateByQueryRequestBuilder extends AbstractBulkIndexByScrollRequestBuilder { diff --git a/server/src/main/java/org/opensearch/index/shard/IndexShard.java b/server/src/main/java/org/opensearch/index/shard/IndexShard.java index 5a5f7b46d5d..2f98981e5a4 100644 --- a/server/src/main/java/org/opensearch/index/shard/IndexShard.java +++ b/server/src/main/java/org/opensearch/index/shard/IndexShard.java @@ -77,7 +77,7 @@ import org.elasticsearch.common.util.concurrent.RunOnce; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.core.internal.io.IOUtils; -import org.elasticsearch.gateway.WriteStateException; +import org.opensearch.gateway.WriteStateException; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexModule; import org.elasticsearch.index.IndexNotFoundException; @@ -137,15 +137,15 @@ import org.elasticsearch.index.translog.TranslogConfig; import org.elasticsearch.index.translog.TranslogStats; import org.elasticsearch.index.warmer.ShardIndexWarmerService; import org.elasticsearch.index.warmer.WarmerStats; -import org.elasticsearch.indices.IndexingMemoryController; -import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.indices.TypeMissingException; -import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.indices.cluster.IndicesClusterStateService; -import org.elasticsearch.indices.recovery.PeerRecoveryTargetService; -import org.elasticsearch.indices.recovery.RecoveryFailedException; -import org.elasticsearch.indices.recovery.RecoveryState; -import org.elasticsearch.indices.recovery.RecoveryTarget; +import org.opensearch.indices.IndexingMemoryController; +import org.opensearch.indices.IndicesService; +import org.opensearch.indices.TypeMissingException; +import org.opensearch.indices.breaker.CircuitBreakerService; +import org.opensearch.indices.cluster.IndicesClusterStateService; +import org.opensearch.indices.recovery.PeerRecoveryTargetService; +import org.opensearch.indices.recovery.RecoveryFailedException; +import org.opensearch.indices.recovery.RecoveryState; +import org.opensearch.indices.recovery.RecoveryTarget; import org.opensearch.repositories.RepositoriesService; import org.opensearch.repositories.Repository; import org.opensearch.rest.RestStatus; diff --git a/server/src/main/java/org/opensearch/index/shard/ShardToolCli.java b/server/src/main/java/org/opensearch/index/shard/ShardToolCli.java index 8640527e7c1..0ad41c8d64a 100644 --- a/server/src/main/java/org/opensearch/index/shard/ShardToolCli.java +++ b/server/src/main/java/org/opensearch/index/shard/ShardToolCli.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.index.shard; -import org.elasticsearch.cli.LoggingAwareMultiCommand; +import org.opensearch.cli.LoggingAwareMultiCommand; import org.opensearch.cli.Terminal; /** diff --git a/server/src/main/java/org/opensearch/rest/BaseRestHandler.java b/server/src/main/java/org/opensearch/rest/BaseRestHandler.java index fbd2271f3f4..45ed67208d3 100644 --- a/server/src/main/java/org/opensearch/rest/BaseRestHandler.java +++ b/server/src/main/java/org/opensearch/rest/BaseRestHandler.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.search.spell.LevenshteinDistance; import org.apache.lucene.util.CollectionUtil; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.CheckedConsumer; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.settings.Setting; diff --git a/server/src/main/java/org/opensearch/rest/DeprecationRestHandler.java b/server/src/main/java/org/opensearch/rest/DeprecationRestHandler.java index 586058106be..62004ba702b 100644 --- a/server/src/main/java/org/opensearch/rest/DeprecationRestHandler.java +++ b/server/src/main/java/org/opensearch/rest/DeprecationRestHandler.java @@ -18,7 +18,7 @@ */ package org.opensearch.rest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.DeprecationLogger; diff --git a/server/src/main/java/org/opensearch/rest/RestController.java b/server/src/main/java/org/opensearch/rest/RestController.java index 93ed96677ad..8b5bcc4b542 100644 --- a/server/src/main/java/org/opensearch/rest/RestController.java +++ b/server/src/main/java/org/opensearch/rest/RestController.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.elasticsearch.OpenSearchException; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.common.breaker.CircuitBreaker; diff --git a/server/src/main/java/org/opensearch/rest/RestHandler.java b/server/src/main/java/org/opensearch/rest/RestHandler.java index ec282e5b3f2..8c9ab1eed59 100644 --- a/server/src/main/java/org/opensearch/rest/RestHandler.java +++ b/server/src/main/java/org/opensearch/rest/RestHandler.java @@ -19,7 +19,7 @@ package org.opensearch.rest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.xcontent.XContent; import org.opensearch.rest.RestRequest.Method; diff --git a/server/src/main/java/org/opensearch/rest/action/RestCancellableNodeClient.java b/server/src/main/java/org/opensearch/rest/action/RestCancellableNodeClient.java index 90ee3c37165..b707b02077d 100644 --- a/server/src/main/java/org/opensearch/rest/action/RestCancellableNodeClient.java +++ b/server/src/main/java/org/opensearch/rest/action/RestCancellableNodeClient.java @@ -24,10 +24,10 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; import org.opensearch.action.ActionType; import org.opensearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.FilterClient; -import org.elasticsearch.client.OriginSettingClient; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.Client; +import org.opensearch.client.FilterClient; +import org.opensearch.client.OriginSettingClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.http.HttpChannel; import org.opensearch.tasks.Task; import org.opensearch.tasks.TaskId; diff --git a/server/src/main/java/org/opensearch/rest/action/RestFieldCapabilitiesAction.java b/server/src/main/java/org/opensearch/rest/action/RestFieldCapabilitiesAction.java index bef60c5ac25..e5bc6fce154 100644 --- a/server/src/main/java/org/opensearch/rest/action/RestFieldCapabilitiesAction.java +++ b/server/src/main/java/org/opensearch/rest/action/RestFieldCapabilitiesAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action; import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/RestMainAction.java b/server/src/main/java/org/opensearch/rest/action/RestMainAction.java index f06c750029c..64175e528d4 100644 --- a/server/src/main/java/org/opensearch/rest/action/RestMainAction.java +++ b/server/src/main/java/org/opensearch/rest/action/RestMainAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action; import org.elasticsearch.action.main.MainAction; import org.elasticsearch.action.main.MainRequest; import org.elasticsearch.action.main.MainResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionAction.java index 92f1b304110..54b5a8b650e 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionAction.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.admin.cluster.configuration.AddVotingConfigExclusionsAction; import org.opensearch.action.admin.cluster.configuration.AddVotingConfigExclusionsRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.unit.TimeValue; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCancelTasksAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCancelTasksAction.java index 269af36f56a..595eab59540 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCancelTasksAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCancelTasksAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNodes; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCleanupRepositoryAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCleanupRepositoryAction.java index 3e17777361b..a96e0365dbc 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCleanupRepositoryAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCleanupRepositoryAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.repositories.cleanup.CleanupRepositoryRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; @@ -29,7 +29,7 @@ import java.io.IOException; import java.util.List; import static java.util.Collections.singletonList; -import static org.elasticsearch.client.Requests.cleanupRepositoryRequest; +import static org.opensearch.client.Requests.cleanupRepositoryRequest; import static org.opensearch.rest.RestRequest.Method.POST; /** diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClearVotingConfigExclusionsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClearVotingConfigExclusionsAction.java index 7910a5c3e07..ec5af3c02d2 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClearVotingConfigExclusionsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClearVotingConfigExclusionsAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.configuration.ClearVotingConfigExclusionsAction; import org.opensearch.action.admin.cluster.configuration.ClearVotingConfigExclusionsRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCloneSnapshotAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCloneSnapshotAction.java index fc6a78da3d9..ff36da5880b 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCloneSnapshotAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCloneSnapshotAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.snapshots.clone.CloneSnapshotRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java index 6013c5fca87..f12471cd347 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.allocation.ClusterAllocationExplainRequest; import org.opensearch.action.admin.cluster.allocation.ClusterAllocationExplainResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java index b29a7882e5e..f283b9c2018 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java @@ -22,8 +22,8 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.settings.ClusterGetSettingsResponse; import org.opensearch.action.admin.cluster.state.ClusterStateRequest; import org.opensearch.action.admin.cluster.state.ClusterStateResponse; -import org.elasticsearch.client.Requests; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.Requests; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterState; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthAction.java index 226a3867146..76aa3219024 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.health.ClusterHealthRequest; import org.opensearch.action.support.ActiveShardCount; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.health.ClusterHealthStatus; import org.elasticsearch.common.Priority; import org.elasticsearch.common.Strings; @@ -38,7 +38,7 @@ import java.util.Set; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; -import static org.elasticsearch.client.Requests.clusterHealthRequest; +import static org.opensearch.client.Requests.clusterHealthRequest; import static org.opensearch.rest.RestRequest.Method.GET; public class RestClusterHealthAction extends BaseRestHandler { diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterRerouteAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterRerouteAction.java index db7eb6ffa8a..6da27dab665 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterRerouteAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterRerouteAction.java @@ -20,8 +20,8 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.reroute.ClusterRerouteRequest; -import org.elasticsearch.client.Requests; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.Requests; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.allocation.command.AllocationCommands; import org.elasticsearch.common.ParseField; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java index 4cd265f3d2b..8bb3a6f826c 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java @@ -21,8 +21,8 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.shards.ClusterSearchShardsRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.Requests; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.Requests; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterStateAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterStateAction.java index e1eca507986..b26aa701b85 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterStateAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterStateAction.java @@ -22,8 +22,8 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.state.ClusterStateRequest; import org.opensearch.action.admin.cluster.state.ClusterStateResponse; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.Requests; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.Requests; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.Metadata; import org.elasticsearch.common.Strings; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterStatsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterStatsAction.java index 05924e63286..c6b81ece8b6 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterStatsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterStatsAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.stats.ClusterStatsRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestActions.NodesResponseRestListener; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java index 353346da70d..4024e9e1e63 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java @@ -20,8 +20,8 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest; -import org.elasticsearch.client.Requests; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.Requests; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCreateSnapshotAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCreateSnapshotAction.java index 75789a1d3c9..064fb789b81 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCreateSnapshotAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCreateSnapshotAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.snapshots.create.CreateSnapshotRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; @@ -30,7 +30,7 @@ import java.util.List; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; -import static org.elasticsearch.client.Requests.createSnapshotRequest; +import static org.opensearch.client.Requests.createSnapshotRequest; import static org.opensearch.rest.RestRequest.Method.POST; import static org.opensearch.rest.RestRequest.Method.PUT; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java index 23d273c9cd2..292924dc6e8 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteRepositoryAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.repositories.delete.DeleteRepositoryRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; @@ -29,7 +29,7 @@ import java.io.IOException; import java.util.List; import static java.util.Collections.singletonList; -import static org.elasticsearch.client.Requests.deleteRepositoryRequest; +import static org.opensearch.client.Requests.deleteRepositoryRequest; import static org.opensearch.rest.RestRequest.Method.DELETE; /** diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java index 2f6e52d4ffe..03f902468cb 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.snapshots.delete.DeleteSnapshotRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; @@ -30,7 +30,7 @@ import java.io.IOException; import java.util.List; import static java.util.Collections.singletonList; -import static org.elasticsearch.client.Requests.deleteSnapshotRequest; +import static org.opensearch.client.Requests.deleteSnapshotRequest; import static org.opensearch.rest.RestRequest.Method.DELETE; /** diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java index 5e477940e61..91198483f04 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.storedscripts.DeleteStoredScriptRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetRepositoriesAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetRepositoriesAction.java index fd5d5ac74a0..eb2f013ff45 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetRepositoriesAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetRepositoriesAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.repositories.get.GetRepositoriesRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsFilter; @@ -34,7 +34,7 @@ import java.util.Set; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; -import static org.elasticsearch.client.Requests.getRepositoryRequest; +import static org.opensearch.client.Requests.getRepositoryRequest; import static org.opensearch.rest.RestRequest.Method.GET; /** diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetScriptContextAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetScriptContextAction.java index e09e6663608..0d41a549816 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetScriptContextAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetScriptContextAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.storedscripts.GetScriptContextAction; import org.opensearch.action.admin.cluster.storedscripts.GetScriptContextRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetScriptLanguageAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetScriptLanguageAction.java index 892eebbea2b..db2f7f7fd27 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetScriptLanguageAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetScriptLanguageAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.storedscripts.GetScriptLanguageAction; import org.opensearch.action.admin.cluster.storedscripts.GetScriptLanguageRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetSnapshotsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetSnapshotsAction.java index 91efba9e926..da86bb5fc19 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetSnapshotsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetSnapshotsAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.snapshots.get.GetSnapshotsRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; @@ -30,7 +30,7 @@ import java.io.IOException; import java.util.List; import static java.util.Collections.singletonList; -import static org.elasticsearch.client.Requests.getSnapshotsRequest; +import static org.opensearch.client.Requests.getSnapshotsRequest; import static org.opensearch.rest.RestRequest.Method.GET; /** diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetStoredScriptAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetStoredScriptAction.java index b27ec0027db..875f70ad8fd 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetStoredScriptAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetStoredScriptAction.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.storedscripts.GetStoredScriptRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestStatusToXContentListener; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetTaskAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetTaskAction.java index 4bc256bc504..fe3be047d19 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetTaskAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetTaskAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.node.tasks.get.GetTaskRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.unit.TimeValue; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestListTasksAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestListTasksAction.java index 21a68674e4a..d96bbde3fde 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestListTasksAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestListTasksAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.ActionListener; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksRequest; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNodes; import org.elasticsearch.common.Strings; import org.elasticsearch.common.unit.TimeValue; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java index 16acc0ecad9..869cc1757ad 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.node.hotthreads.NodeHotThreads; import org.opensearch.action.admin.cluster.node.hotthreads.NodesHotThreadsRequest; import org.opensearch.action.admin.cluster.node.hotthreads.NodesHotThreadsResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.unit.TimeValue; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesInfoAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesInfoAction.java index 9ff8c60c110..d81bdfe660d 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesInfoAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesInfoAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.node.info.NodesInfoRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsFilter; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsAction.java index cc2ff3a5e99..0634bf60e14 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.node.stats.NodesStatsRequest; import org.opensearch.action.admin.indices.stats.CommonStatsFlags; import org.opensearch.action.admin.indices.stats.CommonStatsFlags.Flag; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesUsageAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesUsageAction.java index 107d3f4c404..e6a65ec1649 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesUsageAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesUsageAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.node.usage.NodesUsageRequest; import org.opensearch.action.admin.cluster.node.usage.NodesUsageResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java index ad62eb18198..172bdec589f 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.tasks.PendingClusterTasksRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPutRepositoryAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPutRepositoryAction.java index e7a5365fe49..13ca0524284 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPutRepositoryAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPutRepositoryAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.repositories.put.PutRepositoryRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; @@ -31,7 +31,7 @@ import java.util.List; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; -import static org.elasticsearch.client.Requests.putRepositoryRequest; +import static org.opensearch.client.Requests.putRepositoryRequest; import static org.opensearch.rest.RestRequest.Method.POST; import static org.opensearch.rest.RestRequest.Method.PUT; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPutStoredScriptAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPutStoredScriptAction.java index a36983a13d9..403fea824fd 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPutStoredScriptAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestPutStoredScriptAction.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.storedscripts.PutStoredScriptRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestReloadSecureSettingsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestReloadSecureSettingsAction.java index 2a0abd3cdc1..6fc570b40b5 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestReloadSecureSettingsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestReloadSecureSettingsAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.node.reload.NodesReloadSecureSettingsRequest; import org.opensearch.action.admin.cluster.node.reload.NodesReloadSecureSettingsRequestBuilder; import org.opensearch.action.admin.cluster.node.reload.NodesReloadSecureSettingsResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.SecureString; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java index 0b1500934de..bb1d8874dd7 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.remote.RemoteInfoAction; import org.opensearch.action.admin.cluster.remote.RemoteInfoRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRestoreSnapshotAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRestoreSnapshotAction.java index 31d27dbb30c..a17f8aec5cf 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRestoreSnapshotAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRestoreSnapshotAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; @@ -29,7 +29,7 @@ import java.io.IOException; import java.util.List; import static java.util.Collections.singletonList; -import static org.elasticsearch.client.Requests.restoreSnapshotRequest; +import static org.opensearch.client.Requests.restoreSnapshotRequest; import static org.opensearch.rest.RestRequest.Method.POST; /** diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java index 595dd7fd3c7..aefbc9175d0 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.snapshots.status.SnapshotsStatusRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; @@ -31,7 +31,7 @@ import java.util.List; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; -import static org.elasticsearch.client.Requests.snapshotsStatusRequest; +import static org.opensearch.client.Requests.snapshotsStatusRequest; import static org.opensearch.rest.RestRequest.Method.GET; /** diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestVerifyRepositoryAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestVerifyRepositoryAction.java index 064ce3566ba..2a173be70f5 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestVerifyRepositoryAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestVerifyRepositoryAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster; import org.opensearch.action.admin.cluster.repositories.verify.VerifyRepositoryRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; @@ -29,7 +29,7 @@ import java.io.IOException; import java.util.List; import static java.util.Collections.singletonList; -import static org.elasticsearch.client.Requests.verifyRepositoryRequest; +import static org.opensearch.client.Requests.verifyRepositoryRequest; import static org.opensearch.rest.RestRequest.Method.POST; public class RestVerifyRepositoryAction extends BaseRestHandler { diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/dangling/RestDeleteDanglingIndexAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/dangling/RestDeleteDanglingIndexAction.java index c8671f40352..8f2a40bab73 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/dangling/RestDeleteDanglingIndexAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/dangling/RestDeleteDanglingIndexAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.cluster.dangling; import org.opensearch.action.admin.indices.dangling.delete.DeleteDanglingIndexRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestStatus; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/dangling/RestImportDanglingIndexAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/dangling/RestImportDanglingIndexAction.java index d9ba2c9f9e9..7ce17f92dd4 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/dangling/RestImportDanglingIndexAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/dangling/RestImportDanglingIndexAction.java @@ -28,7 +28,7 @@ import java.util.List; import org.opensearch.action.admin.indices.dangling.import_index.ImportDanglingIndexRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestStatus; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/dangling/RestListDanglingIndicesAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/dangling/RestListDanglingIndicesAction.java index 2fb60a64091..54ee5be37cf 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/dangling/RestListDanglingIndicesAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/dangling/RestListDanglingIndicesAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.cluster.dangling; import org.opensearch.action.admin.indices.dangling.list.ListDanglingIndicesRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestActions; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestAddIndexBlockAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestAddIndexBlockAction.java index 8b3dd4d9d7a..a202ba62e79 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestAddIndexBlockAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestAddIndexBlockAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.readonly.AddIndexBlockRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestAnalyzeAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestAnalyzeAction.java index 6a6df62b3d7..ac5e0273b72 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestAnalyzeAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestAnalyzeAction.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.analyze.AnalyzeAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestClearIndicesCacheAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestClearIndicesCacheAction.java index 31f4a0d07fc..4f49fdb0822 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestClearIndicesCacheAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestClearIndicesCacheAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.cache.clear.ClearIndicesCacheRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCloseIndexAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCloseIndexAction.java index b5d59103e7c..514094dc814 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCloseIndexAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCloseIndexAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.close.CloseIndexRequest; import org.opensearch.action.support.ActiveShardCount; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCreateDataStreamAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCreateDataStreamAction.java index 2b995848b67..3e82ae64ea1 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCreateDataStreamAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCreateDataStreamAction.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.datastream.CreateDataStreamAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCreateIndexAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCreateIndexAction.java index 3ac08e08371..49a20d2f16b 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCreateIndexAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCreateIndexAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.create.CreateIndexRequest; import org.opensearch.action.support.ActiveShardCount; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.xcontent.LoggingDeprecationHandler; import org.elasticsearch.common.xcontent.XContentHelper; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDataStreamsStatsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDataStreamsStatsAction.java index 426e2a2e1d2..a96800a8ba0 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDataStreamsStatsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDataStreamsStatsAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.datastream.DataStreamsStatsAction; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteComponentTemplateAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteComponentTemplateAction.java index 2cf6d20eb1b..bcd7318f0b2 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteComponentTemplateAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteComponentTemplateAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.template.delete.DeleteComponentTemplateAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteComposableIndexTemplateAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteComposableIndexTemplateAction.java index 4c6ba3dd3dc..b89806084c3 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteComposableIndexTemplateAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteComposableIndexTemplateAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.template.delete.DeleteComposableIndexTemplateAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteDataStreamAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteDataStreamAction.java index e279881ce8d..a5929418efa 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteDataStreamAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteDataStreamAction.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.datastream.DeleteDataStreamAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteIndexAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteIndexAction.java index 0139d81212e..03652b66def 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteIndexAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteIndexAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.delete.DeleteIndexRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java index c0d379ee2fe..52ef3a0da16 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteIndexTemplateAction.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestFlushAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestFlushAction.java index 1c32b056ca9..077f1ce6d5a 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestFlushAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestFlushAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.flush.FlushRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestForceMergeAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestForceMergeAction.java index 3ac40d05a3e..9c0970d2f29 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestForceMergeAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestForceMergeAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.forcemerge.ForceMergeRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.DeprecationLogger; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetAliasesAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetAliasesAction.java index 2e564f0ffba..968f39da858 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetAliasesAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetAliasesAction.java @@ -23,7 +23,7 @@ import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import org.opensearch.action.admin.indices.alias.get.GetAliasesRequest; import org.opensearch.action.admin.indices.alias.get.GetAliasesResponse; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.Metadata; import org.elasticsearch.common.Strings; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetComponentTemplateAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetComponentTemplateAction.java index 3a18a235897..907f8f9c355 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetComponentTemplateAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetComponentTemplateAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.template.get.GetComponentTemplateAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetComposableIndexTemplateAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetComposableIndexTemplateAction.java index 0c1d0f83724..c731f88e64a 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetComposableIndexTemplateAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetComposableIndexTemplateAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.template.get.GetComposableIndexTemplateAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetDataStreamsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetDataStreamsAction.java index fc397759a8e..6ae0c5d6135 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetDataStreamsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetDataStreamsAction.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.datastream.GetDataStreamAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetFieldMappingAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetFieldMappingAction.java index 51df63ae47a..b628ad57241 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetFieldMappingAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetFieldMappingAction.java @@ -25,7 +25,7 @@ import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsRequest; import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse; import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndexTemplateAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndexTemplateAction.java index 3440c5d2de4..c74fce6b2ca 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndexTemplateAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndexTemplateAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.template.get.GetIndexTemplatesRequest; import org.opensearch.action.admin.indices.template.get.GetIndexTemplatesResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.settings.Settings; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndicesAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndicesAction.java index c2887e10ddc..dfd7f3f5cd7 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndicesAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndicesAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.get.GetIndexRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.settings.Settings; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetMappingAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetMappingAction.java index 0a633b8e03a..12a9fc5a7ed 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetMappingAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetMappingAction.java @@ -28,7 +28,7 @@ import org.opensearch.action.ActionRunnable; import org.opensearch.action.admin.indices.mapping.get.GetMappingsRequest; import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.MappingMetadata; import org.elasticsearch.common.Strings; import org.elasticsearch.common.collect.ImmutableOpenMap; @@ -37,7 +37,7 @@ import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.indices.TypeMissingException; +import org.opensearch.indices.TypeMissingException; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetSettingsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetSettingsAction.java index 36dee7ac644..8599aeb3d0a 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetSettingsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetSettingsAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.settings.get.GetSettingsRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java index aff070b7fb2..6375a29e424 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest; import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexPutAliasAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexPutAliasAction.java index 564da6017eb..109911dcc42 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexPutAliasAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexPutAliasAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest; import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesAliasesAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesAliasesAction.java index b3552fac34e..1aad9ac0c7a 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesAliasesAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesAliasesAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesSegmentsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesSegmentsAction.java index 50701f2a31d..aaae3771657 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesSegmentsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesSegmentsAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.segments.IndicesSegmentsRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesShardStoresAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesShardStoresAction.java index 86e4499cedd..3dee55cfe11 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesShardStoresAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesShardStoresAction.java @@ -23,7 +23,7 @@ import org.opensearch.action.admin.indices.shards.IndicesShardStoresAction; import org.opensearch.action.admin.indices.shards.IndicesShardStoresRequest; import org.opensearch.action.admin.indices.shards.IndicesShardStoresResponse; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsAction.java index 7189b6cb2df..a021f3d33a3 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsAction.java @@ -23,7 +23,7 @@ import org.opensearch.action.admin.indices.stats.CommonStatsFlags; import org.opensearch.action.admin.indices.stats.CommonStatsFlags.Flag; import org.opensearch.action.admin.indices.stats.IndicesStatsRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestOpenIndexAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestOpenIndexAction.java index 06ccff43505..527fa0bb4db 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestOpenIndexAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestOpenIndexAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.open.OpenIndexRequest; import org.opensearch.action.support.ActiveShardCount; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutComponentTemplateAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutComponentTemplateAction.java index 96eb32b9c4e..a8010eb8937 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutComponentTemplateAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutComponentTemplateAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.template.put.PutComponentTemplateAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.ComponentTemplate; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutComposableIndexTemplateAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutComposableIndexTemplateAction.java index 27e51b71fd5..4461bcb6983 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutComposableIndexTemplateAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutComposableIndexTemplateAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.template.put.PutComposableIndexTemplateAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.ComposableIndexTemplate; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateAction.java index 0a5d7e2820f..b395b4d90cf 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.template.put.PutIndexTemplateRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.xcontent.XContentHelper; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutMappingAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutMappingAction.java index 72a3320d794..d9bc425f1fc 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutMappingAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutMappingAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.xcontent.XContentHelper; @@ -36,7 +36,7 @@ import java.util.Map; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; -import static org.elasticsearch.client.Requests.putMappingRequest; +import static org.opensearch.client.Requests.putMappingRequest; import static org.elasticsearch.index.mapper.MapperService.isMappingSourceTyped; import static org.opensearch.rest.RestRequest.Method.POST; import static org.opensearch.rest.RestRequest.Method.PUT; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRecoveryAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRecoveryAction.java index a066d78f940..9b895b30112 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRecoveryAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRecoveryAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.recovery.RecoveryRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRefreshAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRefreshAction.java index 2a0e1909d92..5c21d49e492 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRefreshAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRefreshAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.refresh.RefreshRequest; import org.opensearch.action.admin.indices.refresh.RefreshResponse; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResizeHandler.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResizeHandler.java index 31f17858030..3b91eaa8b4b 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResizeHandler.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResizeHandler.java @@ -25,7 +25,7 @@ import org.elasticsearch.Version; import org.opensearch.action.admin.indices.shrink.ResizeRequest; import org.opensearch.action.admin.indices.shrink.ResizeType; import org.opensearch.action.support.ActiveShardCount; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Booleans; import org.elasticsearch.common.logging.DeprecationLogger; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResolveIndexAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResolveIndexAction.java index e54994a488d..70c7aa8209e 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResolveIndexAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResolveIndexAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.resolve.ResolveIndexAction; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRolloverIndexAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRolloverIndexAction.java index 828694a3a55..c2a9af2a3c9 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRolloverIndexAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRolloverIndexAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.rollover.RolloverRequest; import org.opensearch.action.support.ActiveShardCount; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.logging.DeprecationLogger; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSimulateIndexTemplateAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSimulateIndexTemplateAction.java index 6a2c222836e..6c19b556f70 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSimulateIndexTemplateAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSimulateIndexTemplateAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.template.post.SimulateIndexTemplateAction; import org.opensearch.action.admin.indices.template.post.SimulateIndexTemplateRequest; import org.opensearch.action.admin.indices.template.put.PutComposableIndexTemplateAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.ComposableIndexTemplate; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSimulateTemplateAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSimulateTemplateAction.java index a308d31bd88..76712af5b72 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSimulateTemplateAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSimulateTemplateAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.template.post.SimulateTemplateAction; import org.opensearch.action.admin.indices.template.put.PutComposableIndexTemplateAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.ComposableIndexTemplate; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSyncedFlushAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSyncedFlushAction.java index 19acd272e44..69666900cdf 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSyncedFlushAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSyncedFlushAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.flush.SyncedFlushRequest; import org.opensearch.action.admin.indices.flush.SyncedFlushResponse; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpdateSettingsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpdateSettingsAction.java index 042e6fa8672..d9cebcb482d 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpdateSettingsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpdateSettingsAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.Settings; import org.opensearch.rest.BaseRestHandler; @@ -34,7 +34,7 @@ import java.util.Set; import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; -import static org.elasticsearch.client.Requests.updateSettingsRequest; +import static org.opensearch.client.Requests.updateSettingsRequest; import static org.opensearch.rest.RestRequest.Method.PUT; public class RestUpdateSettingsAction extends BaseRestHandler { diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeAction.java index b8d61158c06..ef57befe7ef 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.upgrade.post.UpgradeRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeStatusAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeStatusAction.java index 7a1828e6063..c6fed8c95a0 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeStatusAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeStatusAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.upgrade.get.UpgradeStatusRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestValidateQueryAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestValidateQueryAction.java index 3eb4156c368..752f3f764e5 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestValidateQueryAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestValidateQueryAction.java @@ -23,7 +23,7 @@ import org.opensearch.action.admin.indices.validate.query.QueryExplanation; import org.opensearch.action.admin.indices.validate.query.ValidateQueryRequest; import org.opensearch.action.admin.indices.validate.query.ValidateQueryResponse; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.DeprecationLogger; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/AbstractCatAction.java b/server/src/main/java/org/opensearch/rest/action/cat/AbstractCatAction.java index 719b94dbc2a..30ec06a97e2 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/AbstractCatAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/AbstractCatAction.java @@ -18,7 +18,7 @@ */ package org.opensearch.rest.action.cat; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Table; import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.io.UTF8StreamWriter; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestAliasAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestAliasAction.java index 210201c09f9..f7e34021937 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestAliasAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestAliasAction.java @@ -22,7 +22,7 @@ import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import org.opensearch.action.admin.indices.alias.get.GetAliasesRequest; import org.opensearch.action.admin.indices.alias.get.GetAliasesResponse; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.AliasMetadata; import org.elasticsearch.common.Strings; import org.elasticsearch.common.Table; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestAllocationAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestAllocationAction.java index 3f7b365e3a8..761b528c4ab 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestAllocationAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestAllocationAction.java @@ -26,7 +26,7 @@ import org.opensearch.action.admin.cluster.node.stats.NodesStatsResponse; import org.opensearch.action.admin.cluster.state.ClusterStateRequest; import org.opensearch.action.admin.cluster.state.ClusterStateResponse; import org.opensearch.action.admin.indices.stats.CommonStatsFlags; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.common.Strings; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestCatAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestCatAction.java index cc9bf45ff0f..a8d1cbb2fc1 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestCatAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestCatAction.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.cat; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestCatRecoveryAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestCatRecoveryAction.java index 5c76f26981b..c52585597a6 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestCatRecoveryAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestCatRecoveryAction.java @@ -23,7 +23,7 @@ import org.apache.lucene.util.CollectionUtil; import org.opensearch.action.admin.indices.recovery.RecoveryRequest; import org.opensearch.action.admin.indices.recovery.RecoveryResponse; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.cluster.routing.RecoverySource; import org.elasticsearch.cluster.routing.RecoverySource.SnapshotRecoverySource; import org.elasticsearch.common.Strings; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java index 3c004ceae75..0678ed618b8 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.TotalHits; import org.elasticsearch.OpenSearchException; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.Table; import org.elasticsearch.index.query.QueryBuilder; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestFielddataAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestFielddataAction.java index 01c94fe75fe..31d3070f199 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestFielddataAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestFielddataAction.java @@ -23,7 +23,7 @@ import com.carrotsearch.hppc.cursors.ObjectLongCursor; import org.opensearch.action.admin.cluster.node.stats.NodeStats; import org.opensearch.action.admin.cluster.node.stats.NodesStatsRequest; import org.opensearch.action.admin.cluster.node.stats.NodesStatsResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Table; import org.elasticsearch.common.unit.ByteSizeValue; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestHealthAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestHealthAction.java index 0c65d43f680..999d34222cd 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestHealthAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestHealthAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.cat; import org.opensearch.action.admin.cluster.health.ClusterHealthRequest; import org.opensearch.action.admin.cluster.health.ClusterHealthResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Table; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestResponse; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java index 131d6d98845..6aedc5b63a0 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java @@ -31,9 +31,9 @@ import org.opensearch.action.admin.indices.stats.CommonStats; import org.opensearch.action.admin.indices.stats.IndexStats; import org.opensearch.action.admin.indices.stats.IndicesStatsRequest; import org.opensearch.action.admin.indices.stats.IndicesStatsResponse; -import org.elasticsearch.action.support.GroupedActionListener; +import org.opensearch.action.support.GroupedActionListener; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.health.ClusterHealthStatus; import org.opensearch.cluster.health.ClusterIndexHealth; import org.opensearch.cluster.metadata.IndexMetadata; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestMasterAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestMasterAction.java index 74e60530b6f..9c7bfb659d9 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestMasterAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestMasterAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.cat; import org.opensearch.action.admin.cluster.state.ClusterStateRequest; import org.opensearch.action.admin.cluster.state.ClusterStateResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; import org.elasticsearch.common.Table; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestNodeAttrsAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestNodeAttrsAction.java index 66550d9a1e9..896d7aff2ab 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestNodeAttrsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestNodeAttrsAction.java @@ -24,12 +24,12 @@ import org.opensearch.action.admin.cluster.node.info.NodesInfoRequest; import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse; import org.opensearch.action.admin.cluster.state.ClusterStateRequest; import org.opensearch.action.admin.cluster.state.ClusterStateResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; import org.elasticsearch.common.Strings; import org.elasticsearch.common.Table; -import org.elasticsearch.monitor.process.ProcessInfo; +import org.opensearch.monitor.process.ProcessInfo; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestResponse; import org.opensearch.rest.action.RestActionListener; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestNodesAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestNodesAction.java index 94dd197eeba..11974531006 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestNodesAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestNodesAction.java @@ -27,7 +27,7 @@ import org.opensearch.action.admin.cluster.node.stats.NodesStatsRequest; import org.opensearch.action.admin.cluster.node.stats.NodesStatsResponse; import org.opensearch.action.admin.cluster.state.ClusterStateRequest; import org.opensearch.action.admin.cluster.state.ClusterStateResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.cluster.node.DiscoveryNodes; @@ -37,7 +37,7 @@ import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.network.NetworkAddress; import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.common.unit.ByteSizeValue; -import org.elasticsearch.http.HttpInfo; +import org.opensearch.http.HttpInfo; import org.elasticsearch.index.cache.query.QueryCacheStats; import org.elasticsearch.index.cache.request.RequestCacheStats; import org.elasticsearch.index.engine.SegmentsStats; @@ -48,13 +48,13 @@ import org.elasticsearch.index.merge.MergeStats; import org.elasticsearch.index.refresh.RefreshStats; import org.elasticsearch.index.search.stats.SearchStats; import org.elasticsearch.index.shard.IndexingStats; -import org.elasticsearch.indices.NodeIndicesStats; -import org.elasticsearch.monitor.fs.FsInfo; -import org.elasticsearch.monitor.jvm.JvmInfo; -import org.elasticsearch.monitor.jvm.JvmStats; -import org.elasticsearch.monitor.os.OsStats; -import org.elasticsearch.monitor.process.ProcessInfo; -import org.elasticsearch.monitor.process.ProcessStats; +import org.opensearch.indices.NodeIndicesStats; +import org.opensearch.monitor.fs.FsInfo; +import org.opensearch.monitor.jvm.JvmInfo; +import org.opensearch.monitor.jvm.JvmStats; +import org.opensearch.monitor.os.OsStats; +import org.opensearch.monitor.process.ProcessInfo; +import org.opensearch.monitor.process.ProcessStats; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestResponse; import org.opensearch.rest.action.RestActionListener; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestPendingClusterTasksAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestPendingClusterTasksAction.java index 00f7fadc0c0..08db85f944b 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestPendingClusterTasksAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestPendingClusterTasksAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.cat; import org.opensearch.action.admin.cluster.tasks.PendingClusterTasksRequest; import org.opensearch.action.admin.cluster.tasks.PendingClusterTasksResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.cluster.service.PendingClusterTask; import org.elasticsearch.common.Table; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestPluginsAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestPluginsAction.java index c9e4bb4be1d..9dfa2da94e7 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestPluginsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestPluginsAction.java @@ -25,11 +25,11 @@ import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse; import org.opensearch.action.admin.cluster.node.info.PluginsAndModules; import org.opensearch.action.admin.cluster.state.ClusterStateRequest; import org.opensearch.action.admin.cluster.state.ClusterStateResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; import org.elasticsearch.common.Table; -import org.elasticsearch.plugins.PluginInfo; +import org.opensearch.plugins.PluginInfo; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestResponse; import org.opensearch.rest.action.RestActionListener; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestRepositoriesAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestRepositoriesAction.java index 8fcaa42aed8..05893fa5064 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestRepositoriesAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestRepositoriesAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.cat; import org.opensearch.action.admin.cluster.repositories.get.GetRepositoriesRequest; import org.opensearch.action.admin.cluster.repositories.get.GetRepositoriesResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.RepositoryMetadata; import org.elasticsearch.common.Table; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestSegmentsAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestSegmentsAction.java index 45d71022e30..062cc39e43c 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestSegmentsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestSegmentsAction.java @@ -26,7 +26,7 @@ import org.opensearch.action.admin.indices.segments.IndexShardSegments; import org.opensearch.action.admin.indices.segments.IndicesSegmentResponse; import org.opensearch.action.admin.indices.segments.IndicesSegmentsRequest; import org.opensearch.action.admin.indices.segments.ShardSegments; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNodes; import org.elasticsearch.common.Strings; import org.elasticsearch.common.Table; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java index 86b5e95ed96..59028b66636 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java @@ -25,7 +25,7 @@ import org.opensearch.action.admin.indices.stats.CommonStats; import org.opensearch.action.admin.indices.stats.IndicesStatsRequest; import org.opensearch.action.admin.indices.stats.IndicesStatsResponse; import org.opensearch.action.admin.indices.stats.ShardStats; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.routing.UnassignedInfo; import org.elasticsearch.common.Strings; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestSnapshotAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestSnapshotAction.java index 0b968ae629c..cb47ef9922f 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestSnapshotAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestSnapshotAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action.cat; import org.opensearch.action.admin.cluster.snapshots.get.GetSnapshotsRequest; import org.opensearch.action.admin.cluster.snapshots.get.GetSnapshotsResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Table; import org.elasticsearch.common.time.DateFormatter; import org.elasticsearch.common.unit.TimeValue; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestTasksAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestTasksAction.java index edbfc2f14b4..634e50f942e 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestTasksAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestTasksAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action.cat; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksRequest; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; import org.opensearch.action.admin.cluster.node.tasks.list.TaskGroup; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; import org.elasticsearch.common.Strings; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestTemplatesAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestTemplatesAction.java index 3a458989c52..56e607cd19a 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestTemplatesAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestTemplatesAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action.cat; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import org.opensearch.action.admin.cluster.state.ClusterStateRequest; import org.opensearch.action.admin.cluster.state.ClusterStateResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.IndexTemplateMetadata; import org.opensearch.cluster.metadata.ComposableIndexTemplate; import org.opensearch.cluster.metadata.Metadata; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestThreadPoolAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestThreadPoolAction.java index f00177fbec2..d5ed138163a 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestThreadPoolAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestThreadPoolAction.java @@ -27,12 +27,12 @@ import org.opensearch.action.admin.cluster.node.stats.NodesStatsRequest; import org.opensearch.action.admin.cluster.node.stats.NodesStatsResponse; import org.opensearch.action.admin.cluster.state.ClusterStateRequest; import org.opensearch.action.admin.cluster.state.ClusterStateResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; import org.elasticsearch.common.Table; import org.elasticsearch.common.regex.Regex; -import org.elasticsearch.monitor.process.ProcessInfo; +import org.opensearch.monitor.process.ProcessInfo; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestResponse; import org.opensearch.rest.action.RestActionListener; diff --git a/server/src/main/java/org/opensearch/rest/action/document/RestBulkAction.java b/server/src/main/java/org/opensearch/rest/action/document/RestBulkAction.java index 3b5bd6bae9c..2bd50d1430b 100644 --- a/server/src/main/java/org/opensearch/rest/action/document/RestBulkAction.java +++ b/server/src/main/java/org/opensearch/rest/action/document/RestBulkAction.java @@ -23,8 +23,8 @@ import org.opensearch.action.DocWriteRequest; import org.opensearch.action.bulk.BulkRequest; import org.opensearch.action.bulk.BulkShardRequest; import org.opensearch.action.support.ActiveShardCount; -import org.elasticsearch.client.Requests; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.Requests; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.mapper.MapperService; diff --git a/server/src/main/java/org/opensearch/rest/action/document/RestDeleteAction.java b/server/src/main/java/org/opensearch/rest/action/document/RestDeleteAction.java index 899bff14ed5..851ddf520ee 100644 --- a/server/src/main/java/org/opensearch/rest/action/document/RestDeleteAction.java +++ b/server/src/main/java/org/opensearch/rest/action/document/RestDeleteAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.document; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.support.ActiveShardCount; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.index.VersionType; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/document/RestGetAction.java b/server/src/main/java/org/opensearch/rest/action/document/RestGetAction.java index bdb5cd655ad..507de395aa2 100644 --- a/server/src/main/java/org/opensearch/rest/action/document/RestGetAction.java +++ b/server/src/main/java/org/opensearch/rest/action/document/RestGetAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.document; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.index.VersionType; diff --git a/server/src/main/java/org/opensearch/rest/action/document/RestGetSourceAction.java b/server/src/main/java/org/opensearch/rest/action/document/RestGetSourceAction.java index 7088e03a88e..ed88c54be59 100644 --- a/server/src/main/java/org/opensearch/rest/action/document/RestGetSourceAction.java +++ b/server/src/main/java/org/opensearch/rest/action/document/RestGetSourceAction.java @@ -23,7 +23,7 @@ import org.elasticsearch.ResourceNotFoundException; import org.opensearch.action.ActionRequestValidationException; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/rest/action/document/RestIndexAction.java b/server/src/main/java/org/opensearch/rest/action/document/RestIndexAction.java index ae848fbc656..1a3597c1676 100644 --- a/server/src/main/java/org/opensearch/rest/action/document/RestIndexAction.java +++ b/server/src/main/java/org/opensearch/rest/action/document/RestIndexAction.java @@ -22,8 +22,8 @@ package org.opensearch.rest.action.document; import org.elasticsearch.Version; import org.opensearch.action.DocWriteRequest; import org.elasticsearch.action.index.IndexRequest; -import org.elasticsearch.action.support.ActiveShardCount; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.action.support.ActiveShardCount; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNodes; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.index.VersionType; diff --git a/server/src/main/java/org/opensearch/rest/action/document/RestMultiGetAction.java b/server/src/main/java/org/opensearch/rest/action/document/RestMultiGetAction.java index f2b1bc248f6..004cef3177c 100644 --- a/server/src/main/java/org/opensearch/rest/action/document/RestMultiGetAction.java +++ b/server/src/main/java/org/opensearch/rest/action/document/RestMultiGetAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.document; import org.elasticsearch.action.get.MultiGetRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.settings.Settings; diff --git a/server/src/main/java/org/opensearch/rest/action/document/RestMultiTermVectorsAction.java b/server/src/main/java/org/opensearch/rest/action/document/RestMultiTermVectorsAction.java index 3e9ee5c8591..f2f2377741c 100644 --- a/server/src/main/java/org/opensearch/rest/action/document/RestMultiTermVectorsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/document/RestMultiTermVectorsAction.java @@ -21,7 +21,7 @@ package org.opensearch.rest.action.document; import org.elasticsearch.action.termvectors.MultiTermVectorsRequest; import org.elasticsearch.action.termvectors.TermVectorsRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.index.mapper.MapperService; diff --git a/server/src/main/java/org/opensearch/rest/action/document/RestTermVectorsAction.java b/server/src/main/java/org/opensearch/rest/action/document/RestTermVectorsAction.java index 029d6b38503..14d29acef2f 100644 --- a/server/src/main/java/org/opensearch/rest/action/document/RestTermVectorsAction.java +++ b/server/src/main/java/org/opensearch/rest/action/document/RestTermVectorsAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.document; import org.elasticsearch.action.termvectors.TermVectorsRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/main/java/org/opensearch/rest/action/document/RestUpdateAction.java b/server/src/main/java/org/opensearch/rest/action/document/RestUpdateAction.java index e49e0750559..c0480e4cfc1 100644 --- a/server/src/main/java/org/opensearch/rest/action/document/RestUpdateAction.java +++ b/server/src/main/java/org/opensearch/rest/action/document/RestUpdateAction.java @@ -24,7 +24,7 @@ import org.opensearch.action.DocWriteRequest; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.support.ActiveShardCount; import org.elasticsearch.action.update.UpdateRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.index.VersionType; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/ingest/RestDeletePipelineAction.java b/server/src/main/java/org/opensearch/rest/action/ingest/RestDeletePipelineAction.java index bd95f9b5705..a3e7f24f307 100644 --- a/server/src/main/java/org/opensearch/rest/action/ingest/RestDeletePipelineAction.java +++ b/server/src/main/java/org/opensearch/rest/action/ingest/RestDeletePipelineAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.ingest; import org.elasticsearch.action.ingest.DeletePipelineRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; diff --git a/server/src/main/java/org/opensearch/rest/action/ingest/RestGetPipelineAction.java b/server/src/main/java/org/opensearch/rest/action/ingest/RestGetPipelineAction.java index 028834a5e78..27807604b65 100644 --- a/server/src/main/java/org/opensearch/rest/action/ingest/RestGetPipelineAction.java +++ b/server/src/main/java/org/opensearch/rest/action/ingest/RestGetPipelineAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.ingest; import org.elasticsearch.action.ingest.GetPipelineRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/ingest/RestPutPipelineAction.java b/server/src/main/java/org/opensearch/rest/action/ingest/RestPutPipelineAction.java index baddd249138..974765b0a9d 100644 --- a/server/src/main/java/org/opensearch/rest/action/ingest/RestPutPipelineAction.java +++ b/server/src/main/java/org/opensearch/rest/action/ingest/RestPutPipelineAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.ingest; import org.elasticsearch.action.ingest.PutPipelineRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentType; diff --git a/server/src/main/java/org/opensearch/rest/action/ingest/RestSimulatePipelineAction.java b/server/src/main/java/org/opensearch/rest/action/ingest/RestSimulatePipelineAction.java index 62e731882a3..48f5c94ce65 100644 --- a/server/src/main/java/org/opensearch/rest/action/ingest/RestSimulatePipelineAction.java +++ b/server/src/main/java/org/opensearch/rest/action/ingest/RestSimulatePipelineAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.ingest; import org.elasticsearch.action.ingest.SimulatePipelineRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentType; diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestClearScrollAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestClearScrollAction.java index 3f831ce6d48..6a01b30a2b5 100644 --- a/server/src/main/java/org/opensearch/rest/action/search/RestClearScrollAction.java +++ b/server/src/main/java/org/opensearch/rest/action/search/RestClearScrollAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.search; import org.elasticsearch.action.search.ClearScrollRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestCountAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestCountAction.java index 6d0a30f31b5..d9585b9e97c 100644 --- a/server/src/main/java/org/opensearch/rest/action/search/RestCountAction.java +++ b/server/src/main/java/org/opensearch/rest/action/search/RestCountAction.java @@ -22,7 +22,7 @@ package org.opensearch.rest.action.search; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestExplainAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestExplainAction.java index d8a8bc7a734..eb8123643a5 100644 --- a/server/src/main/java/org/opensearch/rest/action/search/RestExplainAction.java +++ b/server/src/main/java/org/opensearch/rest/action/search/RestExplainAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.search; import org.elasticsearch.action.explain.ExplainRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.index.query.QueryBuilder; diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestMultiSearchAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestMultiSearchAction.java index 4d78b86618b..12341b73204 100644 --- a/server/src/main/java/org/opensearch/rest/action/search/RestMultiSearchAction.java +++ b/server/src/main/java/org/opensearch/rest/action/search/RestMultiSearchAction.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.search.MultiSearchAction; import org.elasticsearch.action.search.MultiSearchRequest; import org.elasticsearch.action.search.SearchRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.CheckedBiConsumer; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java index 621005c2eda..76187712b4a 100644 --- a/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java +++ b/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.search.SearchAction; import org.elasticsearch.action.search.SearchContextId; import org.elasticsearch.action.search.SearchRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Booleans; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestSearchScrollAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestSearchScrollAction.java index 1bad96241f3..9ede6f95b87 100644 --- a/server/src/main/java/org/opensearch/rest/action/search/RestSearchScrollAction.java +++ b/server/src/main/java/org/opensearch/rest/action/search/RestSearchScrollAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.search; import org.elasticsearch.action.search.SearchScrollRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestStatusToXContentListener; diff --git a/server/src/main/java/org/opensearch/tasks/TaskResult.java b/server/src/main/java/org/opensearch/tasks/TaskResult.java index a1c5f694ca4..39305456637 100644 --- a/server/src/main/java/org/opensearch/tasks/TaskResult.java +++ b/server/src/main/java/org/opensearch/tasks/TaskResult.java @@ -19,7 +19,7 @@ package org.opensearch.tasks; import org.elasticsearch.OpenSearchException; -import org.elasticsearch.client.Requests; +import org.opensearch.client.Requests; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; diff --git a/server/src/main/java/org/opensearch/tasks/TaskResultsService.java b/server/src/main/java/org/opensearch/tasks/TaskResultsService.java index 1e048c2f8f2..2787e0d8759 100644 --- a/server/src/main/java/org/opensearch/tasks/TaskResultsService.java +++ b/server/src/main/java/org/opensearch/tasks/TaskResultsService.java @@ -30,9 +30,9 @@ import org.opensearch.action.admin.indices.create.CreateIndexResponse; import org.opensearch.action.bulk.BackoffPolicy; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.index.IndexResponse; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.OriginSettingClient; -import org.elasticsearch.client.Requests; +import org.opensearch.client.Client; +import org.opensearch.client.OriginSettingClient; +import org.opensearch.client.Requests; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.MappingMetadata; diff --git a/server/src/test/java/org/elasticsearch/cluster/FeatureAwareTests.java b/server/src/test/java/org/elasticsearch/cluster/FeatureAwareTests.java index a99ca9e06df..04b42ff4d6d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/FeatureAwareTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/FeatureAwareTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.cluster; import org.elasticsearch.Version; -import org.elasticsearch.client.transport.TransportClient; +import org.opensearch.client.transport.TransportClient; import org.opensearch.cluster.ClusterState.FeatureAware; import org.opensearch.cluster.metadata.Metadata; import org.elasticsearch.common.io.stream.BytesStreamOutput; diff --git a/server/src/test/java/org/elasticsearch/cluster/action/index/MappingUpdatedActionTests.java b/server/src/test/java/org/elasticsearch/cluster/action/index/MappingUpdatedActionTests.java index 92144c4d852..82a514fa3bf 100644 --- a/server/src/test/java/org/elasticsearch/cluster/action/index/MappingUpdatedActionTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/action/index/MappingUpdatedActionTests.java @@ -22,9 +22,9 @@ import org.elasticsearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.admin.indices.mapping.put.AutoPutMappingAction; import org.opensearch.action.support.PlainActionFuture; -import org.elasticsearch.client.AdminClient; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.IndicesAdminClient; +import org.opensearch.client.AdminClient; +import org.opensearch.client.Client; +import org.opensearch.client.IndicesAdminClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.action.index.MappingUpdatedAction; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java index 745c852fa1c..5ecf37ef17f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java @@ -24,9 +24,9 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest; import org.opensearch.action.admin.indices.template.put.PutIndexTemplateRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.AdminClient; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.IndicesAdminClient; +import org.opensearch.client.AdminClient; +import org.opensearch.client.Client; +import org.opensearch.client.IndicesAdminClient; import org.opensearch.cluster.ClusterChangedEvent; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexMetadata; diff --git a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java index bfedac28bad..50691544ff0 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.OpenSearchException; import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.Version; import org.opensearch.action.bulk.BulkItemResponse.Failure; -import org.elasticsearch.client.transport.NoNodeAvailableException; +import org.opensearch.client.transport.NoNodeAvailableException; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksCustomMetadataTests.java b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksCustomMetadataTests.java index 0e94cf3bc92..6ef9c16edf6 100644 --- a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksCustomMetadataTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksCustomMetadataTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.persistent; import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.Version; -import org.elasticsearch.client.transport.TransportClient; +import org.opensearch.client.transport.TransportClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.Diff; diff --git a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksNodeServiceTests.java b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksNodeServiceTests.java index d58ba6abb0e..383ebabc23f 100644 --- a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksNodeServiceTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksNodeServiceTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.persistent; import org.elasticsearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.admin.cluster.node.tasks.cancel.CancelTasksResponse; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.ClusterChangedEvent; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; diff --git a/server/src/test/java/org/elasticsearch/persistent/TestPersistentTasksPlugin.java b/server/src/test/java/org/elasticsearch/persistent/TestPersistentTasksPlugin.java index 82d70322017..bc9f6e92540 100644 --- a/server/src/test/java/org/elasticsearch/persistent/TestPersistentTasksPlugin.java +++ b/server/src/test/java/org/elasticsearch/persistent/TestPersistentTasksPlugin.java @@ -33,8 +33,8 @@ import org.elasticsearch.action.support.tasks.BaseTasksRequest; import org.elasticsearch.action.support.tasks.BaseTasksResponse; import org.elasticsearch.action.support.tasks.TasksRequestBuilder; import org.elasticsearch.action.support.tasks.TransportTasksAction; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.OpenSearchClient; +import org.opensearch.client.Client; +import org.opensearch.client.OpenSearchClient; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/server/src/test/java/org/elasticsearch/search/scroll/RestClearScrollActionTests.java b/server/src/test/java/org/elasticsearch/search/scroll/RestClearScrollActionTests.java index 27aa1a1707a..1a2a6e288fd 100644 --- a/server/src/test/java/org/elasticsearch/search/scroll/RestClearScrollActionTests.java +++ b/server/src/test/java/org/elasticsearch/search/scroll/RestClearScrollActionTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.util.SetOnce; import org.opensearch.action.ActionListener; import org.elasticsearch.action.search.ClearScrollRequest; import org.elasticsearch.action.search.ClearScrollResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.rest.RestRequest; diff --git a/server/src/test/java/org/elasticsearch/search/scroll/RestSearchScrollActionTests.java b/server/src/test/java/org/elasticsearch/search/scroll/RestSearchScrollActionTests.java index 9c261449cba..8c11d4cf8fb 100644 --- a/server/src/test/java/org/elasticsearch/search/scroll/RestSearchScrollActionTests.java +++ b/server/src/test/java/org/elasticsearch/search/scroll/RestSearchScrollActionTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.util.SetOnce; import org.opensearch.action.ActionListener; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchScrollRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.rest.RestRequest; diff --git a/server/src/test/java/org/elasticsearch/transport/RemoteClusterClientTests.java b/server/src/test/java/org/elasticsearch/transport/RemoteClusterClientTests.java index bca552b499c..9b190b356d3 100644 --- a/server/src/test/java/org/elasticsearch/transport/RemoteClusterClientTests.java +++ b/server/src/test/java/org/elasticsearch/transport/RemoteClusterClientTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.transport; import org.elasticsearch.Version; import org.opensearch.action.admin.cluster.state.ClusterStateResponse; import org.opensearch.action.support.PlainActionFuture; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; diff --git a/server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java b/server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java index 683f73cd17d..fd95a26b4d9 100644 --- a/server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java +++ b/server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java @@ -22,14 +22,14 @@ package org.elasticsearch.transport; import org.elasticsearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.support.PlainActionFuture; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.transport.TransportClient; +import org.opensearch.client.Client; +import org.opensearch.client.transport.TransportClient; import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.network.NetworkService; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.PageCacheRecycler; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.VersionUtils; import org.elasticsearch.test.transport.MockTransportService; diff --git a/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryTests.java b/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryTests.java index 0d5b801f3c6..35a3c5c06c4 100644 --- a/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryTests.java +++ b/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.Version; import org.opensearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse; import org.opensearch.action.support.PlainActionFuture; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.metadata.RepositoryMetadata; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.UUIDs; @@ -31,9 +31,9 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.env.Environment; -import org.elasticsearch.indices.recovery.RecoverySettings; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.RepositoryPlugin; +import org.opensearch.indices.recovery.RecoverySettings; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.RepositoryPlugin; import org.opensearch.repositories.IndexId; import org.opensearch.repositories.RepositoriesService; import org.opensearch.repositories.Repository; diff --git a/server/src/test/java/org/opensearch/rest/BaseRestHandlerTests.java b/server/src/test/java/org/opensearch/rest/BaseRestHandlerTests.java index b11286c243f..e658d8990b3 100644 --- a/server/src/test/java/org/opensearch/rest/BaseRestHandlerTests.java +++ b/server/src/test/java/org/opensearch/rest/BaseRestHandlerTests.java @@ -19,7 +19,7 @@ package org.opensearch.rest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.Table; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.settings.Settings; diff --git a/server/src/test/java/org/opensearch/rest/DeprecationRestHandlerTests.java b/server/src/test/java/org/opensearch/rest/DeprecationRestHandlerTests.java index a9e92d75a8b..4e8100094e7 100644 --- a/server/src/test/java/org/opensearch/rest/DeprecationRestHandlerTests.java +++ b/server/src/test/java/org/opensearch/rest/DeprecationRestHandlerTests.java @@ -20,7 +20,7 @@ package org.opensearch.rest; import com.carrotsearch.randomizedtesting.generators.CodepointSetGenerator; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/opensearch/rest/RestControllerTests.java b/server/src/test/java/org/opensearch/rest/RestControllerTests.java index d3212166306..e745b9009d9 100644 --- a/server/src/test/java/org/opensearch/rest/RestControllerTests.java +++ b/server/src/test/java/org/opensearch/rest/RestControllerTests.java @@ -19,7 +19,7 @@ package org.opensearch.rest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.breaker.CircuitBreaker; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; diff --git a/server/src/test/java/org/opensearch/rest/RestHttpResponseHeadersTests.java b/server/src/test/java/org/opensearch/rest/RestHttpResponseHeadersTests.java index 78e410a7c7a..a5919482e8e 100644 --- a/server/src/test/java/org/opensearch/rest/RestHttpResponseHeadersTests.java +++ b/server/src/test/java/org/opensearch/rest/RestHttpResponseHeadersTests.java @@ -19,7 +19,7 @@ package org.opensearch.rest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; diff --git a/server/src/test/java/org/opensearch/rest/action/RestCancellableNodeClientTests.java b/server/src/test/java/org/opensearch/rest/action/RestCancellableNodeClientTests.java index 12756b1f70f..6d48a7e9f04 100644 --- a/server/src/test/java/org/opensearch/rest/action/RestCancellableNodeClientTests.java +++ b/server/src/test/java/org/opensearch/rest/action/RestCancellableNodeClientTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.action.search.SearchAction; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.opensearch.action.support.PlainListenableActionFuture; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.http.HttpChannel; import org.elasticsearch.http.HttpResponse; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsActionTests.java index 5c4a10d317d..a6a9a955260 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsActionTests.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.cluster; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.RestRequest; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.FakeRestRequest; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestAnalyzeActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestAnalyzeActionTests.java index d5f64fb1a47..7920443a702 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestAnalyzeActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestAnalyzeActionTests.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.indices; import org.opensearch.action.admin.indices.analyze.AnalyzeAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestCreateIndexActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestCreateIndexActionTests.java index 339a598e7ee..9ccc802fddd 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestCreateIndexActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestCreateIndexActionTests.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.indices; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetIndicesActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetIndicesActionTests.java index 5969864b1b7..db330f5d69a 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetIndicesActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetIndicesActionTests.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.indices; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.RestRequest; import org.elasticsearch.test.rest.FakeRestRequest; import org.elasticsearch.test.rest.RestActionTestCase; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetMappingActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetMappingActionTests.java index ebd88c2078c..ce775342fce 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetMappingActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetMappingActionTests.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.indices; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.opensearch.rest.RestRequest; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsActionTests.java index eea1c13eb0e..f561cdc3078 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsActionTests.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.indices; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.RestRequest; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.FakeRestRequest; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateActionTests.java index 5ac452f1be3..34d692dfdf7 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateActionTests.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.indices; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestResizeHandlerTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestResizeHandlerTests.java index 89a8f1efb29..5a5bf83305d 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestResizeHandlerTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestResizeHandlerTests.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.admin.indices; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.FakeRestRequest; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestValidateQueryActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestValidateQueryActionTests.java index b8b0abb4985..057c591c0ca 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestValidateQueryActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestValidateQueryActionTests.java @@ -24,7 +24,7 @@ import org.opensearch.action.ActionType; import org.opensearch.action.admin.indices.validate.query.ValidateQueryAction; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.TransportAction; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.settings.Settings; diff --git a/server/src/test/java/org/opensearch/rest/action/cat/RestNodesActionTests.java b/server/src/test/java/org/opensearch/rest/action/cat/RestNodesActionTests.java index d5ae7e7e0b8..b707609f1dc 100644 --- a/server/src/test/java/org/opensearch/rest/action/cat/RestNodesActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/cat/RestNodesActionTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.Version; import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse; import org.opensearch.action.admin.cluster.node.stats.NodesStatsResponse; import org.opensearch.action.admin.cluster.state.ClusterStateResponse; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/server/src/test/java/org/opensearch/rest/action/document/RestBulkActionTests.java b/server/src/test/java/org/opensearch/rest/action/document/RestBulkActionTests.java index 94ab21c9cd4..d7152bf0d9b 100644 --- a/server/src/test/java/org/opensearch/rest/action/document/RestBulkActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/document/RestBulkActionTests.java @@ -25,7 +25,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.bulk.BulkRequest; import org.opensearch.action.bulk.BulkResponse; import org.elasticsearch.action.update.UpdateRequest; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.rest.RestChannel; diff --git a/server/src/test/java/org/opensearch/rest/action/document/RestUpdateActionTests.java b/server/src/test/java/org/opensearch/rest/action/document/RestUpdateActionTests.java index 447875b3eff..3536dcb6a1c 100644 --- a/server/src/test/java/org/opensearch/rest/action/document/RestUpdateActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/document/RestUpdateActionTests.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.document; import org.opensearch.action.ActionRequestValidationException; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.VersionType; diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java index 95d33654701..0c46b6407e5 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java @@ -91,8 +91,8 @@ import org.opensearch.action.support.TransportAction; import org.opensearch.action.support.WriteRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.action.update.UpdateHelper; -import org.elasticsearch.client.AdminClient; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.AdminClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterChangedEvent; import org.opensearch.cluster.ClusterModule; import org.opensearch.cluster.ClusterName; diff --git a/server/src/test/java/org/opensearch/tasks/TaskInfoTests.java b/server/src/test/java/org/opensearch/tasks/TaskInfoTests.java index f12021c0ab0..f22fca57aed 100644 --- a/server/src/test/java/org/opensearch/tasks/TaskInfoTests.java +++ b/server/src/test/java/org/opensearch/tasks/TaskInfoTests.java @@ -19,7 +19,7 @@ package org.opensearch.tasks; -import org.elasticsearch.client.Requests; +import org.opensearch.client.Requests; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.Writeable; diff --git a/server/src/test/java/org/opensearch/usage/UsageServiceTests.java b/server/src/test/java/org/opensearch/usage/UsageServiceTests.java index 3cbbb5152ad..19fd457f703 100644 --- a/server/src/test/java/org/opensearch/usage/UsageServiceTests.java +++ b/server/src/test/java/org/opensearch/usage/UsageServiceTests.java @@ -19,7 +19,7 @@ package org.opensearch.usage; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.elasticsearch.search.aggregations.support.AggregationUsageService; diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/MockInternalClusterInfoService.java b/test/framework/src/main/java/org/elasticsearch/cluster/MockInternalClusterInfoService.java index f94f1868bcb..dc20c941c0a 100644 --- a/test/framework/src/main/java/org/elasticsearch/cluster/MockInternalClusterInfoService.java +++ b/test/framework/src/main/java/org/elasticsearch/cluster/MockInternalClusterInfoService.java @@ -19,15 +19,15 @@ package org.elasticsearch.cluster; import org.opensearch.action.admin.cluster.node.stats.NodeStats; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.monitor.fs.FsInfo; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.monitor.fs.FsInfo; +import org.opensearch.plugins.Plugin; import org.opensearch.cluster.ClusterInfo; import org.opensearch.cluster.InternalClusterInfoService; import org.opensearch.threadpool.ThreadPool; diff --git a/test/framework/src/main/java/org/elasticsearch/node/MockNode.java b/test/framework/src/main/java/org/elasticsearch/node/MockNode.java index 73b0089c342..334b6a5e109 100644 --- a/test/framework/src/main/java/org/elasticsearch/node/MockNode.java +++ b/test/framework/src/main/java/org/elasticsearch/node/MockNode.java @@ -19,7 +19,7 @@ package org.elasticsearch.node; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterInfoService; import org.elasticsearch.cluster.MockInternalClusterInfoService; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java index a85fa5c0870..d77e5f798d2 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java @@ -32,7 +32,7 @@ import org.elasticsearch.action.get.GetResponse; import org.opensearch.action.support.PlainActionFuture; import org.elasticsearch.action.termvectors.MultiTermVectorsRequest; import org.elasticsearch.action.termvectors.MultiTermVectorsResponse; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.Strings; import org.elasticsearch.common.compress.CompressedXContent; @@ -58,17 +58,17 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.similarity.SimilarityService; -import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.indices.analysis.AnalysisModule; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; -import org.elasticsearch.indices.mapper.MapperRegistry; -import org.elasticsearch.node.InternalSettingsPreparer; -import org.elasticsearch.plugins.MapperPlugin; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.PluginsService; -import org.elasticsearch.plugins.ScriptPlugin; -import org.elasticsearch.plugins.SearchPlugin; +import org.opensearch.indices.IndicesModule; +import org.opensearch.indices.analysis.AnalysisModule; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.fielddata.cache.IndicesFieldDataCache; +import org.opensearch.indices.mapper.MapperRegistry; +import org.opensearch.node.InternalSettingsPreparer; +import org.opensearch.plugins.MapperPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.PluginsService; +import org.opensearch.plugins.ScriptPlugin; +import org.opensearch.plugins.SearchPlugin; import org.opensearch.script.MockScriptEngine; import org.opensearch.script.MockScriptService; import org.opensearch.script.ScriptContext; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java index ae60b9e9de6..afc6cc79524 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java @@ -21,7 +21,7 @@ package org.elasticsearch.test; import org.opensearch.action.admin.cluster.remote.RemoteInfoAction; import org.opensearch.action.admin.cluster.remote.RemoteInfoRequest; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.core.internal.io.IOUtils; diff --git a/test/framework/src/main/java/org/elasticsearch/test/BackgroundIndexer.java b/test/framework/src/main/java/org/elasticsearch/test/BackgroundIndexer.java index 2c61071f474..02c352dd4fd 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/BackgroundIndexer.java +++ b/test/framework/src/main/java/org/elasticsearch/test/BackgroundIndexer.java @@ -31,7 +31,7 @@ import org.opensearch.action.bulk.BulkRequestBuilder; import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.bulk.BulkShardRequest; import org.elasticsearch.action.index.IndexResponse; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java index 25a23b2fe5b..7f67c20692f 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java @@ -58,13 +58,13 @@ import org.elasticsearch.action.search.SearchResponse; import org.opensearch.action.support.DefaultShardOperationFailedException; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.bootstrap.JavaVersion; -import org.elasticsearch.client.AdminClient; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.ClusterAdminClient; -import org.elasticsearch.client.Requests; +import org.opensearch.client.AdminClient; +import org.opensearch.client.Client; +import org.opensearch.client.ClusterAdminClient; +import org.opensearch.client.Requests; import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClientBuilder; -import org.elasticsearch.client.transport.TransportClient; +import org.opensearch.client.transport.TransportClient; import org.opensearch.cluster.ClusterModule; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.RestoreInProgress; @@ -114,7 +114,7 @@ import org.elasticsearch.discovery.zen.ElectMasterService; import org.elasticsearch.discovery.zen.ZenDiscovery; import org.elasticsearch.env.Environment; import org.elasticsearch.env.TestEnvironment; -import org.elasticsearch.http.HttpInfo; +import org.opensearch.http.HttpInfo; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexModule; import org.elasticsearch.index.IndexSettings; @@ -126,14 +126,14 @@ import org.elasticsearch.index.engine.Segment; import org.elasticsearch.index.mapper.MockFieldFilterPlugin; import org.elasticsearch.index.store.Store; import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.indices.IndicesQueryCache; -import org.elasticsearch.indices.IndicesRequestCache; -import org.elasticsearch.indices.store.IndicesStore; +import org.opensearch.indices.IndicesQueryCache; +import org.opensearch.indices.IndicesRequestCache; +import org.opensearch.indices.store.IndicesStore; import org.opensearch.ingest.IngestMetadata; import org.opensearch.monitor.os.OsInfo; import org.elasticsearch.node.NodeMocksPlugin; -import org.elasticsearch.plugins.NetworkPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.NetworkPlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.rest.RestStatus; import org.opensearch.rest.action.RestCancellableNodeClient; import org.opensearch.script.MockScriptService; @@ -189,7 +189,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.elasticsearch.client.Requests.syncedFlushRequest; +import static org.opensearch.client.Requests.syncedFlushRequest; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java index 09824c6b3af..58a73dd8f3a 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java @@ -24,8 +24,8 @@ import org.opensearch.action.admin.cluster.health.ClusterHealthResponse; import org.opensearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.opensearch.action.admin.indices.get.GetIndexResponse; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.Requests; +import org.opensearch.client.Client; +import org.opensearch.client.Requests; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.health.ClusterHealthStatus; import org.opensearch.cluster.metadata.IndexMetadata; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java index b68da3524d5..99d719bfca8 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java @@ -50,7 +50,7 @@ import org.apache.lucene.util.TimeUnits; import org.elasticsearch.Version; import org.elasticsearch.bootstrap.BootstrapForTesting; import org.elasticsearch.bootstrap.JavaVersion; -import org.elasticsearch.client.Requests; +import org.opensearch.client.Requests; import org.opensearch.cluster.ClusterModule; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ExternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/ExternalTestCluster.java index 6886ef06de0..8fe44dcc32b 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ExternalTestCluster.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ExternalTestCluster.java @@ -25,7 +25,7 @@ import org.opensearch.action.admin.cluster.node.info.NodeInfo; import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse; import org.opensearch.action.admin.cluster.node.stats.NodeStats; import org.opensearch.action.admin.cluster.node.stats.NodesStatsResponse; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.breaker.CircuitBreaker; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; @@ -33,8 +33,8 @@ import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.env.Environment; -import org.elasticsearch.http.HttpInfo; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.http.HttpInfo; +import org.opensearch.plugins.Plugin; import org.elasticsearch.transport.MockTransportClient; import org.elasticsearch.transport.TransportSettings; import org.elasticsearch.transport.nio.MockNioTransportPlugin; diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java index 76b72a5b9a1..7d09505d3b6 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java +++ b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java @@ -38,8 +38,8 @@ import org.opensearch.action.admin.cluster.node.stats.NodeStats; import org.opensearch.action.admin.indices.stats.CommonStatsFlags; import org.opensearch.action.admin.indices.stats.CommonStatsFlags.Flag; import org.elasticsearch.action.support.replication.TransportReplicationAction; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.transport.TransportClient; +import org.opensearch.client.Client; +import org.opensearch.client.transport.TransportClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.action.index.MappingUpdatedAction; diff --git a/test/framework/src/main/java/org/elasticsearch/test/TestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/TestCluster.java index 1079fb9cd4c..faed100783c 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/TestCluster.java +++ b/test/framework/src/main/java/org/elasticsearch/test/TestCluster.java @@ -28,12 +28,12 @@ import org.opensearch.action.admin.indices.datastream.DeleteDataStreamAction; import org.opensearch.action.admin.indices.template.get.GetIndexTemplatesResponse; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.AcknowledgedResponse; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.IndexTemplateMetadata; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.index.IndexNotFoundException; -import org.elasticsearch.indices.IndexTemplateMissingException; +import org.opensearch.indices.IndexTemplateMissingException; import org.opensearch.repositories.RepositoryMissingException; import java.io.Closeable; diff --git a/test/framework/src/main/java/org/elasticsearch/test/client/NoOpClient.java b/test/framework/src/main/java/org/elasticsearch/test/client/NoOpClient.java index 94a6d0171cc..5cc12cd8e2c 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/client/NoOpClient.java +++ b/test/framework/src/main/java/org/elasticsearch/test/client/NoOpClient.java @@ -24,7 +24,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; import org.opensearch.action.ActionType; -import org.elasticsearch.client.support.AbstractClient; +import org.opensearch.client.support.AbstractClient; import org.elasticsearch.common.settings.Settings; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -35,7 +35,7 @@ import java.util.concurrent.TimeUnit; * Client that always responds with {@code null} to every request. Override {@link #doExecute(ActionType, ActionRequest, ActionListener)} * for testing. * - * See also {@link NoOpNodeClient} if you need to mock a {@link org.elasticsearch.client.node.NodeClient}. + * See also {@link NoOpNodeClient} if you need to mock a {@link org.opensearch.client.node.NodeClient}. */ public class NoOpClient extends AbstractClient { /** diff --git a/test/framework/src/main/java/org/elasticsearch/test/client/NoOpNodeClient.java b/test/framework/src/main/java/org/elasticsearch/test/client/NoOpNodeClient.java index ee6c69936ad..aa43ea4b609 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/client/NoOpNodeClient.java +++ b/test/framework/src/main/java/org/elasticsearch/test/client/NoOpNodeClient.java @@ -25,8 +25,8 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; import org.opensearch.action.ActionType; import org.opensearch.action.support.TransportAction; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.Client; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.settings.Settings; import org.opensearch.tasks.Task; diff --git a/test/framework/src/main/java/org/elasticsearch/test/client/RandomizingClient.java b/test/framework/src/main/java/org/elasticsearch/test/client/RandomizingClient.java index 4c826101780..9a3b5e0dc48 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/client/RandomizingClient.java +++ b/test/framework/src/main/java/org/elasticsearch/test/client/RandomizingClient.java @@ -23,8 +23,8 @@ import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.apache.lucene.util.TestUtil; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchType; -import org.elasticsearch.client.Client; -import org.elasticsearch.client.FilterClient; +import org.opensearch.client.Client; +import org.opensearch.client.FilterClient; import org.elasticsearch.cluster.routing.Preference; import org.elasticsearch.common.unit.TimeValue; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/RestActionTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/RestActionTestCase.java index affade02538..4b84d06c7f3 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/RestActionTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/RestActionTestCase.java @@ -26,6 +26,7 @@ import org.opensearch.action.ActionType; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.client.node.NodeClient; import org.opensearch.rest.RestController; import org.opensearch.rest.RestRequest; import org.opensearch.tasks.Task; @@ -80,7 +81,7 @@ public abstract class RestActionTestCase extends ESTestCase { } /** - * A mocked {@link org.elasticsearch.client.node.NodeClient} which can be easily reconfigured to verify arbitrary verification + * A mocked {@link NodeClient} which can be easily reconfigured to verify arbitrary verification * functions, and can be reset to allow reconfiguration partway through a test without having to construct a new object. * * By default, will throw {@link AssertionError} when any execution method is called, unless configured otherwise using diff --git a/test/framework/src/main/java/org/elasticsearch/transport/MockTransportClient.java b/test/framework/src/main/java/org/elasticsearch/transport/MockTransportClient.java index cb415798d22..c6e1c7597ac 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/MockTransportClient.java +++ b/test/framework/src/main/java/org/elasticsearch/transport/MockTransportClient.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.transport; -import org.elasticsearch.client.transport.TransportClient; +import org.opensearch.client.transport.TransportClient; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; diff --git a/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java b/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java index 6c49476f823..0d08c69697c 100644 --- a/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java +++ b/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java @@ -28,7 +28,7 @@ import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequ import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse; import org.elasticsearch.action.index.IndexRequestBuilder; import org.opensearch.action.support.PlainActionFuture; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.elasticsearch.common.blobstore.BlobContainer; import org.elasticsearch.common.blobstore.BlobMetadata; import org.elasticsearch.common.blobstore.BlobPath; diff --git a/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterIT.java b/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterIT.java index 4e708975ef9..73c42aff1b1 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterIT.java +++ b/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterIT.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.test.test; -import org.elasticsearch.client.node.NodeClient; +import org.opensearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase.ClusterScope; diff --git a/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java b/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java index 5775f3ecddb..751f1f81601 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.test.test; import org.apache.lucene.util.LuceneTestCase; -import org.elasticsearch.client.Client; +import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; import org.elasticsearch.cluster.service.ClusterService; @@ -31,7 +31,7 @@ import org.elasticsearch.discovery.DiscoverySettings; import org.elasticsearch.discovery.SettingsBasedSeedHostsProvider; import org.elasticsearch.env.Environment; import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.MockHttpTransport;