From 43c9b2425e2aa74d11060b6b9b994df5bacef2c2 Mon Sep 17 00:00:00 2001 From: Rabi Panda Date: Mon, 15 Mar 2021 16:31:09 -0700 Subject: [PATCH] [Rename] refactor client/rest module. (#310) Renames `org.elasticsearch.client` to `org.opensearch.client` in package names and references. Signed-off-by: Rabi Panda --- .../benchmark/rest/RestClientBenchmark.java | 6 ++--- .../documentation/CRUDDocumentationIT.java | 6 ++--- .../ClusterClientDocumentationIT.java | 2 +- .../IndicesClientDocumentationIT.java | 2 +- .../IngestClientDocumentationIT.java | 2 +- .../MiscellaneousDocumentationIT.java | 4 ++-- .../documentation/SearchDocumentationIT.java | 8 +++---- .../SnapshotClientDocumentationIT.java | 6 ++--- .../StoredScriptsDocumentationIT.java | 2 +- .../TasksClientDocumentationIT.java | 2 +- client/rest/build.gradle | 16 ++++++------- .../client/Cancellable.java | 2 +- .../client/DeadHostState.java | 2 +- .../client/HasAttributeNodeSelector.java | 2 +- .../HeapBufferedAsyncResponseConsumer.java | 2 +- .../HttpAsyncResponseConsumerFactory.java | 4 ++-- .../client/HttpDeleteWithEntity.java | 2 +- .../client/HttpGetWithEntity.java | 4 ++-- .../client/Node.java | 2 +- .../client/NodeSelector.java | 2 +- ...tentCredentialsAuthenticationStrategy.java | 2 +- .../PreferHasAttributeNodeSelector.java | 2 +- .../client/Request.java | 2 +- .../client/RequestLogger.java | 2 +- .../client/RequestOptions.java | 4 ++-- .../client/Response.java | 4 ++-- .../client/ResponseException.java | 4 ++-- .../client/ResponseListener.java | 2 +- .../client/RestClient.java | 2 +- .../client/RestClientBuilder.java | 2 +- .../client/WarningFailureException.java | 4 ++-- .../client/WarningsHandler.java | 4 ++-- .../client/DeadHostStateTests.java | 3 +-- .../FailureTrackingResponseListenerTests.java | 3 +-- .../client/HasAttributeNodeSelectorTests.java | 5 ++-- ...eapBufferedAsyncResponseConsumerTests.java | 3 +-- .../client/HostsTrackingFailureListener.java | 2 +- .../client/NodeSelectorTests.java | 5 ++-- .../client/NodeTests.java | 5 ++-- .../PreferHasAttributeNodeSelectorTests.java | 5 ++-- .../client/RequestLoggerTests.java | 3 +-- .../client/RequestOptionsTests.java | 5 ++-- .../client/RequestTests.java | 5 ++-- .../client/ResponseExceptionTests.java | 3 +-- .../client/RestClientBuilderIntegTests.java | 3 +-- .../client/RestClientBuilderTests.java | 3 +-- .../RestClientGzipCompressionTests.java | 3 +-- .../RestClientMultipleHostsIntegTests.java | 4 +--- .../client/RestClientMultipleHostsTests.java | 3 +-- .../RestClientSingleHostIntegTests.java | 4 +--- .../client/RestClientSingleHostTests.java | 4 +--- .../client/RestClientTests.java | 5 ++-- .../RestClientDocumentation.java | 24 +++++++++---------- .../opensearch/client/sniff/NodesSniffer.java | 2 +- .../client/sniff/OpenSearchNodesSniffer.java | 10 ++++---- .../client/sniff/SniffOnFailureListener.java | 4 ++-- .../org/opensearch/client/sniff/Sniffer.java | 6 ++--- .../client/sniff/SnifferBuilder.java | 2 +- .../client/sniff/MockNodesSniffer.java | 2 +- .../OpenSearchNodesSnifferParseTests.java | 4 ++-- .../sniff/OpenSearchNodesSnifferTests.java | 8 +++---- .../sniff/SniffOnFailureListenerTests.java | 4 ++-- .../client/sniff/SnifferBuilderTests.java | 2 +- .../opensearch/client/sniff/SnifferTests.java | 4 ++-- .../documentation/SnifferDocumentation.java | 4 ++-- .../test/rest/CreatedLocationHeaderIT.java | 4 ++-- .../test/rest/NodeRestUsageIT.java | 6 ++--- .../test/rest/RequestsWithoutContentIT.java | 4 ++-- .../test/rest/WaitForRefreshAndCloseIT.java | 8 +++---- .../docker/test/DockerYmlTestSuiteIT.java | 2 +- .../kibana/KibanaSystemIndexIT.java | 4 ++-- .../SearchTemplateWithoutContentIT.java | 4 ++-- .../index/reindex/ManyDocumentsIT.java | 2 +- .../reindex/ReindexWithoutContentIT.java | 4 ++-- .../remote/ReindexFromOldRemoteIT.java | 6 ++--- .../opensearch/index/reindex/Reindexer.java | 4 ++-- .../reindex/remote/RemoteRequestBuilders.java | 2 +- .../remote/RemoteScrollableHitSource.java | 8 +++---- ...ReindexFromRemoteBuildRestClientTests.java | 2 +- .../reindex/ReindexRestClientSslTests.java | 6 ++--- .../remote/RemoteRequestBuildersTests.java | 2 +- .../RemoteScrollableHitSourceTests.java | 4 ++-- .../RepositoryURLClientYamlTestSuiteIT.java | 4 ++-- .../rest/discovery/Zen2RestApiIT.java | 10 ++++---- .../opensearch/rest/Netty4BadRequestIT.java | 8 +++---- .../rest/Netty4HeadBodyIsEmptyIT.java | 4 ++-- .../elasticsearch/test/ESIntegTestCase.java | 4 ++-- .../test/rest/ESRestTestCase.java | 16 ++++++------- .../rest/yaml/ClientYamlDocsTestClient.java | 12 +++++----- .../test/rest/yaml/ClientYamlTestClient.java | 16 ++++++------- .../yaml/ClientYamlTestExecutionContext.java | 2 +- .../rest/yaml/ClientYamlTestResponse.java | 2 +- .../yaml/ClientYamlTestResponseException.java | 2 +- .../rest/yaml/ESClientYamlSuiteTestCase.java | 14 +++++------ .../test/rest/yaml/ObjectPath.java | 6 ++--- .../rest/yaml/section/ApiCallSection.java | 2 +- .../yaml/section/ClientYamlTestSuite.java | 2 +- .../test/rest/yaml/section/DoSection.java | 6 ++--- .../AbstractFullClusterRestartTestCase.java | 2 +- .../VersionSensitiveWarningsHandlerTests.java | 2 +- .../ClientYamlTestExecutionContextTests.java | 2 +- .../section/ClientYamlTestSuiteTests.java | 2 +- .../rest/yaml/section/DoSectionTests.java | 4 ++-- 103 files changed, 218 insertions(+), 240 deletions(-) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/Cancellable.java (99%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/DeadHostState.java (99%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/HasAttributeNodeSelector.java (98%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/HeapBufferedAsyncResponseConsumer.java (99%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/HttpAsyncResponseConsumerFactory.java (93%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/HttpDeleteWithEntity.java (97%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/HttpGetWithEntity.java (97%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/Node.java (99%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/NodeSelector.java (98%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/PersistentCredentialsAuthenticationStrategy.java (98%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/PreferHasAttributeNodeSelector.java (98%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/Request.java (99%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/RequestLogger.java (99%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/RequestOptions.java (98%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/Response.java (98%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/ResponseException.java (93%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/ResponseListener.java (98%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/RestClient.java (99%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/RestClientBuilder.java (99%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/WarningFailureException.java (95%) rename client/rest/src/main/java/org/{elasticsearch => opensearch}/client/WarningsHandler.java (97%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/DeadHostStateTests.java (98%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/FailureTrackingResponseListenerTests.java (98%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/HasAttributeNodeSelectorTests.java (95%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/HeapBufferedAsyncResponseConsumerTests.java (98%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/HostsTrackingFailureListener.java (98%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/NodeSelectorTests.java (95%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/NodeTests.java (97%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/PreferHasAttributeNodeSelectorTests.java (96%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/RequestLoggerTests.java (99%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/RequestOptionsTests.java (97%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/RequestTests.java (98%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/ResponseExceptionTests.java (97%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/RestClientBuilderIntegTests.java (98%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/RestClientBuilderTests.java (99%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/RestClientGzipCompressionTests.java (98%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/RestClientMultipleHostsIntegTests.java (99%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/RestClientMultipleHostsTests.java (99%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/RestClientSingleHostIntegTests.java (99%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/RestClientSingleHostTests.java (99%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/RestClientTests.java (99%) rename client/rest/src/test/java/org/{elasticsearch => opensearch}/client/documentation/RestClientDocumentation.java (97%) diff --git a/client/benchmark/src/main/java/org/opensearch/client/benchmark/rest/RestClientBenchmark.java b/client/benchmark/src/main/java/org/opensearch/client/benchmark/rest/RestClientBenchmark.java index 86d39ba6842..67933713cea 100644 --- a/client/benchmark/src/main/java/org/opensearch/client/benchmark/rest/RestClientBenchmark.java +++ b/client/benchmark/src/main/java/org/opensearch/client/benchmark/rest/RestClientBenchmark.java @@ -23,9 +23,9 @@ import org.apache.http.HttpHost; import org.apache.http.HttpStatus; import org.apache.http.message.BasicHeader; import org.opensearch.OpenSearchException; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.Response; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.Request; +import org.opensearch.client.Response; +import org.opensearch.client.RestClient; import org.opensearch.client.benchmark.AbstractBenchmark; import org.opensearch.client.benchmark.ops.bulk.BulkRequestExecutor; import org.opensearch.client.benchmark.ops.search.SearchRequestExecutor; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java index 14683e91d62..3c766f9829f 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java @@ -48,9 +48,9 @@ import org.opensearch.action.support.replication.ReplicationResponse; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.client.ESRestHighLevelClientTestCase; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.Response; +import org.opensearch.client.Request; +import org.opensearch.client.RequestOptions; +import org.opensearch.client.Response; import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.client.RethrottleRequest; import org.elasticsearch.client.core.GetSourceRequest; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ClusterClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ClusterClientDocumentationIT.java index 3aad589a6f8..ebfe49f3476 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ClusterClientDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ClusterClientDocumentationIT.java @@ -30,7 +30,7 @@ import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsRespons import org.opensearch.action.support.ActiveShardCount; import org.opensearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.client.ESRestHighLevelClientTestCase; -import org.elasticsearch.client.RequestOptions; +import org.opensearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.client.cluster.RemoteConnectionInfo; import org.elasticsearch.client.cluster.RemoteInfoRequest; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java index 27738cbe1b9..9f107ce9238 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java @@ -54,7 +54,7 @@ import org.opensearch.action.support.IndicesOptions; import org.opensearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.client.ESRestHighLevelClientTestCase; import org.elasticsearch.client.GetAliasesResponse; -import org.elasticsearch.client.RequestOptions; +import org.opensearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.client.SyncedFlushResponse; import org.elasticsearch.client.indices.AnalyzeRequest; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IngestClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IngestClientDocumentationIT.java index 0c9a978fb3c..5de58106018 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IngestClientDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IngestClientDocumentationIT.java @@ -33,7 +33,7 @@ import org.elasticsearch.action.ingest.SimulatePipelineResponse; import org.elasticsearch.action.ingest.SimulateProcessorResult; import org.opensearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.client.ESRestHighLevelClientTestCase; -import org.elasticsearch.client.RequestOptions; +import org.opensearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; import org.opensearch.common.bytes.BytesArray; import org.elasticsearch.common.unit.TimeValue; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MiscellaneousDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MiscellaneousDocumentationIT.java index 31a67752a9c..8c377070a42 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MiscellaneousDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MiscellaneousDocumentationIT.java @@ -21,8 +21,8 @@ package org.elasticsearch.client.documentation; import org.apache.http.HttpHost; import org.elasticsearch.client.ESRestHighLevelClientTestCase; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.RequestOptions; +import org.opensearch.client.RestClient; import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.client.core.MainResponse; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java index d2b79078435..7a4bff4074c 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java @@ -43,10 +43,10 @@ import org.elasticsearch.action.search.ShardSearchFailure; import org.opensearch.action.support.IndicesOptions; import org.opensearch.action.support.WriteRequest; import org.elasticsearch.client.ESRestHighLevelClientTestCase; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.Response; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.Request; +import org.opensearch.client.RequestOptions; +import org.opensearch.client.Response; +import org.opensearch.client.RestClient; import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.client.core.CountRequest; import org.elasticsearch.client.core.CountResponse; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SnapshotClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SnapshotClientDocumentationIT.java index 5a362159ca6..6012815299e 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SnapshotClientDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SnapshotClientDocumentationIT.java @@ -41,9 +41,9 @@ import org.opensearch.action.admin.cluster.snapshots.status.SnapshotsStatusRespo import org.opensearch.action.support.IndicesOptions; import org.opensearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.client.ESRestHighLevelClientTestCase; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.Response; +import org.opensearch.client.Request; +import org.opensearch.client.RequestOptions; +import org.opensearch.client.Response; import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.client.indices.CreateIndexRequest; import org.opensearch.cluster.SnapshotsInProgress; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/StoredScriptsDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/StoredScriptsDocumentationIT.java index 9ce023cb40e..6d4abf60747 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/StoredScriptsDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/StoredScriptsDocumentationIT.java @@ -27,7 +27,7 @@ import org.opensearch.action.admin.cluster.storedscripts.GetStoredScriptResponse import org.opensearch.action.admin.cluster.storedscripts.PutStoredScriptRequest; import org.opensearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.client.ESRestHighLevelClientTestCase; -import org.elasticsearch.client.RequestOptions; +import org.opensearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TasksClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TasksClientDocumentationIT.java index 007b94acae4..499ad0ff51b 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TasksClientDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TasksClientDocumentationIT.java @@ -27,7 +27,7 @@ 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.ESRestHighLevelClientTestCase; -import org.elasticsearch.client.RequestOptions; +import org.opensearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.client.tasks.CancelTasksRequest; import org.elasticsearch.client.tasks.CancelTasksResponse; diff --git a/client/rest/build.gradle b/client/rest/build.gradle index 1118369c215..7ae804a8b78 100644 --- a/client/rest/build.gradle +++ b/client/rest/build.gradle @@ -18,14 +18,14 @@ import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis * specific language governing permissions and limitations * under the License. */ -apply plugin: 'elasticsearch.build' -apply plugin: 'elasticsearch.publish' +apply plugin: 'opensearch.build' +apply plugin: 'opensearch.publish' targetCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8 -group = 'org.elasticsearch.client' -archivesBaseName = 'elasticsearch-rest-client' +group = 'org.opensearch.client' +archivesBaseName = 'opensearch-rest-client' dependencies { api "org.apache.httpcomponents:httpclient:${versions.httpclient}" @@ -39,8 +39,8 @@ dependencies { testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testImplementation "junit:junit:${versions.junit}" testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}" - testImplementation "org.elasticsearch:securemock:${versions.securemock}" - testImplementation "org.elasticsearch:mocksocket:${versions.mocksocket}" + testImplementation "org.opensearch:securemock:${versions.securemock}" + testImplementation "org.opensearch:mocksocket:${versions.mocksocket}" } tasks.withType(CheckForbiddenApis).configureEach { @@ -59,14 +59,14 @@ tasks.named('forbiddenApisTest').configure { } // JarHell is part of es server, which we don't want to pull in -// TODO: Not anymore. Now in :libs:elasticsearch-core +// TODO: Not anymore. Now in :libs:opensearch-core jarHell.enabled = false testingConventions { naming.clear() naming { Tests { - baseClass 'org.elasticsearch.client.RestClientTestCase' + baseClass 'org.opensearch.client.RestClientTestCase' } } } diff --git a/client/rest/src/main/java/org/elasticsearch/client/Cancellable.java b/client/rest/src/main/java/org/opensearch/client/Cancellable.java similarity index 99% rename from client/rest/src/main/java/org/elasticsearch/client/Cancellable.java rename to client/rest/src/main/java/org/opensearch/client/Cancellable.java index 6a31ab3fe17..4a5c1a87ce5 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/Cancellable.java +++ b/client/rest/src/main/java/org/opensearch/client/Cancellable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.client.methods.AbstractExecutionAwareRequest; import org.apache.http.client.methods.HttpRequestBase; diff --git a/client/rest/src/main/java/org/elasticsearch/client/DeadHostState.java b/client/rest/src/main/java/org/opensearch/client/DeadHostState.java similarity index 99% rename from client/rest/src/main/java/org/elasticsearch/client/DeadHostState.java rename to client/rest/src/main/java/org/opensearch/client/DeadHostState.java index bff397a1c2c..57ec0b2c19e 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/DeadHostState.java +++ b/client/rest/src/main/java/org/opensearch/client/DeadHostState.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; diff --git a/client/rest/src/main/java/org/elasticsearch/client/HasAttributeNodeSelector.java b/client/rest/src/main/java/org/opensearch/client/HasAttributeNodeSelector.java similarity index 98% rename from client/rest/src/main/java/org/elasticsearch/client/HasAttributeNodeSelector.java rename to client/rest/src/main/java/org/opensearch/client/HasAttributeNodeSelector.java index 11232a08c3d..a643bed9f5d 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/HasAttributeNodeSelector.java +++ b/client/rest/src/main/java/org/opensearch/client/HasAttributeNodeSelector.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import java.util.Iterator; import java.util.List; diff --git a/client/rest/src/main/java/org/elasticsearch/client/HeapBufferedAsyncResponseConsumer.java b/client/rest/src/main/java/org/opensearch/client/HeapBufferedAsyncResponseConsumer.java similarity index 99% rename from client/rest/src/main/java/org/elasticsearch/client/HeapBufferedAsyncResponseConsumer.java rename to client/rest/src/main/java/org/opensearch/client/HeapBufferedAsyncResponseConsumer.java index 84753e6f75c..85c606e1386 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/HeapBufferedAsyncResponseConsumer.java +++ b/client/rest/src/main/java/org/opensearch/client/HeapBufferedAsyncResponseConsumer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.ContentTooLongException; import org.apache.http.HttpEntity; diff --git a/client/rest/src/main/java/org/elasticsearch/client/HttpAsyncResponseConsumerFactory.java b/client/rest/src/main/java/org/opensearch/client/HttpAsyncResponseConsumerFactory.java similarity index 93% rename from client/rest/src/main/java/org/elasticsearch/client/HttpAsyncResponseConsumerFactory.java rename to client/rest/src/main/java/org/opensearch/client/HttpAsyncResponseConsumerFactory.java index 1af9e0dcf0f..8f35dfe1388 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/HttpAsyncResponseConsumerFactory.java +++ b/client/rest/src/main/java/org/opensearch/client/HttpAsyncResponseConsumerFactory.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.HttpResponse; import org.apache.http.nio.protocol.HttpAsyncResponseConsumer; -import static org.elasticsearch.client.HttpAsyncResponseConsumerFactory.HeapBufferedResponseConsumerFactory.DEFAULT_BUFFER_LIMIT; +import static org.opensearch.client.HttpAsyncResponseConsumerFactory.HeapBufferedResponseConsumerFactory.DEFAULT_BUFFER_LIMIT; /** * Factory used to create instances of {@link HttpAsyncResponseConsumer}. Each request retry needs its own instance of the diff --git a/client/rest/src/main/java/org/elasticsearch/client/HttpDeleteWithEntity.java b/client/rest/src/main/java/org/opensearch/client/HttpDeleteWithEntity.java similarity index 97% rename from client/rest/src/main/java/org/elasticsearch/client/HttpDeleteWithEntity.java rename to client/rest/src/main/java/org/opensearch/client/HttpDeleteWithEntity.java index df08ae5a8d1..deddec05e0f 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/HttpDeleteWithEntity.java +++ b/client/rest/src/main/java/org/opensearch/client/HttpDeleteWithEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.client.methods.HttpDelete; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; diff --git a/client/rest/src/main/java/org/elasticsearch/client/HttpGetWithEntity.java b/client/rest/src/main/java/org/opensearch/client/HttpGetWithEntity.java similarity index 97% rename from client/rest/src/main/java/org/elasticsearch/client/HttpGetWithEntity.java rename to client/rest/src/main/java/org/opensearch/client/HttpGetWithEntity.java index a3846beefe4..32eb9e368b0 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/HttpGetWithEntity.java +++ b/client/rest/src/main/java/org/opensearch/client/HttpGetWithEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; import org.apache.http.client.methods.HttpGet; @@ -38,4 +38,4 @@ final class HttpGetWithEntity extends HttpEntityEnclosingRequestBase { public String getMethod() { return METHOD_NAME; } -} \ No newline at end of file +} diff --git a/client/rest/src/main/java/org/elasticsearch/client/Node.java b/client/rest/src/main/java/org/opensearch/client/Node.java similarity index 99% rename from client/rest/src/main/java/org/elasticsearch/client/Node.java rename to client/rest/src/main/java/org/opensearch/client/Node.java index f58775cef6b..e71b23c362b 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/Node.java +++ b/client/rest/src/main/java/org/opensearch/client/Node.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.HttpHost; diff --git a/client/rest/src/main/java/org/elasticsearch/client/NodeSelector.java b/client/rest/src/main/java/org/opensearch/client/NodeSelector.java similarity index 98% rename from client/rest/src/main/java/org/elasticsearch/client/NodeSelector.java rename to client/rest/src/main/java/org/opensearch/client/NodeSelector.java index b3efa08befa..b56f36ef7e8 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/NodeSelector.java +++ b/client/rest/src/main/java/org/opensearch/client/NodeSelector.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import java.util.Iterator; diff --git a/client/rest/src/main/java/org/elasticsearch/client/PersistentCredentialsAuthenticationStrategy.java b/client/rest/src/main/java/org/opensearch/client/PersistentCredentialsAuthenticationStrategy.java similarity index 98% rename from client/rest/src/main/java/org/elasticsearch/client/PersistentCredentialsAuthenticationStrategy.java rename to client/rest/src/main/java/org/opensearch/client/PersistentCredentialsAuthenticationStrategy.java index 4ae22fbe372..5dde5a20acc 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/PersistentCredentialsAuthenticationStrategy.java +++ b/client/rest/src/main/java/org/opensearch/client/PersistentCredentialsAuthenticationStrategy.java @@ -19,7 +19,7 @@ * */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/client/rest/src/main/java/org/elasticsearch/client/PreferHasAttributeNodeSelector.java b/client/rest/src/main/java/org/opensearch/client/PreferHasAttributeNodeSelector.java similarity index 98% rename from client/rest/src/main/java/org/elasticsearch/client/PreferHasAttributeNodeSelector.java rename to client/rest/src/main/java/org/opensearch/client/PreferHasAttributeNodeSelector.java index e33a6936745..d4baa185627 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/PreferHasAttributeNodeSelector.java +++ b/client/rest/src/main/java/org/opensearch/client/PreferHasAttributeNodeSelector.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import java.util.Iterator; import java.util.List; diff --git a/client/rest/src/main/java/org/elasticsearch/client/Request.java b/client/rest/src/main/java/org/opensearch/client/Request.java similarity index 99% rename from client/rest/src/main/java/org/elasticsearch/client/Request.java rename to client/rest/src/main/java/org/opensearch/client/Request.java index 0bf92024864..c5b0a53bd8b 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/Request.java +++ b/client/rest/src/main/java/org/opensearch/client/Request.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.HttpEntity; import org.apache.http.entity.ContentType; diff --git a/client/rest/src/main/java/org/elasticsearch/client/RequestLogger.java b/client/rest/src/main/java/org/opensearch/client/RequestLogger.java similarity index 99% rename from client/rest/src/main/java/org/elasticsearch/client/RequestLogger.java rename to client/rest/src/main/java/org/opensearch/client/RequestLogger.java index 7c56a7edf97..74239f5bf21 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/RequestLogger.java +++ b/client/rest/src/main/java/org/opensearch/client/RequestLogger.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/client/rest/src/main/java/org/elasticsearch/client/RequestOptions.java b/client/rest/src/main/java/org/opensearch/client/RequestOptions.java similarity index 98% rename from client/rest/src/main/java/org/elasticsearch/client/RequestOptions.java rename to client/rest/src/main/java/org/opensearch/client/RequestOptions.java index 6e44c219cd0..f1fb0d2c699 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/RequestOptions.java +++ b/client/rest/src/main/java/org/opensearch/client/RequestOptions.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.Header; import org.apache.http.client.config.RequestConfig; import org.apache.http.message.BasicHeader; import org.apache.http.nio.protocol.HttpAsyncResponseConsumer; -import org.elasticsearch.client.HttpAsyncResponseConsumerFactory.HeapBufferedResponseConsumerFactory; +import org.opensearch.client.HttpAsyncResponseConsumerFactory.HeapBufferedResponseConsumerFactory; import java.util.ArrayList; import java.util.Collections; diff --git a/client/rest/src/main/java/org/elasticsearch/client/Response.java b/client/rest/src/main/java/org/opensearch/client/Response.java similarity index 98% rename from client/rest/src/main/java/org/elasticsearch/client/Response.java rename to client/rest/src/main/java/org/opensearch/client/Response.java index 099a913db92..8b3ac3e7c97 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/Response.java +++ b/client/rest/src/main/java/org/opensearch/client/Response.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.Header; import org.apache.http.HttpEntity; @@ -33,7 +33,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * Holds an elasticsearch response. It wraps the {@link HttpResponse} returned and associates it with + * Holds an opensearch response. It wraps the {@link HttpResponse} returned and associates it with * its corresponding {@link RequestLine} and {@link HttpHost}. */ public class Response { diff --git a/client/rest/src/main/java/org/elasticsearch/client/ResponseException.java b/client/rest/src/main/java/org/opensearch/client/ResponseException.java similarity index 93% rename from client/rest/src/main/java/org/elasticsearch/client/ResponseException.java rename to client/rest/src/main/java/org/opensearch/client/ResponseException.java index e133776affb..d7f423a4369 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/ResponseException.java +++ b/client/rest/src/main/java/org/opensearch/client/ResponseException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.HttpEntity; import org.apache.http.entity.BufferedHttpEntity; @@ -27,7 +27,7 @@ import java.io.IOException; import java.util.Locale; /** - * Exception thrown when an elasticsearch node responds to a request with a status code that indicates an error. + * Exception thrown when an opensearch node responds to a request with a status code that indicates an error. * Holds the response that was returned. */ public final class ResponseException extends IOException { diff --git a/client/rest/src/main/java/org/elasticsearch/client/ResponseListener.java b/client/rest/src/main/java/org/opensearch/client/ResponseListener.java similarity index 98% rename from client/rest/src/main/java/org/elasticsearch/client/ResponseListener.java rename to client/rest/src/main/java/org/opensearch/client/ResponseListener.java index 3d587359900..a5ea95adea1 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/ResponseListener.java +++ b/client/rest/src/main/java/org/opensearch/client/ResponseListener.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; /** * Listener to be provided when calling async performRequest methods provided by {@link RestClient}. diff --git a/client/rest/src/main/java/org/elasticsearch/client/RestClient.java b/client/rest/src/main/java/org/opensearch/client/RestClient.java similarity index 99% rename from client/rest/src/main/java/org/elasticsearch/client/RestClient.java rename to client/rest/src/main/java/org/opensearch/client/RestClient.java index e7851223514..ffd769f7fbb 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/RestClient.java +++ b/client/rest/src/main/java/org/opensearch/client/RestClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/client/rest/src/main/java/org/elasticsearch/client/RestClientBuilder.java b/client/rest/src/main/java/org/opensearch/client/RestClientBuilder.java similarity index 99% rename from client/rest/src/main/java/org/elasticsearch/client/RestClientBuilder.java rename to client/rest/src/main/java/org/opensearch/client/RestClientBuilder.java index 3305340ec5a..c9c789fe969 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/RestClientBuilder.java +++ b/client/rest/src/main/java/org/opensearch/client/RestClientBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.Header; import org.apache.http.client.config.RequestConfig; diff --git a/client/rest/src/main/java/org/elasticsearch/client/WarningFailureException.java b/client/rest/src/main/java/org/opensearch/client/WarningFailureException.java similarity index 95% rename from client/rest/src/main/java/org/elasticsearch/client/WarningFailureException.java rename to client/rest/src/main/java/org/opensearch/client/WarningFailureException.java index f8a89dc8de0..80254501fc6 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/WarningFailureException.java +++ b/client/rest/src/main/java/org/opensearch/client/WarningFailureException.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import java.io.IOException; -import static org.elasticsearch.client.ResponseException.buildMessage; +import static org.opensearch.client.ResponseException.buildMessage; /** * This exception is used to indicate that one or more {@link Response#getWarnings()} exist diff --git a/client/rest/src/main/java/org/elasticsearch/client/WarningsHandler.java b/client/rest/src/main/java/org/opensearch/client/WarningsHandler.java similarity index 97% rename from client/rest/src/main/java/org/elasticsearch/client/WarningsHandler.java rename to client/rest/src/main/java/org/opensearch/client/WarningsHandler.java index 26b75454f3a..31888e28feb 100644 --- a/client/rest/src/main/java/org/elasticsearch/client/WarningsHandler.java +++ b/client/rest/src/main/java/org/opensearch/client/WarningsHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import java.util.List; @@ -50,4 +50,4 @@ public interface WarningsHandler { return "strict"; } }; -} \ No newline at end of file +} diff --git a/client/rest/src/test/java/org/elasticsearch/client/DeadHostStateTests.java b/client/rest/src/test/java/org/opensearch/client/DeadHostStateTests.java similarity index 98% rename from client/rest/src/test/java/org/elasticsearch/client/DeadHostStateTests.java rename to client/rest/src/test/java/org/opensearch/client/DeadHostStateTests.java index fd99adaece1..67ee4c989f2 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/DeadHostStateTests.java +++ b/client/rest/src/test/java/org/opensearch/client/DeadHostStateTests.java @@ -17,9 +17,8 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; -import org.opensearch.client.RestClientTestCase; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; diff --git a/client/rest/src/test/java/org/elasticsearch/client/FailureTrackingResponseListenerTests.java b/client/rest/src/test/java/org/opensearch/client/FailureTrackingResponseListenerTests.java similarity index 98% rename from client/rest/src/test/java/org/elasticsearch/client/FailureTrackingResponseListenerTests.java rename to client/rest/src/test/java/org/opensearch/client/FailureTrackingResponseListenerTests.java index e1c53d8a3a9..0dc08747605 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/FailureTrackingResponseListenerTests.java +++ b/client/rest/src/test/java/org/opensearch/client/FailureTrackingResponseListenerTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.HttpHost; import org.apache.http.HttpResponse; @@ -27,7 +27,6 @@ import org.apache.http.StatusLine; import org.apache.http.message.BasicHttpResponse; import org.apache.http.message.BasicRequestLine; import org.apache.http.message.BasicStatusLine; -import org.opensearch.client.RestClientTestCase; import java.util.concurrent.atomic.AtomicReference; diff --git a/client/rest/src/test/java/org/elasticsearch/client/HasAttributeNodeSelectorTests.java b/client/rest/src/test/java/org/opensearch/client/HasAttributeNodeSelectorTests.java similarity index 95% rename from client/rest/src/test/java/org/elasticsearch/client/HasAttributeNodeSelectorTests.java rename to client/rest/src/test/java/org/opensearch/client/HasAttributeNodeSelectorTests.java index 6a104e0129f..da3faa3335c 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/HasAttributeNodeSelectorTests.java +++ b/client/rest/src/test/java/org/opensearch/client/HasAttributeNodeSelectorTests.java @@ -17,11 +17,10 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.HttpHost; -import org.elasticsearch.client.Node.Roles; -import org.opensearch.client.RestClientTestCase; +import org.opensearch.client.Node.Roles; import java.util.ArrayList; import java.util.Arrays; diff --git a/client/rest/src/test/java/org/elasticsearch/client/HeapBufferedAsyncResponseConsumerTests.java b/client/rest/src/test/java/org/opensearch/client/HeapBufferedAsyncResponseConsumerTests.java similarity index 98% rename from client/rest/src/test/java/org/elasticsearch/client/HeapBufferedAsyncResponseConsumerTests.java rename to client/rest/src/test/java/org/opensearch/client/HeapBufferedAsyncResponseConsumerTests.java index 0cb3e7f2a64..fe4c17e6f69 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/HeapBufferedAsyncResponseConsumerTests.java +++ b/client/rest/src/test/java/org/opensearch/client/HeapBufferedAsyncResponseConsumerTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.ContentTooLongException; import org.apache.http.HttpEntity; @@ -32,7 +32,6 @@ import org.apache.http.nio.ContentDecoder; import org.apache.http.nio.IOControl; import org.apache.http.nio.protocol.HttpAsyncResponseConsumer; import org.apache.http.protocol.HttpContext; -import org.opensearch.client.RestClientTestCase; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/client/rest/src/test/java/org/elasticsearch/client/HostsTrackingFailureListener.java b/client/rest/src/test/java/org/opensearch/client/HostsTrackingFailureListener.java similarity index 98% rename from client/rest/src/test/java/org/elasticsearch/client/HostsTrackingFailureListener.java rename to client/rest/src/test/java/org/opensearch/client/HostsTrackingFailureListener.java index 6c952fcf947..db2613e1ce6 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/HostsTrackingFailureListener.java +++ b/client/rest/src/test/java/org/opensearch/client/HostsTrackingFailureListener.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.HttpHost; diff --git a/client/rest/src/test/java/org/elasticsearch/client/NodeSelectorTests.java b/client/rest/src/test/java/org/opensearch/client/NodeSelectorTests.java similarity index 95% rename from client/rest/src/test/java/org/elasticsearch/client/NodeSelectorTests.java rename to client/rest/src/test/java/org/opensearch/client/NodeSelectorTests.java index 1f602fa9588..274e696f4b1 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/NodeSelectorTests.java +++ b/client/rest/src/test/java/org/opensearch/client/NodeSelectorTests.java @@ -17,11 +17,10 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.HttpHost; -import org.elasticsearch.client.Node.Roles; -import org.opensearch.client.RestClientTestCase; +import org.opensearch.client.Node.Roles; import java.util.ArrayList; import java.util.Collections; diff --git a/client/rest/src/test/java/org/elasticsearch/client/NodeTests.java b/client/rest/src/test/java/org/opensearch/client/NodeTests.java similarity index 97% rename from client/rest/src/test/java/org/elasticsearch/client/NodeTests.java rename to client/rest/src/test/java/org/opensearch/client/NodeTests.java index b35c533288c..eb72c9dffed 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/NodeTests.java +++ b/client/rest/src/test/java/org/opensearch/client/NodeTests.java @@ -17,11 +17,10 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.HttpHost; -import org.elasticsearch.client.Node.Roles; -import org.opensearch.client.RestClientTestCase; +import org.opensearch.client.Node.Roles; import java.util.Arrays; import java.util.Collections; diff --git a/client/rest/src/test/java/org/elasticsearch/client/PreferHasAttributeNodeSelectorTests.java b/client/rest/src/test/java/org/opensearch/client/PreferHasAttributeNodeSelectorTests.java similarity index 96% rename from client/rest/src/test/java/org/elasticsearch/client/PreferHasAttributeNodeSelectorTests.java rename to client/rest/src/test/java/org/opensearch/client/PreferHasAttributeNodeSelectorTests.java index f52fff54118..433af8dbeb9 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/PreferHasAttributeNodeSelectorTests.java +++ b/client/rest/src/test/java/org/opensearch/client/PreferHasAttributeNodeSelectorTests.java @@ -17,11 +17,10 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.HttpHost; -import org.elasticsearch.client.Node.Roles; -import org.opensearch.client.RestClientTestCase; +import org.opensearch.client.Node.Roles; import java.util.ArrayList; import java.util.Arrays; diff --git a/client/rest/src/test/java/org/elasticsearch/client/RequestLoggerTests.java b/client/rest/src/test/java/org/opensearch/client/RequestLoggerTests.java similarity index 99% rename from client/rest/src/test/java/org/elasticsearch/client/RequestLoggerTests.java rename to client/rest/src/test/java/org/opensearch/client/RequestLoggerTests.java index 994ed4f2c35..d90a978d8d8 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/RequestLoggerTests.java +++ b/client/rest/src/test/java/org/opensearch/client/RequestLoggerTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.Header; import org.apache.http.HttpEntity; @@ -40,7 +40,6 @@ import org.apache.http.message.BasicStatusLine; import org.apache.http.nio.entity.NByteArrayEntity; import org.apache.http.nio.entity.NStringEntity; import org.apache.http.util.EntityUtils; -import org.opensearch.client.RestClientTestCase; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/client/rest/src/test/java/org/elasticsearch/client/RequestOptionsTests.java b/client/rest/src/test/java/org/opensearch/client/RequestOptionsTests.java similarity index 97% rename from client/rest/src/test/java/org/elasticsearch/client/RequestOptionsTests.java rename to client/rest/src/test/java/org/opensearch/client/RequestOptionsTests.java index ea8e88a0f6c..fccc11f1153 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/RequestOptionsTests.java +++ b/client/rest/src/test/java/org/opensearch/client/RequestOptionsTests.java @@ -17,12 +17,11 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.Header; import org.apache.http.client.config.RequestConfig; -import org.elasticsearch.client.HttpAsyncResponseConsumerFactory.HeapBufferedResponseConsumerFactory; -import org.opensearch.client.RestClientTestCase; +import org.opensearch.client.HttpAsyncResponseConsumerFactory.HeapBufferedResponseConsumerFactory; import java.util.ArrayList; import java.util.Collections; diff --git a/client/rest/src/test/java/org/elasticsearch/client/RequestTests.java b/client/rest/src/test/java/org/opensearch/client/RequestTests.java similarity index 98% rename from client/rest/src/test/java/org/elasticsearch/client/RequestTests.java rename to client/rest/src/test/java/org/opensearch/client/RequestTests.java index a41cc0e105b..b95c7b32285 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/RequestTests.java +++ b/client/rest/src/test/java/org/opensearch/client/RequestTests.java @@ -17,15 +17,14 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.HttpEntity; import org.apache.http.entity.ByteArrayEntity; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.nio.entity.NStringEntity; -import org.elasticsearch.client.HttpAsyncResponseConsumerFactory.HeapBufferedResponseConsumerFactory; -import org.opensearch.client.RestClientTestCase; +import org.opensearch.client.HttpAsyncResponseConsumerFactory.HeapBufferedResponseConsumerFactory; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/client/rest/src/test/java/org/elasticsearch/client/ResponseExceptionTests.java b/client/rest/src/test/java/org/opensearch/client/ResponseExceptionTests.java similarity index 97% rename from client/rest/src/test/java/org/elasticsearch/client/ResponseExceptionTests.java rename to client/rest/src/test/java/org/opensearch/client/ResponseExceptionTests.java index 9fc88006c2c..fbd65708f6d 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/ResponseExceptionTests.java +++ b/client/rest/src/test/java/org/opensearch/client/ResponseExceptionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.HttpEntity; import org.apache.http.HttpHost; @@ -32,7 +32,6 @@ import org.apache.http.message.BasicHttpResponse; import org.apache.http.message.BasicRequestLine; import org.apache.http.message.BasicStatusLine; import org.apache.http.util.EntityUtils; -import org.opensearch.client.RestClientTestCase; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderIntegTests.java b/client/rest/src/test/java/org/opensearch/client/RestClientBuilderIntegTests.java similarity index 98% rename from client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderIntegTests.java rename to client/rest/src/test/java/org/opensearch/client/RestClientBuilderIntegTests.java index 4ad180a20e0..b1d1bd40380 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderIntegTests.java +++ b/client/rest/src/test/java/org/opensearch/client/RestClientBuilderIntegTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; @@ -27,7 +27,6 @@ import org.apache.http.HttpHost; import org.elasticsearch.mocksocket.MockHttpServer; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.opensearch.client.RestClientTestCase; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; diff --git a/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java b/client/rest/src/test/java/org/opensearch/client/RestClientBuilderTests.java similarity index 99% rename from client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java rename to client/rest/src/test/java/org/opensearch/client/RestClientBuilderTests.java index 398b84afffa..f38f09f13d2 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java +++ b/client/rest/src/test/java/org/opensearch/client/RestClientBuilderTests.java @@ -17,14 +17,13 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.Header; import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; import org.apache.http.impl.nio.client.HttpAsyncClientBuilder; import org.apache.http.message.BasicHeader; -import org.opensearch.client.RestClientTestCase; import java.io.IOException; import java.util.Base64; diff --git a/client/rest/src/test/java/org/elasticsearch/client/RestClientGzipCompressionTests.java b/client/rest/src/test/java/org/opensearch/client/RestClientGzipCompressionTests.java similarity index 98% rename from client/rest/src/test/java/org/elasticsearch/client/RestClientGzipCompressionTests.java rename to client/rest/src/test/java/org/opensearch/client/RestClientGzipCompressionTests.java index f2fa9b19dd2..48c677d497a 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/RestClientGzipCompressionTests.java +++ b/client/rest/src/test/java/org/opensearch/client/RestClientGzipCompressionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; @@ -30,7 +30,6 @@ import org.elasticsearch.mocksocket.MockHttpServer; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; -import org.opensearch.client.RestClientTestCase; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/client/rest/src/test/java/org/elasticsearch/client/RestClientMultipleHostsIntegTests.java b/client/rest/src/test/java/org/opensearch/client/RestClientMultipleHostsIntegTests.java similarity index 99% rename from client/rest/src/test/java/org/elasticsearch/client/RestClientMultipleHostsIntegTests.java rename to client/rest/src/test/java/org/opensearch/client/RestClientMultipleHostsIntegTests.java index 04596917717..915fb993f8f 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/RestClientMultipleHostsIntegTests.java +++ b/client/rest/src/test/java/org/opensearch/client/RestClientMultipleHostsIntegTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; @@ -28,8 +28,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; -import org.opensearch.client.RestClientTestCase; -import org.opensearch.client.RestClientTestUtil; import java.io.IOException; import java.net.ConnectException; diff --git a/client/rest/src/test/java/org/elasticsearch/client/RestClientMultipleHostsTests.java b/client/rest/src/test/java/org/opensearch/client/RestClientMultipleHostsTests.java similarity index 99% rename from client/rest/src/test/java/org/elasticsearch/client/RestClientMultipleHostsTests.java rename to client/rest/src/test/java/org/opensearch/client/RestClientMultipleHostsTests.java index 77c711f219d..f8e5fe5acca 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/RestClientMultipleHostsTests.java +++ b/client/rest/src/test/java/org/opensearch/client/RestClientMultipleHostsTests.java @@ -17,14 +17,13 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import org.apache.http.Header; import org.apache.http.HttpHost; import org.apache.http.impl.nio.client.CloseableHttpAsyncClient; import org.junit.After; -import org.opensearch.client.RestClientTestCase; import java.io.IOException; import java.util.ArrayList; diff --git a/client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostIntegTests.java b/client/rest/src/test/java/org/opensearch/client/RestClientSingleHostIntegTests.java similarity index 99% rename from client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostIntegTests.java rename to client/rest/src/test/java/org/opensearch/client/RestClientSingleHostIntegTests.java index 47e63c2005b..5a08fb5e31e 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostIntegTests.java +++ b/client/rest/src/test/java/org/opensearch/client/RestClientSingleHostIntegTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; @@ -42,8 +42,6 @@ import org.apache.http.util.EntityUtils; import org.elasticsearch.mocksocket.MockHttpServer; import org.junit.After; import org.junit.Before; -import org.opensearch.client.RestClientTestCase; -import org.opensearch.client.RestClientTestUtil; import java.io.IOException; import java.io.InputStreamReader; diff --git a/client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostTests.java b/client/rest/src/test/java/org/opensearch/client/RestClientSingleHostTests.java similarity index 99% rename from client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostTests.java rename to client/rest/src/test/java/org/opensearch/client/RestClientSingleHostTests.java index 0f6294b7c9c..d1b1952ca7c 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostTests.java +++ b/client/rest/src/test/java/org/opensearch/client/RestClientSingleHostTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -53,8 +53,6 @@ import org.junit.After; import org.junit.Before; import org.mockito.ArgumentCaptor; import org.mockito.stubbing.Answer; -import org.opensearch.client.RestClientTestCase; -import org.opensearch.client.RestClientTestUtil; import javax.net.ssl.SSLHandshakeException; import java.io.IOException; diff --git a/client/rest/src/test/java/org/elasticsearch/client/RestClientTests.java b/client/rest/src/test/java/org/opensearch/client/RestClientTests.java similarity index 99% rename from client/rest/src/test/java/org/elasticsearch/client/RestClientTests.java rename to client/rest/src/test/java/org/opensearch/client/RestClientTests.java index 3519c839d37..672774bd20a 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/RestClientTests.java +++ b/client/rest/src/test/java/org/opensearch/client/RestClientTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client; +package org.opensearch.client; import org.apache.http.Header; import org.apache.http.HttpHost; @@ -25,8 +25,7 @@ import org.apache.http.client.AuthCache; import org.apache.http.impl.auth.BasicScheme; import org.apache.http.impl.client.BasicAuthCache; import org.apache.http.impl.nio.client.CloseableHttpAsyncClient; -import org.elasticsearch.client.RestClient.NodeTuple; -import org.opensearch.client.RestClientTestCase; +import org.opensearch.client.RestClient.NodeTuple; import java.io.IOException; import java.net.URI; diff --git a/client/rest/src/test/java/org/elasticsearch/client/documentation/RestClientDocumentation.java b/client/rest/src/test/java/org/opensearch/client/documentation/RestClientDocumentation.java similarity index 97% rename from client/rest/src/test/java/org/elasticsearch/client/documentation/RestClientDocumentation.java rename to client/rest/src/test/java/org/opensearch/client/documentation/RestClientDocumentation.java index 11c81d2ae24..8875feb46c3 100644 --- a/client/rest/src/test/java/org/elasticsearch/client/documentation/RestClientDocumentation.java +++ b/client/rest/src/test/java/org/opensearch/client/documentation/RestClientDocumentation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.documentation; +package org.opensearch.client.documentation; import org.apache.http.Header; import org.apache.http.HttpEntity; @@ -36,17 +36,17 @@ import org.apache.http.nio.entity.NStringEntity; import org.apache.http.ssl.SSLContextBuilder; import org.apache.http.ssl.SSLContexts; import org.apache.http.util.EntityUtils; -import org.elasticsearch.client.Cancellable; -import org.elasticsearch.client.HttpAsyncResponseConsumerFactory; -import org.elasticsearch.client.Node; -import org.elasticsearch.client.NodeSelector; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.Response; -import org.elasticsearch.client.ResponseListener; -import org.elasticsearch.client.RestClient; -import org.elasticsearch.client.RestClientBuilder; -import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback; +import org.opensearch.client.Cancellable; +import org.opensearch.client.HttpAsyncResponseConsumerFactory; +import org.opensearch.client.Node; +import org.opensearch.client.NodeSelector; +import org.opensearch.client.Request; +import org.opensearch.client.RequestOptions; +import org.opensearch.client.Response; +import org.opensearch.client.ResponseListener; +import org.opensearch.client.RestClient; +import org.opensearch.client.RestClientBuilder; +import org.opensearch.client.RestClientBuilder.HttpClientConfigCallback; import javax.net.ssl.SSLContext; import java.io.IOException; diff --git a/client/sniffer/src/main/java/org/opensearch/client/sniff/NodesSniffer.java b/client/sniffer/src/main/java/org/opensearch/client/sniff/NodesSniffer.java index 79da0724e14..f926a0ca77b 100644 --- a/client/sniffer/src/main/java/org/opensearch/client/sniff/NodesSniffer.java +++ b/client/sniffer/src/main/java/org/opensearch/client/sniff/NodesSniffer.java @@ -19,7 +19,7 @@ package org.opensearch.client.sniff; -import org.elasticsearch.client.Node; +import org.opensearch.client.Node; import java.io.IOException; import java.util.List; diff --git a/client/sniffer/src/main/java/org/opensearch/client/sniff/OpenSearchNodesSniffer.java b/client/sniffer/src/main/java/org/opensearch/client/sniff/OpenSearchNodesSniffer.java index e7ad42d168d..3c302668898 100644 --- a/client/sniffer/src/main/java/org/opensearch/client/sniff/OpenSearchNodesSniffer.java +++ b/client/sniffer/src/main/java/org/opensearch/client/sniff/OpenSearchNodesSniffer.java @@ -26,11 +26,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.HttpEntity; import org.apache.http.HttpHost; -import org.elasticsearch.client.Node; -import org.elasticsearch.client.Node.Roles; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.Response; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.Node; +import org.opensearch.client.Node.Roles; +import org.opensearch.client.Request; +import org.opensearch.client.Response; +import org.opensearch.client.RestClient; import java.io.IOException; import java.io.InputStream; diff --git a/client/sniffer/src/main/java/org/opensearch/client/sniff/SniffOnFailureListener.java b/client/sniffer/src/main/java/org/opensearch/client/sniff/SniffOnFailureListener.java index 5e8ae508317..8e5435134d1 100644 --- a/client/sniffer/src/main/java/org/opensearch/client/sniff/SniffOnFailureListener.java +++ b/client/sniffer/src/main/java/org/opensearch/client/sniff/SniffOnFailureListener.java @@ -19,8 +19,8 @@ package org.opensearch.client.sniff; -import org.elasticsearch.client.Node; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.Node; +import org.opensearch.client.RestClient; import java.util.Objects; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/client/sniffer/src/main/java/org/opensearch/client/sniff/Sniffer.java b/client/sniffer/src/main/java/org/opensearch/client/sniff/Sniffer.java index 36fefbab2e7..bb611260515 100644 --- a/client/sniffer/src/main/java/org/opensearch/client/sniff/Sniffer.java +++ b/client/sniffer/src/main/java/org/opensearch/client/sniff/Sniffer.java @@ -21,9 +21,9 @@ package org.opensearch.client.sniff; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.elasticsearch.client.Node; -import org.elasticsearch.client.RestClient; -import org.elasticsearch.client.RestClientBuilder; +import org.opensearch.client.Node; +import org.opensearch.client.RestClient; +import org.opensearch.client.RestClientBuilder; import java.io.Closeable; import java.io.IOException; diff --git a/client/sniffer/src/main/java/org/opensearch/client/sniff/SnifferBuilder.java b/client/sniffer/src/main/java/org/opensearch/client/sniff/SnifferBuilder.java index 1d41de7bbbf..d9c4abcd451 100644 --- a/client/sniffer/src/main/java/org/opensearch/client/sniff/SnifferBuilder.java +++ b/client/sniffer/src/main/java/org/opensearch/client/sniff/SnifferBuilder.java @@ -19,7 +19,7 @@ package org.opensearch.client.sniff; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.RestClient; import java.util.Objects; import java.util.concurrent.TimeUnit; diff --git a/client/sniffer/src/test/java/org/opensearch/client/sniff/MockNodesSniffer.java b/client/sniffer/src/test/java/org/opensearch/client/sniff/MockNodesSniffer.java index 68484b0aaf5..6c3fffde9a6 100644 --- a/client/sniffer/src/test/java/org/opensearch/client/sniff/MockNodesSniffer.java +++ b/client/sniffer/src/test/java/org/opensearch/client/sniff/MockNodesSniffer.java @@ -20,7 +20,7 @@ package org.opensearch.client.sniff; import org.apache.http.HttpHost; -import org.elasticsearch.client.Node; +import org.opensearch.client.Node; import java.util.Collections; import java.util.List; diff --git a/client/sniffer/src/test/java/org/opensearch/client/sniff/OpenSearchNodesSnifferParseTests.java b/client/sniffer/src/test/java/org/opensearch/client/sniff/OpenSearchNodesSnifferParseTests.java index 4166e094e17..3f1fdeb61f6 100644 --- a/client/sniffer/src/test/java/org/opensearch/client/sniff/OpenSearchNodesSnifferParseTests.java +++ b/client/sniffer/src/test/java/org/opensearch/client/sniff/OpenSearchNodesSnifferParseTests.java @@ -24,8 +24,8 @@ import org.apache.http.HttpEntity; import org.apache.http.HttpHost; import org.apache.http.entity.ContentType; import org.apache.http.entity.InputStreamEntity; -import org.elasticsearch.client.Node; -import org.elasticsearch.client.Node.Roles; +import org.opensearch.client.Node; +import org.opensearch.client.Node.Roles; import org.opensearch.client.RestClientTestCase; import org.opensearch.client.sniff.OpenSearchNodesSniffer.Scheme; diff --git a/client/sniffer/src/test/java/org/opensearch/client/sniff/OpenSearchNodesSnifferTests.java b/client/sniffer/src/test/java/org/opensearch/client/sniff/OpenSearchNodesSnifferTests.java index 17b5fb732a0..dc57a08d9b2 100644 --- a/client/sniffer/src/test/java/org/opensearch/client/sniff/OpenSearchNodesSnifferTests.java +++ b/client/sniffer/src/test/java/org/opensearch/client/sniff/OpenSearchNodesSnifferTests.java @@ -30,10 +30,10 @@ import com.sun.net.httpserver.HttpServer; import org.apache.http.Consts; import org.apache.http.HttpHost; import org.apache.http.client.methods.HttpGet; -import org.elasticsearch.client.Node; -import org.elasticsearch.client.Response; -import org.elasticsearch.client.ResponseException; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.Node; +import org.opensearch.client.Response; +import org.opensearch.client.ResponseException; +import org.opensearch.client.RestClient; import org.opensearch.client.RestClientTestCase; import org.elasticsearch.mocksocket.MockHttpServer; import org.junit.After; diff --git a/client/sniffer/src/test/java/org/opensearch/client/sniff/SniffOnFailureListenerTests.java b/client/sniffer/src/test/java/org/opensearch/client/sniff/SniffOnFailureListenerTests.java index 389f0b079c2..f3c702c2bd9 100644 --- a/client/sniffer/src/test/java/org/opensearch/client/sniff/SniffOnFailureListenerTests.java +++ b/client/sniffer/src/test/java/org/opensearch/client/sniff/SniffOnFailureListenerTests.java @@ -20,8 +20,8 @@ package org.opensearch.client.sniff; import org.apache.http.HttpHost; -import org.elasticsearch.client.Node; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.Node; +import org.opensearch.client.RestClient; import org.opensearch.client.RestClientTestCase; import static org.junit.Assert.assertEquals; diff --git a/client/sniffer/src/test/java/org/opensearch/client/sniff/SnifferBuilderTests.java b/client/sniffer/src/test/java/org/opensearch/client/sniff/SnifferBuilderTests.java index 1241b3f7ed3..3ef64b2b185 100644 --- a/client/sniffer/src/test/java/org/opensearch/client/sniff/SnifferBuilderTests.java +++ b/client/sniffer/src/test/java/org/opensearch/client/sniff/SnifferBuilderTests.java @@ -21,7 +21,7 @@ package org.opensearch.client.sniff; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import org.apache.http.HttpHost; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.RestClient; import org.opensearch.client.RestClientTestCase; import static org.junit.Assert.assertEquals; diff --git a/client/sniffer/src/test/java/org/opensearch/client/sniff/SnifferTests.java b/client/sniffer/src/test/java/org/opensearch/client/sniff/SnifferTests.java index 36ce2e13177..2bc32013103 100644 --- a/client/sniffer/src/test/java/org/opensearch/client/sniff/SnifferTests.java +++ b/client/sniffer/src/test/java/org/opensearch/client/sniff/SnifferTests.java @@ -20,8 +20,8 @@ package org.opensearch.client.sniff; import org.apache.http.HttpHost; -import org.elasticsearch.client.Node; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.Node; +import org.opensearch.client.RestClient; import org.opensearch.client.RestClientTestCase; import org.opensearch.client.sniff.Sniffer.DefaultScheduler; import org.opensearch.client.sniff.Sniffer.Scheduler; diff --git a/client/sniffer/src/test/java/org/opensearch/client/sniff/documentation/SnifferDocumentation.java b/client/sniffer/src/test/java/org/opensearch/client/sniff/documentation/SnifferDocumentation.java index 640765d4ae8..dbac5c6fbcd 100644 --- a/client/sniffer/src/test/java/org/opensearch/client/sniff/documentation/SnifferDocumentation.java +++ b/client/sniffer/src/test/java/org/opensearch/client/sniff/documentation/SnifferDocumentation.java @@ -20,8 +20,8 @@ package org.opensearch.client.sniff.documentation; import org.apache.http.HttpHost; -import org.elasticsearch.client.Node; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.Node; +import org.opensearch.client.RestClient; import org.opensearch.client.sniff.OpenSearchNodesSniffer; import org.opensearch.client.sniff.NodesSniffer; import org.opensearch.client.sniff.SniffOnFailureListener; diff --git a/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/CreatedLocationHeaderIT.java b/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/CreatedLocationHeaderIT.java index a054066ef5a..895863b07e6 100644 --- a/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/CreatedLocationHeaderIT.java +++ b/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/CreatedLocationHeaderIT.java @@ -19,8 +19,8 @@ package org.elasticsearch.test.rest; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.Response; +import org.opensearch.client.Request; +import org.opensearch.client.Response; import java.io.IOException; diff --git a/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/NodeRestUsageIT.java b/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/NodeRestUsageIT.java index 42ebbb97432..b238b285a38 100644 --- a/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/NodeRestUsageIT.java +++ b/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/NodeRestUsageIT.java @@ -19,9 +19,9 @@ package org.elasticsearch.test.rest; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.Response; -import org.elasticsearch.client.ResponseException; +import org.opensearch.client.Request; +import org.opensearch.client.Response; +import org.opensearch.client.ResponseException; import org.opensearch.common.Strings; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.opensearch.search.builder.SearchSourceBuilder; diff --git a/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/RequestsWithoutContentIT.java b/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/RequestsWithoutContentIT.java index 4d27f156b38..fe75246545d 100644 --- a/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/RequestsWithoutContentIT.java +++ b/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/RequestsWithoutContentIT.java @@ -19,8 +19,8 @@ package org.elasticsearch.test.rest; -import org.elasticsearch.client.ResponseException; -import org.elasticsearch.client.Request; +import org.opensearch.client.ResponseException; +import org.opensearch.client.Request; import java.io.IOException; diff --git a/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/WaitForRefreshAndCloseIT.java b/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/WaitForRefreshAndCloseIT.java index 811df9cfbe8..4ec4e49f856 100644 --- a/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/WaitForRefreshAndCloseIT.java +++ b/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/WaitForRefreshAndCloseIT.java @@ -22,10 +22,10 @@ package org.elasticsearch.test.rest; import org.apache.http.util.EntityUtils; import org.opensearch.action.ActionFuture; import org.opensearch.action.support.PlainActionFuture; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.Response; -import org.elasticsearch.client.ResponseException; -import org.elasticsearch.client.ResponseListener; +import org.opensearch.client.Request; +import org.opensearch.client.Response; +import org.opensearch.client.ResponseException; +import org.opensearch.client.ResponseListener; import org.junit.After; import org.junit.Before; diff --git a/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java b/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java index 46ba0b2a9e2..88dd7f4642d 100644 --- a/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java +++ b/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java @@ -20,7 +20,7 @@ package org.elasticsearch.docker.test; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import org.opensearch.OpenSearchException; -import org.elasticsearch.client.Request; +import org.opensearch.client.Request; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; diff --git a/modules/kibana/src/javaRestTest/java/org/elasticsearch/kibana/KibanaSystemIndexIT.java b/modules/kibana/src/javaRestTest/java/org/elasticsearch/kibana/KibanaSystemIndexIT.java index 51af77c4565..57efc5a3165 100644 --- a/modules/kibana/src/javaRestTest/java/org/elasticsearch/kibana/KibanaSystemIndexIT.java +++ b/modules/kibana/src/javaRestTest/java/org/elasticsearch/kibana/KibanaSystemIndexIT.java @@ -22,8 +22,8 @@ package org.elasticsearch.kibana; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import org.apache.http.util.EntityUtils; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.Response; +import org.opensearch.client.Request; +import org.opensearch.client.Response; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.test.rest.ESRestTestCase; diff --git a/modules/lang-mustache/src/javaRestTest/java/org/opensearch/script/mustache/SearchTemplateWithoutContentIT.java b/modules/lang-mustache/src/javaRestTest/java/org/opensearch/script/mustache/SearchTemplateWithoutContentIT.java index 5986717bbc8..a4a03e7bb9a 100644 --- a/modules/lang-mustache/src/javaRestTest/java/org/opensearch/script/mustache/SearchTemplateWithoutContentIT.java +++ b/modules/lang-mustache/src/javaRestTest/java/org/opensearch/script/mustache/SearchTemplateWithoutContentIT.java @@ -19,8 +19,8 @@ package org.opensearch.script.mustache; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.ResponseException; +import org.opensearch.client.Request; +import org.opensearch.client.ResponseException; import org.elasticsearch.test.rest.ESRestTestCase; import java.io.IOException; diff --git a/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ManyDocumentsIT.java b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ManyDocumentsIT.java index 88ed7bada87..7676524e3be 100644 --- a/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ManyDocumentsIT.java +++ b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ManyDocumentsIT.java @@ -19,7 +19,7 @@ package org.opensearch.index.reindex; -import org.elasticsearch.client.Request; +import org.opensearch.client.Request; import org.elasticsearch.test.rest.ESRestTestCase; import org.junit.Before; diff --git a/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ReindexWithoutContentIT.java b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ReindexWithoutContentIT.java index bd4f52f7646..98765af02dd 100644 --- a/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ReindexWithoutContentIT.java +++ b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ReindexWithoutContentIT.java @@ -19,8 +19,8 @@ package org.opensearch.index.reindex; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.ResponseException; +import org.opensearch.client.Request; +import org.opensearch.client.ResponseException; import org.elasticsearch.test.rest.ESRestTestCase; import java.io.IOException; diff --git a/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/remote/ReindexFromOldRemoteIT.java b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/remote/ReindexFromOldRemoteIT.java index d5d8cdb3e59..744f46c85d6 100644 --- a/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/remote/ReindexFromOldRemoteIT.java +++ b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/remote/ReindexFromOldRemoteIT.java @@ -22,9 +22,9 @@ package org.opensearch.index.reindex.remote; import org.apache.http.HttpHost; import org.apache.http.util.EntityUtils; import org.apache.lucene.util.Constants; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.Response; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.Request; +import org.opensearch.client.Response; +import org.opensearch.client.RestClient; import org.elasticsearch.common.Booleans; import org.elasticsearch.test.rest.ESRestTestCase; 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 667a04e716f..46ed4465322 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 @@ -36,8 +36,8 @@ import org.opensearch.action.bulk.BulkItemResponse; import org.elasticsearch.action.index.IndexRequest; import org.opensearch.client.Client; import org.opensearch.client.ParentTaskAssigningClient; -import org.elasticsearch.client.RestClient; -import org.elasticsearch.client.RestClientBuilder; +import org.opensearch.client.RestClient; +import org.opensearch.client.RestClientBuilder; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java index ac39be1292b..5a27ba7a0f5 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java @@ -24,7 +24,7 @@ import org.apache.http.nio.entity.NStringEntity; import org.opensearch.OpenSearchException; import org.opensearch.Version; import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.client.Request; +import org.opensearch.client.Request; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; import org.elasticsearch.common.logging.DeprecationLogger; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java index a8c5b9fb101..9c826db88f3 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java @@ -31,10 +31,10 @@ import org.opensearch.OpenSearchStatusException; import org.opensearch.Version; import org.opensearch.action.bulk.BackoffPolicy; import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.ResponseException; -import org.elasticsearch.client.ResponseListener; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.Request; +import org.opensearch.client.ResponseException; +import org.opensearch.client.ResponseListener; +import org.opensearch.client.RestClient; import org.elasticsearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java index 0b69031168d..16fc0e1e3a3 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java @@ -19,7 +19,7 @@ package org.opensearch.index.reindex; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.RestClient; import org.elasticsearch.client.RestClientBuilderTestCase; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java index 862298c39d5..db86f7d4705 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java @@ -23,9 +23,9 @@ import com.sun.net.httpserver.HttpsConfigurator; import com.sun.net.httpserver.HttpsExchange; import com.sun.net.httpserver.HttpsParameters; import com.sun.net.httpserver.HttpsServer; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.Response; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.Request; +import org.opensearch.client.Response; +import org.opensearch.client.RestClient; import org.elasticsearch.common.SuppressForbidden; import org.opensearch.common.bytes.BytesArray; import org.elasticsearch.common.io.PathUtils; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java index ad4572fad7e..f0fbcf7f2e6 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java @@ -23,7 +23,7 @@ import org.apache.http.HttpEntity; import org.apache.http.entity.ContentType; import org.opensearch.Version; import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.client.Request; +import org.opensearch.client.Request; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.elasticsearch.common.io.Streams; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java index ef06928dc0d..079c23aad1d 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java @@ -41,8 +41,8 @@ import org.opensearch.OpenSearchStatusException; import org.opensearch.Version; import org.opensearch.action.bulk.BackoffPolicy; import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.client.HeapBufferedAsyncResponseConsumer; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.HeapBufferedAsyncResponseConsumer; +import org.opensearch.client.RestClient; import org.opensearch.common.ParsingException; import org.opensearch.common.bytes.BytesArray; import org.elasticsearch.common.io.FileSystemUtils; diff --git a/modules/repository-url/src/yamlRestTest/java/org/opensearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java b/modules/repository-url/src/yamlRestTest/java/org/opensearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java index 8e285a3dc93..5846e1d335a 100644 --- a/modules/repository-url/src/yamlRestTest/java/org/opensearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java +++ b/modules/repository-url/src/yamlRestTest/java/org/opensearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java @@ -24,8 +24,8 @@ import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import org.apache.http.HttpEntity; import org.apache.http.entity.ContentType; import org.apache.http.nio.entity.NStringEntity; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.Response; +import org.opensearch.client.Request; +import org.opensearch.client.Response; import org.opensearch.common.Strings; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.Settings; 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 5581624910f..b4adbe40270 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 @@ -23,11 +23,11 @@ import org.apache.http.HttpHost; import org.opensearch.OpenSearchNetty4IntegTestCase; import org.opensearch.action.admin.cluster.health.ClusterHealthResponse; import org.opensearch.client.Client; -import org.elasticsearch.client.Node; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.Response; -import org.elasticsearch.client.ResponseException; -import org.elasticsearch.client.RestClient; +import org.opensearch.client.Node; +import org.opensearch.client.Request; +import org.opensearch.client.Response; +import org.opensearch.client.ResponseException; +import org.opensearch.client.RestClient; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.routing.UnassignedInfo; import org.opensearch.common.Priority; diff --git a/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4BadRequestIT.java b/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4BadRequestIT.java index cd59289f17e..4ddb430a371 100644 --- a/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4BadRequestIT.java +++ b/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4BadRequestIT.java @@ -19,10 +19,10 @@ package org.opensearch.rest; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.Response; -import org.elasticsearch.client.ResponseException; +import org.opensearch.client.Request; +import org.opensearch.client.RequestOptions; +import org.opensearch.client.Response; +import org.opensearch.client.ResponseException; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeValue; diff --git a/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4HeadBodyIsEmptyIT.java b/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4HeadBodyIsEmptyIT.java index 82116402c96..9aed8a8ada7 100644 --- a/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4HeadBodyIsEmptyIT.java +++ b/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4HeadBodyIsEmptyIT.java @@ -19,8 +19,8 @@ package org.opensearch.rest; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.Response; +import org.opensearch.client.Request; +import org.opensearch.client.Response; import org.opensearch.common.Strings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.test.rest.ESRestTestCase; 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 ad339e9f815..6e1b7983d12 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java @@ -62,8 +62,8 @@ 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.opensearch.client.RestClient; +import org.opensearch.client.RestClientBuilder; import org.opensearch.client.transport.TransportClient; import org.opensearch.cluster.ClusterModule; import org.opensearch.cluster.ClusterState; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java index 85be9e6ccc2..066bf5a3e66 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java @@ -32,14 +32,14 @@ import org.apache.lucene.util.SetOnce; import org.opensearch.Version; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksAction; import org.opensearch.action.admin.cluster.repositories.put.PutRepositoryRequest; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.RequestOptions.Builder; -import org.elasticsearch.client.Response; -import org.elasticsearch.client.ResponseException; -import org.elasticsearch.client.RestClient; -import org.elasticsearch.client.RestClientBuilder; -import org.elasticsearch.client.WarningsHandler; +import org.opensearch.client.Request; +import org.opensearch.client.RequestOptions; +import org.opensearch.client.RequestOptions.Builder; +import org.opensearch.client.Response; +import org.opensearch.client.ResponseException; +import org.opensearch.client.RestClient; +import org.opensearch.client.RestClientBuilder; +import org.opensearch.client.WarningsHandler; import org.elasticsearch.common.CheckedRunnable; import org.opensearch.common.Strings; import org.elasticsearch.common.io.PathUtils; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlDocsTestClient.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlDocsTestClient.java index a854a68f115..aa9143b1d7c 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlDocsTestClient.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlDocsTestClient.java @@ -22,12 +22,12 @@ package org.elasticsearch.test.rest.yaml; import org.apache.http.HttpEntity; import org.apache.http.HttpHost; import org.opensearch.Version; -import org.elasticsearch.client.NodeSelector; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.Response; -import org.elasticsearch.client.ResponseException; -import org.elasticsearch.client.RestClient; -import org.elasticsearch.client.RestClientBuilder; +import org.opensearch.client.NodeSelector; +import org.opensearch.client.Request; +import org.opensearch.client.Response; +import org.opensearch.client.ResponseException; +import org.opensearch.client.RestClient; +import org.opensearch.client.RestClientBuilder; import org.opensearch.common.CheckedSupplier; import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestSpec; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java index 1b35cccdfe6..2210cb1c9e1 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java @@ -27,14 +27,14 @@ import org.apache.http.util.EntityUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.Version; -import org.elasticsearch.client.NodeSelector; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.Response; -import org.elasticsearch.client.ResponseException; -import org.elasticsearch.client.RestClient; -import org.elasticsearch.client.RestClientBuilder; -import org.elasticsearch.client.WarningsHandler; +import org.opensearch.client.NodeSelector; +import org.opensearch.client.Request; +import org.opensearch.client.RequestOptions; +import org.opensearch.client.Response; +import org.opensearch.client.ResponseException; +import org.opensearch.client.RestClient; +import org.opensearch.client.RestClientBuilder; +import org.opensearch.client.WarningsHandler; import org.opensearch.common.CheckedSupplier; import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestApi; import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestSpec; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContext.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContext.java index 46e5546a23e..90892e33933 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContext.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContext.java @@ -27,7 +27,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.util.BytesRef; import org.opensearch.Version; -import org.elasticsearch.client.NodeSelector; +import org.opensearch.client.NodeSelector; import org.opensearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponse.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponse.java index c82234779f7..15aecddeb52 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponse.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponse.java @@ -21,7 +21,7 @@ package org.elasticsearch.test.rest.yaml; import org.apache.http.Header; import org.apache.http.client.methods.HttpHead; import org.apache.http.util.EntityUtils; -import org.elasticsearch.client.Response; +import org.opensearch.client.Response; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesArray; import org.elasticsearch.common.xcontent.LoggingDeprecationHandler; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponseException.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponseException.java index 8874570b73c..66155418cba 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponseException.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponseException.java @@ -19,7 +19,7 @@ package org.elasticsearch.test.rest.yaml; -import org.elasticsearch.client.ResponseException; +import org.opensearch.client.ResponseException; import java.io.IOException; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java index 3c812b60383..fe7d9a4be24 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java @@ -24,13 +24,13 @@ import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; import org.apache.http.HttpHost; import org.apache.lucene.util.TimeUnits; import org.opensearch.Version; -import org.elasticsearch.client.Node; -import org.elasticsearch.client.Request; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.Response; -import org.elasticsearch.client.RestClient; -import org.elasticsearch.client.RestClientBuilder; -import org.elasticsearch.client.WarningsHandler; +import org.opensearch.client.Node; +import org.opensearch.client.Request; +import org.opensearch.client.RequestOptions; +import org.opensearch.client.Response; +import org.opensearch.client.RestClient; +import org.opensearch.client.RestClientBuilder; +import org.opensearch.client.WarningsHandler; import org.opensearch.client.sniff.OpenSearchNodesSniffer; import org.opensearch.common.Strings; import org.elasticsearch.common.collect.Tuple; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ObjectPath.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ObjectPath.java index 0fcd72ad139..d9fb69b3822 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ObjectPath.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ObjectPath.java @@ -19,9 +19,9 @@ package org.elasticsearch.test.rest.yaml; import org.apache.http.util.EntityUtils; -import org.elasticsearch.client.Response; -import org.opensearch.common.bytes.BytesArray; -import org.opensearch.common.bytes.BytesReference; +import org.opensearch.client.Response; +import org.elasticsearch.common.bytes.BytesArray; +import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContent; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ApiCallSection.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ApiCallSection.java index de73fefaea7..3dd10bb3411 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ApiCallSection.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ApiCallSection.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.elasticsearch.client.NodeSelector; +import org.opensearch.client.NodeSelector; import static java.util.Collections.unmodifiableMap; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuite.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuite.java index b4f4b3ca1e4..6b79b60fdcf 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuite.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuite.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.test.rest.yaml.section; -import org.elasticsearch.client.NodeSelector; +import org.opensearch.client.NodeSelector; import org.opensearch.common.ParsingException; import org.elasticsearch.common.xcontent.LoggingDeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java index 129775a87c3..820308d45a1 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java @@ -22,9 +22,9 @@ package org.elasticsearch.test.rest.yaml.section; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.Version; -import org.elasticsearch.client.HasAttributeNodeSelector; -import org.elasticsearch.client.Node; -import org.elasticsearch.client.NodeSelector; +import org.opensearch.client.HasAttributeNodeSelector; +import org.opensearch.client.Node; +import org.opensearch.client.NodeSelector; import org.opensearch.common.ParsingException; import org.opensearch.common.Strings; import org.elasticsearch.common.collect.Tuple; diff --git a/test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java b/test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java index 19f23bea56e..1b66da7aff4 100644 --- a/test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java @@ -20,7 +20,7 @@ package org.elasticsearch.upgrades; import org.opensearch.Version; -import org.elasticsearch.client.Request; +import org.opensearch.client.Request; import org.elasticsearch.common.Booleans; import org.opensearch.common.Strings; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/VersionSensitiveWarningsHandlerTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/VersionSensitiveWarningsHandlerTests.java index bece807ef61..272ef258d48 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/VersionSensitiveWarningsHandlerTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/VersionSensitiveWarningsHandlerTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.test.rest; import org.opensearch.Version; -import org.elasticsearch.client.WarningsHandler; +import org.opensearch.client.WarningsHandler; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.ESRestTestCase.VersionSensitiveWarningsHandler; diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java index e0b7e922412..ea1a66e634d 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.test.rest.yaml; import org.apache.http.HttpEntity; import org.opensearch.Version; -import org.elasticsearch.client.NodeSelector; +import org.opensearch.client.NodeSelector; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.VersionUtils; diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuiteTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuiteTests.java index 14c63a2abd8..98e789c82d5 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuiteTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuiteTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.test.rest.yaml.section; import org.opensearch.Version; -import org.elasticsearch.client.NodeSelector; +import org.opensearch.client.NodeSelector; import org.opensearch.common.ParsingException; import org.elasticsearch.common.xcontent.XContentLocation; import org.elasticsearch.common.xcontent.yaml.YamlXContent; diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/DoSectionTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/DoSectionTests.java index 4b71bf5a610..bea0355dcb6 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/DoSectionTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/DoSectionTests.java @@ -21,8 +21,8 @@ package org.elasticsearch.test.rest.yaml.section; import org.apache.http.HttpHost; import org.opensearch.Version; -import org.elasticsearch.client.Node; -import org.elasticsearch.client.NodeSelector; +import org.opensearch.client.Node; +import org.opensearch.client.NodeSelector; import org.opensearch.common.ParsingException; import org.elasticsearch.common.logging.HeaderWarning; import org.elasticsearch.common.xcontent.XContentLocation;