From 07ca47a256e4c97ab3f09d63398fb05f1ac8da94 Mon Sep 17 00:00:00 2001 From: Nick Knize Date: Wed, 17 Mar 2021 12:29:02 -0500 Subject: [PATCH] [Rename] remaining classes in o.e (#352) This commit refactors the remaining classes from o.e to the o.opensearch namespace. All references throughout the codebase have been refactored. Signed-off-by: Nicholas Walter Knize --- .../client/CustomRestHighLevelClientTests.java | 2 +- .../opensearch/client/core/MainResponseTests.java | 2 +- .../opensearch/plugins/InstallPluginCommand.java | 2 +- .../plugins/InstallPluginCommandTests.java | 2 +- .../ingest/common/DateIndexNameProcessor.java | 2 +- .../opensearch/ingest/common/DateProcessor.java | 10 +++++----- .../opensearch/ingest/geoip/GeoIpProcessor.java | 2 +- .../script/expression/ExpressionScriptEngine.java | 12 ++++++------ .../script/mustache/SearchTemplateIT.java | 2 +- .../script/mustache/MustacheScriptEngine.java | 2 +- .../opensearch/painless/PainlessScriptEngine.java | 2 +- .../query/ParentChildInnerHitContextBuilder.java | 2 +- .../percolator/PercolateQueryBuilder.java | 2 +- .../percolator/PercolateQueryBuilderTests.java | 2 +- .../reindex/AsyncBulkByScrollActionTests.java | 8 +------- .../org/opensearch/index/reindex/CancelTests.java | 2 +- .../opensearch/index/reindex/RethrottleTests.java | 2 +- .../java/org/opensearch/systemd/SystemdPlugin.java | 6 +++--- .../org/opensearch/systemd/SystemdPluginTests.java | 2 +- .../http/netty4/Netty4HttpRequestCreator.java | 2 +- .../http/netty4/Netty4HttpRequestHandler.java | 2 +- .../http/netty4/Netty4HttpServerTransport.java | 2 +- .../netty4/Netty4MessageChannelHandler.java | 2 +- .../transport/netty4/Netty4TcpChannel.java | 2 +- .../transport/netty4/Netty4Transport.java | 2 +- .../{elasticsearch => opensearch}/Assertions.java | 4 ++-- .../org/{elasticsearch => opensearch}/Build.java | 5 ++--- .../ExceptionsHelper.java | 6 +++--- .../java/org/opensearch/OpenSearchException.java | 14 ++++++-------- .../opensearch/OpenSearchSecurityException.java | 1 - .../ResourceAlreadyExistsException.java | 6 +++--- .../ResourceNotFoundException.java | 4 ++-- .../SpecialPermission.java | 4 ++-- server/src/main/java/org/opensearch/Version.java | 2 -- .../java/org/opensearch/action/ActionListener.java | 2 +- .../opensearch/action/TaskOperationFailure.java | 2 +- .../action/admin/cluster/node/info/NodeInfo.java | 2 +- .../TransportNodesReloadSecureSettingsAction.java | 2 +- .../tasks/cancel/TransportCancelTasksAction.java | 2 +- .../node/tasks/get/TransportGetTaskAction.java | 4 ++-- .../reroute/TransportClusterRerouteAction.java | 2 +- .../get/TransportGetComponentTemplateAction.java | 2 +- .../TransportGetComposableIndexTemplateAction.java | 2 +- .../opensearch/action/bulk/BulkItemResponse.java | 2 +- .../action/bulk/TransportBulkAction.java | 6 +++--- .../action/bulk/TransportShardBulkAction.java | 2 +- .../org/opensearch/action/main/MainResponse.java | 2 +- .../action/main/TransportMainAction.java | 2 +- .../action/search/AbstractSearchAsyncAction.java | 2 +- .../action/search/MultiSearchResponse.java | 2 +- .../search/SearchPhaseExecutionException.java | 2 +- .../action/search/ShardSearchFailure.java | 2 +- .../DefaultShardOperationFailedException.java | 4 ++-- .../action/support/TransportActions.java | 2 +- .../support/replication/ReplicationOperation.java | 4 ++-- .../support/replication/ReplicationResponse.java | 2 +- .../TransportBroadcastReplicationAction.java | 2 +- .../replication/TransportReplicationAction.java | 4 ++-- .../action/support/tasks/BaseTasksResponse.java | 2 +- .../action/support/tasks/TransportTasksAction.java | 2 +- .../action/update/TransportUpdateAction.java | 4 ++-- .../java/org/opensearch/bootstrap/OpenSearch.java | 2 +- .../transport/TransportClientNodesService.java | 8 ++++---- .../cluster/action/shard/ShardStateAction.java | 2 +- .../opensearch/cluster/metadata/IndexMetadata.java | 2 +- .../metadata/MetadataCreateDataStreamService.java | 2 +- .../metadata/MetadataCreateIndexService.java | 2 +- .../metadata/MetadataUpdateSettingsService.java | 2 +- .../opensearch/cluster/routing/RoutingNodes.java | 2 +- .../opensearch/cluster/routing/UnassignedInfo.java | 2 +- .../cluster/routing/allocation/FailedShard.java | 2 +- .../opensearch/cluster/service/MasterService.java | 2 +- .../main/java/org/opensearch/common/Strings.java | 2 +- .../common/compress/DeflateCompressor.java | 2 +- .../common/geo/builders/ShapeBuilder.java | 2 +- .../io/stream/NotSerializableExceptionWrapper.java | 2 +- .../opensearch/common/logging/HeaderWarning.java | 2 +- .../java/org/opensearch/common/lucene/Lucene.java | 2 +- .../opensearch/common/lucene/ShardCoreKeyMap.java | 2 +- .../common/settings/AbstractScopedSettings.java | 2 +- .../common/util/concurrent/EsExecutors.java | 2 +- .../common/util/concurrent/ReleasableLock.java | 2 +- .../common/util/concurrent/TimedRunnable.java | 2 +- .../org/opensearch/discovery/DiscoveryModule.java | 2 +- .../org/opensearch/discovery/zen/ZenDiscovery.java | 2 +- .../package-info.java | 4 ++-- .../opensearch/repositories/RepositoryData.java | 2 +- .../blobstore/BlobStoreRepository.java | 2 +- .../org/opensearch/rest/BytesRestResponse.java | 2 +- .../org/opensearch/rest/action/RestActions.java | 2 +- .../admin/indices/AliasesNotFoundException.java | 2 +- .../rest/action/document/RestGetSourceAction.java | 2 +- .../rest/action/search/RestSearchAction.java | 2 +- .../org/opensearch/script/ScoreScriptUtils.java | 2 +- .../java/org/opensearch/script/ScriptMetadata.java | 2 +- .../java/org/opensearch/script/ScriptService.java | 2 +- .../opensearch/search/lookup/LeafDocLookup.java | 10 +++++----- .../phrase/DirectCandidateGeneratorBuilder.java | 2 +- .../org/opensearch/snapshots/SnapshotsService.java | 2 +- .../opensearch/tasks/TaskCancellationService.java | 2 +- .../java/org/opensearch/tasks/TaskManager.java | 4 ++-- .../org/opensearch/tasks/TaskResultsService.java | 4 ++-- .../java/org/opensearch/threadpool/Scheduler.java | 10 +++++----- .../transport/NoSuchRemoteClusterException.java | 2 +- .../coordination/CoordinationStateTests.java | 2 +- .../MetadataCreateDataStreamServiceTests.java | 2 +- .../metadata/MetadataCreateIndexServiceTests.java | 4 ++-- .../elasticsearch/common/hppc/HppcMapsTests.java | 2 +- .../common/util/concurrent/TimedRunnableTests.java | 2 +- .../analysis/ReloadableCustomAnalyzerTests.java | 2 +- .../index/mapper/MapperServiceTests.java | 2 +- .../index/reindex/BulkByScrollResponseTests.java | 2 +- .../shard/GlobalCheckpointListenersTests.java | 2 +- .../elasticsearch/index/shard/IndexShardTests.java | 2 +- .../org/elasticsearch/index/store/StoreTests.java | 2 +- .../index/translog/TranslogTests.java | 2 +- .../indices/cluster/ClusterStateChanges.java | 2 +- .../indices/flush/SyncedFlushUtil.java | 2 +- .../recovery/RecoverySourceHandlerTests.java | 2 +- .../indices/recovery/RecoveryTests.java | 2 +- .../nodesinfo/NodeInfoStreamingTests.java | 2 +- .../PersistentTasksClusterServiceTests.java | 2 +- .../PersistentTasksCustomMetadataTests.java | 2 +- .../opensearch/rest/BytesRestResponseTests.java | 6 +++--- .../rest/action/RestMainActionTests.java | 2 +- .../action/document/RestGetSourceActionTests.java | 2 +- .../org/opensearch/script/ScriptServiceTests.java | 2 +- .../org/opensearch/script/StoredScriptTests.java | 2 +- .../bucket/geogrid/GeoTileGridParserTests.java | 2 +- .../pipeline/DerivativeAggregatorTests.java | 2 +- .../search/internal/ContextIndexSearcherTests.java | 2 +- .../snapshots/SnapshotResiliencyTests.java | 2 +- .../transport/TransportActionProxyTests.java | 2 +- .../org/elasticsearch/test/ESIntegTestCase.java | 2 +- .../disruption/SlowClusterStateProcessing.java | 2 +- .../test/hamcrest/ElasticsearchAssertions.java | 2 +- .../transport/AbstractSimpleTransportTestCase.java | 2 +- 137 files changed, 183 insertions(+), 195 deletions(-) rename server/src/main/java/org/{elasticsearch => opensearch}/Assertions.java (95%) rename server/src/main/java/org/{elasticsearch => opensearch}/Build.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/ExceptionsHelper.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/ResourceAlreadyExistsException.java (92%) rename server/src/main/java/org/{elasticsearch => opensearch}/ResourceNotFoundException.java (95%) rename server/src/main/java/org/{elasticsearch => opensearch}/SpecialPermission.java (97%) rename server/src/main/java/org/{elasticsearch => opensearch}/package-info.java (91%) diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/CustomRestHighLevelClientTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/CustomRestHighLevelClientTests.java index 4550142dd05..8b45ff388a2 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/CustomRestHighLevelClientTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/CustomRestHighLevelClientTests.java @@ -29,7 +29,7 @@ import org.apache.http.message.BasicRequestLine; import org.apache.http.message.BasicStatusLine; import org.apache.http.nio.entity.NByteArrayEntity; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.Build; +import org.opensearch.Build; import org.elasticsearch.client.Request; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.Response; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/core/MainResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/core/MainResponseTests.java index 92fadfe5e21..ef2da07d427 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/core/MainResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/core/MainResponseTests.java @@ -19,7 +19,7 @@ package org.opensearch.client.core; -import org.elasticsearch.Build; +import org.opensearch.Build; import org.opensearch.Version; import org.opensearch.client.AbstractResponseTestCase; import org.opensearch.cluster.ClusterName; diff --git a/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java b/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java index 812b80f0d1d..a0f1fa94f0d 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java @@ -35,7 +35,7 @@ import org.bouncycastle.openpgp.PGPUtil; import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; -import org.elasticsearch.Build; +import org.opensearch.Build; import org.opensearch.Version; import org.opensearch.bootstrap.JarHell; import org.opensearch.cli.EnvironmentAwareCommand; diff --git a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java index af8706e0533..7380ade6526 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java @@ -41,7 +41,7 @@ import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBu import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair; import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; -import org.elasticsearch.Build; +import org.opensearch.Build; import org.opensearch.Version; import org.opensearch.cli.ExitCodes; import org.elasticsearch.cli.MockTerminal; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateIndexNameProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateIndexNameProcessor.java index cc6f83e0546..5b4334adfdc 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateIndexNameProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateIndexNameProcessor.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.common.time.DateFormatter; import org.elasticsearch.ingest.AbstractProcessor; import org.elasticsearch.ingest.ConfigurationUtils; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateProcessor.java index dd7754dff10..10614e77db6 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateProcessor.java @@ -19,14 +19,14 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.common.Nullable; import org.opensearch.common.time.DateFormatter; import org.opensearch.common.util.LocaleUtils; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.script.ScriptService; import org.opensearch.script.TemplateScript; diff --git a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java index d95f90d995c..619247bbcce 100644 --- a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java +++ b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java @@ -30,7 +30,7 @@ import com.maxmind.geoip2.record.Country; import com.maxmind.geoip2.record.Location; import com.maxmind.geoip2.record.Subdivision; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.SpecialPermission; +import org.opensearch.SpecialPermission; import org.opensearch.common.network.InetAddresses; import org.opensearch.common.network.NetworkAddress; import org.elasticsearch.ingest.AbstractProcessor; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java index 3511d9a91cc..65f0911df32 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java @@ -25,13 +25,13 @@ import org.apache.lucene.expressions.js.JavascriptCompiler; import org.apache.lucene.expressions.js.VariableContext; import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.SortField; -import org.elasticsearch.SpecialPermission; +import org.opensearch.SpecialPermission; import org.opensearch.common.Nullable; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.IndexNumericFieldData; -import org.elasticsearch.index.mapper.DateFieldMapper; -import org.elasticsearch.index.mapper.GeoPointFieldMapper.GeoPointFieldType; -import org.elasticsearch.index.mapper.MappedFieldType; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.IndexNumericFieldData; +import org.opensearch.index.mapper.DateFieldMapper; +import org.opensearch.index.mapper.GeoPointFieldMapper.GeoPointFieldType; +import org.opensearch.index.mapper.MappedFieldType; import org.opensearch.script.AggregationScript; import org.opensearch.script.BucketAggregationScript; import org.opensearch.script.BucketAggregationSelectorScript; diff --git a/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java b/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java index 5beb00c675a..b72de905d85 100644 --- a/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java +++ b/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java @@ -18,7 +18,7 @@ */ package org.opensearch.script.mustache; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.action.admin.cluster.storedscripts.GetStoredScriptResponse; import org.opensearch.action.bulk.BulkRequestBuilder; import org.opensearch.action.search.SearchRequest; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheScriptEngine.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheScriptEngine.java index 09d2f574b81..4b3d3cacb4f 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheScriptEngine.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustacheScriptEngine.java @@ -25,7 +25,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.util.Supplier; -import org.elasticsearch.SpecialPermission; +import org.opensearch.SpecialPermission; import org.opensearch.script.GeneralScriptException; import org.opensearch.script.Script; import org.opensearch.script.ScriptContext; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScriptEngine.java b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScriptEngine.java index 01a7a0eb168..da64874d72b 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScriptEngine.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScriptEngine.java @@ -19,7 +19,7 @@ package org.opensearch.painless; -import org.elasticsearch.SpecialPermission; +import org.opensearch.SpecialPermission; import org.opensearch.common.settings.Settings; import org.opensearch.painless.Compiler.Loader; import org.opensearch.painless.lookup.PainlessLookup; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/query/ParentChildInnerHitContextBuilder.java b/modules/parent-join/src/main/java/org/opensearch/join/query/ParentChildInnerHitContextBuilder.java index c9d3df202be..b3750ee84d3 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/query/ParentChildInnerHitContextBuilder.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/query/ParentChildInnerHitContextBuilder.java @@ -34,7 +34,7 @@ import org.apache.lucene.search.TotalHitCountCollector; import org.apache.lucene.search.TotalHits; import org.apache.lucene.search.Weight; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.search.MaxScoreCollector; import org.opensearch.common.lucene.Lucene; import org.opensearch.common.lucene.search.TopDocsAndMaxScore; diff --git a/modules/percolator/src/main/java/org/opensearch/percolator/PercolateQueryBuilder.java b/modules/percolator/src/main/java/org/opensearch/percolator/PercolateQueryBuilder.java index 17d18010b3e..a44f775dc9a 100644 --- a/modules/percolator/src/main/java/org/opensearch/percolator/PercolateQueryBuilder.java +++ b/modules/percolator/src/main/java/org/opensearch/percolator/PercolateQueryBuilder.java @@ -43,7 +43,7 @@ import org.apache.lucene.util.BitSet; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.SetOnce; import org.opensearch.OpenSearchException; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.get.GetRequest; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java index 991f60f15b4..2acb58caa31 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java @@ -21,7 +21,7 @@ package org.opensearch.percolator; import org.apache.lucene.search.Query; import org.opensearch.OpenSearchException; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest; import org.opensearch.action.get.GetRequest; import org.opensearch.action.get.GetResponse; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java index c05ad069554..54a80c00d8f 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java @@ -21,7 +21,7 @@ package org.opensearch.index.reindex; import org.apache.lucene.search.TotalHits; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.action.ActionType; import org.opensearch.action.ActionListener; @@ -67,14 +67,8 @@ import org.opensearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.index.Index; import org.opensearch.index.engine.VersionConflictEngineException; -import org.opensearch.index.reindex.AbstractBulkByScrollRequest; -import org.opensearch.index.reindex.BulkByScrollResponse; -import org.opensearch.index.reindex.BulkByScrollTask; -import org.opensearch.index.reindex.ClientScrollableHitSource; -import org.opensearch.index.reindex.ScrollableHitSource; import org.opensearch.index.reindex.ScrollableHitSource.Hit; import org.opensearch.index.reindex.ScrollableHitSource.SearchFailure; -import org.opensearch.index.reindex.WorkerBulkByScrollTaskState; import org.opensearch.index.shard.ShardId; import org.opensearch.rest.RestStatus; import org.opensearch.search.SearchHit; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java index 54a79d4b7a8..37ceb0e7107 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java @@ -21,7 +21,7 @@ package org.opensearch.index.reindex; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionFuture; import org.opensearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/RethrottleTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RethrottleTests.java index 04c7d36e30a..d520da62467 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/RethrottleTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RethrottleTests.java @@ -20,7 +20,7 @@ package org.opensearch.index.reindex; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionFuture; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; import org.opensearch.action.admin.cluster.node.tasks.list.TaskGroup; diff --git a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java index e49f7c463b1..ef46fa2f6d6 100644 --- a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java +++ b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java @@ -22,15 +22,15 @@ package org.opensearch.systemd; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.util.SetOnce; -import org.elasticsearch.Build; +import org.opensearch.Build; import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.NodeEnvironment; +import org.opensearch.env.Environment; +import org.opensearch.env.NodeEnvironment; import org.opensearch.plugins.ClusterPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.repositories.RepositoriesService; diff --git a/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java b/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java index 1830b528571..0485af0e9ed 100644 --- a/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java +++ b/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java @@ -19,7 +19,7 @@ package org.opensearch.systemd; -import org.elasticsearch.Build; +import org.opensearch.Build; import org.opensearch.common.CheckedConsumer; import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpRequestCreator.java b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpRequestCreator.java index 95973b17b80..1904bb2f972 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpRequestCreator.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpRequestCreator.java @@ -23,7 +23,7 @@ import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageDecoder; import io.netty.handler.codec.http.FullHttpRequest; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import java.util.List; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpRequestHandler.java b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpRequestHandler.java index 1a346a99392..9fc9cf94d87 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpRequestHandler.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpRequestHandler.java @@ -22,7 +22,7 @@ package org.opensearch.http.netty4; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.http.HttpPipelinedRequest; @ChannelHandler.Sharable diff --git a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerTransport.java b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerTransport.java index 1d298d45e75..71d0a911f49 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerTransport.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerTransport.java @@ -41,7 +41,7 @@ import io.netty.handler.timeout.ReadTimeoutHandler; import io.netty.util.AttributeKey; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.common.network.NetworkService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4MessageChannelHandler.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4MessageChannelHandler.java index 8b9ba32ffc0..72dee25d3ca 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4MessageChannelHandler.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4MessageChannelHandler.java @@ -26,7 +26,7 @@ import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.ReleasableBytesReference; import org.opensearch.common.lease.Releasables; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4TcpChannel.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4TcpChannel.java index 0562cd0ed0d..bf2b57d6267 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4TcpChannel.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4TcpChannel.java @@ -22,7 +22,7 @@ package org.opensearch.transport.netty4; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelPromise; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionListener; import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesReference; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Transport.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Transport.java index d1495adfcc4..01a625e7344 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Transport.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Transport.java @@ -35,7 +35,7 @@ import io.netty.util.AttributeKey; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.SuppressForbidden; diff --git a/server/src/main/java/org/elasticsearch/Assertions.java b/server/src/main/java/org/opensearch/Assertions.java similarity index 95% rename from server/src/main/java/org/elasticsearch/Assertions.java rename to server/src/main/java/org/opensearch/Assertions.java index 49ace92c2ea..c7ff057a5f6 100644 --- a/server/src/main/java/org/elasticsearch/Assertions.java +++ b/server/src/main/java/org/opensearch/Assertions.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch; +package org.opensearch; /** * Provides a static final field that can be used to check if assertions are enabled. Since this field might be used elsewhere to check if diff --git a/server/src/main/java/org/elasticsearch/Build.java b/server/src/main/java/org/opensearch/Build.java similarity index 99% rename from server/src/main/java/org/elasticsearch/Build.java rename to server/src/main/java/org/opensearch/Build.java index 479a1418231..99f5bbcca9e 100644 --- a/server/src/main/java/org/elasticsearch/Build.java +++ b/server/src/main/java/org/opensearch/Build.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,13 +17,12 @@ * under the License. */ -package org.elasticsearch; +package org.opensearch; import org.opensearch.common.Booleans; import org.opensearch.common.io.FileSystemUtils; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.opensearch.Version; import java.io.IOException; import java.net.URL; diff --git a/server/src/main/java/org/elasticsearch/ExceptionsHelper.java b/server/src/main/java/org/opensearch/ExceptionsHelper.java similarity index 99% rename from server/src/main/java/org/elasticsearch/ExceptionsHelper.java rename to server/src/main/java/org/opensearch/ExceptionsHelper.java index 352a6979990..ffac79ad2a3 100644 --- a/server/src/main/java/org/elasticsearch/ExceptionsHelper.java +++ b/server/src/main/java/org/opensearch/ExceptionsHelper.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch; +package org.opensearch; import com.fasterxml.jackson.core.JsonParseException; import org.apache.logging.log4j.LogManager; @@ -28,7 +28,7 @@ import org.apache.lucene.index.IndexFormatTooOldException; import org.opensearch.action.ShardOperationFailedException; import org.opensearch.common.Nullable; import org.opensearch.common.util.concurrent.EsRejectedExecutionException; -import org.elasticsearch.index.Index; +import org.opensearch.index.Index; import org.opensearch.rest.RestStatus; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/OpenSearchException.java b/server/src/main/java/org/opensearch/OpenSearchException.java index 68157984da2..6c5fd541d1d 100644 --- a/server/src/main/java/org/opensearch/OpenSearchException.java +++ b/server/src/main/java/org/opensearch/OpenSearchException.java @@ -736,8 +736,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF org.opensearch.index.snapshots.IndexShardSnapshotFailedException::new, 0, UNKNOWN_VERSION_ADDED), DFS_PHASE_EXECUTION_EXCEPTION(org.opensearch.search.dfs.DfsPhaseExecutionException.class, org.opensearch.search.dfs.DfsPhaseExecutionException::new, 1, UNKNOWN_VERSION_ADDED), - EXECUTION_CANCELLED_EXCEPTION(org.elasticsearch.common.util.CancellableThreads.ExecutionCancelledException.class, - org.elasticsearch.common.util.CancellableThreads.ExecutionCancelledException::new, 2, UNKNOWN_VERSION_ADDED), + EXECUTION_CANCELLED_EXCEPTION(org.opensearch.common.util.CancellableThreads.ExecutionCancelledException.class, + org.opensearch.common.util.CancellableThreads.ExecutionCancelledException::new, 2, UNKNOWN_VERSION_ADDED), MASTER_NOT_DISCOVERED_EXCEPTION(org.opensearch.discovery.MasterNotDiscoveredException.class, org.opensearch.discovery.MasterNotDiscoveredException::new, 3, UNKNOWN_VERSION_ADDED), ELASTICSEARCH_SECURITY_EXCEPTION(org.opensearch.OpenSearchSecurityException.class, @@ -770,8 +770,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF org.opensearch.cluster.routing.IllegalShardRoutingStateException::new, 17, UNKNOWN_VERSION_ADDED), BROADCAST_SHARD_OPERATION_FAILED_EXCEPTION(org.opensearch.action.support.broadcast.BroadcastShardOperationFailedException.class, org.opensearch.action.support.broadcast.BroadcastShardOperationFailedException::new, 18, UNKNOWN_VERSION_ADDED), - RESOURCE_NOT_FOUND_EXCEPTION(org.elasticsearch.ResourceNotFoundException.class, - org.elasticsearch.ResourceNotFoundException::new, 19, UNKNOWN_VERSION_ADDED), + RESOURCE_NOT_FOUND_EXCEPTION(org.opensearch.ResourceNotFoundException.class, + org.opensearch.ResourceNotFoundException::new, 19, UNKNOWN_VERSION_ADDED), ACTION_TRANSPORT_EXCEPTION(org.opensearch.transport.ActionTransportException.class, org.opensearch.transport.ActionTransportException::new, 20, UNKNOWN_VERSION_ADDED), ELASTICSEARCH_GENERATION_EXCEPTION(org.opensearch.OpenSearchGenerationException.class, @@ -875,8 +875,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF org.opensearch.cluster.IncompatibleClusterStateVersionException::new, 75, UNKNOWN_VERSION_ADDED), RECOVERY_ENGINE_EXCEPTION(org.opensearch.index.engine.RecoveryEngineException.class, org.opensearch.index.engine.RecoveryEngineException::new, 76, UNKNOWN_VERSION_ADDED), - UNCATEGORIZED_EXECUTION_EXCEPTION(org.elasticsearch.common.util.concurrent.UncategorizedExecutionException.class, - org.elasticsearch.common.util.concurrent.UncategorizedExecutionException::new, 77, UNKNOWN_VERSION_ADDED), + UNCATEGORIZED_EXECUTION_EXCEPTION(org.opensearch.common.util.concurrent.UncategorizedExecutionException.class, + org.opensearch.common.util.concurrent.UncategorizedExecutionException::new, 77, UNKNOWN_VERSION_ADDED), TIMESTAMP_PARSING_EXCEPTION(org.opensearch.action.TimestampParsingException.class, org.opensearch.action.TimestampParsingException::new, 78, UNKNOWN_VERSION_ADDED), ROUTING_MISSING_EXCEPTION(org.opensearch.action.RoutingMissingException.class, @@ -948,8 +948,6 @@ public class OpenSearchException extends RuntimeException implements ToXContentF ReplicationOperation.RetryOnPrimaryException::new, 117, UNKNOWN_VERSION_ADDED), ELASTICSEARCH_TIMEOUT_EXCEPTION(org.opensearch.OpenSearchTimeoutException.class, org.opensearch.OpenSearchTimeoutException::new, 118, UNKNOWN_VERSION_ADDED), - ELASTICSEARCH_TIMEOUT_EXCEPTION(org.opensearch.OpenSearchTimeoutException.class, - org.opensearch.OpenSearchTimeoutException::new, 118, UNKNOWN_VERSION_ADDED), QUERY_PHASE_EXECUTION_EXCEPTION(org.opensearch.search.query.QueryPhaseExecutionException.class, org.opensearch.search.query.QueryPhaseExecutionException::new, 119, UNKNOWN_VERSION_ADDED), REPOSITORY_VERIFICATION_EXCEPTION(org.opensearch.repositories.RepositoryVerificationException.class, diff --git a/server/src/main/java/org/opensearch/OpenSearchSecurityException.java b/server/src/main/java/org/opensearch/OpenSearchSecurityException.java index 1c402701dcd..53fc0189bd5 100644 --- a/server/src/main/java/org/opensearch/OpenSearchSecurityException.java +++ b/server/src/main/java/org/opensearch/OpenSearchSecurityException.java @@ -18,7 +18,6 @@ */ package org.opensearch; -import org.elasticsearch.ExceptionsHelper; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.rest.RestStatus; diff --git a/server/src/main/java/org/elasticsearch/ResourceAlreadyExistsException.java b/server/src/main/java/org/opensearch/ResourceAlreadyExistsException.java similarity index 92% rename from server/src/main/java/org/elasticsearch/ResourceAlreadyExistsException.java rename to server/src/main/java/org/opensearch/ResourceAlreadyExistsException.java index 9685e600c1a..5041cdce0da 100644 --- a/server/src/main/java/org/elasticsearch/ResourceAlreadyExistsException.java +++ b/server/src/main/java/org/opensearch/ResourceAlreadyExistsException.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch; +package org.opensearch; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.index.Index; +import org.opensearch.index.Index; import org.opensearch.rest.RestStatus; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/ResourceNotFoundException.java b/server/src/main/java/org/opensearch/ResourceNotFoundException.java similarity index 95% rename from server/src/main/java/org/elasticsearch/ResourceNotFoundException.java rename to server/src/main/java/org/opensearch/ResourceNotFoundException.java index 4ee51773d78..e111b954df5 100644 --- a/server/src/main/java/org/elasticsearch/ResourceNotFoundException.java +++ b/server/src/main/java/org/opensearch/ResourceNotFoundException.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch; +package org.opensearch; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.rest.RestStatus; diff --git a/server/src/main/java/org/elasticsearch/SpecialPermission.java b/server/src/main/java/org/opensearch/SpecialPermission.java similarity index 97% rename from server/src/main/java/org/elasticsearch/SpecialPermission.java rename to server/src/main/java/org/opensearch/SpecialPermission.java index 9e5571a5b0a..a24d8dffc8d 100644 --- a/server/src/main/java/org/elasticsearch/SpecialPermission.java +++ b/server/src/main/java/org/opensearch/SpecialPermission.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch; +package org.opensearch; import java.security.BasicPermission; diff --git a/server/src/main/java/org/opensearch/Version.java b/server/src/main/java/org/opensearch/Version.java index 3361a942ec8..f11b35b835c 100644 --- a/server/src/main/java/org/opensearch/Version.java +++ b/server/src/main/java/org/opensearch/Version.java @@ -19,8 +19,6 @@ package org.opensearch; -import org.elasticsearch.Assertions; -import org.elasticsearch.Build; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.Strings; import org.opensearch.common.SuppressForbidden; diff --git a/server/src/main/java/org/opensearch/action/ActionListener.java b/server/src/main/java/org/opensearch/action/ActionListener.java index 3eaf1671b5b..9060786cd36 100644 --- a/server/src/main/java/org/opensearch/action/ActionListener.java +++ b/server/src/main/java/org/opensearch/action/ActionListener.java @@ -19,7 +19,7 @@ package org.opensearch.action; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.common.CheckedConsumer; import org.opensearch.common.CheckedFunction; import org.opensearch.common.CheckedRunnable; diff --git a/server/src/main/java/org/opensearch/action/TaskOperationFailure.java b/server/src/main/java/org/opensearch/action/TaskOperationFailure.java index 5cb724acf83..97f817f5718 100644 --- a/server/src/main/java/org/opensearch/action/TaskOperationFailure.java +++ b/server/src/main/java/org/opensearch/action/TaskOperationFailure.java @@ -20,7 +20,7 @@ package org.opensearch.action; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodeInfo.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodeInfo.java index 1b478c9671e..8eb70cc97ed 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodeInfo.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodeInfo.java @@ -19,7 +19,7 @@ package org.opensearch.action.admin.cluster.node.info; -import org.elasticsearch.Build; +import org.opensearch.Build; import org.opensearch.Version; import org.opensearch.action.support.nodes.BaseNodeResponse; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/TransportNodesReloadSecureSettingsAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/TransportNodesReloadSecureSettingsAction.java index 7562844ba65..5c905853e5c 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/TransportNodesReloadSecureSettingsAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/TransportNodesReloadSecureSettingsAction.java @@ -22,7 +22,7 @@ package org.opensearch.action.admin.cluster.node.reload; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.util.Supplier; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionListener; import org.opensearch.action.FailedNodeException; import org.opensearch.action.support.ActionFilters; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java index 6a99afc2ca9..5886d570200 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java @@ -19,7 +19,7 @@ package org.opensearch.action.admin.cluster.node.tasks.cancel; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.action.ActionListener; import org.opensearch.action.FailedNodeException; import org.opensearch.action.TaskOperationFailure; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java index eb3191733c2..00ccce80c67 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java @@ -20,8 +20,8 @@ package org.opensearch.action.admin.cluster.node.tasks.get; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ExceptionsHelper; +import org.opensearch.ResourceNotFoundException; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionListenerResponseHandler; import org.opensearch.action.get.GetRequest; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java index 99e78878845..650072c628b 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java @@ -22,7 +22,7 @@ package org.opensearch.action.admin.cluster.reroute; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionListenerResponseHandler; import org.opensearch.action.admin.indices.shards.IndicesShardStoresAction; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/template/get/TransportGetComponentTemplateAction.java b/server/src/main/java/org/opensearch/action/admin/indices/template/get/TransportGetComponentTemplateAction.java index 3eb03989443..eaff20bf7c1 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/template/get/TransportGetComponentTemplateAction.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/template/get/TransportGetComponentTemplateAction.java @@ -19,7 +19,7 @@ package org.opensearch.action.admin.indices.template.get; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.master.TransportMasterNodeReadAction; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/template/get/TransportGetComposableIndexTemplateAction.java b/server/src/main/java/org/opensearch/action/admin/indices/template/get/TransportGetComposableIndexTemplateAction.java index 721d4d5b73a..a33eadd2139 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/template/get/TransportGetComposableIndexTemplateAction.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/template/get/TransportGetComposableIndexTemplateAction.java @@ -19,7 +19,7 @@ package org.opensearch.action.admin.indices.template.get; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.master.TransportMasterNodeReadAction; diff --git a/server/src/main/java/org/opensearch/action/bulk/BulkItemResponse.java b/server/src/main/java/org/opensearch/action/bulk/BulkItemResponse.java index a7d870e30c2..ff6ef6e68b9 100644 --- a/server/src/main/java/org/opensearch/action/bulk/BulkItemResponse.java +++ b/server/src/main/java/org/opensearch/action/bulk/BulkItemResponse.java @@ -20,7 +20,7 @@ package org.opensearch.action.bulk; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.elasticsearch.Version; import org.opensearch.action.DocWriteRequest.OpType; import org.opensearch.action.DocWriteResponse; diff --git a/server/src/main/java/org/opensearch/action/bulk/TransportBulkAction.java b/server/src/main/java/org/opensearch/action/bulk/TransportBulkAction.java index 91242c1035a..f3f7363910f 100644 --- a/server/src/main/java/org/opensearch/action/bulk/TransportBulkAction.java +++ b/server/src/main/java/org/opensearch/action/bulk/TransportBulkAction.java @@ -22,10 +22,10 @@ package org.opensearch.action.bulk; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.util.SparseFixedBitSet; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.ResourceAlreadyExistsException; +import org.opensearch.ExceptionsHelper; +import org.opensearch.ResourceAlreadyExistsException; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRunnable; diff --git a/server/src/main/java/org/opensearch/action/bulk/TransportShardBulkAction.java b/server/src/main/java/org/opensearch/action/bulk/TransportShardBulkAction.java index 16e83601995..87db168914d 100644 --- a/server/src/main/java/org/opensearch/action/bulk/TransportShardBulkAction.java +++ b/server/src/main/java/org/opensearch/action/bulk/TransportShardBulkAction.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.util.MessageSupplier; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRunnable; import org.opensearch.action.DocWriteRequest; diff --git a/server/src/main/java/org/opensearch/action/main/MainResponse.java b/server/src/main/java/org/opensearch/action/main/MainResponse.java index 0f41081b410..268fd3dcb40 100644 --- a/server/src/main/java/org/opensearch/action/main/MainResponse.java +++ b/server/src/main/java/org/opensearch/action/main/MainResponse.java @@ -19,7 +19,7 @@ package org.opensearch.action.main; -import org.elasticsearch.Build; +import org.opensearch.Build; import org.opensearch.Version; import org.opensearch.action.ActionResponse; import org.opensearch.cluster.ClusterName; diff --git a/server/src/main/java/org/opensearch/action/main/TransportMainAction.java b/server/src/main/java/org/opensearch/action/main/TransportMainAction.java index 44e18e342c3..09165c7e7c6 100644 --- a/server/src/main/java/org/opensearch/action/main/TransportMainAction.java +++ b/server/src/main/java/org/opensearch/action/main/TransportMainAction.java @@ -19,7 +19,7 @@ package org.opensearch.action.main; -import org.elasticsearch.Build; +import org.opensearch.Build; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; diff --git a/server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java b/server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java index 405685006cb..e13ef51740b 100644 --- a/server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java +++ b/server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.lucene.util.SetOnce; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.NoShardAvailableActionException; diff --git a/server/src/main/java/org/opensearch/action/search/MultiSearchResponse.java b/server/src/main/java/org/opensearch/action/search/MultiSearchResponse.java index 92bb79c57d5..30f6a2ab8c9 100644 --- a/server/src/main/java/org/opensearch/action/search/MultiSearchResponse.java +++ b/server/src/main/java/org/opensearch/action/search/MultiSearchResponse.java @@ -20,7 +20,7 @@ package org.opensearch.action.search; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.action.ActionResponse; import org.opensearch.common.Nullable; diff --git a/server/src/main/java/org/opensearch/action/search/SearchPhaseExecutionException.java b/server/src/main/java/org/opensearch/action/search/SearchPhaseExecutionException.java index 10782094a9b..43a80fcb646 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchPhaseExecutionException.java +++ b/server/src/main/java/org/opensearch/action/search/SearchPhaseExecutionException.java @@ -20,7 +20,7 @@ package org.opensearch.action.search; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ShardOperationFailedException; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/search/ShardSearchFailure.java b/server/src/main/java/org/opensearch/action/search/ShardSearchFailure.java index e663a8a11d4..2ed206eb0e4 100644 --- a/server/src/main/java/org/opensearch/action/search/ShardSearchFailure.java +++ b/server/src/main/java/org/opensearch/action/search/ShardSearchFailure.java @@ -20,7 +20,7 @@ package org.opensearch.action.search; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.OriginalIndices; import org.opensearch.action.ShardOperationFailedException; import org.opensearch.cluster.metadata.IndexMetadata; diff --git a/server/src/main/java/org/opensearch/action/support/DefaultShardOperationFailedException.java b/server/src/main/java/org/opensearch/action/support/DefaultShardOperationFailedException.java index 3f8b962d963..74041b52684 100644 --- a/server/src/main/java/org/opensearch/action/support/DefaultShardOperationFailedException.java +++ b/server/src/main/java/org/opensearch/action/support/DefaultShardOperationFailedException.java @@ -20,7 +20,7 @@ package org.opensearch.action.support; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ShardOperationFailedException; import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; @@ -33,7 +33,7 @@ import org.opensearch.rest.RestStatus; import java.io.IOException; -import static org.elasticsearch.ExceptionsHelper.detailedMessage; +import static org.opensearch.ExceptionsHelper.detailedMessage; import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; public class DefaultShardOperationFailedException extends ShardOperationFailedException implements Writeable { diff --git a/server/src/main/java/org/opensearch/action/support/TransportActions.java b/server/src/main/java/org/opensearch/action/support/TransportActions.java index de5b28f185d..7540c3b97b3 100644 --- a/server/src/main/java/org/opensearch/action/support/TransportActions.java +++ b/server/src/main/java/org/opensearch/action/support/TransportActions.java @@ -20,7 +20,7 @@ package org.opensearch.action.support; import org.apache.lucene.store.AlreadyClosedException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.NoShardAvailableActionException; import org.opensearch.action.UnavailableShardsException; import org.elasticsearch.index.IndexNotFoundException; diff --git a/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java b/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java index 4a851d38075..eb478790ca2 100644 --- a/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java +++ b/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java @@ -21,9 +21,9 @@ package org.opensearch.action.support.replication; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.lucene.store.AlreadyClosedException; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionListener; import org.opensearch.action.UnavailableShardsException; import org.opensearch.action.support.ActiveShardCount; diff --git a/server/src/main/java/org/opensearch/action/support/replication/ReplicationResponse.java b/server/src/main/java/org/opensearch/action/support/replication/ReplicationResponse.java index 273b0f34a63..fca1d834de3 100644 --- a/server/src/main/java/org/opensearch/action/support/replication/ReplicationResponse.java +++ b/server/src/main/java/org/opensearch/action/support/replication/ReplicationResponse.java @@ -20,7 +20,7 @@ package org.opensearch.action.support.replication; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionResponse; import org.opensearch.action.ShardOperationFailedException; import org.opensearch.cluster.metadata.IndexMetadata; diff --git a/server/src/main/java/org/opensearch/action/support/replication/TransportBroadcastReplicationAction.java b/server/src/main/java/org/opensearch/action/support/replication/TransportBroadcastReplicationAction.java index d3c9bdc8d59..a236a8de5c5 100644 --- a/server/src/main/java/org/opensearch/action/support/replication/TransportBroadcastReplicationAction.java +++ b/server/src/main/java/org/opensearch/action/support/replication/TransportBroadcastReplicationAction.java @@ -20,7 +20,7 @@ package org.opensearch.action.support.replication; import com.carrotsearch.hppc.cursors.IntObjectCursor; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.DefaultShardOperationFailedException; diff --git a/server/src/main/java/org/opensearch/action/support/replication/TransportReplicationAction.java b/server/src/main/java/org/opensearch/action/support/replication/TransportReplicationAction.java index aec1996f35b..e34ecf85d14 100644 --- a/server/src/main/java/org/opensearch/action/support/replication/TransportReplicationAction.java +++ b/server/src/main/java/org/opensearch/action/support/replication/TransportReplicationAction.java @@ -21,9 +21,9 @@ package org.opensearch.action.support.replication; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.lucene.store.AlreadyClosedException; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.elasticsearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionListenerResponseHandler; diff --git a/server/src/main/java/org/opensearch/action/support/tasks/BaseTasksResponse.java b/server/src/main/java/org/opensearch/action/support/tasks/BaseTasksResponse.java index 0ec3ae195ee..22890dd3e74 100644 --- a/server/src/main/java/org/opensearch/action/support/tasks/BaseTasksResponse.java +++ b/server/src/main/java/org/opensearch/action/support/tasks/BaseTasksResponse.java @@ -37,7 +37,7 @@ import java.util.Objects; import java.util.stream.Stream; import static java.util.stream.Collectors.toList; -import static org.elasticsearch.ExceptionsHelper.rethrowAndSuppress; +import static org.opensearch.ExceptionsHelper.rethrowAndSuppress; /** diff --git a/server/src/main/java/org/opensearch/action/support/tasks/TransportTasksAction.java b/server/src/main/java/org/opensearch/action/support/tasks/TransportTasksAction.java index 142547ae1aa..a161e254780 100644 --- a/server/src/main/java/org/opensearch/action/support/tasks/TransportTasksAction.java +++ b/server/src/main/java/org/opensearch/action/support/tasks/TransportTasksAction.java @@ -20,7 +20,7 @@ package org.opensearch.action.support.tasks; import org.apache.logging.log4j.message.ParameterizedMessage; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.action.ActionListener; import org.opensearch.action.FailedNodeException; import org.opensearch.action.NoSuchNodeException; diff --git a/server/src/main/java/org/opensearch/action/update/TransportUpdateAction.java b/server/src/main/java/org/opensearch/action/update/TransportUpdateAction.java index bf8f621240e..5d2c57f0b5f 100644 --- a/server/src/main/java/org/opensearch/action/update/TransportUpdateAction.java +++ b/server/src/main/java/org/opensearch/action/update/TransportUpdateAction.java @@ -19,7 +19,7 @@ package org.opensearch.action.update; -import org.elasticsearch.ResourceAlreadyExistsException; +import org.opensearch.ResourceAlreadyExistsException; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRunnable; import org.opensearch.action.DocWriteRequest; @@ -64,7 +64,7 @@ import java.io.IOException; import java.util.Collections; import java.util.Map; -import static org.elasticsearch.ExceptionsHelper.unwrapCause; +import static org.opensearch.ExceptionsHelper.unwrapCause; import static org.opensearch.action.bulk.TransportSingleItemBulkWriteAction.toSingleItemBulkRequest; import static org.opensearch.action.bulk.TransportSingleItemBulkWriteAction.wrapBulkResponse; diff --git a/server/src/main/java/org/opensearch/bootstrap/OpenSearch.java b/server/src/main/java/org/opensearch/bootstrap/OpenSearch.java index a50c307cee3..8bd7d042b1f 100644 --- a/server/src/main/java/org/opensearch/bootstrap/OpenSearch.java +++ b/server/src/main/java/org/opensearch/bootstrap/OpenSearch.java @@ -23,7 +23,7 @@ import joptsimple.OptionSet; import joptsimple.OptionSpec; import joptsimple.OptionSpecBuilder; import joptsimple.util.PathConverter; -import org.elasticsearch.Build; +import org.opensearch.Build; import org.opensearch.cli.EnvironmentAwareCommand; import org.opensearch.cli.ExitCodes; import org.opensearch.cli.Terminal; diff --git a/server/src/main/java/org/opensearch/client/transport/TransportClientNodesService.java b/server/src/main/java/org/opensearch/client/transport/TransportClientNodesService.java index f109dffb3a3..1508a80dffa 100644 --- a/server/src/main/java/org/opensearch/client/transport/TransportClientNodesService.java +++ b/server/src/main/java/org/opensearch/client/transport/TransportClientNodesService.java @@ -25,8 +25,8 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.Version; +import org.opensearch.ExceptionsHelper; +import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.admin.cluster.node.liveness.LivenessRequest; import org.opensearch.action.admin.cluster.node.liveness.LivenessResponse; @@ -40,8 +40,8 @@ import org.opensearch.common.Randomness; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.common.util.concurrent.AbstractRunnable; -import org.elasticsearch.common.util.concurrent.ConcurrentCollections; +import org.opensearch.common.util.concurrent.AbstractRunnable; +import org.opensearch.common.util.concurrent.ConcurrentCollections; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.ConnectTransportException; diff --git a/server/src/main/java/org/opensearch/cluster/action/shard/ShardStateAction.java b/server/src/main/java/org/opensearch/cluster/action/shard/ShardStateAction.java index c8bde35302c..4fc2bf32f10 100644 --- a/server/src/main/java/org/opensearch/cluster/action/shard/ShardStateAction.java +++ b/server/src/main/java/org/opensearch/cluster/action/shard/ShardStateAction.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.cluster.ClusterChangedEvent; diff --git a/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java b/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java index 07fb5fd1cc9..7045fca453d 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java @@ -23,7 +23,7 @@ import com.carrotsearch.hppc.LongArrayList; import com.carrotsearch.hppc.cursors.IntObjectCursor; import com.carrotsearch.hppc.cursors.ObjectCursor; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.opensearch.Version; import org.opensearch.action.admin.indices.rollover.RolloverInfo; import org.opensearch.action.support.ActiveShardCount; diff --git a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateDataStreamService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateDataStreamService.java index 9e7b5e2e79c..f16cb111be0 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateDataStreamService.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateDataStreamService.java @@ -21,7 +21,7 @@ package org.opensearch.cluster.metadata; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.OpenSearchStatusException; -import org.elasticsearch.ResourceAlreadyExistsException; +import org.opensearch.ResourceAlreadyExistsException; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.admin.indices.create.CreateIndexClusterStateUpdateRequest; diff --git a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java index 2c4cbf542c3..cebd2668d23 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java @@ -25,7 +25,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.OpenSearchException; -import org.elasticsearch.ResourceAlreadyExistsException; +import org.opensearch.ResourceAlreadyExistsException; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.admin.indices.alias.Alias; diff --git a/server/src/main/java/org/opensearch/cluster/metadata/MetadataUpdateSettingsService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataUpdateSettingsService.java index b1705c943d7..a16a9bc7b27 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataUpdateSettingsService.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataUpdateSettingsService.java @@ -21,7 +21,7 @@ package org.opensearch.cluster.metadata; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.admin.indices.settings.put.UpdateSettingsClusterStateUpdateRequest; diff --git a/server/src/main/java/org/opensearch/cluster/routing/RoutingNodes.java b/server/src/main/java/org/opensearch/cluster/routing/RoutingNodes.java index afbdcf51a6d..187154164a2 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/RoutingNodes.java +++ b/server/src/main/java/org/opensearch/cluster/routing/RoutingNodes.java @@ -23,7 +23,7 @@ import com.carrotsearch.hppc.ObjectIntHashMap; import com.carrotsearch.hppc.cursors.ObjectCursor; import org.apache.logging.log4j.Logger; import org.apache.lucene.util.CollectionUtil; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.Metadata; diff --git a/server/src/main/java/org/opensearch/cluster/routing/UnassignedInfo.java b/server/src/main/java/org/opensearch/cluster/routing/UnassignedInfo.java index f20a5656b19..276eed5e293 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/UnassignedInfo.java +++ b/server/src/main/java/org/opensearch/cluster/routing/UnassignedInfo.java @@ -19,7 +19,7 @@ package org.opensearch.cluster.routing; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.Metadata; diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/FailedShard.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/FailedShard.java index 55baee06408..48c608ecdc9 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/allocation/FailedShard.java +++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/FailedShard.java @@ -19,7 +19,7 @@ package org.opensearch.cluster.routing.allocation; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.common.Nullable; diff --git a/server/src/main/java/org/opensearch/cluster/service/MasterService.java b/server/src/main/java/org/opensearch/cluster/service/MasterService.java index 7004a9b9a15..91bc0021afb 100644 --- a/server/src/main/java/org/opensearch/cluster/service/MasterService.java +++ b/server/src/main/java/org/opensearch/cluster/service/MasterService.java @@ -22,7 +22,7 @@ package org.opensearch.cluster.service; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.cluster.AckedClusterStateTaskListener; import org.opensearch.cluster.ClusterChangedEvent; diff --git a/server/src/main/java/org/opensearch/common/Strings.java b/server/src/main/java/org/opensearch/common/Strings.java index 61683ff28c9..7fa32bd7620 100644 --- a/server/src/main/java/org/opensearch/common/Strings.java +++ b/server/src/main/java/org/opensearch/common/Strings.java @@ -21,7 +21,7 @@ package org.opensearch.common; import org.apache.lucene.util.BytesRefBuilder; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.util.CollectionUtils; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/server/src/main/java/org/opensearch/common/compress/DeflateCompressor.java b/server/src/main/java/org/opensearch/common/compress/DeflateCompressor.java index 9ce9422c723..0093a0bb374 100644 --- a/server/src/main/java/org/opensearch/common/compress/DeflateCompressor.java +++ b/server/src/main/java/org/opensearch/common/compress/DeflateCompressor.java @@ -19,7 +19,7 @@ package org.opensearch.common.compress; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.lease.Releasable; diff --git a/server/src/main/java/org/opensearch/common/geo/builders/ShapeBuilder.java b/server/src/main/java/org/opensearch/common/geo/builders/ShapeBuilder.java index 202f0e732ce..d8faa41ebed 100644 --- a/server/src/main/java/org/opensearch/common/geo/builders/ShapeBuilder.java +++ b/server/src/main/java/org/opensearch/common/geo/builders/ShapeBuilder.java @@ -25,7 +25,7 @@ import org.locationtech.jts.geom.GeometryFactory; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.opensearch.Version; import org.opensearch.common.Strings; import org.opensearch.common.geo.GeoShapeType; diff --git a/server/src/main/java/org/opensearch/common/io/stream/NotSerializableExceptionWrapper.java b/server/src/main/java/org/opensearch/common/io/stream/NotSerializableExceptionWrapper.java index ec562282610..0aabcab1439 100644 --- a/server/src/main/java/org/opensearch/common/io/stream/NotSerializableExceptionWrapper.java +++ b/server/src/main/java/org/opensearch/common/io/stream/NotSerializableExceptionWrapper.java @@ -20,7 +20,7 @@ package org.opensearch.common.io.stream; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.rest.RestStatus; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/common/logging/HeaderWarning.java b/server/src/main/java/org/opensearch/common/logging/HeaderWarning.java index 17673bed439..a21f3734912 100644 --- a/server/src/main/java/org/opensearch/common/logging/HeaderWarning.java +++ b/server/src/main/java/org/opensearch/common/logging/HeaderWarning.java @@ -19,7 +19,7 @@ package org.opensearch.common.logging; -import org.elasticsearch.Build; +import org.opensearch.Build; import org.opensearch.Version; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.tasks.Task; diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java index b0d43ad0d40..9d30f7eab9d 100644 --- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java +++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java @@ -82,7 +82,7 @@ import org.apache.lucene.store.Lock; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Version; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.SuppressForbidden; diff --git a/server/src/main/java/org/opensearch/common/lucene/ShardCoreKeyMap.java b/server/src/main/java/org/opensearch/common/lucene/ShardCoreKeyMap.java index 5793f4ab570..06945f365c6 100644 --- a/server/src/main/java/org/opensearch/common/lucene/ShardCoreKeyMap.java +++ b/server/src/main/java/org/opensearch/common/lucene/ShardCoreKeyMap.java @@ -21,7 +21,7 @@ package org.opensearch.common.lucene; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReader; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardUtils; diff --git a/server/src/main/java/org/opensearch/common/settings/AbstractScopedSettings.java b/server/src/main/java/org/opensearch/common/settings/AbstractScopedSettings.java index 82e667b23dc..c265bd76d87 100644 --- a/server/src/main/java/org/opensearch/common/settings/AbstractScopedSettings.java +++ b/server/src/main/java/org/opensearch/common/settings/AbstractScopedSettings.java @@ -24,7 +24,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.lucene.search.spell.LevenshteinDistance; import org.apache.lucene.util.CollectionUtil; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.common.collect.Tuple; import org.opensearch.common.regex.Regex; diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/EsExecutors.java b/server/src/main/java/org/opensearch/common/util/concurrent/EsExecutors.java index 8777bb897d9..08f6346475f 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/EsExecutors.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/EsExecutors.java @@ -19,7 +19,7 @@ package org.opensearch.common.util.concurrent; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.common.SuppressForbidden; import org.opensearch.common.logging.DeprecationLogger; import org.opensearch.common.settings.Setting; diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/ReleasableLock.java b/server/src/main/java/org/opensearch/common/util/concurrent/ReleasableLock.java index e45f21e1afb..705edde1cde 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/ReleasableLock.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/ReleasableLock.java @@ -19,7 +19,7 @@ package org.opensearch.common.util.concurrent; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.opensearch.common.lease.Releasable; import org.opensearch.common.unit.TimeValue; import org.opensearch.index.engine.EngineException; diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/TimedRunnable.java b/server/src/main/java/org/opensearch/common/util/concurrent/TimedRunnable.java index 39ef3fe16bc..ae1fa969160 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/TimedRunnable.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/TimedRunnable.java @@ -19,7 +19,7 @@ package org.opensearch.common.util.concurrent; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; /** * A class used to wrap a {@code Runnable} that allows capturing the time of the task since creation diff --git a/server/src/main/java/org/opensearch/discovery/DiscoveryModule.java b/server/src/main/java/org/opensearch/discovery/DiscoveryModule.java index 1ea850f04c9..297497d6f06 100644 --- a/server/src/main/java/org/opensearch/discovery/DiscoveryModule.java +++ b/server/src/main/java/org/opensearch/discovery/DiscoveryModule.java @@ -21,7 +21,7 @@ package org.opensearch.discovery; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.coordination.Coordinator; import org.opensearch.cluster.coordination.ElectionStrategy; diff --git a/server/src/main/java/org/opensearch/discovery/zen/ZenDiscovery.java b/server/src/main/java/org/opensearch/discovery/zen/ZenDiscovery.java index bf735339f9c..37741a14f8e 100644 --- a/server/src/main/java/org/opensearch/discovery/zen/ZenDiscovery.java +++ b/server/src/main/java/org/opensearch/discovery/zen/ZenDiscovery.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionListener; import org.opensearch.cluster.ClusterChangedEvent; import org.opensearch.cluster.ClusterName; diff --git a/server/src/main/java/org/elasticsearch/package-info.java b/server/src/main/java/org/opensearch/package-info.java similarity index 91% rename from server/src/main/java/org/elasticsearch/package-info.java rename to server/src/main/java/org/opensearch/package-info.java index de7dfceab36..1645d858e4b 100644 --- a/server/src/main/java/org/elasticsearch/package-info.java +++ b/server/src/main/java/org/opensearch/package-info.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -20,4 +20,4 @@ /** * A distributed RESTful search engine. */ -package org.elasticsearch; +package org.opensearch; diff --git a/server/src/main/java/org/opensearch/repositories/RepositoryData.java b/server/src/main/java/org/opensearch/repositories/RepositoryData.java index 0686884169c..ad548aabeb0 100644 --- a/server/src/main/java/org/opensearch/repositories/RepositoryData.java +++ b/server/src/main/java/org/opensearch/repositories/RepositoryData.java @@ -20,7 +20,7 @@ package org.opensearch.repositories; import org.elasticsearch.OpenSearchParseException; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.Version; import org.opensearch.common.Nullable; import org.opensearch.common.UUIDs; diff --git a/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java b/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java index 8e7e434a39d..cc0c9d6408b 100644 --- a/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java +++ b/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java @@ -33,7 +33,7 @@ import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.RateLimiter; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.SetOnce; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRunnable; diff --git a/server/src/main/java/org/opensearch/rest/BytesRestResponse.java b/server/src/main/java/org/opensearch/rest/BytesRestResponse.java index 5ecce3b91be..1848bb68e76 100644 --- a/server/src/main/java/org/opensearch/rest/BytesRestResponse.java +++ b/server/src/main/java/org/opensearch/rest/BytesRestResponse.java @@ -25,7 +25,7 @@ import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.util.Supplier; import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchStatusException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/server/src/main/java/org/opensearch/rest/action/RestActions.java b/server/src/main/java/org/opensearch/rest/action/RestActions.java index ab74639c826..2cf3cb776da 100644 --- a/server/src/main/java/org/opensearch/rest/action/RestActions.java +++ b/server/src/main/java/org/opensearch/rest/action/RestActions.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.FailedNodeException; import org.opensearch.action.ShardOperationFailedException; import org.opensearch.action.support.broadcast.BroadcastResponse; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/AliasesNotFoundException.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/AliasesNotFoundException.java index 16db30d5fac..bdcd07b43f8 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/AliasesNotFoundException.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/AliasesNotFoundException.java @@ -18,7 +18,7 @@ */ package org.opensearch.rest.action.admin.indices; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.common.io.stream.StreamInput; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/rest/action/document/RestGetSourceAction.java b/server/src/main/java/org/opensearch/rest/action/document/RestGetSourceAction.java index 8c6c937c21e..e35a4c79cbe 100644 --- a/server/src/main/java/org/opensearch/rest/action/document/RestGetSourceAction.java +++ b/server/src/main/java/org/opensearch/rest/action/document/RestGetSourceAction.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.document; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.get.GetRequest; import org.opensearch.action.get.GetResponse; diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java index fcec41af6ec..0bae7377942 100644 --- a/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java +++ b/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.search; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.search.SearchAction; import org.opensearch.action.search.SearchContextId; diff --git a/server/src/main/java/org/opensearch/script/ScoreScriptUtils.java b/server/src/main/java/org/opensearch/script/ScoreScriptUtils.java index aae3d1133fc..c35f172a0d4 100644 --- a/server/src/main/java/org/opensearch/script/ScoreScriptUtils.java +++ b/server/src/main/java/org/opensearch/script/ScoreScriptUtils.java @@ -21,7 +21,7 @@ package org.opensearch.script; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.StringHelper; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.common.geo.GeoDistance; import org.opensearch.common.geo.GeoPoint; import org.opensearch.common.geo.GeoUtils; diff --git a/server/src/main/java/org/opensearch/script/ScriptMetadata.java b/server/src/main/java/org/opensearch/script/ScriptMetadata.java index 70fd6edae11..5e7ed458f7e 100644 --- a/server/src/main/java/org/opensearch/script/ScriptMetadata.java +++ b/server/src/main/java/org/opensearch/script/ScriptMetadata.java @@ -18,7 +18,7 @@ */ package org.opensearch.script; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.Version; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.Diff; diff --git a/server/src/main/java/org/opensearch/script/ScriptService.java b/server/src/main/java/org/opensearch/script/ScriptService.java index 57cc4c83c9b..6e07ab0396a 100644 --- a/server/src/main/java/org/opensearch/script/ScriptService.java +++ b/server/src/main/java/org/opensearch/script/ScriptService.java @@ -21,7 +21,7 @@ package org.opensearch.script; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.action.ActionListener; import org.opensearch.action.admin.cluster.storedscripts.DeleteStoredScriptRequest; import org.opensearch.action.admin.cluster.storedscripts.GetStoredScriptRequest; diff --git a/server/src/main/java/org/opensearch/search/lookup/LeafDocLookup.java b/server/src/main/java/org/opensearch/search/lookup/LeafDocLookup.java index d5bce50d8f4..689f0c70599 100644 --- a/server/src/main/java/org/opensearch/search/lookup/LeafDocLookup.java +++ b/server/src/main/java/org/opensearch/search/lookup/LeafDocLookup.java @@ -19,13 +19,13 @@ package org.opensearch.search.lookup; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.common.Nullable; import org.opensearch.common.logging.DeprecationLogger; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.ScriptDocValues; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.MapperService; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.ScriptDocValues; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.MapperService; import java.io.IOException; import java.security.AccessController; diff --git a/server/src/main/java/org/opensearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java b/server/src/main/java/org/opensearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java index 53f3d4e05ee..12b9dd5b12e 100644 --- a/server/src/main/java/org/opensearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java +++ b/server/src/main/java/org/opensearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java @@ -27,7 +27,7 @@ import org.apache.lucene.search.spell.NGramDistance; import org.apache.lucene.search.spell.StringDistance; import org.apache.lucene.search.spell.SuggestMode; import org.apache.lucene.util.automaton.LevenshteinAutomata; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java b/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java index 76774215e37..b1d7f42010a 100644 --- a/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java +++ b/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java @@ -24,7 +24,7 @@ import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.StepListener; diff --git a/server/src/main/java/org/opensearch/tasks/TaskCancellationService.java b/server/src/main/java/org/opensearch/tasks/TaskCancellationService.java index 451d9575458..2c21005e239 100644 --- a/server/src/main/java/org/opensearch/tasks/TaskCancellationService.java +++ b/server/src/main/java/org/opensearch/tasks/TaskCancellationService.java @@ -22,7 +22,7 @@ package org.opensearch.tasks; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.OpenSearchSecurityException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.StepListener; diff --git a/server/src/main/java/org/opensearch/tasks/TaskManager.java b/server/src/main/java/org/opensearch/tasks/TaskManager.java index b3ac1dc03d5..62067bd23bb 100644 --- a/server/src/main/java/org/opensearch/tasks/TaskManager.java +++ b/server/src/main/java/org/opensearch/tasks/TaskManager.java @@ -25,8 +25,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.lucene.util.SetOnce; -import org.elasticsearch.Assertions; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.Assertions; +import org.opensearch.ExceptionsHelper; import org.opensearch.OpenSearchException; import org.elasticsearch.OpenSearchTimeoutException; import org.opensearch.action.ActionListener; diff --git a/server/src/main/java/org/opensearch/tasks/TaskResultsService.java b/server/src/main/java/org/opensearch/tasks/TaskResultsService.java index 4f5f8696a1c..49fc6dc3062 100644 --- a/server/src/main/java/org/opensearch/tasks/TaskResultsService.java +++ b/server/src/main/java/org/opensearch/tasks/TaskResultsService.java @@ -22,8 +22,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.ResourceAlreadyExistsException; +import org.opensearch.ExceptionsHelper; +import org.opensearch.ResourceAlreadyExistsException; import org.opensearch.action.ActionListener; import org.opensearch.action.admin.indices.create.CreateIndexRequest; import org.opensearch.action.admin.indices.create.CreateIndexResponse; diff --git a/server/src/main/java/org/opensearch/threadpool/Scheduler.java b/server/src/main/java/org/opensearch/threadpool/Scheduler.java index 83143cec948..f11da0fd6f1 100644 --- a/server/src/main/java/org/opensearch/threadpool/Scheduler.java +++ b/server/src/main/java/org/opensearch/threadpool/Scheduler.java @@ -19,14 +19,14 @@ package org.opensearch.threadpool; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.common.SuppressForbidden; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.common.util.concurrent.AbstractRunnable; -import org.elasticsearch.common.util.concurrent.EsAbortPolicy; -import org.elasticsearch.common.util.concurrent.EsExecutors; -import org.elasticsearch.common.util.concurrent.OpenSearchRejectedExecutionException; +import org.opensearch.common.util.concurrent.AbstractRunnable; +import org.opensearch.common.util.concurrent.EsAbortPolicy; +import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import java.util.concurrent.Delayed; import java.util.concurrent.Future; diff --git a/server/src/main/java/org/opensearch/transport/NoSuchRemoteClusterException.java b/server/src/main/java/org/opensearch/transport/NoSuchRemoteClusterException.java index e5695d602a7..d7a21dcac2f 100644 --- a/server/src/main/java/org/opensearch/transport/NoSuchRemoteClusterException.java +++ b/server/src/main/java/org/opensearch/transport/NoSuchRemoteClusterException.java @@ -19,7 +19,7 @@ package org.opensearch.transport; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.common.io.stream.StreamInput; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationStateTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationStateTests.java index 03d35a350a0..808fd42cf43 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationStateTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationStateTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.cluster.coordination; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.opensearch.Version; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java index 6a5e0c5c19f..4e7c8879529 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.cluster.metadata; -import org.elasticsearch.ResourceAlreadyExistsException; +import org.opensearch.ResourceAlreadyExistsException; import org.opensearch.Version; import org.opensearch.action.admin.indices.create.CreateIndexClusterStateUpdateRequest; import org.opensearch.cluster.ClusterName; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java index b25d58bb4ec..2609fc227fa 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java @@ -20,8 +20,8 @@ package org.elasticsearch.cluster.metadata; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; -import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.ResourceAlreadyExistsException; +import org.opensearch.ExceptionsHelper; +import org.opensearch.ResourceAlreadyExistsException; import org.opensearch.Version; import org.opensearch.action.admin.indices.alias.Alias; import org.opensearch.action.admin.indices.create.CreateIndexClusterStateUpdateRequest; diff --git a/server/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java b/server/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java index c51d72b4231..dd55abfffa7 100644 --- a/server/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java +++ b/server/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.hppc; import com.carrotsearch.hppc.ObjectHashSet; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.opensearch.common.collect.HppcMaps; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/common/util/concurrent/TimedRunnableTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/TimedRunnableTests.java index c5a52a6fa84..b7e1ef8c28c 100644 --- a/server/src/test/java/org/elasticsearch/common/util/concurrent/TimedRunnableTests.java +++ b/server/src/test/java/org/elasticsearch/common/util/concurrent/TimedRunnableTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.util.concurrent; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.elasticsearch.test.ESTestCase; import org.opensearch.common.util.concurrent.AbstractRunnable; import org.opensearch.common.util.concurrent.TimedRunnable; diff --git a/server/src/test/java/org/elasticsearch/index/analysis/ReloadableCustomAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/ReloadableCustomAnalyzerTests.java index aafda27005a..8088a1ae417 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/ReloadableCustomAnalyzerTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/ReloadableCustomAnalyzerTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java index 2d30756c3da..76661d6f214 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.mapper; import org.apache.lucene.analysis.TokenStream; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; diff --git a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java index 35010d1c8b9..a06288412bb 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.reindex; import org.opensearch.OpenSearchException; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.Version; import org.opensearch.action.bulk.BulkItemResponse.Failure; import org.opensearch.client.transport.NoNodeAvailableException; diff --git a/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java b/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java index 281a5603965..6f633b76c2e 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.shard; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.EsExecutors; diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index 55118d4cfd7..676d737da44 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -31,7 +31,7 @@ import org.apache.lucene.store.FilterDirectory; import org.apache.lucene.store.IOContext; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Constants; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.opensearch.OpenSearchException; import org.opensearch.Version; import org.opensearch.action.ActionListener; diff --git a/server/src/test/java/org/elasticsearch/index/store/StoreTests.java b/server/src/test/java/org/elasticsearch/index/store/StoreTests.java index d0ec632c905..1d7c6986854 100644 --- a/server/src/test/java/org/elasticsearch/index/store/StoreTests.java +++ b/server/src/test/java/org/elasticsearch/index/store/StoreTests.java @@ -51,7 +51,7 @@ import org.apache.lucene.store.NIOFSDirectory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.Version; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.UUIDs; import org.opensearch.common.io.stream.InputStreamStreamInput; diff --git a/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java b/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java index b3cc79030c6..e8af62563ce 100644 --- a/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java +++ b/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java @@ -34,7 +34,7 @@ import org.apache.lucene.store.ByteArrayDataOutput; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.util.LineFileDocs; import org.apache.lucene.util.LuceneTestCase; -import org.elasticsearch.Assertions; +import org.opensearch.Assertions; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.Randomness; diff --git a/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java index d61dc3b2306..e4edb6c60f2 100644 --- a/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java +++ b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java @@ -21,7 +21,7 @@ package org.elasticsearch.indices.cluster; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.action.ActionResponse; import org.opensearch.action.admin.cluster.reroute.ClusterRerouteRequest; diff --git a/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java b/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java index 4b04173648f..bb024d17d24 100644 --- a/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java +++ b/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java @@ -19,7 +19,7 @@ package org.elasticsearch.indices.flush; import org.apache.logging.log4j.Logger; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionListener; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.routing.ShardRouting; diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java index ccd5ff0ebe4..f82bcad88b9 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java @@ -33,7 +33,7 @@ import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.util.SetOnce; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.LatchedActionListener; diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java index bff1c09b5fa..b702ec46715 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java @@ -27,7 +27,7 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.NoMergePolicy; import org.apache.lucene.store.AlreadyClosedException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionListener; import org.opensearch.action.admin.indices.flush.FlushRequest; import org.opensearch.action.bulk.BulkShardRequest; diff --git a/server/src/test/java/org/elasticsearch/nodesinfo/NodeInfoStreamingTests.java b/server/src/test/java/org/elasticsearch/nodesinfo/NodeInfoStreamingTests.java index 59053c82eeb..c17a8ca2356 100644 --- a/server/src/test/java/org/elasticsearch/nodesinfo/NodeInfoStreamingTests.java +++ b/server/src/test/java/org/elasticsearch/nodesinfo/NodeInfoStreamingTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.nodesinfo; -import org.elasticsearch.Build; +import org.opensearch.Build; import org.opensearch.action.admin.cluster.node.info.NodeInfo; import org.opensearch.action.admin.cluster.node.info.PluginsAndModules; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java index 21e573096e2..755e8cfc9b7 100644 --- a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.persistent; import com.carrotsearch.hppc.cursors.ObjectCursor; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.cluster.ClusterChangedEvent; diff --git a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksCustomMetadataTests.java b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksCustomMetadataTests.java index a8b32235df8..041f4276d71 100644 --- a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksCustomMetadataTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksCustomMetadataTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.persistent; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.Version; import org.opensearch.client.transport.TransportClient; import org.opensearch.cluster.ClusterName; diff --git a/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java b/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java index 066bc3cf3c5..aaef96c6a3c 100644 --- a/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java +++ b/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java @@ -19,11 +19,11 @@ package org.opensearch.rest; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.OpenSearchStatusException; import org.opensearch.OpenSearchException; -import org.elasticsearch.ResourceAlreadyExistsException; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceAlreadyExistsException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.action.OriginalIndices; import org.opensearch.action.search.SearchPhaseExecutionException; import org.opensearch.action.search.ShardSearchFailure; diff --git a/server/src/test/java/org/opensearch/rest/action/RestMainActionTests.java b/server/src/test/java/org/opensearch/rest/action/RestMainActionTests.java index 456628fa908..5de4fecd1ff 100644 --- a/server/src/test/java/org/opensearch/rest/action/RestMainActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/RestMainActionTests.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action; -import org.elasticsearch.Build; +import org.opensearch.Build; import org.opensearch.Version; import org.opensearch.action.main.MainResponse; import org.opensearch.cluster.ClusterName; diff --git a/server/src/test/java/org/opensearch/rest/action/document/RestGetSourceActionTests.java b/server/src/test/java/org/opensearch/rest/action/document/RestGetSourceActionTests.java index ac4d83e5a65..80c4faf515b 100644 --- a/server/src/test/java/org/opensearch/rest/action/document/RestGetSourceActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/document/RestGetSourceActionTests.java @@ -19,7 +19,7 @@ package org.opensearch.rest.action.document; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.action.get.GetResponse; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; diff --git a/server/src/test/java/org/opensearch/script/ScriptServiceTests.java b/server/src/test/java/org/opensearch/script/ScriptServiceTests.java index 9cad49511e2..997a1277e5c 100644 --- a/server/src/test/java/org/opensearch/script/ScriptServiceTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptServiceTests.java @@ -18,7 +18,7 @@ */ package org.opensearch.script; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.action.admin.cluster.storedscripts.GetStoredScriptRequest; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; diff --git a/server/src/test/java/org/opensearch/script/StoredScriptTests.java b/server/src/test/java/org/opensearch/script/StoredScriptTests.java index 08e8124ffa3..340b7e7490f 100644 --- a/server/src/test/java/org/opensearch/script/StoredScriptTests.java +++ b/server/src/test/java/org/opensearch/script/StoredScriptTests.java @@ -19,7 +19,7 @@ package org.opensearch.script; -import org.elasticsearch.ResourceNotFoundException; +import org.opensearch.ResourceNotFoundException; import org.opensearch.common.ParsingException; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java index 161891f6f0f..bf11ba7d0c5 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java @@ -18,7 +18,7 @@ */ package org.opensearch.search.aggregations.bucket.geogrid; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.elasticsearch.common.xcontent.XContentParseException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; diff --git a/server/src/test/java/org/opensearch/search/aggregations/pipeline/DerivativeAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/pipeline/DerivativeAggregatorTests.java index 3810a744238..298b6dded37 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/pipeline/DerivativeAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/pipeline/DerivativeAggregatorTests.java @@ -28,7 +28,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.search.SearchPhaseExecutionException; import org.opensearch.common.CheckedConsumer; import org.elasticsearch.index.mapper.DateFieldMapper; diff --git a/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java b/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java index 0f11b1de240..aadfbba1cdd 100644 --- a/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java +++ b/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java @@ -59,7 +59,7 @@ import org.apache.lucene.util.Bits; import org.apache.lucene.util.CombinedBitSet; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.SparseFixedBitSet; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; import org.opensearch.common.lucene.index.SequentialStoredFieldsLeafReader; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java index 703c1a4cbc1..5a3f475b0aa 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java @@ -22,7 +22,7 @@ package org.opensearch.snapshots; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.util.SetOnce; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionType; diff --git a/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java b/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java index f224ed597bc..df8e637b152 100644 --- a/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java +++ b/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java @@ -19,7 +19,7 @@ package org.opensearch.transport; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.io.stream.StreamInput; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java index 994456ffb1b..d4d417138d0 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java @@ -28,7 +28,7 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.TotalHits; import org.apache.lucene.util.LuceneTestCase; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionListener; import org.opensearch.action.DocWriteResponse; import org.opensearch.action.admin.cluster.health.ClusterHealthRequest; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/SlowClusterStateProcessing.java b/test/framework/src/main/java/org/elasticsearch/test/disruption/SlowClusterStateProcessing.java index 094a00d1058..1c120418116 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/SlowClusterStateProcessing.java +++ b/test/framework/src/main/java/org/elasticsearch/test/disruption/SlowClusterStateProcessing.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.test.disruption; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Priority; import org.opensearch.common.unit.TimeValue; diff --git a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java b/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java index 262931eca7e..000a5027d7d 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java +++ b/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.DisjunctionMaxQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TotalHits; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionFuture; import org.opensearch.action.ActionRequestBuilder; import org.opensearch.action.admin.cluster.health.ClusterHealthRequestBuilder; diff --git a/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java b/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java index 943044aacb8..cf35f474bbd 100644 --- a/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java +++ b/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java @@ -26,7 +26,7 @@ import org.apache.logging.log4j.util.Supplier; import org.apache.lucene.util.CollectionUtil; import org.apache.lucene.util.Constants; import org.opensearch.OpenSearchException; -import org.elasticsearch.ExceptionsHelper; +import org.opensearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionListenerResponseHandler;