From 642f823228ce927280d235e22fb463c8189b6eac Mon Sep 17 00:00:00 2001 From: Harold Wang <74381974+harold-wang@users.noreply.github.com> Date: Tue, 16 Mar 2021 22:25:37 -0700 Subject: [PATCH] Rename org.elasticsearch.gateway to org.opensearch.gateway (#346) Signed-off-by: Harold Wang --- .../org/opensearch/cluster/ClusterChangedEvent.java | 2 +- .../coordination/ClusterFormationFailureHelper.java | 2 +- .../opensearch/cluster/coordination/Coordinator.java | 4 ++-- .../cluster/coordination/DetachClusterCommand.java | 2 +- .../cluster/coordination/JoinTaskExecutor.java | 2 +- .../cluster/coordination/OpenSearchNodeCommand.java | 2 +- .../cluster/coordination/RemoveCustomsCommand.java | 2 +- .../cluster/coordination/RemoveSettingsCommand.java | 2 +- .../coordination/UnsafeBootstrapMasterCommand.java | 2 +- .../java/org/opensearch/cluster/metadata/Manifest.java | 2 +- .../routing/allocation/ExistingShardsAllocator.java | 2 +- .../java/org/opensearch/discovery/DiscoveryModule.java | 2 +- .../org/opensearch/discovery/zen/ZenDiscovery.java | 2 +- .../java/org/opensearch/discovery/zen/ZenPing.java | 2 +- .../main/java/org/opensearch/env/NodeEnvironment.java | 4 ++-- .../src/main/java/org/opensearch/env/NodeMetadata.java | 2 +- .../java/org/opensearch/env/NodeRepurposeCommand.java | 4 ++-- .../org/opensearch/env/OverrideNodeVersionCommand.java | 2 +- .../cluster/ClusterChangedEventTests.java | 2 +- .../org/elasticsearch/cluster/ClusterModuleTests.java | 4 ++-- .../ClusterFormationFailureHelperTests.java | 2 +- .../cluster/coordination/CoordinatorTests.java | 2 +- .../routing/allocation/AllocationServiceTests.java | 2 +- .../seqno/RetentionLeaseBackgroundSyncActionTests.java | 2 +- .../shard/RemoveCorruptedShardDataCommandTests.java | 2 +- .../org/elasticsearch/indices/IndicesServiceTests.java | 6 +++--- .../elasticsearch/cluster/ESAllocationTestCase.java | 2 +- .../coordination/AbstractCoordinatorTestCase.java | 10 +++++----- .../elasticsearch/gateway/MockGatewayMetaState.java | 2 +- .../test/gateway/TestGatewayAllocator.java | 10 +++++----- 30 files changed, 44 insertions(+), 44 deletions(-) diff --git a/server/src/main/java/org/opensearch/cluster/ClusterChangedEvent.java b/server/src/main/java/org/opensearch/cluster/ClusterChangedEvent.java index 1ad3e8bf106..b4ae875d3d8 100644 --- a/server/src/main/java/org/opensearch/cluster/ClusterChangedEvent.java +++ b/server/src/main/java/org/opensearch/cluster/ClusterChangedEvent.java @@ -27,7 +27,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.Metadata; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.gateway.GatewayService; +import org.opensearch.gateway.GatewayService; import org.elasticsearch.index.Index; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/ClusterFormationFailureHelper.java b/server/src/main/java/org/opensearch/cluster/coordination/ClusterFormationFailureHelper.java index 5c5860df228..6d39ff0a65a 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/ClusterFormationFailureHelper.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/ClusterFormationFailureHelper.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; -import org.elasticsearch.gateway.GatewayMetaState; +import org.opensearch.gateway.GatewayMetaState; import org.opensearch.monitor.StatusInfo; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPool.Names; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java b/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java index 84c13a073f8..f17347d34e4 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java @@ -94,8 +94,8 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; import static org.opensearch.cluster.coordination.NoMasterBlockService.NO_MASTER_BLOCK_ID; -import static org.elasticsearch.gateway.ClusterStateUpdaters.hideStateIfNotRecovered; -import static org.elasticsearch.gateway.GatewayService.STATE_NOT_RECOVERED_BLOCK; +import static org.opensearch.gateway.ClusterStateUpdaters.hideStateIfNotRecovered; +import static org.opensearch.gateway.GatewayService.STATE_NOT_RECOVERED_BLOCK; import static org.opensearch.monitor.StatusInfo.Status.UNHEALTHY; public class Coordinator extends AbstractLifecycleComponent implements Discovery { diff --git a/server/src/main/java/org/opensearch/cluster/coordination/DetachClusterCommand.java b/server/src/main/java/org/opensearch/cluster/coordination/DetachClusterCommand.java index 2c8d233d87a..f979be85b4c 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/DetachClusterCommand.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/DetachClusterCommand.java @@ -23,7 +23,7 @@ import org.opensearch.cli.Terminal; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.Metadata; import org.elasticsearch.env.Environment; -import org.elasticsearch.gateway.PersistedClusterStateService; +import org.opensearch.gateway.PersistedClusterStateService; import java.io.IOException; import java.nio.file.Path; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java b/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java index 3cd3dd22d75..f89fe58b790 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java @@ -46,7 +46,7 @@ import java.util.Set; import java.util.function.BiConsumer; import java.util.stream.Collectors; -import static org.elasticsearch.gateway.GatewayService.STATE_NOT_RECOVERED_BLOCK; +import static org.opensearch.gateway.GatewayService.STATE_NOT_RECOVERED_BLOCK; public class JoinTaskExecutor implements ClusterStateTaskExecutor { diff --git a/server/src/main/java/org/opensearch/cluster/coordination/OpenSearchNodeCommand.java b/server/src/main/java/org/opensearch/cluster/coordination/OpenSearchNodeCommand.java index 0bc58e2f665..7d74ad18e4c 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/OpenSearchNodeCommand.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/OpenSearchNodeCommand.java @@ -47,7 +47,7 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.env.Environment; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.env.NodeMetadata; -import org.elasticsearch.gateway.PersistedClusterStateService; +import org.opensearch.gateway.PersistedClusterStateService; import java.io.IOException; import java.nio.file.Files; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/RemoveCustomsCommand.java b/server/src/main/java/org/opensearch/cluster/coordination/RemoveCustomsCommand.java index 38ec5574c9c..cff5a5db684 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/RemoveCustomsCommand.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/RemoveCustomsCommand.java @@ -29,7 +29,7 @@ import org.opensearch.cluster.metadata.Metadata; import org.elasticsearch.common.collect.Tuple; import org.opensearch.common.regex.Regex; import org.elasticsearch.env.Environment; -import org.elasticsearch.gateway.PersistedClusterStateService; +import org.opensearch.gateway.PersistedClusterStateService; import java.io.IOException; import java.nio.file.Path; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/RemoveSettingsCommand.java b/server/src/main/java/org/opensearch/cluster/coordination/RemoveSettingsCommand.java index 641a8352845..99ad0389630 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/RemoveSettingsCommand.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/RemoveSettingsCommand.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.collect.Tuple; import org.opensearch.common.regex.Regex; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.gateway.PersistedClusterStateService; +import org.opensearch.gateway.PersistedClusterStateService; import java.io.IOException; import java.nio.file.Path; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/UnsafeBootstrapMasterCommand.java b/server/src/main/java/org/opensearch/cluster/coordination/UnsafeBootstrapMasterCommand.java index 0a885b53f06..871c91beb50 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/UnsafeBootstrapMasterCommand.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/UnsafeBootstrapMasterCommand.java @@ -32,7 +32,7 @@ import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.gateway.PersistedClusterStateService; +import org.opensearch.gateway.PersistedClusterStateService; import java.io.IOException; import java.nio.file.Path; diff --git a/server/src/main/java/org/opensearch/cluster/metadata/Manifest.java b/server/src/main/java/org/opensearch/cluster/metadata/Manifest.java index 16718d562b8..c3f12fd561c 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/Manifest.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/Manifest.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.gateway.MetadataStateFormat; +import org.opensearch.gateway.MetadataStateFormat; import org.elasticsearch.index.Index; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/ExistingShardsAllocator.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/ExistingShardsAllocator.java index a499a83f680..8d531251075 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/allocation/ExistingShardsAllocator.java +++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/ExistingShardsAllocator.java @@ -25,7 +25,7 @@ import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.UnassignedInfo; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.settings.Setting; -import org.elasticsearch.gateway.GatewayAllocator; +import org.opensearch.gateway.GatewayAllocator; import java.util.List; diff --git a/server/src/main/java/org/opensearch/discovery/DiscoveryModule.java b/server/src/main/java/org/opensearch/discovery/DiscoveryModule.java index 015c22d99c8..8e66c5130a9 100644 --- a/server/src/main/java/org/opensearch/discovery/DiscoveryModule.java +++ b/server/src/main/java/org/opensearch/discovery/DiscoveryModule.java @@ -39,7 +39,7 @@ import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; import org.opensearch.discovery.zen.ZenDiscovery; -import org.elasticsearch.gateway.GatewayMetaState; +import org.opensearch.gateway.GatewayMetaState; import org.elasticsearch.monitor.NodeHealthService; import org.elasticsearch.plugins.DiscoveryPlugin; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/opensearch/discovery/zen/ZenDiscovery.java b/server/src/main/java/org/opensearch/discovery/zen/ZenDiscovery.java index 024bb9032fb..3063a3f3d4d 100644 --- a/server/src/main/java/org/opensearch/discovery/zen/ZenDiscovery.java +++ b/server/src/main/java/org/opensearch/discovery/zen/ZenDiscovery.java @@ -87,7 +87,7 @@ import java.util.function.Consumer; import java.util.stream.Collectors; import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; -import static org.elasticsearch.gateway.GatewayService.STATE_NOT_RECOVERED_BLOCK; +import static org.opensearch.gateway.GatewayService.STATE_NOT_RECOVERED_BLOCK; public class ZenDiscovery extends AbstractLifecycleComponent implements Discovery, PingContextProvider, IncomingClusterStateListener { private static final Logger logger = LogManager.getLogger(ZenDiscovery.class); diff --git a/server/src/main/java/org/opensearch/discovery/zen/ZenPing.java b/server/src/main/java/org/opensearch/discovery/zen/ZenPing.java index 1551c094417..56159dfd078 100644 --- a/server/src/main/java/org/opensearch/discovery/zen/ZenPing.java +++ b/server/src/main/java/org/opensearch/discovery/zen/ZenPing.java @@ -36,7 +36,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; -import static org.elasticsearch.gateway.GatewayService.STATE_NOT_RECOVERED_BLOCK; +import static org.opensearch.gateway.GatewayService.STATE_NOT_RECOVERED_BLOCK; public interface ZenPing extends Releasable { diff --git a/server/src/main/java/org/opensearch/env/NodeEnvironment.java b/server/src/main/java/org/opensearch/env/NodeEnvironment.java index 57008f80c69..2e9b48b7940 100644 --- a/server/src/main/java/org/opensearch/env/NodeEnvironment.java +++ b/server/src/main/java/org/opensearch/env/NodeEnvironment.java @@ -50,8 +50,8 @@ import org.opensearch.common.unit.ByteSizeValue; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.core.internal.io.IOUtils; -import org.elasticsearch.gateway.MetadataStateFormat; -import org.elasticsearch.gateway.PersistedClusterStateService; +import org.opensearch.gateway.MetadataStateFormat; +import org.opensearch.gateway.PersistedClusterStateService; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.shard.ShardId; diff --git a/server/src/main/java/org/opensearch/env/NodeMetadata.java b/server/src/main/java/org/opensearch/env/NodeMetadata.java index fb237ea92b4..6dc6458595c 100644 --- a/server/src/main/java/org/opensearch/env/NodeMetadata.java +++ b/server/src/main/java/org/opensearch/env/NodeMetadata.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.gateway.MetadataStateFormat; +import org.opensearch.gateway.MetadataStateFormat; import java.io.IOException; import java.io.OutputStream; diff --git a/server/src/main/java/org/opensearch/env/NodeRepurposeCommand.java b/server/src/main/java/org/opensearch/env/NodeRepurposeCommand.java index f5b208a523a..e9c1c272a51 100644 --- a/server/src/main/java/org/opensearch/env/NodeRepurposeCommand.java +++ b/server/src/main/java/org/opensearch/env/NodeRepurposeCommand.java @@ -31,8 +31,8 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.core.internal.io.IOUtils; -import org.elasticsearch.gateway.MetadataStateFormat; -import org.elasticsearch.gateway.PersistedClusterStateService; +import org.opensearch.gateway.MetadataStateFormat; +import org.opensearch.gateway.PersistedClusterStateService; import java.io.IOException; import java.nio.file.Path; diff --git a/server/src/main/java/org/opensearch/env/OverrideNodeVersionCommand.java b/server/src/main/java/org/opensearch/env/OverrideNodeVersionCommand.java index 3a170615c92..7be440656f6 100644 --- a/server/src/main/java/org/opensearch/env/OverrideNodeVersionCommand.java +++ b/server/src/main/java/org/opensearch/env/OverrideNodeVersionCommand.java @@ -24,7 +24,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.Version; import org.opensearch.cli.Terminal; import org.opensearch.cluster.coordination.OpenSearchNodeCommand; -import org.elasticsearch.gateway.PersistedClusterStateService; +import org.opensearch.gateway.PersistedClusterStateService; import java.io.IOException; import java.nio.file.Path; diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java index eabd5f8d386..f84d132dac7 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java @@ -32,7 +32,7 @@ import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.common.UUIDs; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.gateway.GatewayService; +import org.opensearch.gateway.GatewayService; import org.elasticsearch.index.Index; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.TestCustomMetadata; diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java index 33bc9718007..a56607bb4de 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java @@ -51,8 +51,8 @@ import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsModule; -import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.gateway.GatewayAllocator; +import org.elasticsearch.common.util.concurrent.ThreadContext; +import org.opensearch.gateway.GatewayAllocator; import org.elasticsearch.plugins.ClusterPlugin; import org.elasticsearch.test.gateway.TestGatewayAllocator; import org.opensearch.cluster.ClusterInfoService; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelperTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelperTests.java index bcd7f8b5015..909e0b9a983 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelperTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelperTests.java @@ -31,7 +31,7 @@ import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.cluster.node.DiscoveryNodes; import org.elasticsearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.gateway.GatewayMetaState; +import org.opensearch.gateway.GatewayMetaState; import org.elasticsearch.monitor.StatusInfo; import org.elasticsearch.test.ESTestCase; import org.opensearch.cluster.coordination.Coordinator; 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 8e1eca7a9b8..fa2a57dec48 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java @@ -48,7 +48,7 @@ import org.opensearch.common.util.set.Sets; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.discovery.DiscoveryModule; import org.opensearch.discovery.zen.PublishClusterStateStats; -import org.elasticsearch.gateway.GatewayService; +import org.opensearch.gateway.GatewayService; import org.elasticsearch.monitor.StatusInfo; import org.elasticsearch.test.MockLogAppender; import org.opensearch.cluster.coordination.DetachClusterCommand; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationServiceTests.java index de74fe065c3..4f37673b68c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationServiceTests.java @@ -49,7 +49,7 @@ import org.opensearch.cluster.routing.allocation.decider.SameShardAllocationDeci import org.opensearch.cluster.routing.allocation.decider.ThrottlingAllocationDecider; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.gateway.GatewayAllocator; +import org.opensearch.gateway.GatewayAllocator; import org.opensearch.snapshots.EmptySnapshotsInfoService; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.gateway.TestGatewayAllocator; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java index adb183a1601..87f527ddbbe 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java @@ -29,7 +29,7 @@ import org.opensearch.cluster.action.shard.ShardStateAction; import org.opensearch.cluster.service.ClusterService; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.core.internal.io.IOUtils; -import org.elasticsearch.gateway.WriteStateException; +import org.opensearch.gateway.WriteStateException; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.shard.IndexShard; 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 64121809d44..6a312e56eb5 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java @@ -42,7 +42,7 @@ import org.opensearch.common.util.BigArrays; import org.elasticsearch.env.Environment; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.env.TestEnvironment; -import org.elasticsearch.gateway.PersistedClusterStateService; +import org.opensearch.gateway.PersistedClusterStateService; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.MergePolicyConfig; import org.elasticsearch.index.engine.EngineException; diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java index 2769ab7859d..a8a9d82de4d 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java @@ -38,9 +38,9 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.env.ShardLockObtainFailedException; -import org.elasticsearch.gateway.GatewayMetaState; -import org.elasticsearch.gateway.LocalAllocateDangledIndices; -import org.elasticsearch.gateway.MetaStateService; +import org.opensearch.gateway.GatewayMetaState; +import org.opensearch.gateway.LocalAllocateDangledIndices; +import org.opensearch.gateway.MetaStateService; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexModule; import org.elasticsearch.index.IndexService; diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/ESAllocationTestCase.java b/test/framework/src/main/java/org/elasticsearch/cluster/ESAllocationTestCase.java index 2161794f8f3..2b45a247a0c 100644 --- a/test/framework/src/main/java/org/elasticsearch/cluster/ESAllocationTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/cluster/ESAllocationTestCase.java @@ -38,7 +38,7 @@ import org.opensearch.cluster.routing.allocation.decider.SameShardAllocationDeci import org.opensearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.gateway.GatewayAllocator; +import org.opensearch.gateway.GatewayAllocator; import org.opensearch.cluster.ClusterInfoService; import org.opensearch.cluster.ClusterModule; import org.opensearch.cluster.ClusterState; 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 96ebb6d4964..34724babe11 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 @@ -65,10 +65,10 @@ import org.opensearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; import org.opensearch.discovery.DiscoveryModule; import org.opensearch.discovery.SeedHostsProvider; import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.gateway.ClusterStateUpdaters; -import org.elasticsearch.gateway.GatewayService; -import org.elasticsearch.gateway.MockGatewayMetaState; -import org.elasticsearch.gateway.PersistedClusterStateService; +import org.opensearch.gateway.ClusterStateUpdaters; +import org.opensearch.gateway.GatewayService; +import org.opensearch.gateway.MockGatewayMetaState; +import org.opensearch.gateway.PersistedClusterStateService; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.monitor.NodeHealthService; import org.elasticsearch.monitor.StatusInfo; @@ -136,7 +136,7 @@ import static org.opensearch.cluster.coordination.LeaderChecker.LEADER_CHECK_TIM import static org.opensearch.cluster.coordination.NoMasterBlockService.NO_MASTER_BLOCK_ID; import static org.opensearch.cluster.coordination.Reconfigurator.CLUSTER_AUTO_SHRINK_VOTING_CONFIGURATION; import static org.opensearch.discovery.PeerFinder.DISCOVERY_FIND_PEERS_INTERVAL_SETTING; -import static org.elasticsearch.gateway.GatewayService.STATE_NOT_RECOVERED_BLOCK; +import static org.opensearch.gateway.GatewayService.STATE_NOT_RECOVERED_BLOCK; import static org.elasticsearch.monitor.StatusInfo.Status.HEALTHY; import static org.elasticsearch.node.Node.NODE_NAME_SETTING; import static org.opensearch.transport.TransportService.NOOP_TRANSPORT_INTERCEPTOR; diff --git a/test/framework/src/main/java/org/elasticsearch/gateway/MockGatewayMetaState.java b/test/framework/src/main/java/org/elasticsearch/gateway/MockGatewayMetaState.java index d9571200f0d..93c2422b605 100644 --- a/test/framework/src/main/java/org/elasticsearch/gateway/MockGatewayMetaState.java +++ b/test/framework/src/main/java/org/elasticsearch/gateway/MockGatewayMetaState.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.gateway; +package org.opensearch.gateway; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.Manifest; diff --git a/test/framework/src/main/java/org/elasticsearch/test/gateway/TestGatewayAllocator.java b/test/framework/src/main/java/org/elasticsearch/test/gateway/TestGatewayAllocator.java index 621fb068488..0aec59bd8a0 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/gateway/TestGatewayAllocator.java +++ b/test/framework/src/main/java/org/elasticsearch/test/gateway/TestGatewayAllocator.java @@ -24,11 +24,11 @@ import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.allocation.FailedShard; import org.opensearch.cluster.routing.allocation.RoutingAllocation; -import org.elasticsearch.gateway.AsyncShardFetch; -import org.elasticsearch.gateway.GatewayAllocator; -import org.elasticsearch.gateway.PrimaryShardAllocator; -import org.elasticsearch.gateway.ReplicaShardAllocator; -import org.elasticsearch.gateway.TransportNodesListGatewayStartedShards.NodeGatewayStartedShards; +import org.opensearch.gateway.AsyncShardFetch; +import org.opensearch.gateway.GatewayAllocator; +import org.opensearch.gateway.PrimaryShardAllocator; +import org.opensearch.gateway.ReplicaShardAllocator; +import org.opensearch.gateway.TransportNodesListGatewayStartedShards.NodeGatewayStartedShards; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.store.TransportNodesListShardStoreMetadata.NodeStoreFilesMetadata;