diff --git a/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java b/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java index 38ad53b21a38f..b40dfa8659961 100644 --- a/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java +++ b/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.index.reindex.ReindexPlugin; +import org.opensearch.index.reindex.ReindexPlugin; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.percolator.PercolatorPlugin; import org.elasticsearch.plugins.Plugin; diff --git a/client/transport/src/test/java/org/opensearch/transport/client/PreBuiltTransportClientTests.java b/client/transport/src/test/java/org/opensearch/transport/client/PreBuiltTransportClientTests.java index a2bbbb4e29a48..f33811681ef2c 100644 --- a/client/transport/src/test/java/org/opensearch/transport/client/PreBuiltTransportClientTests.java +++ b/client/transport/src/test/java/org/opensearch/transport/client/PreBuiltTransportClientTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.client.transport.TransportClient; import org.elasticsearch.common.network.NetworkModule; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.index.reindex.ReindexPlugin; +import org.opensearch.index.reindex.ReindexPlugin; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.percolator.PercolatorPlugin; import org.elasticsearch.plugins.Plugin; diff --git a/modules/kibana/src/main/java/org/elasticsearch/kibana/KibanaPlugin.java b/modules/kibana/src/main/java/org/elasticsearch/kibana/KibanaPlugin.java index 0918e03ad0753..e2791d58f3c5a 100644 --- a/modules/kibana/src/main/java/org/elasticsearch/kibana/KibanaPlugin.java +++ b/modules/kibana/src/main/java/org/elasticsearch/kibana/KibanaPlugin.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsFilter; -import org.elasticsearch.index.reindex.RestDeleteByQueryAction; +import org.opensearch.index.reindex.RestDeleteByQueryAction; import org.elasticsearch.indices.SystemIndexDescriptor; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.SystemIndexPlugin; diff --git a/modules/reindex/build.gradle b/modules/reindex/build.gradle index 1be346232e060..7e1c4a485c4c9 100644 --- a/modules/reindex/build.gradle +++ b/modules/reindex/build.gradle @@ -18,19 +18,19 @@ */ import org.apache.tools.ant.taskdefs.condition.Os -import org.elasticsearch.gradle.Architecture -import org.elasticsearch.gradle.OS -import org.elasticsearch.gradle.info.BuildParams +import org.opensearch.gradle.Architecture +import org.opensearch.gradle.OS +import org.opensearch.gradle.info.BuildParams -apply plugin: 'elasticsearch.test-with-dependencies' -apply plugin: 'elasticsearch.jdk-download' -apply plugin: 'elasticsearch.yaml-rest-test' -apply plugin: 'elasticsearch.java-rest-test' -apply plugin: 'elasticsearch.internal-cluster-test' +apply plugin: 'opensearch.test-with-dependencies' +apply plugin: 'opensearch.jdk-download' +apply plugin: 'opensearch.yaml-rest-test' +apply plugin: 'opensearch.java-rest-test' +apply plugin: 'opensearch.internal-cluster-test' esplugin { description 'The Reindex module adds APIs to reindex from one index to another or update documents in place.' - classname 'org.elasticsearch.index.reindex.ReindexPlugin' + classname 'org.opensearch.index.reindex.ReindexPlugin' hasClientJar = true } @@ -53,7 +53,7 @@ test { dependencies { api project(":client:rest") - api project(":libs:elasticsearch-ssl-config") + api project(":libs:opensearch-ssl-config") // for http - testing reindex from remote testImplementation project(':modules:transport-netty4') // for parent/child testing @@ -90,7 +90,7 @@ configurations { } dependencies { - oldesFixture project(':test:fixtures:old-elasticsearch') + oldesFixture project(':test:fixtures:old-opensearch') /* Right now we just test against the latest version of each major we expect * reindex-from-remote to work against. We could randomize the versions but * that doesn't seem worth it at this point. */ @@ -139,7 +139,7 @@ if (Os.isFamily(Os.FAMILY_WINDOWS)) { into temporaryDir } - Task fixture = task("oldEs${version}Fixture", type: org.elasticsearch.gradle.test.AntFixture) { + Task fixture = task("oldEs${version}Fixture", type: org.opensearch.gradle.test.AntFixture) { dependsOn project.configurations.oldesFixture, jdks.legacy dependsOn unzip executable = "${BuildParams.runtimeJavaHome}/bin/java" diff --git a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation/ReindexDocumentationIT.java b/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java similarity index 98% rename from modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation/ReindexDocumentationIT.java rename to modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java index 89b74e9ad0137..8e0f98177cb49 100644 --- a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation/ReindexDocumentationIT.java +++ b/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.client.documentation; +package org.opensearch.client.documentation; import org.opensearch.action.ActionListener; import org.opensearch.action.admin.cluster.node.tasks.get.GetTaskResponse; @@ -29,14 +29,14 @@ import org.elasticsearch.index.reindex.AbstractBulkByScrollRequestBuilder; import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.BulkByScrollTask; -import org.elasticsearch.index.reindex.CancelTests; +import org.opensearch.index.reindex.CancelTests; import org.elasticsearch.index.reindex.DeleteByQueryAction; import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder; import org.elasticsearch.index.reindex.ReindexAction; -import org.elasticsearch.index.reindex.ReindexPlugin; +import org.opensearch.index.reindex.ReindexPlugin; import org.elasticsearch.index.reindex.ReindexRequestBuilder; -import org.elasticsearch.index.reindex.RethrottleAction; -import org.elasticsearch.index.reindex.RethrottleRequestBuilder; +import org.opensearch.index.reindex.RethrottleAction; +import org.opensearch.index.reindex.RethrottleRequestBuilder; import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; import org.elasticsearch.index.shard.IndexingOperationListener; diff --git a/modules/reindex/src/javaRestTest/java/org/elasticsearch/index/reindex/ManyDocumentsIT.java b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ManyDocumentsIT.java similarity index 99% rename from modules/reindex/src/javaRestTest/java/org/elasticsearch/index/reindex/ManyDocumentsIT.java rename to modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ManyDocumentsIT.java index 6eed35200808c..88ed7bada8744 100644 --- a/modules/reindex/src/javaRestTest/java/org/elasticsearch/index/reindex/ManyDocumentsIT.java +++ b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ManyDocumentsIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.client.Request; import org.elasticsearch.test.rest.ESRestTestCase; diff --git a/modules/reindex/src/javaRestTest/java/org/elasticsearch/index/reindex/ReindexWithoutContentIT.java b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ReindexWithoutContentIT.java similarity index 97% rename from modules/reindex/src/javaRestTest/java/org/elasticsearch/index/reindex/ReindexWithoutContentIT.java rename to modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ReindexWithoutContentIT.java index 683f02b6f967d..bd4f52f7646fa 100644 --- a/modules/reindex/src/javaRestTest/java/org/elasticsearch/index/reindex/ReindexWithoutContentIT.java +++ b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ReindexWithoutContentIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.client.Request; import org.elasticsearch.client.ResponseException; diff --git a/modules/reindex/src/javaRestTest/java/org/elasticsearch/index/reindex/remote/ReindexFromOldRemoteIT.java b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/remote/ReindexFromOldRemoteIT.java similarity index 99% rename from modules/reindex/src/javaRestTest/java/org/elasticsearch/index/reindex/remote/ReindexFromOldRemoteIT.java rename to modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/remote/ReindexFromOldRemoteIT.java index 407b081abbeec..d5d8cdb3e59ef 100644 --- a/modules/reindex/src/javaRestTest/java/org/elasticsearch/index/reindex/remote/ReindexFromOldRemoteIT.java +++ b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/remote/ReindexFromOldRemoteIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex.remote; +package org.opensearch.index.reindex.remote; import org.apache.http.HttpHost; import org.apache.http.util.EntityUtils; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java similarity index 98% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollAction.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java index c88645f2c760f..52a3d171c585d 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; @@ -47,7 +47,13 @@ import org.elasticsearch.index.mapper.SourceFieldMapper; import org.elasticsearch.index.mapper.TypeFieldMapper; import org.elasticsearch.index.mapper.VersionFieldMapper; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.BulkByScrollTask; +import org.elasticsearch.index.reindex.ClientScrollableHitSource; +import org.elasticsearch.index.reindex.ScrollableHitSource; import org.elasticsearch.index.reindex.ScrollableHitSource.SearchFailure; +import org.elasticsearch.index.reindex.WorkerBulkByScrollTaskState; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.UpdateScript; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/AbstractBaseReindexRestHandler.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractBaseReindexRestHandler.java similarity index 97% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/AbstractBaseReindexRestHandler.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractBaseReindexRestHandler.java index 2976f85a4f51e..e21930868438c 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/AbstractBaseReindexRestHandler.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractBaseReindexRestHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.ActionType; @@ -25,6 +25,9 @@ import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.xcontent.XContentBuilder; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.BulkByScrollTask; import org.elasticsearch.rest.BaseRestHandler; import org.elasticsearch.rest.BytesRestResponse; import org.elasticsearch.rest.RestRequest; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByQueryRestHandler.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractBulkByQueryRestHandler.java similarity index 96% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByQueryRestHandler.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractBulkByQueryRestHandler.java index aeed2699844bd..d1c0a80c1be4d 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByQueryRestHandler.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractBulkByQueryRestHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.opensearch.action.ActionType; import org.elasticsearch.action.search.SearchRequest; @@ -27,6 +27,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; +import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.action.search.RestSearchAction; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/AsyncDeleteByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/AsyncDeleteByQueryAction.java similarity index 90% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/AsyncDeleteByQueryAction.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/AsyncDeleteByQueryAction.java index a8aa88f7045e6..dbb10a6df7ca0 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/AsyncDeleteByQueryAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/AsyncDeleteByQueryAction.java @@ -17,12 +17,16 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.client.ParentTaskAssigningClient; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.BulkByScrollTask; +import org.elasticsearch.index.reindex.DeleteByQueryRequest; +import org.elasticsearch.index.reindex.ScrollableHitSource; import org.elasticsearch.script.ScriptService; import org.elasticsearch.threadpool.ThreadPool; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/BulkByScrollParallelizationHelper.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelper.java similarity index 97% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/BulkByScrollParallelizationHelper.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelper.java index 09a9f46090faf..28685a68e1267 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/BulkByScrollParallelizationHelper.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.opensearch.action.ActionType; import org.opensearch.action.ActionListener; @@ -28,6 +28,10 @@ import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.index.Index; import org.elasticsearch.index.mapper.IdFieldMapper; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.BulkByScrollTask; +import org.elasticsearch.index.reindex.LeaderBulkByScrollTaskState; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.slice.SliceBuilder; import org.elasticsearch.tasks.TaskId; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/BulkIndexByScrollResponseContentListener.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkIndexByScrollResponseContentListener.java similarity index 96% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/BulkIndexByScrollResponseContentListener.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/BulkIndexByScrollResponseContentListener.java index d64bcf8662e3e..be0d6f41db1ac 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/BulkIndexByScrollResponseContentListener.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkIndexByScrollResponseContentListener.java @@ -17,11 +17,12 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.action.bulk.BulkItemResponse.Failure; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; +import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.ScrollableHitSource.SearchFailure; import org.elasticsearch.rest.BytesRestResponse; import org.elasticsearch.rest.RestChannel; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexPlugin.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java similarity index 94% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexPlugin.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java index 8d029cfe15e15..31ad01185b20b 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexPlugin.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; @@ -34,6 +34,10 @@ import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.env.Environment; import org.elasticsearch.env.NodeEnvironment; +import org.elasticsearch.index.reindex.BulkByScrollTask; +import org.elasticsearch.index.reindex.DeleteByQueryAction; +import org.elasticsearch.index.reindex.ReindexAction; +import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.plugins.ActionPlugin; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.repositories.RepositoriesService; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexSslConfig.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexSslConfig.java similarity index 99% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexSslConfig.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexSslConfig.java index 10be40acbc792..29a0d26f997cc 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexSslConfig.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexSslConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.apache.http.conn.ssl.DefaultHostnameVerifier; import org.apache.http.conn.ssl.NoopHostnameVerifier; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexValidator.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexValidator.java similarity index 96% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexValidator.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexValidator.java index 92756c73892db..19df0afa1d04c 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexValidator.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexValidator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.Automaton; @@ -37,6 +37,8 @@ import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexNotFoundException; +import org.elasticsearch.index.reindex.ReindexRequest; +import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.search.builder.SearchSourceBuilder; import java.util.List; @@ -94,7 +96,7 @@ static CharacterRunAutomaton buildRemoteWhitelist(List whitelist) { automaton = MinimizationOperations.minimize(automaton, Operations.DEFAULT_MAX_DETERMINIZED_STATES); if (Operations.isTotal(automaton)) { throw new IllegalArgumentException("Refusing to start because whitelist " + whitelist + " accepts all addresses. " - + "This would allow users to reindex-from-remote any URL they like effectively having Elasticsearch make HTTP GETs " + + "This would allow users to reindex-from-remote any URL they like effectively having OpenSearch make HTTP GETs " + "for them."); } return new CharacterRunAutomaton(automaton); diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/Reindexer.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java similarity index 96% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/Reindexer.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java index acafa15a83019..471826cd59971 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/Reindexer.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.apache.http.Header; import org.apache.http.HttpHost; @@ -49,7 +49,14 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.VersionType; import org.elasticsearch.index.mapper.VersionFieldMapper; -import org.elasticsearch.index.reindex.remote.RemoteScrollableHitSource; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.BulkByScrollTask; +import org.elasticsearch.index.reindex.ReindexAction; +import org.elasticsearch.index.reindex.ReindexRequest; +import org.elasticsearch.index.reindex.RemoteInfo; +import org.elasticsearch.index.reindex.ScrollableHitSource; +import org.elasticsearch.index.reindex.WorkerBulkByScrollTaskState; +import org.opensearch.index.reindex.remote.RemoteScrollableHitSource; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptService; import org.elasticsearch.threadpool.ThreadPool; @@ -162,8 +169,8 @@ static RestClient buildRestClient(RemoteInfo remoteInfo, ReindexSslConfig sslCon static class AsyncIndexBySearchAction extends AbstractAsyncBulkByScrollAction { /** - * List of threads created by this process. Usually actions don't create threads in Elasticsearch. Instead they use the builtin - * {@link ThreadPool}s. But reindex-from-remote uses Elasticsearch's {@link RestClient} which doesn't use the + * List of threads created by this process. Usually actions don't create threads in OpenSearch. Instead they use the builtin + * {@link ThreadPool}s. But reindex-from-remote uses OpenSearch's {@link RestClient} which doesn't use the * {@linkplain ThreadPool}s because it uses httpasyncclient. It'd be a ton of trouble to work around creating those threads. So * instead we let it create threads but we watch them carefully and assert that they are dead when the process is over. */ diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestDeleteByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestDeleteByQueryAction.java similarity index 94% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestDeleteByQueryAction.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/RestDeleteByQueryAction.java index b4d4dbd116cfc..21a50ba6ea996 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestDeleteByQueryAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestDeleteByQueryAction.java @@ -17,10 +17,12 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; +import org.elasticsearch.index.reindex.DeleteByQueryAction; +import org.elasticsearch.index.reindex.DeleteByQueryRequest; import org.elasticsearch.rest.RestRequest; import java.io.IOException; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestReindexAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestReindexAction.java similarity index 95% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestReindexAction.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/RestReindexAction.java index 0c83b27415218..83a01df0db8cc 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestReindexAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestReindexAction.java @@ -17,12 +17,14 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.opensearch.action.DocWriteRequest; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.xcontent.XContentParser; +import org.elasticsearch.index.reindex.ReindexAction; +import org.elasticsearch.index.reindex.ReindexRequest; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.RestRequestFilter; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestRethrottleAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestRethrottleAction.java similarity index 98% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestRethrottleAction.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/RestRethrottleAction.java index a89546efc27de..0de3a8b9a99a7 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestRethrottleAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestRethrottleAction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.cluster.node.DiscoveryNodes; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestUpdateByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestUpdateByQueryAction.java similarity index 94% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestUpdateByQueryAction.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/RestUpdateByQueryAction.java index b725daddc669a..b43f26685f35b 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestUpdateByQueryAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestUpdateByQueryAction.java @@ -17,10 +17,12 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; +import org.elasticsearch.index.reindex.UpdateByQueryAction; +import org.elasticsearch.index.reindex.UpdateByQueryRequest; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.script.Script; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RethrottleAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/RethrottleAction.java similarity index 96% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/RethrottleAction.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/RethrottleAction.java index 3ac780e593b3d..2f40216d64f40 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RethrottleAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/RethrottleAction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.opensearch.action.ActionType; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RethrottleRequest.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/RethrottleRequest.java similarity index 94% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/RethrottleRequest.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/RethrottleRequest.java index 779e791b8c37a..1ced80c515580 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RethrottleRequest.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/RethrottleRequest.java @@ -17,12 +17,15 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.opensearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.tasks.BaseTasksRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; +import org.elasticsearch.index.reindex.DeleteByQueryAction; +import org.elasticsearch.index.reindex.ReindexAction; +import org.elasticsearch.index.reindex.UpdateByQueryAction; import java.io.IOException; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RethrottleRequestBuilder.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/RethrottleRequestBuilder.java similarity index 97% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/RethrottleRequestBuilder.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/RethrottleRequestBuilder.java index cf2a24218528c..ac4c7c70b048f 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RethrottleRequestBuilder.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/RethrottleRequestBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.opensearch.action.ActionType; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportDeleteByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportDeleteByQueryAction.java similarity index 91% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportDeleteByQueryAction.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/TransportDeleteByQueryAction.java index ec170c3cf9284..57c6322406fab 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportDeleteByQueryAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportDeleteByQueryAction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.opensearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; @@ -27,6 +27,10 @@ import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.io.stream.Writeable; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.BulkByScrollTask; +import org.elasticsearch.index.reindex.DeleteByQueryAction; +import org.elasticsearch.index.reindex.DeleteByQueryRequest; import org.elasticsearch.script.ScriptService; import org.elasticsearch.tasks.Task; import org.elasticsearch.threadpool.ThreadPool; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportReindexAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java similarity index 92% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportReindexAction.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java index 006c300887c6d..ff37de428b097 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportReindexAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.opensearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; @@ -30,6 +30,10 @@ import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.BulkByScrollTask; +import org.elasticsearch.index.reindex.ReindexAction; +import org.elasticsearch.index.reindex.ReindexRequest; import org.elasticsearch.script.ScriptService; import org.elasticsearch.tasks.Task; import org.elasticsearch.threadpool.ThreadPool; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportRethrottleAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportRethrottleAction.java similarity index 96% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportRethrottleAction.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/TransportRethrottleAction.java index fa90bceb7adbc..b05944173de8e 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportRethrottleAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportRethrottleAction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; @@ -29,6 +29,8 @@ import org.elasticsearch.client.Client; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.inject.Inject; +import org.elasticsearch.index.reindex.BulkByScrollTask; +import org.elasticsearch.index.reindex.LeaderBulkByScrollTaskState; import org.elasticsearch.tasks.TaskId; import org.elasticsearch.tasks.TaskInfo; import org.elasticsearch.threadpool.ThreadPool; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportUpdateByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportUpdateByQueryAction.java similarity index 94% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportUpdateByQueryAction.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/TransportUpdateByQueryAction.java index b53a60d75756f..fb702de866985 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/TransportUpdateByQueryAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportUpdateByQueryAction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.apache.logging.log4j.Logger; import org.elasticsearch.Version; @@ -35,6 +35,12 @@ import org.elasticsearch.index.mapper.IndexFieldMapper; import org.elasticsearch.index.mapper.RoutingFieldMapper; import org.elasticsearch.index.mapper.TypeFieldMapper; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.BulkByScrollTask; +import org.elasticsearch.index.reindex.ScrollableHitSource; +import org.elasticsearch.index.reindex.UpdateByQueryAction; +import org.elasticsearch.index.reindex.UpdateByQueryRequest; +import org.elasticsearch.index.reindex.WorkerBulkByScrollTaskState; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptService; import org.elasticsearch.tasks.Task; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/package-info.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/package-info.java similarity index 95% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/package-info.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/package-info.java index bb16842867f3c..27de269c6bed5 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/package-info.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/package-info.java @@ -21,4 +21,4 @@ * Actions that modify documents based on the results of a scrolling query like {@link ReindexAction}, {@link UpdateByQueryAction}, and * {@link DeleteByQueryAction}. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteRequestBuilders.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java similarity index 97% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteRequestBuilders.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java index 1bc2fbd64a14d..1375fb923ad36 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteRequestBuilders.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex.remote; +package org.opensearch.index.reindex.remote; import org.apache.http.entity.ContentType; import org.apache.http.nio.entity.NStringEntity; @@ -47,9 +47,9 @@ import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; /** - * Builds requests for remote version of Elasticsearch. Note that unlike most of the - * rest of Elasticsearch this file needs to be compatible with very old versions of - * Elasticsearch. Thus it often uses identifiers for versions like {@code 2000099} + * Builds requests for remote version of OpenSearch. Note that unlike most of the + * rest of OpenSearch this file needs to be compatible with very old versions of + * OpenSearch. Thus it often uses identifiers for versions like {@code 2000099} * for {@code 2.0.0-alpha1}. Do not drop support for features from this file just * because the version constants have been removed. */ diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteResponseParsers.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java similarity index 99% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteResponseParsers.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java index 9a5378666ad4a..cd0e2cf20e28c 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteResponseParsers.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex.remote; +package org.opensearch.index.reindex.remote; import org.apache.lucene.search.TotalHits; import org.elasticsearch.Version; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteScrollableHitSource.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java similarity index 97% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteScrollableHitSource.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java index 04b6c1c056233..0e9b6ef662b0a 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteScrollableHitSource.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex.remote; +package org.opensearch.index.reindex.remote; import org.apache.http.ContentTooLongException; import org.apache.http.HttpEntity; @@ -57,8 +57,8 @@ import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; import static org.elasticsearch.common.unit.TimeValue.timeValueNanos; -import static org.elasticsearch.index.reindex.remote.RemoteResponseParsers.MAIN_ACTION_PARSER; -import static org.elasticsearch.index.reindex.remote.RemoteResponseParsers.RESPONSE_PARSER; +import static org.opensearch.index.reindex.remote.RemoteResponseParsers.MAIN_ACTION_PARSER; +import static org.opensearch.index.reindex.remote.RemoteResponseParsers.RESPONSE_PARSER; public class RemoteScrollableHitSource extends ScrollableHitSource { private final RestClient client; @@ -189,11 +189,11 @@ public void onSuccess(org.elasticsearch.client.Response response) { /* Because we're streaming the response we can't get a copy of it here. The best we can do is hint that it * is totally wrong and we're probably not talking to Elasticsearch. */ throw new OpenSearchException( - "Error parsing the response, remote is likely not an Elasticsearch instance", e); + "Error parsing the response, remote is likely not an OpenSearch instance", e); } } catch (IOException e) { throw new OpenSearchException( - "Error deserializing response, remote is likely not an Elasticsearch instance", e); + "Error deserializing response, remote is likely not an OpenSearch instance", e); } listener.onResponse(parsedResponse); } @@ -228,7 +228,7 @@ public void onFailure(Exception e) { /** * Wrap the ResponseException in an exception that'll preserve its status code if possible so we can send it back to the user. We might * not have a constant for the status code so in that case we just use 500 instead. We also extract make sure to include the response - * body in the message so the user can figure out *why* the remote Elasticsearch service threw the error back to us. + * body in the message so the user can figure out *why* the remote OpenSearch service threw the error back to us. */ static OpenSearchStatusException wrapExceptionToPreserveStatus(int statusCode, @Nullable HttpEntity entity, Exception cause) { RestStatus status = RestStatus.fromCode(statusCode); diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/package-info.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/package-info.java similarity index 87% rename from modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/package-info.java rename to modules/reindex/src/main/java/org/opensearch/index/reindex/remote/package-info.java index 6dd03ad295202..d163bed4acd2b 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/package-info.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/package-info.java @@ -18,6 +18,6 @@ */ /** - * Support for reindexing from a remote Elasticsearch cluster. + * Support for reindexing from a remote OpenSearch cluster. */ -package org.elasticsearch.index.reindex.remote; \ No newline at end of file +package org.opensearch.index.reindex.remote; diff --git a/modules/reindex/src/test/java/org/elasticsearch/client/documentation/placeholder.txt b/modules/reindex/src/test/java/org/opensearch/client/documentation/placeholder.txt similarity index 100% rename from modules/reindex/src/test/java/org/elasticsearch/client/documentation/placeholder.txt rename to modules/reindex/src/test/java/org/opensearch/client/documentation/placeholder.txt diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionMetadataTestCase.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionMetadataTestCase.java similarity index 80% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionMetadataTestCase.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionMetadataTestCase.java index 8d67a3bd6760d..3243ea7706fb8 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionMetadataTestCase.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionMetadataTestCase.java @@ -17,7 +17,12 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; + +import org.elasticsearch.index.reindex.AbstractAsyncBulkByScrollActionTestCase; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.ScrollableHitSource; public abstract class AbstractAsyncBulkByScrollActionMetadataTestCase< Request extends AbstractBulkByScrollRequest, diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java similarity index 92% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java index e951c0f4cb25d..9b9f2f898fad5 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java @@ -17,13 +17,17 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.opensearch.action.ActionRequest; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; -import org.elasticsearch.index.reindex.AbstractAsyncBulkByScrollAction.OpType; -import org.elasticsearch.index.reindex.AbstractAsyncBulkByScrollAction.RequestWrapper; +import org.elasticsearch.index.reindex.AbstractAsyncBulkByScrollActionTestCase; +import org.elasticsearch.index.reindex.AbstractBulkIndexByScrollRequest; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.ScrollableHitSource; +import org.opensearch.index.reindex.AbstractAsyncBulkByScrollAction.OpType; +import org.opensearch.index.reindex.AbstractAsyncBulkByScrollAction.RequestWrapper; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.UpdateScript; import org.junit.Before; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AsyncBulkByScrollActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java similarity index 99% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/AsyncBulkByScrollActionTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java index dbb8968135609..a0b0e6ded7e81 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/AsyncBulkByScrollActionTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.apache.lucene.search.TotalHits; import org.elasticsearch.OpenSearchException; @@ -67,8 +67,14 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.Index; import org.elasticsearch.index.engine.VersionConflictEngineException; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.BulkByScrollTask; +import org.elasticsearch.index.reindex.ClientScrollableHitSource; +import org.elasticsearch.index.reindex.ScrollableHitSource; import org.elasticsearch.index.reindex.ScrollableHitSource.Hit; import org.elasticsearch.index.reindex.ScrollableHitSource.SearchFailure; +import org.elasticsearch.index.reindex.WorkerBulkByScrollTaskState; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.search.SearchHit; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/BulkByScrollParallelizationHelperTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelperTests.java similarity index 95% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/BulkByScrollParallelizationHelperTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelperTests.java index a64415d08b1b1..500ac247aef43 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/BulkByScrollParallelizationHelperTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelperTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.index.mapper.IdFieldMapper; @@ -27,7 +27,7 @@ import java.io.IOException; import static java.util.Collections.emptyList; -import static org.elasticsearch.index.reindex.BulkByScrollParallelizationHelper.sliceIntoSubRequests; +import static org.opensearch.index.reindex.BulkByScrollParallelizationHelper.sliceIntoSubRequests; import static org.elasticsearch.search.RandomSearchRequestGenerator.randomSearchRequest; import static org.elasticsearch.search.RandomSearchRequestGenerator.randomSearchSourceBuilder; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/BulkIndexByScrollResponseMatcher.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseMatcher.java similarity index 98% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/BulkIndexByScrollResponseMatcher.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseMatcher.java index cb2ff1a7ae24a..8ca6aea85c8a3 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/BulkIndexByScrollResponseMatcher.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseMatcher.java @@ -17,8 +17,9 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; +import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/BulkIndexByScrollResponseTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseTests.java similarity index 95% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/BulkIndexByScrollResponseTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseTests.java index 6809a02585e1b..f9d1768b5ee02 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/BulkIndexByScrollResponseTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseTests.java @@ -17,9 +17,11 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.action.bulk.BulkItemResponse; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.BulkByScrollTask; import org.elasticsearch.index.reindex.ScrollableHitSource.SearchFailure; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/CancelTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java similarity index 97% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/CancelTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java index 769615ca2e308..09225a2a865af 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/CancelTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -33,6 +33,12 @@ import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.engine.Engine.Operation.Origin; import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequestBuilder; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.BulkByScrollTask; +import org.elasticsearch.index.reindex.DeleteByQueryAction; +import org.elasticsearch.index.reindex.ReindexAction; +import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.index.shard.IndexingOperationListener; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.ingest.IngestTestPlugin; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ClientScrollableHitSourceTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java similarity index 98% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/ClientScrollableHitSourceTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java index b010d0354fc9d..4ad4b6131114a 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ClientScrollableHitSourceTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.apache.lucene.search.TotalHits; import org.opensearch.action.ActionListener; @@ -37,6 +37,8 @@ import org.elasticsearch.common.text.Text; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; +import org.elasticsearch.index.reindex.ClientScrollableHitSource; +import org.elasticsearch.index.reindex.ScrollableHitSource; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.internal.InternalSearchResponse; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryBasicTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java similarity index 98% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryBasicTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java index 5787e1b4a3fc6..285dd38209d6c 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryBasicTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.opensearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.index.IndexRequestBuilder; @@ -28,6 +28,9 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.test.InternalSettingsPlugin; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryConcurrentTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryConcurrentTests.java similarity index 97% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryConcurrentTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryConcurrentTests.java index 8954f1c35c179..2892d25dc8f4a 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryConcurrentTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryConcurrentTests.java @@ -17,11 +17,12 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.index.query.MatchQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.index.reindex.BulkByScrollResponse; import java.util.ArrayList; import java.util.List; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexBasicTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexBasicTests.java similarity index 97% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexBasicTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexBasicTests.java index d95ab55591467..5adf5ef6b75ab 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexBasicTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexBasicTests.java @@ -17,9 +17,12 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.action.index.IndexRequestBuilder; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.ReindexRequestBuilder; import java.util.ArrayList; import java.util.Collection; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFailureTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFailureTests.java similarity index 97% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFailureTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFailureTests.java index 121ec9fec333a..18e61e0416d6a 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFailureTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFailureTests.java @@ -17,10 +17,12 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.action.bulk.BulkItemResponse.Failure; import org.elasticsearch.action.index.IndexRequestBuilder; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.ReindexRequestBuilder; import java.util.ArrayList; import java.util.List; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java similarity index 97% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java index c82c159b8c3e9..cfd80c9e16218 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClientBuilderTestCase; @@ -27,6 +27,7 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.env.TestEnvironment; import org.elasticsearch.index.query.MatchAllQueryBuilder; +import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.watcher.ResourceWatcherService; import java.util.ArrayList; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteWhitelistTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWhitelistTests.java similarity index 94% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteWhitelistTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWhitelistTests.java index c911efc965285..19e816c39ce1b 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteWhitelistTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWhitelistTests.java @@ -17,10 +17,11 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; +import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.test.ESTestCase; import java.net.UnknownHostException; @@ -31,8 +32,8 @@ import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; -import static org.elasticsearch.index.reindex.ReindexValidator.buildRemoteWhitelist; -import static org.elasticsearch.index.reindex.ReindexValidator.checkRemoteWhitelist; +import static org.opensearch.index.reindex.ReindexValidator.buildRemoteWhitelist; +import static org.opensearch.index.reindex.ReindexValidator.checkRemoteWhitelist; /** * Tests the reindex-from-remote whitelist of remotes. @@ -115,7 +116,7 @@ public void testIPv6Address() { private void assertMatchesTooMuch(List whitelist) { Exception e = expectThrows(IllegalArgumentException.class, () -> buildRemoteWhitelist(whitelist)); assertEquals("Refusing to start because whitelist " + whitelist + " accepts all addresses. " - + "This would allow users to reindex-from-remote any URL they like effectively having Elasticsearch make HTTP GETs " + + "This would allow users to reindex-from-remote any URL they like effectively having OpenSearch make HTTP GETs " + "for them.", e.getMessage()); } diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteWithAuthTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java similarity index 97% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteWithAuthTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java index 4072600c8a23f..09ac58edecc45 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteWithAuthTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.apache.lucene.util.SetOnce; import org.elasticsearch.OpenSearchSecurityException; @@ -43,6 +43,9 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.http.HttpInfo; +import org.elasticsearch.index.reindex.ReindexAction; +import org.elasticsearch.index.reindex.ReindexRequestBuilder; +import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.plugins.ActionPlugin; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.repositories.RepositoriesService; @@ -66,7 +69,7 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; -import static org.elasticsearch.index.reindex.ReindexTestCase.matcher; +import static org.opensearch.index.reindex.ReindexTestCase.matcher; import static org.hamcrest.Matchers.containsString; public class ReindexFromRemoteWithAuthTests extends ESSingleNodeTestCase { diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexMetadataTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexMetadataTests.java similarity index 95% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexMetadataTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexMetadataTests.java index 1859acdb74a2d..90da31196538f 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexMetadataTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexMetadataTests.java @@ -17,8 +17,10 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.ReindexRequest; import org.elasticsearch.index.reindex.ScrollableHitSource.Hit; import org.elasticsearch.action.index.IndexRequest; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexRestClientSslTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java similarity index 99% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexRestClientSslTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java index 6dd989ffafdb5..05c1d7904c599 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexRestClientSslTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import com.sun.net.httpserver.HttpsConfigurator; import com.sun.net.httpserver.HttpsExchange; @@ -34,6 +34,7 @@ import org.elasticsearch.common.ssl.PemTrustConfig; import org.elasticsearch.env.Environment; import org.elasticsearch.env.TestEnvironment; +import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.mocksocket.MockHttpServer; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.watcher.ResourceWatcherService; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexScriptTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexScriptTests.java similarity index 96% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexScriptTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexScriptTests.java index 54a2ea96b25f5..87819fa50ea78 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexScriptTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexScriptTests.java @@ -17,10 +17,12 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.common.lucene.uid.Versions; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.ReindexRequest; import org.elasticsearch.script.ScriptService; import org.mockito.Mockito; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexSingleNodeTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java similarity index 91% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexSingleNodeTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java index 90491f9470419..0ea361e8e50cd 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexSingleNodeTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java @@ -17,9 +17,11 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.index.query.RangeQueryBuilder; +import org.elasticsearch.index.reindex.ReindexAction; +import org.elasticsearch.index.reindex.ReindexRequestBuilder; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.test.ESSingleNodeTestCase; @@ -27,7 +29,7 @@ import java.util.Arrays; import java.util.Collection; -import static org.elasticsearch.index.reindex.ReindexTestCase.matcher; +import static org.opensearch.index.reindex.ReindexTestCase.matcher; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; public class ReindexSingleNodeTests extends ESSingleNodeTestCase { diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexSourceTargetValidationTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSourceTargetValidationTests.java similarity index 98% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexSourceTargetValidationTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSourceTargetValidationTests.java index 71eceba59d2e8..55b586d8aab7e 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexSourceTargetValidationTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSourceTargetValidationTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.Version; import org.opensearch.action.ActionRequestValidationException; @@ -35,6 +35,7 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.indices.SystemIndices; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.test.ESTestCase; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexTestCase.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java similarity index 89% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexTestCase.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java index 01b5539a23c48..29a70e90d54cb 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexTestCase.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java @@ -17,8 +17,15 @@ * under the License. */ -package org.elasticsearch.index.reindex; - +package org.opensearch.index.reindex; + +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; +import org.elasticsearch.index.reindex.DeleteByQueryAction; +import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder; +import org.elasticsearch.index.reindex.ReindexAction; +import org.elasticsearch.index.reindex.ReindexRequestBuilder; +import org.elasticsearch.index.reindex.UpdateByQueryAction; +import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase.ClusterScope; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexVersioningTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexVersioningTests.java similarity index 97% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexVersioningTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexVersioningTests.java index 06a4b5a3456e0..14710063b50c7 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexVersioningTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexVersioningTests.java @@ -17,9 +17,11 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.action.get.GetResponse; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.ReindexRequestBuilder; import static org.opensearch.action.DocWriteRequest.OpType.CREATE; import static org.elasticsearch.index.VersionType.EXTERNAL; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RestDeleteByQueryActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RestDeleteByQueryActionTests.java similarity index 94% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/RestDeleteByQueryActionTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/RestDeleteByQueryActionTests.java index 43b8f40526615..5e449230137d1 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RestDeleteByQueryActionTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RestDeleteByQueryActionTests.java @@ -17,9 +17,11 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.common.xcontent.NamedXContentRegistry; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; +import org.elasticsearch.index.reindex.DeleteByQueryRequest; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.action.search.RestSearchAction; import org.elasticsearch.test.rest.FakeRestRequest; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RestReindexActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RestReindexActionTests.java similarity index 97% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/RestReindexActionTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/RestReindexActionTests.java index a77d775175ec0..903a837e5e4a2 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RestReindexActionTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RestReindexActionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; @@ -25,6 +25,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.json.JsonXContent; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; +import org.elasticsearch.index.reindex.ReindexRequest; import org.elasticsearch.rest.RestRequest.Method; import org.elasticsearch.test.rest.FakeRestRequest; import org.elasticsearch.test.rest.RestActionTestCase; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RestUpdateByQueryActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RestUpdateByQueryActionTests.java similarity index 94% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/RestUpdateByQueryActionTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/RestUpdateByQueryActionTests.java index 8ccc904755367..9e84730625a8c 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RestUpdateByQueryActionTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RestUpdateByQueryActionTests.java @@ -17,9 +17,11 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.common.xcontent.NamedXContentRegistry; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; +import org.elasticsearch.index.reindex.UpdateByQueryRequest; import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.action.search.RestSearchAction; import org.elasticsearch.test.rest.FakeRestRequest; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RethrottleTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RethrottleTests.java similarity index 97% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/RethrottleTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/RethrottleTests.java index 44c575f763b4b..53522e3635707 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RethrottleTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RethrottleTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.OpenSearchException; import org.elasticsearch.ExceptionsHelper; @@ -26,6 +26,12 @@ import org.opensearch.action.admin.cluster.node.tasks.list.TaskGroup; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequestBuilder; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.BulkByScrollTask; +import org.elasticsearch.index.reindex.DeleteByQueryAction; +import org.elasticsearch.index.reindex.ReindexAction; +import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.tasks.TaskId; import java.util.ArrayList; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RetryTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java similarity index 93% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/RetryTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java index e26195c0bef14..8243a240cd6d8 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RetryTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.opensearch.action.ActionFuture; import org.opensearch.action.admin.cluster.node.info.NodeInfo; @@ -33,6 +33,16 @@ import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.http.HttpInfo; import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequestBuilder; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.BulkByScrollTask; +import org.elasticsearch.index.reindex.DeleteByQueryAction; +import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder; +import org.elasticsearch.index.reindex.ReindexAction; +import org.elasticsearch.index.reindex.ReindexRequestBuilder; +import org.elasticsearch.index.reindex.RemoteInfo; +import org.elasticsearch.index.reindex.UpdateByQueryAction; +import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.threadpool.ThreadPool; @@ -47,14 +57,14 @@ import java.util.function.Function; import static java.util.Collections.emptyMap; -import static org.elasticsearch.index.reindex.ReindexTestCase.matcher; +import static org.opensearch.index.reindex.ReindexTestCase.matcher; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasSize; /** * Integration test for bulk retry behavior. Useful because retrying relies on the way that the - * rest of Elasticsearch throws exceptions and unit tests won't verify that. + * rest of OpenSearch throws exceptions and unit tests won't verify that. */ public class RetryTests extends ESIntegTestCase { diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RoundTripTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java similarity index 95% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/RoundTripTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java index 8210fc0aacacd..e872d6c357486 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/RoundTripTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.Version; import org.elasticsearch.common.bytes.BytesArray; @@ -27,6 +27,14 @@ import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.lucene.uid.Versions; import org.elasticsearch.common.unit.TimeValue; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; +import org.elasticsearch.index.reindex.AbstractBulkIndexByScrollRequest; +import org.elasticsearch.index.reindex.DeleteByQueryRequest; +import org.elasticsearch.index.reindex.ReindexAction; +import org.elasticsearch.index.reindex.ReindexRequest; +import org.elasticsearch.index.reindex.RemoteInfo; +import org.elasticsearch.index.reindex.UpdateByQueryAction; +import org.elasticsearch.index.reindex.UpdateByQueryRequest; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptType; import org.elasticsearch.tasks.TaskId; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/TransportRethrottleActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java similarity index 98% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/TransportRethrottleActionTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java index b11c6e359e767..96823029931a2 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/TransportRethrottleActionTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java @@ -17,13 +17,15 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.opensearch.action.ActionListener; import org.opensearch.action.FailedNodeException; import org.opensearch.action.TaskOperationFailure; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; import org.elasticsearch.client.Client; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.BulkByScrollTask; import org.elasticsearch.tasks.TaskId; import org.elasticsearch.tasks.TaskInfo; import org.elasticsearch.test.ESTestCase; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryBasicTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryBasicTests.java similarity index 97% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryBasicTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryBasicTests.java index 5b67fece47ebc..5a9853fc7488f 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryBasicTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryBasicTests.java @@ -17,9 +17,12 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.action.index.IndexRequestBuilder; +import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; import org.elasticsearch.search.sort.SortOrder; import java.util.ArrayList; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryMetadataTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryMetadataTests.java similarity index 93% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryMetadataTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryMetadataTests.java index 6d6f034827ab8..36b755a98a255 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryMetadataTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryMetadataTests.java @@ -17,11 +17,13 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.cluster.ClusterState; +import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.ScrollableHitSource.Hit; +import org.elasticsearch.index.reindex.UpdateByQueryRequest; public class UpdateByQueryMetadataTests extends AbstractAsyncBulkByScrollActionMetadataTestCase { diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryWhileModifyingTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWhileModifyingTests.java similarity index 97% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryWhileModifyingTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWhileModifyingTests.java index 1c3456fe20c5f..588964aac0730 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryWhileModifyingTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWhileModifyingTests.java @@ -17,11 +17,12 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.index.engine.VersionConflictEngineException; +import org.elasticsearch.index.reindex.BulkByScrollResponse; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryWithScriptTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWithScriptTests.java similarity index 94% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryWithScriptTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWithScriptTests.java index 607969a6ff2c2..bbc7c6bbd1c41 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryWithScriptTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWithScriptTests.java @@ -17,10 +17,12 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.cluster.ClusterState; +import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.elasticsearch.index.reindex.UpdateByQueryRequest; import org.elasticsearch.script.ScriptService; import org.elasticsearch.transport.TransportService; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/remote/RemoteInfoTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteInfoTests.java similarity index 97% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/remote/RemoteInfoTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteInfoTests.java index f0c4ccf476636..73c5ed1fae885 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/remote/RemoteInfoTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteInfoTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex.remote; +package org.opensearch.index.reindex.remote; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.index.reindex.RemoteInfo; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/remote/RemoteRequestBuildersTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java similarity index 96% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/remote/RemoteRequestBuildersTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java index 4337ce9abce1b..7a8931995805d 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/remote/RemoteRequestBuildersTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex.remote; +package org.opensearch.index.reindex.remote; import org.apache.http.HttpEntity; import org.apache.http.entity.ContentType; @@ -37,10 +37,10 @@ import java.util.Map; import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; -import static org.elasticsearch.index.reindex.remote.RemoteRequestBuilders.DEPRECATED_URL_ENCODED_INDEX_WARNING; -import static org.elasticsearch.index.reindex.remote.RemoteRequestBuilders.clearScroll; -import static org.elasticsearch.index.reindex.remote.RemoteRequestBuilders.initialSearch; -import static org.elasticsearch.index.reindex.remote.RemoteRequestBuilders.scroll; +import static org.opensearch.index.reindex.remote.RemoteRequestBuilders.DEPRECATED_URL_ENCODED_INDEX_WARNING; +import static org.opensearch.index.reindex.remote.RemoteRequestBuilders.clearScroll; +import static org.opensearch.index.reindex.remote.RemoteRequestBuilders.initialSearch; +import static org.opensearch.index.reindex.remote.RemoteRequestBuilders.scroll; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.either; @@ -52,8 +52,8 @@ /** * Tests for {@link RemoteRequestBuilders} which builds requests for remote version of - * Elasticsearch. Note that unlike most of the rest of Elasticsearch this file needs to - * be compatible with very old versions of Elasticsearch. Thus is often uses identifiers + * OpenSearch. Note that unlike most of the rest of OpenSearch this file needs to + * be compatible with very old versions of OpenSearch. Thus is often uses identifiers * for versions like {@code 2000099} for {@code 2.0.0-alpha1}. Do not drop support for * features from this file just because the version constants have been removed. */ diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/remote/RemoteResponseParsersTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteResponseParsersTests.java similarity index 97% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/remote/RemoteResponseParsersTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteResponseParsersTests.java index 61a8320696439..2ed662b22a6d8 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/remote/RemoteResponseParsersTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteResponseParsersTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex.remote; +package org.opensearch.index.reindex.remote; import org.elasticsearch.action.search.ShardSearchFailure; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/remote/RemoteScrollableHitSourceTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java similarity index 99% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/remote/RemoteScrollableHitSourceTests.java rename to modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java index 1347f1dc751dc..df7c8e26f455a 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/remote/RemoteScrollableHitSourceTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex.remote; +package org.opensearch.index.reindex.remote; import org.apache.http.ContentTooLongException; import org.apache.http.HttpEntity; diff --git a/modules/reindex/src/test/resources/org/elasticsearch/index/reindex/README.txt b/modules/reindex/src/test/resources/org/opensearch/index/reindex/README.txt similarity index 100% rename from modules/reindex/src/test/resources/org/elasticsearch/index/reindex/README.txt rename to modules/reindex/src/test/resources/org/opensearch/index/reindex/README.txt diff --git a/modules/reindex/src/test/resources/org/elasticsearch/index/reindex/ca.p12 b/modules/reindex/src/test/resources/org/opensearch/index/reindex/ca.p12 similarity index 100% rename from modules/reindex/src/test/resources/org/elasticsearch/index/reindex/ca.p12 rename to modules/reindex/src/test/resources/org/opensearch/index/reindex/ca.p12 diff --git a/modules/reindex/src/test/resources/org/elasticsearch/index/reindex/ca.pem b/modules/reindex/src/test/resources/org/opensearch/index/reindex/ca.pem similarity index 100% rename from modules/reindex/src/test/resources/org/elasticsearch/index/reindex/ca.pem rename to modules/reindex/src/test/resources/org/opensearch/index/reindex/ca.pem diff --git a/modules/reindex/src/test/resources/org/elasticsearch/index/reindex/client/client.crt b/modules/reindex/src/test/resources/org/opensearch/index/reindex/client/client.crt similarity index 100% rename from modules/reindex/src/test/resources/org/elasticsearch/index/reindex/client/client.crt rename to modules/reindex/src/test/resources/org/opensearch/index/reindex/client/client.crt diff --git a/modules/reindex/src/test/resources/org/elasticsearch/index/reindex/client/client.key b/modules/reindex/src/test/resources/org/opensearch/index/reindex/client/client.key similarity index 100% rename from modules/reindex/src/test/resources/org/elasticsearch/index/reindex/client/client.key rename to modules/reindex/src/test/resources/org/opensearch/index/reindex/client/client.key diff --git a/modules/reindex/src/test/resources/org/elasticsearch/index/reindex/http/http.crt b/modules/reindex/src/test/resources/org/opensearch/index/reindex/http/http.crt similarity index 100% rename from modules/reindex/src/test/resources/org/elasticsearch/index/reindex/http/http.crt rename to modules/reindex/src/test/resources/org/opensearch/index/reindex/http/http.crt diff --git a/modules/reindex/src/test/resources/org/elasticsearch/index/reindex/http/http.key b/modules/reindex/src/test/resources/org/opensearch/index/reindex/http/http.key similarity index 100% rename from modules/reindex/src/test/resources/org/elasticsearch/index/reindex/http/http.key rename to modules/reindex/src/test/resources/org/opensearch/index/reindex/http/http.key diff --git a/modules/reindex/src/yamlRestTest/java/org/elasticsearch/index/reindex/ReindexClientYamlTestSuiteIT.java b/modules/reindex/src/yamlRestTest/java/org/opensearch/index/reindex/ReindexClientYamlTestSuiteIT.java similarity index 97% rename from modules/reindex/src/yamlRestTest/java/org/elasticsearch/index/reindex/ReindexClientYamlTestSuiteIT.java rename to modules/reindex/src/yamlRestTest/java/org/opensearch/index/reindex/ReindexClientYamlTestSuiteIT.java index 3ec84e548a682..ed7e83d535a5b 100644 --- a/modules/reindex/src/yamlRestTest/java/org/elasticsearch/index/reindex/ReindexClientYamlTestSuiteIT.java +++ b/modules/reindex/src/yamlRestTest/java/org/opensearch/index/reindex/ReindexClientYamlTestSuiteIT.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;