From 0deb25590dc934fcfaada99ec2d1adb240741035 Mon Sep 17 00:00:00 2001 From: Nick Knize Date: Fri, 12 Mar 2021 16:35:46 -0600 Subject: [PATCH] [Rename] server OpenSearch classes (#290) This commit refactors all OpenSearch classes in the root server package to o.opensearch. All references throughout the codebase are also refactored. Signed-off-by: Nicholas Knize --- .../client/benchmark/ops/bulk/BulkBenchmarkTask.java | 2 +- .../client/benchmark/rest/RestClientBenchmark.java | 2 +- .../transport/TransportClientBenchmark.java | 2 +- .../org/elasticsearch/client/GetAliasesResponse.java | 2 +- .../elasticsearch/client/NodesResponseHeader.java | 2 +- .../elasticsearch/client/RestHighLevelClient.java | 4 ++-- .../client/indices/CloseIndexResponse.java | 2 +- .../client/indices/CreateIndexRequest.java | 4 ++-- .../client/indices/PutIndexTemplateRequest.java | 4 ++-- .../client/indices/PutMappingRequest.java | 2 +- .../client/tasks/ElasticsearchException.java | 2 +- .../org/elasticsearch/client/ClusterClientIT.java | 4 ++-- .../test/java/org/elasticsearch/client/CrudIT.java | 4 ++-- .../org/elasticsearch/client/IndicesClientIT.java | 4 ++-- .../client/NodesResponseHeaderTestUtils.java | 2 +- .../client/RestHighLevelClientTests.java | 2 +- .../test/java/org/elasticsearch/client/SearchIT.java | 4 ++-- .../java/org/elasticsearch/client/SnapshotIT.java | 2 +- .../org/elasticsearch/client/StoredScriptsIT.java | 2 +- .../client/documentation/CRUDDocumentationIT.java | 2 +- .../documentation/IndicesClientDocumentationIT.java | 2 +- .../documentation/TasksClientDocumentationIT.java | 2 +- .../client/indices/CloseIndexResponseTests.java | 2 +- .../indices/DataStreamsStatsResponseTests.java | 2 +- .../client/tasks/CancelTasksResponseTests.java | 2 +- .../client/tasks/OpenSearchExceptionTests.java | 2 +- .../docker/test/DockerYmlTestSuiteIT.java | 2 +- .../opensearch/geometry/BaseGeometryTestCase.java | 2 +- .../matrix/stats/MatrixStatsResults.java | 2 +- .../aggregations/matrix/stats/RunningStats.java | 2 +- .../opensearch/ingest/common/HtmlStripProcessor.java | 2 +- .../AbstractStringProcessorFactoryTestCase.java | 2 +- .../ingest/common/AppendProcessorFactoryTests.java | 4 ++-- .../ingest/common/BytesProcessorTests.java | 2 +- .../ingest/common/ConvertProcessorFactoryTests.java | 2 +- .../ingest/common/DateIndexNameFactoryTests.java | 2 +- .../ingest/common/DateProcessorFactoryTests.java | 2 +- .../ingest/common/DissectProcessorFactoryTests.java | 2 +- .../common/DotExpanderProcessorFactoryTests.java | 2 +- .../ingest/common/FailProcessorFactoryTests.java | 4 ++-- .../ingest/common/ForEachProcessorFactoryTests.java | 2 +- .../ingest/common/GrokProcessorFactoryTests.java | 2 +- .../ingest/common/GsubProcessorFactoryTests.java | 2 +- .../ingest/common/JoinProcessorFactoryTests.java | 2 +- .../ingest/common/JsonProcessorFactoryTests.java | 4 ++-- .../ingest/common/KeyValueProcessorFactoryTests.java | 4 ++-- .../ingest/common/RemoveProcessorFactoryTests.java | 4 ++-- .../ingest/common/RenameProcessorFactoryTests.java | 2 +- .../ingest/common/ScriptProcessorFactoryTests.java | 2 +- .../ingest/common/SetProcessorFactoryTests.java | 4 ++-- .../ingest/common/SortProcessorFactoryTests.java | 2 +- .../ingest/common/SplitProcessorFactoryTests.java | 2 +- .../org/opensearch/ingest/geoip/GeoIpProcessor.java | 2 +- .../ingest/geoip/GeoIpProcessorFactoryTests.java | 2 +- .../opensearch/ingest/useragent/UserAgentParser.java | 2 +- .../useragent/UserAgentProcessorFactoryTests.java | 2 +- .../script/mustache/MultiSearchTemplateResponse.java | 2 +- .../mustache/MultiSearchTemplateResponseTests.java | 2 +- .../java/org/opensearch/painless/DebugTests.java | 2 +- .../mapper/TokenCountFieldMapperIntegrationIT.java | 2 +- .../index/mapper/SearchAsYouTypeFieldTypeTests.java | 2 +- .../opensearch/join/query/HasChildQueryBuilder.java | 2 +- .../opensearch/join/query/HasParentQueryBuilder.java | 2 +- .../opensearch/join/query/ParentIdQueryBuilder.java | 2 +- .../join/query/HasChildQueryBuilderTests.java | 2 +- .../join/query/HasParentQueryBuilderTests.java | 2 +- .../join/query/ParentIdQueryBuilderTests.java | 2 +- .../percolator/PercolatorQuerySearchIT.java | 2 +- .../opensearch/percolator/PercolateQueryBuilder.java | 2 +- .../percolator/PercolateQueryBuilderTests.java | 2 +- .../opensearch/index/rankeval/RankEvalRequestIT.java | 2 +- .../opensearch/index/rankeval/RankEvalResponse.java | 2 +- .../index/rankeval/RankEvalResponseTests.java | 2 +- .../index/reindex/remote/RemoteRequestBuilders.java | 2 +- .../reindex/remote/RemoteScrollableHitSource.java | 4 ++-- .../index/reindex/AsyncBulkByScrollActionTests.java | 2 +- .../reindex/ReindexFromRemoteWithAuthTests.java | 4 ++-- .../opensearch/index/reindex/RethrottleTests.java | 2 +- .../remote/RemoteScrollableHitSourceTests.java | 2 +- .../netty4/Netty4MessageChannelHandler.java | 2 +- .../http/netty4/Netty4BadRequestTests.java | 2 +- .../http/netty4/Netty4HttpServerTransportTests.java | 2 +- .../OpenSearchCorruptionException.java | 4 ++-- .../OpenSearchException.java | 2 +- .../OpenSearchGenerationException.java | 4 ++-- .../OpenSearchParseException.java | 4 ++-- .../OpenSearchSecurityException.java | 5 +++-- .../OpenSearchStatusException.java | 4 ++-- .../OpenSearchTimeoutException.java | 4 ++-- .../OpenSearchWrapperException.java | 4 ++-- .../org/opensearch/action/FailedNodeException.java | 2 +- .../action/NoShardAvailableActionException.java | 2 +- .../action/PrimaryMissingActionException.java | 2 +- .../opensearch/action/RoutingMissingException.java | 2 +- .../org/opensearch/action/TaskOperationFailure.java | 2 +- .../opensearch/action/TimestampParsingException.java | 2 +- .../action/UnavailableShardsException.java | 2 +- .../snapshots/status/SnapshotIndexShardStatus.java | 2 +- .../opensearch/action/admin/indices/alias/Alias.java | 2 +- .../admin/indices/close/CloseIndexResponse.java | 2 +- .../indices/readonly/AddIndexBlockResponse.java | 2 +- .../indices/shards/IndicesShardStoresResponse.java | 2 +- .../org/opensearch/action/bulk/BulkItemResponse.java | 2 +- .../client/transport/NoNodeAvailableException.java | 2 +- .../java/org/opensearch/rest/BytesRestResponse.java | 8 ++++---- .../main/java/org/opensearch/rest/RestRequest.java | 2 +- .../java/org/opensearch/rest/RestRequestFilter.java | 2 +- .../main/java/org/opensearch/rest/RestResponse.java | 2 +- .../opensearch/rest/action/cat/RestCountAction.java | 2 +- .../cluster/NodeConnectionsServiceTests.java | 2 +- .../coordination/ClusterBootstrapServiceTests.java | 2 +- .../cluster/coordination/CoordinatorTests.java | 2 +- .../cluster/coordination/FollowersCheckerTests.java | 2 +- .../cluster/coordination/LeaderCheckerTests.java | 2 +- .../PublicationTransportHandlerTests.java | 2 +- .../metadata/DateMathExpressionResolverTests.java | 2 +- .../cluster/routing/BatchedRerouteServiceTests.java | 2 +- .../cluster/routing/RoutingTableGenerator.java | 2 +- .../allocation/RetryFailedAllocationTests.java | 2 +- .../cluster/service/MasterServiceTests.java | 2 +- .../common/geo/GeoBoundingBoxTests.java | 2 +- .../common/geo/GeoJsonShapeParserTests.java | 2 +- .../common/geo/GeoWKTShapeParserTests.java | 4 ++-- .../common/geo/GeometryParserTests.java | 2 +- .../common/joda/JavaJodaTimeDuellingTests.java | 2 +- .../common/joda/JodaDateMathParserTests.java | 2 +- .../elasticsearch/common/settings/SettingsTests.java | 2 +- .../common/time/JavaDateMathParserTests.java | 2 +- .../common/unit/ByteSizeValueTests.java | 2 +- .../elasticsearch/common/unit/RatioValueTests.java | 2 +- .../index/engine/CompletionStatsCacheTests.java | 2 +- .../index/engine/InternalEngineTests.java | 2 +- .../index/mapper/IgnoredFieldTypeTests.java | 2 +- .../index/mapper/KeywordFieldTypeTests.java | 2 +- .../index/mapper/LegacyGeoShapeFieldMapperTests.java | 2 +- .../index/mapper/RangeFieldTypeTests.java | 2 +- .../index/mapper/RoutingFieldTypeTests.java | 2 +- .../index/mapper/TextFieldTypeTests.java | 2 +- .../index/query/FuzzyQueryBuilderTests.java | 2 +- .../index/query/GeoBoundingBoxQueryBuilderTests.java | 2 +- .../index/query/GeoShapeQueryBuilderTests.java | 2 +- .../index/query/MoreLikeThisQueryBuilderTests.java | 2 +- .../index/query/NestedQueryBuilderTests.java | 2 +- .../index/query/RangeQueryBuilderTests.java | 2 +- .../index/query/ScriptQueryBuilderTests.java | 2 +- .../index/query/ScriptScoreQueryBuilderTests.java | 2 +- .../index/query/TermsQueryBuilderTests.java | 2 +- .../query/functionscore/FunctionScoreTests.java | 2 +- .../index/reindex/BulkByScrollResponseTests.java | 2 +- .../BulkByScrollTaskStatusOrExceptionTests.java | 2 +- .../index/reindex/BulkByScrollTaskStatusTests.java | 2 +- .../index/search/geo/GeoPointParsingTests.java | 2 +- .../index/search/geo/GeoUtilsTests.java | 2 +- .../index/seqno/LocalCheckpointTrackerTests.java | 2 +- .../elasticsearch/index/shard/IndexShardTests.java | 2 +- .../shard/RemoveCorruptedShardDataCommandTests.java | 2 +- .../index/snapshots/blobstore/FileInfoTests.java | 2 +- .../index/translog/SnapshotMatchers.java | 2 +- .../recovery/RecoveryRequestTrackerTests.java | 2 +- .../recovery/RecoveriesCollectionTests.java | 12 ++++++------ .../org/elasticsearch/search/SearchServiceTests.java | 2 +- .../bucket/composite/CompositeAggregatorTests.java | 2 +- .../bucket/range/DateRangeAggregatorTests.java | 2 +- .../search/rescore/QueryRescorerBuilderTests.java | 2 +- .../search/sort/GeoDistanceSortBuilderTests.java | 2 +- .../suggest/completion/GeoContextMappingTests.java | 2 +- .../elasticsearch/test/geo/RandomShapeGenerator.java | 2 +- .../elasticsearch/transport/InboundHandlerTests.java | 2 +- .../transport/OutboundHandlerTests.java | 2 +- .../elasticsearch/transport/TcpTransportTests.java | 2 +- .../transport/TransportActionProxyTests.java | 2 +- .../opensearch/repositories/RepositoryDataTests.java | 2 +- .../org/opensearch/rest/BytesRestResponseTests.java | 4 ++-- .../java/org/opensearch/rest/RestRequestTests.java | 2 +- .../test/java/org/opensearch/script/ScriptTests.java | 2 +- .../opensearch/snapshots/BlobStoreFormatTests.java | 4 ++-- .../org/opensearch/tasks/ListTasksResponseTests.java | 2 +- .../threadpool/ScheduleWithFixedDelayTests.java | 2 +- .../coordination/AbstractCoordinatorTestCase.java | 2 +- .../test/AbstractBroadcastResponseTestCase.java | 2 +- .../elasticsearch/test/AbstractQueryTestCase.java | 2 +- .../org/elasticsearch/test/ClusterServiceUtils.java | 2 +- .../java/org/elasticsearch/test/ESIntegTestCase.java | 2 +- .../org/elasticsearch/test/InternalTestCluster.java | 2 +- .../java/org/elasticsearch/test/RandomObjects.java | 2 +- .../org/elasticsearch/test/TestCustomMetadata.java | 2 +- .../org/elasticsearch/test/client/NoOpClient.java | 2 +- .../elasticsearch/test/client/NoOpNodeClient.java | 2 +- .../elasticsearch/test/engine/MockEngineSupport.java | 2 +- .../test/hamcrest/ElasticsearchAssertions.java | 2 +- .../transport/AbstractSimpleTransportTestCase.java | 2 +- .../transport/nio/MockNioTransport.java | 2 +- .../snapshots/mockstore/MockRepository.java | 2 +- 193 files changed, 227 insertions(+), 226 deletions(-) rename server/src/main/java/org/{elasticsearch => opensearch}/OpenSearchCorruptionException.java (95%) rename server/src/main/java/org/{elasticsearch => opensearch}/OpenSearchException.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/OpenSearchGenerationException.java (94%) rename server/src/main/java/org/{elasticsearch => opensearch}/OpenSearchParseException.java (95%) rename server/src/main/java/org/{elasticsearch => opensearch}/OpenSearchSecurityException.java (94%) rename server/src/main/java/org/{elasticsearch => opensearch}/OpenSearchStatusException.java (96%) rename server/src/main/java/org/{elasticsearch => opensearch}/OpenSearchTimeoutException.java (94%) rename server/src/main/java/org/{elasticsearch => opensearch}/OpenSearchWrapperException.java (93%) diff --git a/client/benchmark/src/main/java/org/opensearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java b/client/benchmark/src/main/java/org/opensearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java index c81ea7344a5..19fa63aa2ad 100644 --- a/client/benchmark/src/main/java/org/opensearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java +++ b/client/benchmark/src/main/java/org/opensearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java @@ -20,7 +20,7 @@ package org.opensearch.client.benchmark.ops.bulk; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.client.benchmark.BenchmarkTask; import org.opensearch.client.benchmark.metrics.Sample; import org.opensearch.client.benchmark.metrics.SampleRecorder; diff --git a/client/benchmark/src/main/java/org/opensearch/client/benchmark/rest/RestClientBenchmark.java b/client/benchmark/src/main/java/org/opensearch/client/benchmark/rest/RestClientBenchmark.java index 7e8ff42f899..86d39ba6842 100644 --- a/client/benchmark/src/main/java/org/opensearch/client/benchmark/rest/RestClientBenchmark.java +++ b/client/benchmark/src/main/java/org/opensearch/client/benchmark/rest/RestClientBenchmark.java @@ -22,7 +22,7 @@ import org.apache.http.HttpHeaders; import org.apache.http.HttpHost; import org.apache.http.HttpStatus; import org.apache.http.message.BasicHeader; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.client.Request; import org.elasticsearch.client.Response; import org.elasticsearch.client.RestClient; diff --git a/client/benchmark/src/main/java/org/opensearch/client/benchmark/transport/TransportClientBenchmark.java b/client/benchmark/src/main/java/org/opensearch/client/benchmark/transport/TransportClientBenchmark.java index ba463c60783..ccbbf8c1113 100644 --- a/client/benchmark/src/main/java/org/opensearch/client/benchmark/transport/TransportClientBenchmark.java +++ b/client/benchmark/src/main/java/org/opensearch/client/benchmark/transport/TransportClientBenchmark.java @@ -18,7 +18,7 @@ */ package org.opensearch.client.benchmark.transport; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.bulk.BulkRequest; import org.opensearch.action.bulk.BulkResponse; import org.elasticsearch.action.index.IndexRequest; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/GetAliasesResponse.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/GetAliasesResponse.java index 02a3629839d..459c2b45b9a 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/GetAliasesResponse.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/GetAliasesResponse.java @@ -19,7 +19,7 @@ package org.elasticsearch.client; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.cluster.metadata.AliasMetadata; import org.elasticsearch.common.xcontent.StatusToXContentObject; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/NodesResponseHeader.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/NodesResponseHeader.java index ed6bd921de6..cb40c4f1adb 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/NodesResponseHeader.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/NodesResponseHeader.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.client; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.action.support.nodes.BaseNodesResponse; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java index ab5ccb62f5f..e3e25536db7 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java @@ -20,8 +20,8 @@ package org.elasticsearch.client; import org.apache.http.HttpEntity; -import org.elasticsearch.OpenSearchException; -import org.elasticsearch.OpenSearchStatusException; +import org.opensearch.OpenSearchException; +import org.opensearch.OpenSearchStatusException; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/CloseIndexResponse.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/CloseIndexResponse.java index 8f149eb7c35..20fabce99f5 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/CloseIndexResponse.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/CloseIndexResponse.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.client.indices; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.master.ShardsAcknowledgedResponse; import org.elasticsearch.common.Nullable; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/CreateIndexRequest.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/CreateIndexRequest.java index cece2520c3d..be918332d3a 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/CreateIndexRequest.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/CreateIndexRequest.java @@ -19,8 +19,8 @@ package org.elasticsearch.client.indices; -import org.elasticsearch.OpenSearchGenerationException; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchGenerationException; +import org.opensearch.OpenSearchParseException; import org.opensearch.action.admin.indices.alias.Alias; import org.opensearch.action.support.ActiveShardCount; import org.elasticsearch.client.TimedRequest; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/PutIndexTemplateRequest.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/PutIndexTemplateRequest.java index ff8ba3e938f..dfb268b2366 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/PutIndexTemplateRequest.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/PutIndexTemplateRequest.java @@ -18,8 +18,8 @@ */ package org.elasticsearch.client.indices; -import org.elasticsearch.OpenSearchGenerationException; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchGenerationException; +import org.opensearch.OpenSearchParseException; import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.IndicesRequest; import org.opensearch.action.admin.indices.alias.Alias; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/PutMappingRequest.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/PutMappingRequest.java index 2cf6c2f84cb..8d104e501cd 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/PutMappingRequest.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/indices/PutMappingRequest.java @@ -19,7 +19,7 @@ package org.elasticsearch.client.indices; -import org.elasticsearch.OpenSearchGenerationException; +import org.opensearch.OpenSearchGenerationException; import org.opensearch.action.IndicesRequest; import org.opensearch.action.support.IndicesOptions; import org.elasticsearch.client.TimedRequest; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/tasks/ElasticsearchException.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/tasks/ElasticsearchException.java index 598e33670b8..ee7e3ef34d3 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/tasks/ElasticsearchException.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/tasks/ElasticsearchException.java @@ -17,7 +17,7 @@ * under the License. */ package org.elasticsearch.client.tasks; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.XContentParser; import java.io.IOException; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/ClusterClientIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/ClusterClientIT.java index 329787e7602..9ae088e189a 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/ClusterClientIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/ClusterClientIT.java @@ -20,8 +20,8 @@ package org.elasticsearch.client; import org.apache.http.util.EntityUtils; -import org.elasticsearch.OpenSearchException; -import org.elasticsearch.OpenSearchStatusException; +import org.opensearch.OpenSearchException; +import org.opensearch.OpenSearchStatusException; import org.opensearch.action.admin.cluster.health.ClusterHealthRequest; import org.opensearch.action.admin.cluster.health.ClusterHealthResponse; import org.opensearch.action.admin.cluster.settings.ClusterGetSettingsRequest; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java index 4c9ddb82857..14383f7d549 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/CrudIT.java @@ -19,8 +19,8 @@ package org.elasticsearch.client; -import org.elasticsearch.OpenSearchException; -import org.elasticsearch.OpenSearchStatusException; +import org.opensearch.OpenSearchException; +import org.opensearch.OpenSearchStatusException; import org.opensearch.action.DocWriteRequest; import org.opensearch.action.DocWriteResponse; import org.opensearch.action.bulk.BulkItemResponse; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java index a2569c99b21..644f8913064 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java @@ -22,8 +22,8 @@ package org.elasticsearch.client; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPut; -import org.elasticsearch.OpenSearchException; -import org.elasticsearch.OpenSearchStatusException; +import org.opensearch.OpenSearchException; +import org.opensearch.OpenSearchStatusException; import org.opensearch.action.admin.indices.alias.Alias; import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest; import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/NodesResponseHeaderTestUtils.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/NodesResponseHeaderTestUtils.java index 73911f4d69b..ca8ed3a3c0a 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/NodesResponseHeaderTestUtils.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/NodesResponseHeaderTestUtils.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.client; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java index 7e9fc9ccb0b..c97686a5eb5 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java @@ -33,7 +33,7 @@ import org.apache.http.message.BasicRequestLine; import org.apache.http.message.BasicStatusLine; import org.apache.http.nio.entity.NByteArrayEntity; import org.apache.http.nio.entity.NStringEntity; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java index 248079a75ee..1a890e07086 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java @@ -21,8 +21,8 @@ package org.elasticsearch.client; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPut; -import org.elasticsearch.OpenSearchException; -import org.elasticsearch.OpenSearchStatusException; +import org.opensearch.OpenSearchException; +import org.opensearch.OpenSearchStatusException; import org.elasticsearch.action.explain.ExplainRequest; import org.elasticsearch.action.explain.ExplainResponse; import org.elasticsearch.action.fieldcaps.FieldCapabilities; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/SnapshotIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/SnapshotIT.java index 80c06871469..74771e73ef8 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/SnapshotIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/SnapshotIT.java @@ -19,7 +19,7 @@ package org.elasticsearch.client; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.admin.cluster.repositories.cleanup.CleanupRepositoryRequest; import org.opensearch.action.admin.cluster.repositories.cleanup.CleanupRepositoryResponse; import org.opensearch.action.admin.cluster.repositories.delete.DeleteRepositoryRequest; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/StoredScriptsIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/StoredScriptsIT.java index f4e50bd040d..18d868ee567 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/StoredScriptsIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/StoredScriptsIT.java @@ -18,7 +18,7 @@ package org.elasticsearch.client; * under the License. */ -import org.elasticsearch.OpenSearchStatusException; +import org.opensearch.OpenSearchStatusException; import org.opensearch.action.admin.cluster.storedscripts.DeleteStoredScriptRequest; import org.opensearch.action.admin.cluster.storedscripts.GetStoredScriptRequest; import org.opensearch.action.admin.cluster.storedscripts.GetStoredScriptResponse; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java index 2f967b57b5c..105a4c91281 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CRUDDocumentationIT.java @@ -20,7 +20,7 @@ package org.elasticsearch.client.documentation; import org.apache.http.HttpHost; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; import org.opensearch.action.DocWriteRequest; import org.opensearch.action.DocWriteResponse; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java index b81168e36e4..d55db503804 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java @@ -19,7 +19,7 @@ package org.elasticsearch.client.documentation; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; import org.opensearch.action.LatchedActionListener; import org.opensearch.action.admin.indices.alias.Alias; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TasksClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TasksClientDocumentationIT.java index dfc82daa416..007b94acae4 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TasksClientDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/TasksClientDocumentationIT.java @@ -19,7 +19,7 @@ package org.elasticsearch.client.documentation; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; import org.opensearch.action.LatchedActionListener; import org.opensearch.action.TaskOperationFailure; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/indices/CloseIndexResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/indices/CloseIndexResponseTests.java index d3736a9ba75..f6a4a1ddc3b 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/indices/CloseIndexResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/indices/CloseIndexResponseTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.client.indices; -import org.elasticsearch.OpenSearchStatusException; +import org.opensearch.OpenSearchStatusException; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.action.support.master.ShardsAcknowledgedResponse; import org.elasticsearch.client.AbstractResponseTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/indices/DataStreamsStatsResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/indices/DataStreamsStatsResponseTests.java index bf914e71d3c..c4d90b40614 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/indices/DataStreamsStatsResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/indices/DataStreamsStatsResponseTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.client.indices; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.admin.indices.datastream.DataStreamsStatsAction; import org.opensearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.client.AbstractResponseTestCase; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/tasks/CancelTasksResponseTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/tasks/CancelTasksResponseTests.java index 53f30537ee8..759d29a1ea7 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/tasks/CancelTasksResponseTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/tasks/CancelTasksResponseTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.client.tasks; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.action.TaskOperationFailure; import org.opensearch.action.admin.cluster.node.tasks.cancel.CancelTasksResponse; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/tasks/OpenSearchExceptionTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/tasks/OpenSearchExceptionTests.java index bcd95507917..be70be86465 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/tasks/OpenSearchExceptionTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/tasks/OpenSearchExceptionTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.client.tasks; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.client.AbstractResponseTestCase; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; diff --git a/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java b/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java index 6da61196111..46ba0b2a9e2 100644 --- a/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java +++ b/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java @@ -19,7 +19,7 @@ package org.elasticsearch.docker.test; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.client.Request; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.Settings; diff --git a/libs/geo/src/test/java/org/opensearch/geometry/BaseGeometryTestCase.java b/libs/geo/src/test/java/org/opensearch/geometry/BaseGeometryTestCase.java index 8e5c599bb46..8ee13dac2ae 100644 --- a/libs/geo/src/test/java/org/opensearch/geometry/BaseGeometryTestCase.java +++ b/libs/geo/src/test/java/org/opensearch/geometry/BaseGeometryTestCase.java @@ -19,7 +19,7 @@ package org.opensearch.geometry; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.geometry.utils.GeographyValidator; import org.opensearch.geometry.utils.WellKnownText; diff --git a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsResults.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsResults.java index dac0a204389..685e414c142 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsResults.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsResults.java @@ -18,7 +18,7 @@ */ package org.opensearch.search.aggregations.matrix.stats; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; diff --git a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/RunningStats.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/RunningStats.java index 4e17b7716fa..e9fb12fa554 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/RunningStats.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/RunningStats.java @@ -18,7 +18,7 @@ */ package org.opensearch.search.aggregations.matrix.stats; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/HtmlStripProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/HtmlStripProcessor.java index 2f71d16ea8a..e273a80e8a5 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/HtmlStripProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/HtmlStripProcessor.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.common; import org.apache.lucene.analysis.charfilter.HTMLStripCharFilter; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import java.io.IOException; import java.io.StringReader; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorFactoryTestCase.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorFactoryTestCase.java index 3a2caf751bd..aaf9aff84e3 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorFactoryTestCase.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorFactoryTestCase.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.ingest.RandomDocumentPicks; import org.elasticsearch.test.ESTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorFactoryTests.java index 24b39a027a3..d1114b50773 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorFactoryTests.java @@ -19,8 +19,8 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchException; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/BytesProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/BytesProcessorTests.java index e0a208c5efb..446c6b9c8e9 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/BytesProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/BytesProcessorTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.ingest.IngestDocument; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorFactoryTests.java index c372e33be99..8c6f3eb3444 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameFactoryTests.java index 15ef3bbace4..66542dca216 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorFactoryTests.java index feefc7fee26..9841a89e2a1 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorFactoryTests.java index db3502f9a17..4e9a1174719 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.opensearch.dissect.DissectException; import org.elasticsearch.ingest.RandomDocumentPicks; import org.elasticsearch.test.ESTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorFactoryTests.java index 86cb1adcda1..649c85e8d81 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.test.ESTestCase; import java.util.HashMap; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorFactoryTests.java index 0097c9da761..41b0bffa47c 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorFactoryTests.java @@ -19,8 +19,8 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchException; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java index 7d5d90aea9a..cc5f310fd3b 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.ingest.Processor; import org.elasticsearch.ingest.TestProcessor; import org.opensearch.script.ScriptService; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorFactoryTests.java index ab578ebd5f6..65ccf3c11fe 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.opensearch.grok.MatcherWatchdog; import org.elasticsearch.test.ESTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GsubProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GsubProcessorFactoryTests.java index 8124621fc1a..4c28e7751a0 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GsubProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GsubProcessorFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import java.util.HashMap; import java.util.Map; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorFactoryTests.java index e7d2133e8db..b6b7681615f 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.test.ESTestCase; import java.util.HashMap; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorFactoryTests.java index 66363cf1044..01cb48dde0e 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorFactoryTests.java @@ -19,8 +19,8 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchException; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.test.ESTestCase; import java.util.HashMap; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorFactoryTests.java index 5eb11a4a435..a059ec5249a 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorFactoryTests.java @@ -19,8 +19,8 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchException; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.test.ESTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java index 56219be4c5f..ef31a58c498 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java @@ -19,8 +19,8 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchException; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorFactoryTests.java index 02958cceecb..d36d6cf03fe 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorFactoryTests.java index c150f4fb34f..bacc49ea5fd 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParseException; import org.opensearch.script.IngestScript; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorFactoryTests.java index 0c8b1f78ba2..ae34cc1964a 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorFactoryTests.java @@ -19,8 +19,8 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchException; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorFactoryTests.java index a2b331b2e0c..6fd4d989b9c 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.ingest.RandomDocumentPicks; import org.elasticsearch.test.ESTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorFactoryTests.java index 8e9689aae6b..18fc74edac8 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.test.ESTestCase; import java.util.HashMap; 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 9c4f0cd6c07..2f8025b1e49 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 @@ -29,7 +29,7 @@ import com.maxmind.geoip2.record.Continent; import com.maxmind.geoip2.record.Country; import com.maxmind.geoip2.record.Location; import com.maxmind.geoip2.record.Subdivision; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.SpecialPermission; import org.elasticsearch.common.network.InetAddresses; import org.elasticsearch.common.network.NetworkAddress; diff --git a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java index 8edb1218c1c..f842097b67a 100644 --- a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java +++ b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.geoip; import com.carrotsearch.randomizedtesting.generators.RandomPicks; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.Randomness; import org.elasticsearch.index.VersionType; import org.elasticsearch.ingest.IngestDocument; diff --git a/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentParser.java b/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentParser.java index 46723346793..d03f1d03351 100644 --- a/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentParser.java +++ b/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentParser.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.useragent; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.xcontent.LoggingDeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentFactory; diff --git a/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java b/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java index 7cc6babf27f..a166e2954ce 100644 --- a/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java +++ b/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.useragent; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.Strings; import org.elasticsearch.test.ESTestCase; import org.junit.BeforeClass; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MultiSearchTemplateResponse.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MultiSearchTemplateResponse.java index 714dc196484..a17fd0649df 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MultiSearchTemplateResponse.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MultiSearchTemplateResponse.java @@ -19,7 +19,7 @@ package org.opensearch.script.mustache; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.action.ActionResponse; import org.elasticsearch.action.search.MultiSearchResponse; diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateResponseTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateResponseTests.java index 45d8c8c22ae..0eefbaf5a9f 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateResponseTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateResponseTests.java @@ -18,7 +18,7 @@ */ package org.opensearch.script.mustache; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.ShardSearchFailure; import org.elasticsearch.common.Strings; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/DebugTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/DebugTests.java index 20aa8e6433f..354c266fac7 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/DebugTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/DebugTests.java @@ -19,7 +19,7 @@ package org.opensearch.painless; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; import org.opensearch.painless.lookup.PainlessLookup; diff --git a/modules/mapper-extras/src/javaRestTest/java/org/elasticsearch/index/mapper/TokenCountFieldMapperIntegrationIT.java b/modules/mapper-extras/src/javaRestTest/java/org/elasticsearch/index/mapper/TokenCountFieldMapperIntegrationIT.java index 2b36796d8d2..bf404891558 100644 --- a/modules/mapper-extras/src/javaRestTest/java/org/elasticsearch/index/mapper/TokenCountFieldMapperIntegrationIT.java +++ b/modules/mapper-extras/src/javaRestTest/java/org/elasticsearch/index/mapper/TokenCountFieldMapperIntegrationIT.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.mapper; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.DocWriteResponse; import org.opensearch.action.bulk.BulkResponse; import org.elasticsearch.action.index.IndexRequestBuilder; diff --git a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldTypeTests.java b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldTypeTests.java index 583174b3664..8b9592fd285 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldTypeTests.java +++ b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldTypeTests.java @@ -27,7 +27,7 @@ import org.apache.lucene.search.PrefixQuery; import org.apache.lucene.search.TermInSetQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.index.mapper.SearchAsYouTypeFieldMapper.Defaults; import org.elasticsearch.index.mapper.SearchAsYouTypeFieldMapper.PrefixFieldType; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/query/HasChildQueryBuilder.java b/modules/parent-join/src/main/java/org/opensearch/join/query/HasChildQueryBuilder.java index def73821a81..30e980d2a6c 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/query/HasChildQueryBuilder.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/query/HasChildQueryBuilder.java @@ -27,7 +27,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.join.JoinUtil; import org.apache.lucene.search.join.ScoreMode; import org.apache.lucene.search.similarities.Similarity; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/query/HasParentQueryBuilder.java b/modules/parent-join/src/main/java/org/opensearch/join/query/HasParentQueryBuilder.java index 7620b096a91..1e4089e4652 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/query/HasParentQueryBuilder.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/query/HasParentQueryBuilder.java @@ -21,7 +21,7 @@ package org.opensearch.join.query; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.join.ScoreMode; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/query/ParentIdQueryBuilder.java b/modules/parent-join/src/main/java/org/opensearch/join/query/ParentIdQueryBuilder.java index d4297be518b..bb7f17c8a2c 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/query/ParentIdQueryBuilder.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/query/ParentIdQueryBuilder.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java b/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java index 31a230962fb..b80ad069608 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java @@ -31,7 +31,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.join.ScoreMode; import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper; import org.apache.lucene.search.similarities.Similarity; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.compress.CompressedXContent; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java b/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java index 9d7eeebe0c9..1f9742fa34a 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java @@ -22,7 +22,7 @@ package org.opensearch.join.query; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.join.ScoreMode; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.compress.CompressedXContent; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java b/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java index c20c346135f..87064afbc81 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java b/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java index b4cfeb17c31..a7cda0bf55f 100644 --- a/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java +++ b/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java @@ -19,7 +19,7 @@ package org.opensearch.percolator; import org.apache.lucene.search.join.ScoreMode; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest; import org.elasticsearch.action.search.MultiSearchResponse; import org.elasticsearch.action.search.SearchResponse; 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 b5ad3d0c018..7adf0757662 100644 --- a/modules/percolator/src/main/java/org/opensearch/percolator/PercolateQueryBuilder.java +++ b/modules/percolator/src/main/java/org/opensearch/percolator/PercolateQueryBuilder.java @@ -42,7 +42,7 @@ import org.apache.lucene.util.BitDocIdSet; import org.apache.lucene.util.BitSet; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.SetOnce; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.Version; import org.opensearch.action.ActionListener; 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 d469a7aeb09..4e3640d440b 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java @@ -20,7 +20,7 @@ package org.opensearch.percolator; import org.apache.lucene.search.Query; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.ResourceNotFoundException; import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest; import org.elasticsearch.action.get.GetRequest; diff --git a/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java b/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java index 6082d1550f0..3e512af27e4 100644 --- a/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java +++ b/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java @@ -19,7 +19,7 @@ package org.opensearch.index.rankeval; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions; import org.elasticsearch.action.search.SearchRequest; import org.opensearch.action.support.IndicesOptions; diff --git a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalResponse.java b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalResponse.java index 7ea507cfa07..1d7c4045ffc 100644 --- a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalResponse.java +++ b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalResponse.java @@ -19,7 +19,7 @@ package org.opensearch.index.rankeval; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.ActionResponse; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalResponseTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalResponseTests.java index 0ef3657cd37..d1adb64d815 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalResponseTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalResponseTests.java @@ -19,7 +19,7 @@ package org.opensearch.index.rankeval; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.OriginalIndices; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.ShardSearchFailure; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java index 1375fb923ad..0614b35cca6 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java @@ -21,7 +21,7 @@ package org.opensearch.index.reindex.remote; import org.apache.http.entity.ContentType; import org.apache.http.nio.entity.NStringEntity; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.client.Request; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java index 87cd3bbd4d1..47a08f60e82 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java @@ -26,8 +26,8 @@ import org.apache.http.util.EntityUtils; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.util.Supplier; -import org.elasticsearch.OpenSearchException;; -import org.elasticsearch.OpenSearchStatusException; +import org.opensearch.OpenSearchException;; +import org.opensearch.OpenSearchStatusException; import org.elasticsearch.Version; import org.opensearch.action.bulk.BackoffPolicy; import org.elasticsearch.action.search.SearchRequest; 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 9b817fca938..7d8a839fc92 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 @@ -20,7 +20,7 @@ package org.opensearch.index.reindex; import org.apache.lucene.search.TotalHits; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.Version; import org.opensearch.action.ActionType; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java index 8d556de4f8a..a02f693fd54 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java @@ -20,8 +20,8 @@ package org.opensearch.index.reindex; import org.apache.lucene.util.SetOnce; -import org.elasticsearch.OpenSearchSecurityException; -import org.elasticsearch.OpenSearchStatusException; +import org.opensearch.OpenSearchSecurityException; +import org.opensearch.OpenSearchStatusException; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; 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 42612d844cb..0a23e9c6496 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 @@ -19,7 +19,7 @@ package org.opensearch.index.reindex; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.ExceptionsHelper; import org.opensearch.action.ActionFuture; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java index 2d0bfe8bfb6..c9f9a822848 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java @@ -37,7 +37,7 @@ import org.apache.http.message.BasicHttpResponse; import org.apache.http.message.BasicStatusLine; import org.apache.http.nio.protocol.HttpAsyncRequestProducer; import org.apache.http.nio.protocol.HttpAsyncResponseConsumer; -import org.elasticsearch.OpenSearchStatusException; +import org.opensearch.OpenSearchStatusException; import org.elasticsearch.Version; import org.opensearch.action.bulk.BackoffPolicy; import org.elasticsearch.action.search.SearchRequest; 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 8aea9f00b53..c47ce47be33 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 @@ -25,7 +25,7 @@ import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.ReleasableBytesReference; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4BadRequestTests.java b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4BadRequestTests.java index a50c0d68180..a1771a64bd4 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4BadRequestTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4BadRequestTests.java @@ -21,7 +21,7 @@ package org.opensearch.http.netty4; import io.netty.handler.codec.http.FullHttpResponse; import io.netty.util.ReferenceCounted; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.network.NetworkService; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java index 0967893ff9c..cadea7d7853 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java @@ -44,7 +44,7 @@ import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.codec.http.HttpUtil; import io.netty.handler.codec.http.HttpVersion; import org.apache.logging.log4j.message.ParameterizedMessage; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.network.NetworkAddress; import org.elasticsearch.common.network.NetworkService; diff --git a/server/src/main/java/org/elasticsearch/OpenSearchCorruptionException.java b/server/src/main/java/org/opensearch/OpenSearchCorruptionException.java similarity index 95% rename from server/src/main/java/org/elasticsearch/OpenSearchCorruptionException.java rename to server/src/main/java/org/opensearch/OpenSearchCorruptionException.java index bd14751968c..275713f047c 100644 --- a/server/src/main/java/org/elasticsearch/OpenSearchCorruptionException.java +++ b/server/src/main/java/org/opensearch/OpenSearchCorruptionException.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 java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/OpenSearchException.java b/server/src/main/java/org/opensearch/OpenSearchException.java similarity index 99% rename from server/src/main/java/org/elasticsearch/OpenSearchException.java rename to server/src/main/java/org/opensearch/OpenSearchException.java index b8ba8120e1f..28a8da3be08 100644 --- a/server/src/main/java/org/elasticsearch/OpenSearchException.java +++ b/server/src/main/java/org/opensearch/OpenSearchException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch; +package org.opensearch; import org.elasticsearch.action.support.replication.ReplicationOperation; import org.opensearch.cluster.action.shard.ShardStateAction; diff --git a/server/src/main/java/org/elasticsearch/OpenSearchGenerationException.java b/server/src/main/java/org/opensearch/OpenSearchGenerationException.java similarity index 94% rename from server/src/main/java/org/elasticsearch/OpenSearchGenerationException.java rename to server/src/main/java/org/opensearch/OpenSearchGenerationException.java index f3dd538d1b5..830a035fc8f 100644 --- a/server/src/main/java/org/elasticsearch/OpenSearchGenerationException.java +++ b/server/src/main/java/org/opensearch/OpenSearchGenerationException.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 org.elasticsearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/elasticsearch/OpenSearchParseException.java b/server/src/main/java/org/opensearch/OpenSearchParseException.java similarity index 95% rename from server/src/main/java/org/elasticsearch/OpenSearchParseException.java rename to server/src/main/java/org/opensearch/OpenSearchParseException.java index 4e617e2f5a5..4ee1fb011c2 100644 --- a/server/src/main/java/org/elasticsearch/OpenSearchParseException.java +++ b/server/src/main/java/org/opensearch/OpenSearchParseException.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 org.elasticsearch.common.io.stream.StreamInput; import org.opensearch.rest.RestStatus; diff --git a/server/src/main/java/org/elasticsearch/OpenSearchSecurityException.java b/server/src/main/java/org/opensearch/OpenSearchSecurityException.java similarity index 94% rename from server/src/main/java/org/elasticsearch/OpenSearchSecurityException.java rename to server/src/main/java/org/opensearch/OpenSearchSecurityException.java index 6a5e37d1e38..0b1c469d2a5 100644 --- a/server/src/main/java/org/elasticsearch/OpenSearchSecurityException.java +++ b/server/src/main/java/org/opensearch/OpenSearchSecurityException.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,8 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch; +package org.opensearch; +import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.io.stream.StreamInput; import org.opensearch.rest.RestStatus; diff --git a/server/src/main/java/org/elasticsearch/OpenSearchStatusException.java b/server/src/main/java/org/opensearch/OpenSearchStatusException.java similarity index 96% rename from server/src/main/java/org/elasticsearch/OpenSearchStatusException.java rename to server/src/main/java/org/opensearch/OpenSearchStatusException.java index a325d48f9f6..50f7c77519c 100644 --- a/server/src/main/java/org/elasticsearch/OpenSearchStatusException.java +++ b/server/src/main/java/org/opensearch/OpenSearchStatusException.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 org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/elasticsearch/OpenSearchTimeoutException.java b/server/src/main/java/org/opensearch/OpenSearchTimeoutException.java similarity index 94% rename from server/src/main/java/org/elasticsearch/OpenSearchTimeoutException.java rename to server/src/main/java/org/opensearch/OpenSearchTimeoutException.java index 7f864cfc4d4..effff45d09e 100644 --- a/server/src/main/java/org/elasticsearch/OpenSearchTimeoutException.java +++ b/server/src/main/java/org/opensearch/OpenSearchTimeoutException.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 org.elasticsearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/elasticsearch/OpenSearchWrapperException.java b/server/src/main/java/org/opensearch/OpenSearchWrapperException.java similarity index 93% rename from server/src/main/java/org/elasticsearch/OpenSearchWrapperException.java rename to server/src/main/java/org/opensearch/OpenSearchWrapperException.java index 647f876cf0b..0625a37e31c 100644 --- a/server/src/main/java/org/elasticsearch/OpenSearchWrapperException.java +++ b/server/src/main/java/org/opensearch/OpenSearchWrapperException.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; /** * An exception that is meant to be "unwrapped" when sent back to the user diff --git a/server/src/main/java/org/opensearch/action/FailedNodeException.java b/server/src/main/java/org/opensearch/action/FailedNodeException.java index adc43b596a5..44c622de00d 100644 --- a/server/src/main/java/org/opensearch/action/FailedNodeException.java +++ b/server/src/main/java/org/opensearch/action/FailedNodeException.java @@ -19,7 +19,7 @@ package org.opensearch.action; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/action/NoShardAvailableActionException.java b/server/src/main/java/org/opensearch/action/NoShardAvailableActionException.java index 8382d3c17af..dd6d88fcb4c 100644 --- a/server/src/main/java/org/opensearch/action/NoShardAvailableActionException.java +++ b/server/src/main/java/org/opensearch/action/NoShardAvailableActionException.java @@ -19,7 +19,7 @@ package org.opensearch.action; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.index.shard.ShardId; import org.opensearch.rest.RestStatus; diff --git a/server/src/main/java/org/opensearch/action/PrimaryMissingActionException.java b/server/src/main/java/org/opensearch/action/PrimaryMissingActionException.java index f994af197c7..76c81aef67f 100644 --- a/server/src/main/java/org/opensearch/action/PrimaryMissingActionException.java +++ b/server/src/main/java/org/opensearch/action/PrimaryMissingActionException.java @@ -19,7 +19,7 @@ package org.opensearch.action; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/action/RoutingMissingException.java b/server/src/main/java/org/opensearch/action/RoutingMissingException.java index 23c7a62341b..b9fd7234e3b 100644 --- a/server/src/main/java/org/opensearch/action/RoutingMissingException.java +++ b/server/src/main/java/org/opensearch/action/RoutingMissingException.java @@ -19,7 +19,7 @@ package org.opensearch.action; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.opensearch.rest.RestStatus; diff --git a/server/src/main/java/org/opensearch/action/TaskOperationFailure.java b/server/src/main/java/org/opensearch/action/TaskOperationFailure.java index b68fbabee6f..e12d651ab1e 100644 --- a/server/src/main/java/org/opensearch/action/TaskOperationFailure.java +++ b/server/src/main/java/org/opensearch/action/TaskOperationFailure.java @@ -19,7 +19,7 @@ package org.opensearch.action; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/opensearch/action/TimestampParsingException.java b/server/src/main/java/org/opensearch/action/TimestampParsingException.java index 56b31ea63bd..3d0c6cd33af 100644 --- a/server/src/main/java/org/opensearch/action/TimestampParsingException.java +++ b/server/src/main/java/org/opensearch/action/TimestampParsingException.java @@ -19,7 +19,7 @@ package org.opensearch.action; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/UnavailableShardsException.java b/server/src/main/java/org/opensearch/action/UnavailableShardsException.java index e63ce61b8f9..d8c23319c5e 100644 --- a/server/src/main/java/org/opensearch/action/UnavailableShardsException.java +++ b/server/src/main/java/org/opensearch/action/UnavailableShardsException.java @@ -19,7 +19,7 @@ package org.opensearch.action; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.index.shard.ShardId; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java index 21db3446829..8b8f9d4503b 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java @@ -19,7 +19,7 @@ package org.opensearch.action.admin.cluster.snapshots.status; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.opensearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.ParseField; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/alias/Alias.java b/server/src/main/java/org/opensearch/action/admin/indices/alias/Alias.java index 367123418c7..7e1b907c34d 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/alias/Alias.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/alias/Alias.java @@ -19,7 +19,7 @@ package org.opensearch.action.admin.indices.alias; -import org.elasticsearch.OpenSearchGenerationException; +import org.opensearch.OpenSearchGenerationException; import org.elasticsearch.Version; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/close/CloseIndexResponse.java b/server/src/main/java/org/opensearch/action/admin/indices/close/CloseIndexResponse.java index 0cc2c279ef9..87614a133a6 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/close/CloseIndexResponse.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/close/CloseIndexResponse.java @@ -18,7 +18,7 @@ */ package org.opensearch.action.admin.indices.close; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.master.ShardsAcknowledgedResponse; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/readonly/AddIndexBlockResponse.java b/server/src/main/java/org/opensearch/action/admin/indices/readonly/AddIndexBlockResponse.java index 240b527817a..e8a85cb239e 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/readonly/AddIndexBlockResponse.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/readonly/AddIndexBlockResponse.java @@ -18,7 +18,7 @@ */ package org.opensearch.action.admin.indices.readonly; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.master.ShardsAcknowledgedResponse; import org.elasticsearch.common.Nullable; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoresResponse.java b/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoresResponse.java index 41bd12f3b66..24759e7f6fd 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoresResponse.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoresResponse.java @@ -21,7 +21,7 @@ package org.opensearch.action.admin.indices.shards; import com.carrotsearch.hppc.cursors.IntObjectCursor; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.action.ActionResponse; import org.elasticsearch.action.support.DefaultShardOperationFailedException; 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 623cc394647..6346640d6d6 100644 --- a/server/src/main/java/org/opensearch/action/bulk/BulkItemResponse.java +++ b/server/src/main/java/org/opensearch/action/bulk/BulkItemResponse.java @@ -19,7 +19,7 @@ package org.opensearch.action.bulk; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.Version; import org.opensearch.action.DocWriteRequest.OpType; diff --git a/server/src/main/java/org/opensearch/client/transport/NoNodeAvailableException.java b/server/src/main/java/org/opensearch/client/transport/NoNodeAvailableException.java index 8b4f9265919..914bb5dfad6 100644 --- a/server/src/main/java/org/opensearch/client/transport/NoNodeAvailableException.java +++ b/server/src/main/java/org/opensearch/client/transport/NoNodeAvailableException.java @@ -19,7 +19,7 @@ package org.opensearch.client.transport; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; import org.opensearch.rest.RestStatus; diff --git a/server/src/main/java/org/opensearch/rest/BytesRestResponse.java b/server/src/main/java/org/opensearch/rest/BytesRestResponse.java index 535767f5561..9477eb52391 100644 --- a/server/src/main/java/org/opensearch/rest/BytesRestResponse.java +++ b/server/src/main/java/org/opensearch/rest/BytesRestResponse.java @@ -23,8 +23,8 @@ 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.OpenSearchException; -import org.elasticsearch.OpenSearchStatusException; +import org.opensearch.OpenSearchException; +import org.opensearch.OpenSearchStatusException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; @@ -35,8 +35,8 @@ import org.elasticsearch.common.xcontent.XContentParser; import java.io.IOException; import static java.util.Collections.singletonMap; -import static org.elasticsearch.OpenSearchException.REST_EXCEPTION_SKIP_STACK_TRACE; -import static org.elasticsearch.OpenSearchException.REST_EXCEPTION_SKIP_STACK_TRACE_DEFAULT; +import static org.opensearch.OpenSearchException.REST_EXCEPTION_SKIP_STACK_TRACE; +import static org.opensearch.OpenSearchException.REST_EXCEPTION_SKIP_STACK_TRACE_DEFAULT; import static org.elasticsearch.common.xcontent.XContentParserUtils.ensureExpectedToken; diff --git a/server/src/main/java/org/opensearch/rest/RestRequest.java b/server/src/main/java/org/opensearch/rest/RestRequest.java index 8c4755dcf9c..582ea3e2b7d 100644 --- a/server/src/main/java/org/opensearch/rest/RestRequest.java +++ b/server/src/main/java/org/opensearch/rest/RestRequest.java @@ -20,7 +20,7 @@ package org.opensearch.rest; import org.apache.lucene.util.SetOnce; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.Booleans; import org.elasticsearch.common.CheckedConsumer; import org.elasticsearch.common.Nullable; diff --git a/server/src/main/java/org/opensearch/rest/RestRequestFilter.java b/server/src/main/java/org/opensearch/rest/RestRequestFilter.java index db8f18de2ae..76a866377d3 100644 --- a/server/src/main/java/org/opensearch/rest/RestRequestFilter.java +++ b/server/src/main/java/org/opensearch/rest/RestRequestFilter.java @@ -19,7 +19,7 @@ package org.opensearch.rest; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.Tuple; diff --git a/server/src/main/java/org/opensearch/rest/RestResponse.java b/server/src/main/java/org/opensearch/rest/RestResponse.java index a1a9633bfbb..70e46698a7f 100644 --- a/server/src/main/java/org/opensearch/rest/RestResponse.java +++ b/server/src/main/java/org/opensearch/rest/RestResponse.java @@ -19,7 +19,7 @@ package org.opensearch.rest; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.bytes.BytesReference; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java index 0678ed618b8..025a8ae7f73 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java @@ -20,7 +20,7 @@ package org.opensearch.rest.action.cat; import org.apache.lucene.search.TotalHits; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.opensearch.client.node.NodeClient; diff --git a/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java index 41f9b91f514..9446d1bac26 100644 --- a/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.cluster; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; -import org.elasticsearch.OpenSearchTimeoutException; +import org.opensearch.OpenSearchTimeoutException; import org.elasticsearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.support.PlainActionFuture; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java index d73359800d2..9c8a212e400 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.cluster.coordination; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java index 2d4c66af227..f981336c5a0 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java @@ -22,7 +22,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.cluster.AbstractDiffable; import org.opensearch.cluster.ClusterState; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java index 96e42537197..36da572a586 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.cluster.coordination; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.coordination.Coordinator.Mode; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java index e1c3deabdbd..8e1e62f8366 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.coordination; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.coordination.CoordinationStateRejectedException; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java index 2056a1c1d57..7b48b1da7c0 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.cluster.coordination; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.cluster.ClusterChangedEvent; import org.opensearch.cluster.ClusterState; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java index 9df21a8f313..f2488b6e7ef 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.metadata; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.opensearch.action.support.IndicesOptions; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/BatchedRerouteServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/BatchedRerouteServiceTests.java index 221177a070f..63766103c3c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/BatchedRerouteServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/BatchedRerouteServiceTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.cluster.routing; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.ClusterStateUpdateTask; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java b/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java index 3dfa974d21e..81578add7a4 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.routing; import com.carrotsearch.randomizedtesting.RandomizedContext; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.cluster.health.ClusterHealthStatus; import org.opensearch.cluster.metadata.IndexMetadata; import org.elasticsearch.index.shard.ShardId; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RetryFailedAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RetryFailedAllocationTests.java index c24b0a7f6e7..3446ebff4e1 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RetryFailedAllocationTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RetryFailedAllocationTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.routing.allocation; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; diff --git a/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java index 9ec1e1781ac..217e1d55f60 100644 --- a/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.cluster.service; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.cluster.AckedClusterStateUpdateTask; import org.opensearch.cluster.ClusterChangedEvent; diff --git a/server/src/test/java/org/elasticsearch/common/geo/GeoBoundingBoxTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeoBoundingBoxTests.java index 071599a7903..3c373d286d3 100644 --- a/server/src/test/java/org/elasticsearch/common/geo/GeoBoundingBoxTests.java +++ b/server/src/test/java/org/elasticsearch/common/geo/GeoBoundingBoxTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.geo; import org.apache.lucene.geo.GeoEncodingUtils; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/test/java/org/elasticsearch/common/geo/GeoJsonShapeParserTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeoJsonShapeParserTests.java index 2b29c28f236..b3b6d6d565a 100644 --- a/server/src/test/java/org/elasticsearch/common/geo/GeoJsonShapeParserTests.java +++ b/server/src/test/java/org/elasticsearch/common/geo/GeoJsonShapeParserTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.geo; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.Strings; diff --git a/server/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java index b1c16d05d31..c896484fe30 100644 --- a/server/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java +++ b/server/src/test/java/org/elasticsearch/common/geo/GeoWKTShapeParserTests.java @@ -19,8 +19,8 @@ package org.elasticsearch.common.geo; import org.apache.lucene.geo.GeoTestUtil; -import org.elasticsearch.OpenSearchException; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.UUIDs; diff --git a/server/src/test/java/org/elasticsearch/common/geo/GeometryParserTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeometryParserTests.java index 42199d0caee..bdbbacb5336 100644 --- a/server/src/test/java/org/elasticsearch/common/geo/GeometryParserTests.java +++ b/server/src/test/java/org/elasticsearch/common/geo/GeometryParserTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.geo; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/test/java/org/elasticsearch/common/joda/JavaJodaTimeDuellingTests.java b/server/src/test/java/org/elasticsearch/common/joda/JavaJodaTimeDuellingTests.java index 2fdaec58033..7582bac3a79 100644 --- a/server/src/test/java/org/elasticsearch/common/joda/JavaJodaTimeDuellingTests.java +++ b/server/src/test/java/org/elasticsearch/common/joda/JavaJodaTimeDuellingTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.joda; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.bootstrap.JavaVersion; import org.elasticsearch.common.time.DateFormatter; import org.elasticsearch.common.time.DateFormatters; diff --git a/server/src/test/java/org/elasticsearch/common/joda/JodaDateMathParserTests.java b/server/src/test/java/org/elasticsearch/common/joda/JodaDateMathParserTests.java index a316c9584a6..dbabab72e50 100644 --- a/server/src/test/java/org/elasticsearch/common/joda/JodaDateMathParserTests.java +++ b/server/src/test/java/org/elasticsearch/common/joda/JodaDateMathParserTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.joda; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.time.DateFormatter; import org.elasticsearch.common.time.DateMathParser; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java b/server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java index 6beb745381f..4405fbf496b 100644 --- a/server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java +++ b/server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.settings; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.Version; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; diff --git a/server/src/test/java/org/elasticsearch/common/time/JavaDateMathParserTests.java b/server/src/test/java/org/elasticsearch/common/time/JavaDateMathParserTests.java index 8e43598f6c7..8f0dd474134 100644 --- a/server/src/test/java/org/elasticsearch/common/time/JavaDateMathParserTests.java +++ b/server/src/test/java/org/elasticsearch/common/time/JavaDateMathParserTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.time; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.bootstrap.JavaVersion; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java b/server/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java index d3e1887af08..ef58cd086d5 100644 --- a/server/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java +++ b/server/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.unit; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.io.stream.Writeable.Reader; import org.elasticsearch.test.AbstractWireSerializingTestCase; import org.hamcrest.MatcherAssert; diff --git a/server/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java b/server/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java index 79207f608a8..edf6c53291d 100644 --- a/server/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java +++ b/server/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.unit; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.test.ESTestCase; import static org.hamcrest.Matchers.is; diff --git a/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java b/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java index 31f2678773b..12bca18a1f8 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java @@ -29,7 +29,7 @@ import org.apache.lucene.search.QueryCachingPolicy; import org.apache.lucene.search.suggest.document.Completion84PostingsFormat; import org.apache.lucene.search.suggest.document.SuggestField; import org.apache.lucene.store.Directory; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.core.internal.io.IOUtils; import org.elasticsearch.search.suggest.completion.CompletionStats; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index ac9bd209db8..9fa5a9ec858 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -69,7 +69,7 @@ import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.action.ActionListener; import org.elasticsearch.action.index.IndexRequest; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IgnoredFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IgnoredFieldTypeTests.java index d23857b0f82..43bc208d7cc 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IgnoredFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IgnoredFieldTypeTests.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.RegexpQuery; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; public class IgnoredFieldTypeTests extends FieldTypeTestCase { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java index c259ff7c6c7..8c19a1a3002 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java @@ -36,7 +36,7 @@ import org.apache.lucene.search.TermInSetQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.lucene.BytesRefs; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java index b2a59cabb2f..1f5b0d6c16f 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.spatial.prefix.PrefixTreeStrategy; import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy; import org.apache.lucene.spatial.prefix.tree.GeohashPrefixTree; import org.apache.lucene.spatial.prefix.tree.QuadPrefixTree; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Strings; import org.elasticsearch.common.collect.List; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java index 7d189b32880..428be2de719 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.IndexOrDocValuesQuery; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.geo.ShapeRelation; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java index d0345e0f9c4..93d747753cf 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.RegexpQuery; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; public class RoutingFieldTypeTests extends FieldTypeTestCase { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java index 9f033017e4c..54b67b287ef 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java @@ -34,7 +34,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.Operations; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.lucene.BytesRefs; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.lucene.search.AutomatonQueries; diff --git a/server/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java index 617951033fb..09650c0164f 100644 --- a/server/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.BoostQuery; import org.apache.lucene.search.FuzzyQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.unit.Fuzziness; import org.elasticsearch.test.AbstractQueryTestCase; diff --git a/server/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java index fa1974b6830..23d3cf3da54 100644 --- a/server/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.document.LatLonPoint; import org.apache.lucene.search.IndexOrDocValuesQuery; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.geo.GeoUtils; import org.elasticsearch.index.mapper.MappedFieldType; diff --git a/server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java index f8d8d4e5767..8577f7775eb 100644 --- a/server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.ConstantScoreQuery; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; diff --git a/server/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java index 1fff8383e39..b10ca94f993 100644 --- a/server/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java @@ -25,7 +25,7 @@ import org.apache.lucene.index.memory.MemoryIndex; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.action.termvectors.MultiTermVectorsItemResponse; import org.elasticsearch.action.termvectors.MultiTermVectorsRequest; import org.elasticsearch.action.termvectors.MultiTermVectorsResponse; diff --git a/server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java index 2a6aec6f756..87bf5264e6c 100644 --- a/server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java @@ -24,7 +24,7 @@ import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.join.ScoreMode; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest; import org.elasticsearch.common.Strings; diff --git a/server/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java index 577293a9765..f3481af5a2a 100644 --- a/server/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java @@ -31,7 +31,7 @@ import org.apache.lucene.search.PointRangeQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TermRangeQuery; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.Version; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.geo.ShapeRelation; diff --git a/server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java index 98f8b6e5ea3..9410c64bc2e 100644 --- a/server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.query; import org.apache.lucene.search.Query; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.ParsingException; import org.opensearch.script.MockScriptEngine; import org.opensearch.script.Script; diff --git a/server/src/test/java/org/elasticsearch/index/query/ScriptScoreQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/ScriptScoreQueryBuilderTests.java index 788505b17ec..5d1a8c02636 100644 --- a/server/src/test/java/org/elasticsearch/index/query/ScriptScoreQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/ScriptScoreQueryBuilderTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.query; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.lucene.search.function.ScriptScoreQuery; import org.elasticsearch.index.query.functionscore.ScriptScoreQueryBuilder; import org.opensearch.script.MockScriptEngine; diff --git a/server/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java index df0e63ea02c..b9ef3403073 100644 --- a/server/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.PointInSetQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermInSetQuery; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.common.ParsingException; diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java index 5f7a7eb21d7..fb4da0c892b 100644 --- a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java @@ -41,7 +41,7 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.lucene.search.function.CombineFunction; import org.elasticsearch.common.lucene.search.function.FieldValueFactorFunction; 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 50691544ff0..bc1f4485281 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.reindex; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.Version; import org.opensearch.action.bulk.BulkItemResponse.Failure; diff --git a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java index 6fe428dbe76..81bf0601269 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.reindex; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java index 55451ff7e69..389e80fd47b 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.reindex; import org.apache.lucene.util.LuceneTestCase; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.elasticsearch.common.Randomness; import org.elasticsearch.common.Strings; diff --git a/server/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java b/server/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java index 89f89529829..e72c1baeec3 100644 --- a/server/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java +++ b/server/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.search.geo; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.geo.GeoUtils; diff --git a/server/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java b/server/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java index 3bdeb68b3a3..42e47f67c89 100644 --- a/server/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java +++ b/server/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.search.geo; import org.apache.lucene.spatial.prefix.tree.Cell; import org.apache.lucene.spatial.prefix.tree.GeohashPrefixTree; import org.apache.lucene.spatial.prefix.tree.QuadPrefixTree; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.geo.GeoUtils; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java b/server/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java index 2ad226e6cfe..dc253faee38 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.seqno; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.Randomness; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.test.ESTestCase; 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 c7fe889681b..ff13c600d9d 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -32,7 +32,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Constants; import org.elasticsearch.Assertions; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.admin.indices.flush.FlushRequest; diff --git a/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java b/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java index 212b36c8e1b..137768853ef 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.shard; import joptsimple.OptionParser; import joptsimple.OptionSet; import org.apache.lucene.store.BaseDirectoryWrapper; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.elasticsearch.cli.MockTerminal; import org.opensearch.cli.Terminal; diff --git a/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java b/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java index 66eadb14530..c501cd36f44 100644 --- a/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java +++ b/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.snapshots.blobstore; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Version; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/server/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java b/server/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java index 9bb33fb8e09..84d1265d460 100644 --- a/server/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java +++ b/server/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.translog; import com.carrotsearch.hppc.LongHashSet; import com.carrotsearch.hppc.LongSet; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryRequestTrackerTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryRequestTrackerTests.java index d90983c2f6e..ac8b0905068 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryRequestTrackerTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryRequestTrackerTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.indices.recovery; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; import org.opensearch.action.support.PlainActionFuture; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; diff --git a/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java b/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java index 92d7b514787..483b0662507 100644 --- a/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java +++ b/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java @@ -18,18 +18,18 @@ */ package org.elasticsearch.recovery; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.replication.ESIndexLevelReplicationTestCase; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.store.Store; -import org.elasticsearch.indices.recovery.RecoveriesCollection; -import org.elasticsearch.indices.recovery.RecoveryFailedException; -import org.elasticsearch.indices.recovery.RecoveryState; -import org.elasticsearch.indices.recovery.PeerRecoveryTargetService; -import org.elasticsearch.indices.recovery.RecoveryTarget; +import org.opensearch.indices.recovery.RecoveriesCollection; +import org.opensearch.indices.recovery.RecoveryFailedException; +import org.opensearch.indices.recovery.RecoveryState; +import org.opensearch.indices.recovery.PeerRecoveryTargetService; +import org.opensearch.indices.recovery.RecoveryTarget; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java index c50ef6c096a..b004548acc5 100644 --- a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java +++ b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.index.FilterDirectoryReader; import org.apache.lucene.index.LeafReader; import org.apache.lucene.search.Query; import org.apache.lucene.store.AlreadyClosedException; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; import org.opensearch.action.OriginalIndices; import org.elasticsearch.action.index.IndexResponse; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java index d1f4dc36db5..4daa865a35a 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java @@ -48,7 +48,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.NumericUtils; import org.apache.lucene.util.TestUtil; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.text.Text; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java index 8db2d2891b7..e1b39b2f196 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.CheckedConsumer; import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.mapper.KeywordFieldMapper; diff --git a/server/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java b/server/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java index d48267d3b0a..14c3a63bfb0 100644 --- a/server/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.search.rescore; import org.apache.lucene.search.Query; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.ParsingException; diff --git a/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java index cacf604ca63..2dccf6a9e5a 100644 --- a/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java @@ -25,7 +25,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermQuery; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.unit.DistanceUnit; diff --git a/server/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java b/server/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java index 14186dc0fbb..758f8b73252 100644 --- a/server/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java +++ b/server/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.search.suggest.completion; import org.apache.lucene.index.IndexableField; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java b/server/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java index f531bca7b1a..37f33489ffc 100644 --- a/server/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java +++ b/server/src/test/java/org/elasticsearch/test/geo/RandomShapeGenerator.java @@ -20,7 +20,7 @@ package org.elasticsearch.test.geo; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.locationtech.jts.algorithm.ConvexHull; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Geometry; diff --git a/server/src/test/java/org/elasticsearch/transport/InboundHandlerTests.java b/server/src/test/java/org/elasticsearch/transport/InboundHandlerTests.java index d44ea429735..700ad0f1d23 100644 --- a/server/src/test/java/org/elasticsearch/transport/InboundHandlerTests.java +++ b/server/src/test/java/org/elasticsearch/transport/InboundHandlerTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.transport; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.action.ActionListener; import org.elasticsearch.common.bytes.BytesArray; diff --git a/server/src/test/java/org/elasticsearch/transport/OutboundHandlerTests.java b/server/src/test/java/org/elasticsearch/transport/OutboundHandlerTests.java index 167c0a44b4f..bd67fe795fb 100644 --- a/server/src/test/java/org/elasticsearch/transport/OutboundHandlerTests.java +++ b/server/src/test/java/org/elasticsearch/transport/OutboundHandlerTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.transport; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/server/src/test/java/org/elasticsearch/transport/TcpTransportTests.java b/server/src/test/java/org/elasticsearch/transport/TcpTransportTests.java index 62c1bef4672..79266b18f3d 100644 --- a/server/src/test/java/org/elasticsearch/transport/TcpTransportTests.java +++ b/server/src/test/java/org/elasticsearch/transport/TcpTransportTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.transport; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/server/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java b/server/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java index 89725323861..d04b8130bb0 100644 --- a/server/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java +++ b/server/src/test/java/org/elasticsearch/transport/TransportActionProxyTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.transport; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.Version; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/server/src/test/java/org/opensearch/repositories/RepositoryDataTests.java b/server/src/test/java/org/opensearch/repositories/RepositoryDataTests.java index f1111cc27e6..82db2347f36 100644 --- a/server/src/test/java/org/opensearch/repositories/RepositoryDataTests.java +++ b/server/src/test/java/org/opensearch/repositories/RepositoryDataTests.java @@ -19,7 +19,7 @@ package org.opensearch.repositories; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.Version; import org.elasticsearch.common.UUIDs; import org.elasticsearch.common.bytes.BytesReference; diff --git a/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java b/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java index ea660b96a24..fff62847557 100644 --- a/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java +++ b/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java @@ -20,8 +20,8 @@ package org.opensearch.rest; import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.OpenSearchStatusException; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchStatusException; +import org.opensearch.OpenSearchException; import org.elasticsearch.ResourceAlreadyExistsException; import org.elasticsearch.ResourceNotFoundException; import org.opensearch.action.OriginalIndices; diff --git a/server/src/test/java/org/opensearch/rest/RestRequestTests.java b/server/src/test/java/org/opensearch/rest/RestRequestTests.java index 425c7ede22c..af573788657 100644 --- a/server/src/test/java/org/opensearch/rest/RestRequestTests.java +++ b/server/src/test/java/org/opensearch/rest/RestRequestTests.java @@ -19,7 +19,7 @@ package org.opensearch.rest; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.CheckedConsumer; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; diff --git a/server/src/test/java/org/opensearch/script/ScriptTests.java b/server/src/test/java/org/opensearch/script/ScriptTests.java index 071969880f7..683a2939001 100644 --- a/server/src/test/java/org/opensearch/script/ScriptTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptTests.java @@ -19,7 +19,7 @@ package org.opensearch.script; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.InputStreamStreamInput; import org.elasticsearch.common.io.stream.OutputStreamStreamOutput; diff --git a/server/src/test/java/org/opensearch/snapshots/BlobStoreFormatTests.java b/server/src/test/java/org/opensearch/snapshots/BlobStoreFormatTests.java index c95733bfed1..ab00c99ac5e 100644 --- a/server/src/test/java/org/opensearch/snapshots/BlobStoreFormatTests.java +++ b/server/src/test/java/org/opensearch/snapshots/BlobStoreFormatTests.java @@ -19,8 +19,8 @@ package org.opensearch.snapshots; -import org.elasticsearch.OpenSearchCorruptionException; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchCorruptionException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.common.blobstore.BlobContainer; import org.elasticsearch.common.blobstore.BlobMetadata; import org.elasticsearch.common.blobstore.BlobPath; diff --git a/server/src/test/java/org/opensearch/tasks/ListTasksResponseTests.java b/server/src/test/java/org/opensearch/tasks/ListTasksResponseTests.java index 10fb99261be..9a10a2eb2b5 100644 --- a/server/src/test/java/org/opensearch/tasks/ListTasksResponseTests.java +++ b/server/src/test/java/org/opensearch/tasks/ListTasksResponseTests.java @@ -19,7 +19,7 @@ package org.opensearch.tasks; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.FailedNodeException; import org.opensearch.action.TaskOperationFailure; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; diff --git a/server/src/test/java/org/opensearch/threadpool/ScheduleWithFixedDelayTests.java b/server/src/test/java/org/opensearch/threadpool/ScheduleWithFixedDelayTests.java index c6787e6df99..1093147ef6c 100644 --- a/server/src/test/java/org/opensearch/threadpool/ScheduleWithFixedDelayTests.java +++ b/server/src/test/java/org/opensearch/threadpool/ScheduleWithFixedDelayTests.java @@ -19,7 +19,7 @@ package org.opensearch.threadpool; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.BaseFuture; diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java index 7ff57c8a1fd..3c7b6dfb5fb 100644 --- a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.CloseableThreadContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.cluster.ClusterModule; import org.opensearch.cluster.ClusterState; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractBroadcastResponseTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractBroadcastResponseTestCase.java index 9c0dd3d8148..c93f34612d0 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractBroadcastResponseTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractBroadcastResponseTestCase.java @@ -19,7 +19,7 @@ package org.elasticsearch.test; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.common.Strings; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java index 74e7651090a..bfcce090fea 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.spans.SpanBoostQuery; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.elasticsearch.Version; import org.opensearch.action.support.PlainActionFuture; import org.elasticsearch.common.ParsingException; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ClusterServiceUtils.java b/test/framework/src/main/java/org/elasticsearch/test/ClusterServiceUtils.java index 3d455fff981..7ef52d6e982 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ClusterServiceUtils.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ClusterServiceUtils.java @@ -19,7 +19,7 @@ package org.elasticsearch.test; import org.apache.logging.log4j.core.util.Throwables; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; 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 7f67c20692f..18bcc418795 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java @@ -27,7 +27,7 @@ import org.apache.http.HttpHost; import org.apache.lucene.search.Sort; import org.apache.lucene.search.TotalHits; import org.apache.lucene.util.LuceneTestCase; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.ExceptionsHelper; import org.opensearch.action.ActionListener; import org.opensearch.action.DocWriteResponse; diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java index 7d09505d3b6..614a2c23d3d 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java +++ b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java @@ -29,7 +29,7 @@ import com.carrotsearch.randomizedtesting.generators.RandomStrings; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.store.AlreadyClosedException; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.admin.cluster.configuration.AddVotingConfigExclusionsAction; import org.opensearch.action.admin.cluster.configuration.AddVotingConfigExclusionsRequest; import org.opensearch.action.admin.cluster.configuration.ClearVotingConfigExclusionsAction; diff --git a/test/framework/src/main/java/org/elasticsearch/test/RandomObjects.java b/test/framework/src/main/java/org/elasticsearch/test/RandomObjects.java index 15270be9156..b95ef536f09 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/RandomObjects.java +++ b/test/framework/src/main/java/org/elasticsearch/test/RandomObjects.java @@ -24,7 +24,7 @@ import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import com.carrotsearch.randomizedtesting.generators.RandomStrings; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.admin.indices.analyze.AnalyzeAction; import org.opensearch.action.admin.indices.analyze.AnalyzeAction.AnalyzeToken; import org.elasticsearch.action.support.replication.ReplicationResponse.ShardInfo; diff --git a/test/framework/src/main/java/org/elasticsearch/test/TestCustomMetadata.java b/test/framework/src/main/java/org/elasticsearch/test/TestCustomMetadata.java index 0537f4dfd9c..ce870465906 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/TestCustomMetadata.java +++ b/test/framework/src/main/java/org/elasticsearch/test/TestCustomMetadata.java @@ -19,7 +19,7 @@ package org.elasticsearch.test; -import org.elasticsearch.OpenSearchParseException; +import org.opensearch.OpenSearchParseException; import org.opensearch.cluster.AbstractNamedDiffable; import org.opensearch.cluster.NamedDiff; import org.opensearch.cluster.metadata.Metadata; diff --git a/test/framework/src/main/java/org/elasticsearch/test/client/NoOpClient.java b/test/framework/src/main/java/org/elasticsearch/test/client/NoOpClient.java index 5cc12cd8e2c..2a6c6afbb1f 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/client/NoOpClient.java +++ b/test/framework/src/main/java/org/elasticsearch/test/client/NoOpClient.java @@ -19,7 +19,7 @@ package org.elasticsearch.test.client; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; diff --git a/test/framework/src/main/java/org/elasticsearch/test/client/NoOpNodeClient.java b/test/framework/src/main/java/org/elasticsearch/test/client/NoOpNodeClient.java index aa43ea4b609..bbf9a80615d 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/client/NoOpNodeClient.java +++ b/test/framework/src/main/java/org/elasticsearch/test/client/NoOpNodeClient.java @@ -19,7 +19,7 @@ package org.elasticsearch.test.client; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; diff --git a/test/framework/src/main/java/org/elasticsearch/test/engine/MockEngineSupport.java b/test/framework/src/main/java/org/elasticsearch/test/engine/MockEngineSupport.java index d0b7f83555c..3d0ca020cc8 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/engine/MockEngineSupport.java +++ b/test/framework/src/main/java/org/elasticsearch/test/engine/MockEngineSupport.java @@ -25,7 +25,7 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.FilterDirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.util.LuceneTestCase; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.common.settings.Settings; 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 c583c332828..98389a2ea26 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 @@ -22,7 +22,7 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.DisjunctionMaxQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TotalHits; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.ExceptionsHelper; import org.opensearch.action.ActionFuture; import org.opensearch.action.ActionRequestBuilder; diff --git a/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java b/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java index 3933cd8bfbd..9831b036ede 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/transport/AbstractSimpleTransportTestCase.java @@ -25,7 +25,7 @@ import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.util.Supplier; import org.apache.lucene.util.CollectionUtil; import org.apache.lucene.util.Constants; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.Version; import org.opensearch.action.ActionListener; diff --git a/test/framework/src/main/java/org/elasticsearch/transport/nio/MockNioTransport.java b/test/framework/src/main/java/org/elasticsearch/transport/nio/MockNioTransport.java index 3441e1ce540..6b1cd172bed 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/nio/MockNioTransport.java +++ b/test/framework/src/main/java/org/elasticsearch/transport/nio/MockNioTransport.java @@ -22,7 +22,7 @@ package org.elasticsearch.transport.nio; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.elasticsearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.support.PlainActionFuture; diff --git a/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java b/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java index e697c5200c7..9bb0b600b43 100644 --- a/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java +++ b/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java @@ -23,7 +23,7 @@ import com.carrotsearch.randomizedtesting.RandomizedContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.index.CorruptIndexException; -import org.elasticsearch.OpenSearchException; +import org.opensearch.OpenSearchException; import org.opensearch.cluster.metadata.RepositoryMetadata; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.blobstore.BlobContainer;