From bf4e3294c93557adf147a1e9b77ee4e9afe49177 Mon Sep 17 00:00:00 2001 From: Himanshu Setia <58999915+setiah@users.noreply.github.com> Date: Thu, 18 Mar 2021 13:27:38 -0700 Subject: [PATCH] [Rename] server test o.e.cluster (#396) [Rename] server test o.e.cluster * moving directory to opensearch Signed-off-by: Himanshu Setia * Fixing imports Signed-off-by: Himanshu Setia * Fixing more imports Signed-off-by: Himanshu Setia --- .../mapper/FieldFilterMapperPluginTests.java | 4 +- .../cluster/ClusterChangedEventTests.java | 4 +- .../cluster/ClusterInfoTests.java | 8 +-- .../cluster/ClusterModuleTests.java | 4 +- .../cluster/ClusterStateObserverTests.java | 2 +- .../ClusterStateTaskExecutorTests.java | 4 +- .../cluster/ClusterStateTests.java | 9 ++- .../cluster/DiskUsageTests.java | 18 +++--- .../cluster/FeatureAwareTests.java | 4 +- ...rnalClusterInfoServiceSchedulingTests.java | 6 +- .../cluster/NodeConnectionsServiceTests.java | 4 +- .../index/MappingUpdatedActionTests.java | 4 +- ...rdFailedClusterStateTaskExecutorTests.java | 4 +- ...dStartedClusterStateTaskExecutorTests.java | 7 +-- .../action/shard/ShardStateActionTests.java | 6 +- .../cluster/block/ClusterBlockTests.java | 4 +- .../ClusterBootstrapServiceTests.java | 4 +- .../ClusterFormationFailureHelperTests.java | 12 ++-- .../CoordinationMetadataTests.java | 4 +- .../coordination/CoordinationStateTests.java | 4 +- .../coordination/CoordinatorTests.java | 10 ++-- .../DiscoveryUpgradeServiceTests.java | 4 +- .../ElectionSchedulerFactoryTests.java | 4 +- .../coordination/FollowersCheckerTests.java | 12 ++-- .../cluster/coordination/JoinHelperTests.java | 10 ++-- .../coordination/JoinTaskExecutorTests.java | 4 +- .../coordination/LagDetectorTests.java | 6 +- .../coordination/LeaderCheckerTests.java | 10 ++-- .../LinearizabilityCheckerTests.java | 4 +- .../cluster/coordination/MessagesTests.java | 14 +---- .../NoMasterBlockServiceTests.java | 7 +-- .../coordination/NoOpClusterApplier.java | 4 +- .../cluster/coordination/NodeJoinTests.java | 22 ++----- ...eRemovalClusterStateTaskExecutorTests.java | 4 +- .../OpenSearchNodeCommandTests.java | 8 +-- .../coordination/PreVoteCollectorTests.java | 15 +---- .../coordination/PublicationTests.java | 15 +---- .../PublicationTransportHandlerTests.java | 10 ++-- .../coordination/ReconfiguratorTests.java | 4 +- .../health/ClusterHealthAllocationTests.java | 4 +- .../health/ClusterIndexHealthTests.java | 9 +-- .../health/ClusterShardHealthTests.java | 4 +- .../health/ClusterStateHealthTests.java | 8 +-- .../cluster/metadata/AliasMetadataTests.java | 4 +- .../cluster/metadata/AliasValidatorTests.java | 6 +- .../metadata/AutoExpandReplicasTests.java | 8 +-- .../ClusterNameExpressionResolverTests.java | 4 +- .../ComponentTemplateMetadataTests.java | 6 +- .../metadata/ComponentTemplateTests.java | 8 +-- .../ComposableIndexTemplateMetadataTests.java | 6 +- .../ComposableIndexTemplateTests.java | 8 +-- .../metadata/DataStreamMetadataTests.java | 6 +- .../cluster/metadata/DataStreamTests.java | 6 +- .../DateMathExpressionResolverTests.java | 4 +- .../metadata/DiffableStringMapTests.java | 4 +- .../HumanReadableIndexSettingsTests.java | 4 +- .../metadata/IndexAbstractionTests.java | 32 +++++------ .../cluster/metadata/IndexGraveyardTests.java | 6 +- .../cluster/metadata/IndexMetadataTests.java | 10 ++-- ...ExpressionResolverAliasIterationTests.java | 5 +- ...sionResolverExpressionsIterationTests.java | 5 +- .../IndexNameExpressionResolverTests.java | 16 +++--- .../metadata/IndexTemplateMetadataTests.java | 4 +- .../cluster/metadata/ManifestTests.java | 6 +- .../MetadataCreateDataStreamServiceTests.java | 2 +- .../MetadataCreateIndexServiceTests.java | 57 ++++++++----------- .../MetadataDeleteIndexServiceTests.java | 8 +-- .../MetadataIndexAliasesServiceTests.java | 4 +- .../MetadataIndexStateServiceTests.java | 12 ++-- .../MetadataIndexStateServiceUtils.java | 6 +- .../MetadataIndexTemplateServiceTests.java | 54 +++++++----------- .../MetadataIndexUpgradeServiceTests.java | 14 ++--- .../metadata/MetadataMappingServiceTests.java | 12 ++-- .../cluster/metadata/MetadataTests.java | 25 +++----- .../metadata/TemplateUpgradeServiceTests.java | 4 +- .../metadata/ToAndFromJsonMetadataTests.java | 8 +-- .../WildcardExpressionResolverTests.java | 8 +-- .../node/DiscoveryNodeFiltersTests.java | 4 +- .../node/DiscoveryNodeRoleSettingTests.java | 2 +- .../cluster/node/DiscoveryNodeRoleTests.java | 4 +- .../cluster/node/DiscoveryNodeTests.java | 4 +- .../cluster/node/DiscoveryNodesTests.java | 4 +- .../cluster/routing/AllocationIdTests.java | 6 +- .../routing/BatchedRerouteServiceTests.java | 4 +- .../DelayedAllocationServiceTests.java | 4 +- .../routing/GroupShardsIteratorTests.java | 15 ++--- .../routing/IndexShardRoutingTableTests.java | 8 +-- .../routing/OperationRoutingTests.java | 8 +-- .../routing/PlainShardIteratorTests.java | 7 +-- .../cluster/routing/PrimaryTermsTests.java | 4 +- .../routing/RandomShardRoutingMutator.java | 4 +- .../cluster/routing/RecoverySourceTests.java | 4 +- .../cluster/routing/RoutingNodeTests.java | 8 +-- .../routing/RoutingTableGenerator.java | 6 +- .../cluster/routing/RoutingTableTests.java | 17 ++---- .../cluster/routing/ShardRoutingTests.java | 8 +-- .../cluster/routing/UnassignedInfoTests.java | 6 +- .../allocation/AddIncrementallyTests.java | 5 +- .../AllocateUnassignedDecisionTests.java | 4 +- .../allocation/AllocationCommandsTests.java | 14 ++--- .../allocation/AllocationDecisionTests.java | 4 +- .../allocation/AllocationPriorityTests.java | 4 +- .../allocation/AllocationServiceTests.java | 4 +- .../allocation/AwarenessAllocationTests.java | 5 +- .../allocation/BalanceConfigurationTests.java | 7 +-- .../BalanceUnbalancedClusterTests.java | 7 +-- .../allocation/BalancedSingleShardTests.java | 4 +- .../allocation/CatAllocationTestCase.java | 4 +- .../ClusterRebalanceRoutingTests.java | 6 +- .../ConcurrentRebalanceRoutingTests.java | 5 +- .../allocation/DeadNodesAllocationTests.java | 5 +- .../DecisionsImpactOnClusterHealthTests.java | 6 +- .../allocation/DiskThresholdMonitorTests.java | 4 +- .../DiskThresholdSettingsTests.java | 7 +-- ...ReplicaAsPrimaryDuringRelocationTests.java | 5 +- .../ExpectedShardSizeAllocationTests.java | 5 +- .../allocation/FailedNodeRoutingTests.java | 8 +-- .../allocation/FailedShardsRoutingTests.java | 8 +-- .../allocation/FilterRoutingTests.java | 4 +- .../allocation/InSyncAllocationIdTests.java | 6 +- .../routing/allocation/IndexBalanceTests.java | 5 +- .../MaxRetryAllocationDeciderTests.java | 4 +- .../routing/allocation/MoveDecisionTests.java | 4 +- .../allocation/NodeAllocationResultTests.java | 4 +- .../NodeVersionAllocationDeciderTests.java | 8 +-- ...alPrimariesToRelocatingPrimariesTests.java | 4 +- .../PreferPrimaryAllocationTests.java | 5 +- .../PrimaryElectionRoutingTests.java | 5 +- ...yNotRelocatedWhileBeingRecoveredTests.java | 5 +- .../RandomAllocationDeciderTests.java | 4 +- .../allocation/RebalanceAfterActiveTests.java | 5 +- .../ReplicaAllocatedAfterPrimaryTests.java | 5 +- .../ResizeAllocationDeciderTests.java | 8 +-- .../RetryFailedAllocationTests.java | 4 +- .../RoutingNodesIntegrityTests.java | 5 +- .../routing/allocation/RoutingNodesUtils.java | 4 +- .../allocation/SameShardRoutingTests.java | 10 ++-- .../allocation/ShardVersioningTests.java | 5 +- .../ShardsLimitAllocationTests.java | 10 ++-- .../SingleShardNoReplicasRoutingTests.java | 7 +-- .../SingleShardOneReplicaRoutingTests.java | 5 +- .../allocation/StartedShardsRoutingTests.java | 4 +- .../TenShardsOneReplicaRoutingTests.java | 5 +- .../allocation/ThrottlingAllocationTests.java | 9 ++- .../TrackFailedAllocationNodesTests.java | 4 +- .../UpdateNumberOfReplicasTests.java | 5 +- .../decider/AllocationDecidersTests.java | 6 +- .../allocation/decider/DecisionTests.java | 4 +- .../decider/DiskThresholdDeciderTests.java | 6 +- .../DiskThresholdDeciderUnitTests.java | 16 ++---- .../EnableAllocationShortCircuitTests.java | 6 +- .../decider/EnableAllocationTests.java | 7 +-- .../decider/FilterAllocationDeciderTests.java | 4 +- ...storeInProgressAllocationDeciderTests.java | 6 +- .../murmur3/Murmur3HashFunctionTests.java | 4 +- .../ClusterSerializationTests.java | 4 +- .../ClusterStateToStringTests.java | 4 +- .../cluster/serialization/DiffableTests.java | 4 +- .../service/ClusterApplierServiceTests.java | 9 ++- .../cluster/service/MasterServiceTests.java | 9 ++- .../cluster/service/TaskBatcherTests.java | 5 +- .../cluster/service/TaskExecutorTests.java | 5 +- .../cluster/shards/ShardCounts.java | 2 +- .../structure/RoutingIteratorTests.java | 6 +- .../indices/ShardLimitValidatorTests.java | 8 +-- .../indices/cluster/ClusterStateChanges.java | 4 +- .../snapshots/SnapshotResiliencyTests.java | 2 +- 167 files changed, 516 insertions(+), 686 deletions(-) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/ClusterChangedEventTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/ClusterInfoTests.java (95%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/ClusterModuleTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/ClusterStateObserverTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/ClusterStateTaskExecutorTests.java (96%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/ClusterStateTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/DiskUsageTests.java (96%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/FeatureAwareTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/InternalClusterInfoServiceSchedulingTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/NodeConnectionsServiceTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/action/index/MappingUpdatedActionTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/action/shard/ShardStartedClusterStateTaskExecutorTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/action/shard/ShardStateActionTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/block/ClusterBlockTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/ClusterBootstrapServiceTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/ClusterFormationFailureHelperTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/CoordinationMetadataTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/CoordinationStateTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/CoordinatorTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/DiscoveryUpgradeServiceTests.java (94%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/ElectionSchedulerFactoryTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/FollowersCheckerTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/JoinHelperTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/JoinTaskExecutorTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/LagDetectorTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/LeaderCheckerTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/LinearizabilityCheckerTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/MessagesTests.java (95%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/NoMasterBlockServiceTests.java (95%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/NoOpClusterApplier.java (92%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/NodeJoinTests.java (96%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/NodeRemovalClusterStateTaskExecutorTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/OpenSearchNodeCommandTests.java (96%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/PreVoteCollectorTests.java (95%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/PublicationTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/PublicationTransportHandlerTests.java (92%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/ReconfiguratorTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/health/ClusterHealthAllocationTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/health/ClusterIndexHealthTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/health/ClusterShardHealthTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/health/ClusterStateHealthTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/AliasMetadataTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/AliasValidatorTests.java (94%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/AutoExpandReplicasTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/ClusterNameExpressionResolverTests.java (96%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/ComponentTemplateMetadataTests.java (92%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/ComponentTemplateTests.java (95%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/ComposableIndexTemplateMetadataTests.java (90%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/ComposableIndexTemplateTests.java (96%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/DataStreamMetadataTests.java (91%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/DataStreamTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/DateMathExpressionResolverTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/DiffableStringMapTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/HumanReadableIndexSettingsTests.java (95%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/IndexAbstractionTests.java (87%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/IndexGraveyardTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/IndexMetadataTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/IndexNameExpressionResolverAliasIterationTests.java (88%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/IndexNameExpressionResolverExpressionsIterationTests.java (89%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/IndexNameExpressionResolverTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/IndexTemplateMetadataTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/ManifestTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/MetadataCreateDataStreamServiceTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/MetadataCreateIndexServiceTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/MetadataDeleteIndexServiceTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/MetadataIndexAliasesServiceTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/MetadataIndexStateServiceTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/MetadataIndexStateServiceUtils.java (94%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/MetadataIndexTemplateServiceTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/MetadataIndexUpgradeServiceTests.java (95%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/MetadataMappingServiceTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/MetadataTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/TemplateUpgradeServiceTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/ToAndFromJsonMetadataTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/metadata/WildcardExpressionResolverTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/node/DiscoveryNodeFiltersTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/node/DiscoveryNodeRoleSettingTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/node/DiscoveryNodeRoleTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/node/DiscoveryNodeTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/node/DiscoveryNodesTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/AllocationIdTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/BatchedRerouteServiceTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/DelayedAllocationServiceTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/GroupShardsIteratorTests.java (93%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/IndexShardRoutingTableTests.java (93%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/OperationRoutingTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/PlainShardIteratorTests.java (95%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/PrimaryTermsTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/RandomShardRoutingMutator.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/RecoverySourceTests.java (96%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/RoutingNodeTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/RoutingTableGenerator.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/RoutingTableTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/ShardRoutingTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/UnassignedInfoTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/AddIncrementallyTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/AllocateUnassignedDecisionTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/AllocationCommandsTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/AllocationDecisionTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/AllocationPriorityTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/AllocationServiceTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/AwarenessAllocationTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/BalanceConfigurationTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/BalanceUnbalancedClusterTests.java (94%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/BalancedSingleShardTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/CatAllocationTestCase.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/ClusterRebalanceRoutingTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/DeadNodesAllocationTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/DiskThresholdMonitorTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/DiskThresholdSettingsTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java (96%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/FailedNodeRoutingTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/FailedShardsRoutingTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/FilterRoutingTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/InSyncAllocationIdTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/IndexBalanceTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/MoveDecisionTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/NodeAllocationResultTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/PreferPrimaryAllocationTests.java (96%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/PrimaryElectionRoutingTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java (96%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/RandomAllocationDeciderTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/RebalanceAfterActiveTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/ResizeAllocationDeciderTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/RetryFailedAllocationTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/RoutingNodesIntegrityTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/RoutingNodesUtils.java (92%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/SameShardRoutingTests.java (94%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/ShardVersioningTests.java (96%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/ShardsLimitAllocationTests.java (96%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/StartedShardsRoutingTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/ThrottlingAllocationTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/TrackFailedAllocationNodesTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/UpdateNumberOfReplicasTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/decider/AllocationDecidersTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/decider/DecisionTests.java (94%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/decider/EnableAllocationShortCircuitTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/decider/EnableAllocationTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java (92%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/serialization/ClusterSerializationTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/serialization/ClusterStateToStringTests.java (97%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/serialization/DiffableTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/service/ClusterApplierServiceTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/service/MasterServiceTests.java (99%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/service/TaskBatcherTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/service/TaskExecutorTests.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/shards/ShardCounts.java (98%) rename server/src/test/java/org/{elasticsearch => opensearch}/cluster/structure/RoutingIteratorTests.java (99%) diff --git a/server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java index c104cbf4f636e..a9b45470ab3a5 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java @@ -46,8 +46,8 @@ import java.util.function.Function; import java.util.function.Predicate; -import static org.elasticsearch.cluster.metadata.MetadataTests.assertLeafs; -import static org.elasticsearch.cluster.metadata.MetadataTests.assertMultiField; +import static org.opensearch.cluster.metadata.MetadataTests.assertLeafs; +import static org.opensearch.cluster.metadata.MetadataTests.assertMultiField; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; public class FieldFilterMapperPluginTests extends OpenSearchSingleNodeTestCase { diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java b/server/src/test/java/org/opensearch/cluster/ClusterChangedEventTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java rename to server/src/test/java/org/opensearch/cluster/ClusterChangedEventTests.java index 6701e408822dc..2d322865f5617 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java +++ b/server/src/test/java/org/opensearch/cluster/ClusterChangedEventTests.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.cluster; +package org.opensearch.cluster; import com.carrotsearch.hppc.cursors.ObjectCursor; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java b/server/src/test/java/org/opensearch/cluster/ClusterInfoTests.java similarity index 95% rename from server/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java rename to server/src/test/java/org/opensearch/cluster/ClusterInfoTests.java index e7608947f4f96..e65c9a5aab00b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java +++ b/server/src/test/java/org/opensearch/cluster/ClusterInfoTests.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,17 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.cluster; +package org.opensearch.cluster; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.ShardRoutingState; import org.opensearch.cluster.routing.TestShardRouting; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; -import org.opensearch.cluster.ClusterInfo; -import org.opensearch.cluster.DiskUsage; public class ClusterInfoTests extends OpenSearchTestCase { diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java b/server/src/test/java/org/opensearch/cluster/ClusterModuleTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java rename to server/src/test/java/org/opensearch/cluster/ClusterModuleTests.java index 41e28f3f6f871..2e9fc3702b8b5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java +++ b/server/src/test/java/org/opensearch/cluster/ClusterModuleTests.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.cluster; +package org.opensearch.cluster; import org.opensearch.cluster.metadata.Metadata; import org.opensearch.cluster.metadata.RepositoriesMetadata; diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterStateObserverTests.java b/server/src/test/java/org/opensearch/cluster/ClusterStateObserverTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/ClusterStateObserverTests.java rename to server/src/test/java/org/opensearch/cluster/ClusterStateObserverTests.java index 5074996918180..0089d6ea6b557 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterStateObserverTests.java +++ b/server/src/test/java/org/opensearch/cluster/ClusterStateObserverTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cluster; +package org.opensearch.cluster; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.ClusterApplierService; diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterStateTaskExecutorTests.java b/server/src/test/java/org/opensearch/cluster/ClusterStateTaskExecutorTests.java similarity index 96% rename from server/src/test/java/org/elasticsearch/cluster/ClusterStateTaskExecutorTests.java rename to server/src/test/java/org/opensearch/cluster/ClusterStateTaskExecutorTests.java index d3f0a8451bc7d..9b305b840fb02 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterStateTaskExecutorTests.java +++ b/server/src/test/java/org/opensearch/cluster/ClusterStateTaskExecutorTests.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.cluster; +package org.opensearch.cluster; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.ClusterStateTaskExecutor; diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java b/server/src/test/java/org/opensearch/cluster/ClusterStateTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java rename to server/src/test/java/org/opensearch/cluster/ClusterStateTests.java index b0f48fabd480e..a4a6778fbedcc 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java +++ b/server/src/test/java/org/opensearch/cluster/ClusterStateTests.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.cluster; +package org.opensearch.cluster; import org.opensearch.Version; import org.opensearch.action.admin.indices.rollover.RolloverInfo; @@ -43,9 +43,8 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; -import org.opensearch.cluster.ClusterState; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; import org.opensearch.rest.RestStatus; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.TestCustomMetadata; diff --git a/server/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java b/server/src/test/java/org/opensearch/cluster/DiskUsageTests.java similarity index 96% rename from server/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java rename to server/src/test/java/org/opensearch/cluster/DiskUsageTests.java index a233770232742..ce7a78fdabad8 100644 --- a/server/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java +++ b/server/src/test/java/org/opensearch/cluster/DiskUsageTests.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.cluster; +package org.opensearch.cluster; import org.opensearch.Version; import org.opensearch.action.admin.cluster.node.stats.NodeStats; @@ -29,16 +29,12 @@ import org.opensearch.cluster.routing.ShardRoutingHelper; import org.opensearch.cluster.routing.UnassignedInfo; import org.opensearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.index.shard.ShardPath; -import org.elasticsearch.index.store.StoreStats; -import org.elasticsearch.monitor.fs.FsInfo; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardPath; +import org.opensearch.index.store.StoreStats; +import org.opensearch.monitor.fs.FsInfo; import org.opensearch.test.OpenSearchTestCase; -import org.opensearch.cluster.ClusterInfo; -import org.opensearch.cluster.ClusterState; -import org.opensearch.cluster.DiskUsage; -import org.opensearch.cluster.InternalClusterInfoService; import java.nio.file.Path; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/cluster/FeatureAwareTests.java b/server/src/test/java/org/opensearch/cluster/FeatureAwareTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/FeatureAwareTests.java rename to server/src/test/java/org/opensearch/cluster/FeatureAwareTests.java index 211cf9ad3fa44..187c844f81bf3 100644 --- a/server/src/test/java/org/elasticsearch/cluster/FeatureAwareTests.java +++ b/server/src/test/java/org/opensearch/cluster/FeatureAwareTests.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.cluster; +package org.opensearch.cluster; import org.opensearch.Version; import org.opensearch.client.transport.TransportClient; diff --git a/server/src/test/java/org/elasticsearch/cluster/InternalClusterInfoServiceSchedulingTests.java b/server/src/test/java/org/opensearch/cluster/InternalClusterInfoServiceSchedulingTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/InternalClusterInfoServiceSchedulingTests.java rename to server/src/test/java/org/opensearch/cluster/InternalClusterInfoServiceSchedulingTests.java index 43342c2cca71d..c51e1065a5ffc 100644 --- a/server/src/test/java/org/elasticsearch/cluster/InternalClusterInfoServiceSchedulingTests.java +++ b/server/src/test/java/org/opensearch/cluster/InternalClusterInfoServiceSchedulingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cluster; +package org.opensearch.cluster; import org.opensearch.Version; import org.opensearch.action.ActionListener; @@ -36,7 +36,7 @@ import org.opensearch.cluster.service.ClusterApplierService; import org.opensearch.cluster.service.ClusterService; import org.opensearch.cluster.service.FakeThreadPoolMasterService; -import org.elasticsearch.cluster.service.MasterService; +import org.opensearch.cluster.service.MasterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.PrioritizedOpenSearchThreadPoolExecutor; @@ -181,7 +181,7 @@ protected void requestCount++; // ClusterInfoService handles ClusterBlockExceptions quietly, so we invent such an exception to avoid excess logging listener.onFailure(new ClusterBlockException( - org.elasticsearch.common.collect.Set.of(NoMasterBlockService.NO_MASTER_BLOCK_ALL))); + org.opensearch.common.collect.Set.of(NoMasterBlockService.NO_MASTER_BLOCK_ALL))); } else { fail("unexpected action: " + action.name()); } diff --git a/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java b/server/src/test/java/org/opensearch/cluster/NodeConnectionsServiceTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java rename to server/src/test/java/org/opensearch/cluster/NodeConnectionsServiceTests.java index d79ca244c93d9..8e4efcef87377 100644 --- a/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/NodeConnectionsServiceTests.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.cluster; +package org.opensearch.cluster; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; diff --git a/server/src/test/java/org/elasticsearch/cluster/action/index/MappingUpdatedActionTests.java b/server/src/test/java/org/opensearch/cluster/action/index/MappingUpdatedActionTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/action/index/MappingUpdatedActionTests.java rename to server/src/test/java/org/opensearch/cluster/action/index/MappingUpdatedActionTests.java index 685466bca123c..b24180a4b6eae 100644 --- a/server/src/test/java/org/elasticsearch/cluster/action/index/MappingUpdatedActionTests.java +++ b/server/src/test/java/org/opensearch/cluster/action/index/MappingUpdatedActionTests.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.cluster.action.index; +package org.opensearch.cluster.action.index; import org.opensearch.Version; import org.opensearch.action.ActionListener; diff --git a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java b/server/src/test/java/org/opensearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java rename to server/src/test/java/org/opensearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java index c98d1d94b0e8e..cfbaabfae9751 100644 --- a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java +++ b/server/src/test/java/org/opensearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.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.cluster.action.shard; +package org.opensearch.cluster.action.shard; import com.carrotsearch.hppc.cursors.ObjectCursor; import org.apache.lucene.index.CorruptIndexException; diff --git a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStartedClusterStateTaskExecutorTests.java b/server/src/test/java/org/opensearch/cluster/action/shard/ShardStartedClusterStateTaskExecutorTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStartedClusterStateTaskExecutorTests.java rename to server/src/test/java/org/opensearch/cluster/action/shard/ShardStartedClusterStateTaskExecutorTests.java index 34ab944e7de6e..eaad1de43855e 100644 --- a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStartedClusterStateTaskExecutorTests.java +++ b/server/src/test/java/org/opensearch/cluster/action/shard/ShardStartedClusterStateTaskExecutorTests.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,13 +17,12 @@ * under the License. */ -package org.elasticsearch.cluster.action.shard; +package org.opensearch.cluster.action.shard; import org.opensearch.action.ActionListener; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.ClusterStateTaskExecutor; import org.opensearch.cluster.OpenSearchAllocationTestCase; -import org.opensearch.cluster.action.shard.ShardStateAction; import org.opensearch.cluster.action.shard.ShardStateAction.StartedShardEntry; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.Metadata; @@ -33,7 +32,7 @@ import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.common.Priority; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import java.util.ArrayList; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java b/server/src/test/java/org/opensearch/cluster/action/shard/ShardStateActionTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java rename to server/src/test/java/org/opensearch/cluster/action/shard/ShardStateActionTests.java index 04d93ff7b90c3..c8fe49bf15a10 100644 --- a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java +++ b/server/src/test/java/org/opensearch/cluster/action/shard/ShardStateActionTests.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.cluster.action.shard; +package org.opensearch.cluster.action.shard; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.util.SetOnce; @@ -43,7 +43,7 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.VersionUtils; import org.opensearch.test.transport.CapturingTransport; diff --git a/server/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java b/server/src/test/java/org/opensearch/cluster/block/ClusterBlockTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java rename to server/src/test/java/org/opensearch/cluster/block/ClusterBlockTests.java index 40965f544979e..2d70e1fef4d17 100644 --- a/server/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java +++ b/server/src/test/java/org/opensearch/cluster/block/ClusterBlockTests.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.cluster.block; +package org.opensearch.cluster.block; import org.opensearch.Version; import org.opensearch.common.UUIDs; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java b/server/src/test/java/org/opensearch/cluster/coordination/ClusterBootstrapServiceTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/ClusterBootstrapServiceTests.java index 069b684fd2b3f..771a2543c9f05 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/ClusterBootstrapServiceTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.OpenSearchException; import org.opensearch.Version; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelperTests.java b/server/src/test/java/org/opensearch/cluster/coordination/ClusterFormationFailureHelperTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelperTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/ClusterFormationFailureHelperTests.java index 3c2c790377f92..a0b79c460fdb7 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelperTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/ClusterFormationFailureHelperTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.Version; import org.opensearch.cluster.ClusterName; @@ -33,7 +33,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; import org.opensearch.gateway.GatewayMetaState; -import org.elasticsearch.monitor.StatusInfo; +import org.opensearch.monitor.StatusInfo; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.coordination.Coordinator; import org.opensearch.cluster.coordination.ElectionStrategy; @@ -49,8 +49,8 @@ import static java.util.Collections.singletonList; import static org.opensearch.cluster.coordination.ClusterBootstrapService.BOOTSTRAP_PLACEHOLDER_PREFIX; import static org.opensearch.cluster.coordination.ClusterBootstrapService.INITIAL_MASTER_NODES_SETTING; -import static org.elasticsearch.monitor.StatusInfo.Status.HEALTHY; -import static org.elasticsearch.monitor.StatusInfo.Status.UNHEALTHY; +import static org.opensearch.monitor.StatusInfo.Status.HEALTHY; +import static org.opensearch.monitor.StatusInfo.Status.UNHEALTHY; import static org.opensearch.node.Node.NODE_NAME_SETTING; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; @@ -203,7 +203,7 @@ public void testDescriptionOnUnhealthyNodes() { is("this node is unhealthy: unhealthy-info")); final DiscoveryNode masterNode = new DiscoveryNode("local", buildNewFakeTransportAddress(), emptyMap(), - org.elasticsearch.common.collect.Set.of(DiscoveryNodeRole.MASTER_ROLE), Version.CURRENT); + org.opensearch.common.collect.Set.of(DiscoveryNodeRole.MASTER_ROLE), Version.CURRENT); clusterState = ClusterState.builder(ClusterName.DEFAULT) .version(12L).nodes(DiscoveryNodes.builder().add(masterNode).localNodeId(masterNode.getId())).build(); diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationMetadataTests.java b/server/src/test/java/org/opensearch/cluster/coordination/CoordinationMetadataTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationMetadataTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/CoordinationMetadataTests.java index e8fcae2b6dae7..401db1e2e9ee3 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationMetadataTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/CoordinationMetadataTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.cluster.coordination.CoordinationMetadata; import org.opensearch.cluster.coordination.CoordinationMetadata.VotingConfigExclusion; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationStateTests.java b/server/src/test/java/org/opensearch/cluster/coordination/CoordinationStateTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationStateTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/CoordinationStateTests.java index c4dc7736bc065..374df95106ce6 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationStateTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/CoordinationStateTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.Assertions; import org.opensearch.Version; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java b/server/src/test/java/org/opensearch/cluster/coordination/CoordinatorTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/CoordinatorTests.java index 1b90f9d7d7e38..564c9f056e268 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/CoordinatorTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -50,7 +50,7 @@ import org.opensearch.discovery.DiscoveryModule; import org.opensearch.discovery.zen.PublishClusterStateStats; import org.opensearch.gateway.GatewayService; -import org.elasticsearch.monitor.StatusInfo; +import org.opensearch.monitor.StatusInfo; import org.opensearch.test.MockLogAppender; import org.opensearch.cluster.coordination.DetachClusterCommand; import org.opensearch.cluster.coordination.FollowersChecker; @@ -88,8 +88,8 @@ import static org.opensearch.cluster.coordination.NoMasterBlockService.NO_MASTER_BLOCK_WRITES; 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.monitor.StatusInfo.Status.HEALTHY; -import static org.elasticsearch.monitor.StatusInfo.Status.UNHEALTHY; +import static org.opensearch.monitor.StatusInfo.Status.HEALTHY; +import static org.opensearch.monitor.StatusInfo.Status.UNHEALTHY; import static org.opensearch.test.NodeRoles.nonMasterNode; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.anyOf; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/DiscoveryUpgradeServiceTests.java b/server/src/test/java/org/opensearch/cluster/coordination/DiscoveryUpgradeServiceTests.java similarity index 94% rename from server/src/test/java/org/elasticsearch/cluster/coordination/DiscoveryUpgradeServiceTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/DiscoveryUpgradeServiceTests.java index 023d74e9f2e75..19dd59d9d4980 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/DiscoveryUpgradeServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/DiscoveryUpgradeServiceTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.Version; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/ElectionSchedulerFactoryTests.java b/server/src/test/java/org/opensearch/cluster/coordination/ElectionSchedulerFactoryTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/coordination/ElectionSchedulerFactoryTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/ElectionSchedulerFactoryTests.java index 460b3aa33327b..514e94a67777a 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/ElectionSchedulerFactoryTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/ElectionSchedulerFactoryTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.cluster.coordination.DeterministicTaskQueue; import org.opensearch.common.lease.Releasable; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java b/server/src/test/java/org/opensearch/cluster/coordination/FollowersCheckerTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/FollowersCheckerTests.java index 9b1caec29a701..43fdf4d2a81a9 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/FollowersCheckerTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.OpenSearchException; import org.opensearch.Version; @@ -31,8 +31,8 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings.Builder; -import org.elasticsearch.monitor.NodeHealthService; -import org.elasticsearch.monitor.StatusInfo; +import org.opensearch.monitor.NodeHealthService; +import org.opensearch.monitor.StatusInfo; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.EqualsHashCodeTestUtils; import org.opensearch.test.EqualsHashCodeTestUtils.CopyFunction; @@ -68,8 +68,8 @@ import static org.opensearch.cluster.coordination.FollowersChecker.FOLLOWER_CHECK_INTERVAL_SETTING; import static org.opensearch.cluster.coordination.FollowersChecker.FOLLOWER_CHECK_RETRY_COUNT_SETTING; import static org.opensearch.cluster.coordination.FollowersChecker.FOLLOWER_CHECK_TIMEOUT_SETTING; -import static org.elasticsearch.monitor.StatusInfo.Status.HEALTHY; -import static org.elasticsearch.monitor.StatusInfo.Status.UNHEALTHY; +import static org.opensearch.monitor.StatusInfo.Status.HEALTHY; +import static org.opensearch.monitor.StatusInfo.Status.UNHEALTHY; import static org.opensearch.node.Node.NODE_NAME_SETTING; import static org.opensearch.transport.TransportService.HANDSHAKE_ACTION_NAME; import static org.hamcrest.Matchers.contains; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java b/server/src/test/java/org/opensearch/cluster/coordination/JoinHelperTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/JoinHelperTests.java index 811969b96d1a9..034c6f97a8b69 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/JoinHelperTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.apache.logging.log4j.Level; import org.opensearch.Version; @@ -30,7 +30,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.settings.Settings; import org.opensearch.discovery.zen.MembershipAction; -import org.elasticsearch.monitor.StatusInfo; +import org.opensearch.monitor.StatusInfo; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.transport.CapturingTransport; import org.opensearch.test.transport.CapturingTransport.CapturedRequest; @@ -49,8 +49,8 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; -import static org.elasticsearch.monitor.StatusInfo.Status.HEALTHY; -import static org.elasticsearch.monitor.StatusInfo.Status.UNHEALTHY; +import static org.opensearch.monitor.StatusInfo.Status.HEALTHY; +import static org.opensearch.monitor.StatusInfo.Status.UNHEALTHY; import static org.opensearch.node.Node.NODE_NAME_SETTING; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinTaskExecutorTests.java b/server/src/test/java/org/opensearch/cluster/coordination/JoinTaskExecutorTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/coordination/JoinTaskExecutorTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/JoinTaskExecutorTests.java index 1668a75ce2841..5dbcdd8e9d5ad 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinTaskExecutorTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/JoinTaskExecutorTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.Version; import org.opensearch.cluster.ClusterName; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/LagDetectorTests.java b/server/src/test/java/org/opensearch/cluster/coordination/LagDetectorTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/coordination/LagDetectorTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/LagDetectorTests.java index 3d3e1b7017f53..7f4d5825829de 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/LagDetectorTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/LagDetectorTests.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,15 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.cluster.coordination; +package org.opensearch.cluster.coordination; -import org.opensearch.cluster.coordination.DeterministicTaskQueue; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; -import org.opensearch.cluster.coordination.LagDetector; import java.util.Arrays; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java b/server/src/test/java/org/opensearch/cluster/coordination/LeaderCheckerTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/LeaderCheckerTests.java index 4421ec8db0dbd..35f6dbf42b89f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/LeaderCheckerTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.OpenSearchException; import org.opensearch.Version; @@ -30,7 +30,7 @@ import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; -import org.elasticsearch.monitor.StatusInfo; +import org.opensearch.monitor.StatusInfo; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.EqualsHashCodeTestUtils; import org.opensearch.test.EqualsHashCodeTestUtils.CopyFunction; @@ -55,8 +55,8 @@ import static org.opensearch.cluster.coordination.LeaderChecker.LEADER_CHECK_INTERVAL_SETTING; import static org.opensearch.cluster.coordination.LeaderChecker.LEADER_CHECK_RETRY_COUNT_SETTING; import static org.opensearch.cluster.coordination.LeaderChecker.LEADER_CHECK_TIMEOUT_SETTING; -import static org.elasticsearch.monitor.StatusInfo.Status.HEALTHY; -import static org.elasticsearch.monitor.StatusInfo.Status.UNHEALTHY; +import static org.opensearch.monitor.StatusInfo.Status.HEALTHY; +import static org.opensearch.monitor.StatusInfo.Status.UNHEALTHY; import static org.opensearch.node.Node.NODE_NAME_SETTING; import static org.opensearch.transport.TransportService.HANDSHAKE_ACTION_NAME; import static org.opensearch.transport.TransportService.NOOP_TRANSPORT_INTERCEPTOR; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/LinearizabilityCheckerTests.java b/server/src/test/java/org/opensearch/cluster/coordination/LinearizabilityCheckerTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/coordination/LinearizabilityCheckerTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/LinearizabilityCheckerTests.java index bcfb50dbf463f..577e88cb3d9a5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/LinearizabilityCheckerTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/LinearizabilityCheckerTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.cluster.coordination.LinearizabilityChecker; import org.opensearch.cluster.coordination.LinearizabilityChecker.History; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/MessagesTests.java b/server/src/test/java/org/opensearch/cluster/coordination/MessagesTests.java similarity index 95% rename from server/src/test/java/org/elasticsearch/cluster/coordination/MessagesTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/MessagesTests.java index cfc73220cf64b..b73b1073330db 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/MessagesTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/MessagesTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.Version; import org.opensearch.cluster.ClusterState; @@ -25,16 +25,6 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.EqualsHashCodeTestUtils; import org.opensearch.test.EqualsHashCodeTestUtils.CopyFunction; -import org.opensearch.cluster.coordination.ApplyCommitRequest; -import org.opensearch.cluster.coordination.CoordinationMetadata; -import org.opensearch.cluster.coordination.Join; -import org.opensearch.cluster.coordination.JoinRequest; -import org.opensearch.cluster.coordination.PreVoteRequest; -import org.opensearch.cluster.coordination.PreVoteResponse; -import org.opensearch.cluster.coordination.PublishRequest; -import org.opensearch.cluster.coordination.PublishResponse; -import org.opensearch.cluster.coordination.PublishWithJoinResponse; -import org.opensearch.cluster.coordination.StartJoinRequest; import java.util.Optional; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/NoMasterBlockServiceTests.java b/server/src/test/java/org/opensearch/cluster/coordination/NoMasterBlockServiceTests.java similarity index 95% rename from server/src/test/java/org/elasticsearch/cluster/coordination/NoMasterBlockServiceTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/NoMasterBlockServiceTests.java index c12899b469df3..7778c71b87e33 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/NoMasterBlockServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/NoMasterBlockServiceTests.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,12 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.test.OpenSearchTestCase; -import org.opensearch.cluster.coordination.NoMasterBlockService; import static org.opensearch.cluster.coordination.NoMasterBlockService.NO_MASTER_BLOCK_ALL; import static org.opensearch.cluster.coordination.NoMasterBlockService.NO_MASTER_BLOCK_METADATA_WRITES; @@ -42,7 +41,7 @@ private void createService(Settings settings) { } private void assertDeprecatedWarningEmitted() { - assertWarnings("[discovery.zen.no_master_block] setting was deprecated in Elasticsearch and will be removed in a future release! " + + assertWarnings("[discovery.zen.no_master_block] setting was deprecated in OpenSearch and will be removed in a future release! " + "See the breaking changes documentation for the next major version."); } diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/NoOpClusterApplier.java b/server/src/test/java/org/opensearch/cluster/coordination/NoOpClusterApplier.java similarity index 92% rename from server/src/test/java/org/elasticsearch/cluster/coordination/NoOpClusterApplier.java rename to server/src/test/java/org/opensearch/cluster/coordination/NoOpClusterApplier.java index 194a872f6c80e..9ff226280d80c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/NoOpClusterApplier.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/NoOpClusterApplier.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.service.ClusterApplier; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinTests.java b/server/src/test/java/org/opensearch/cluster/coordination/NodeJoinTests.java similarity index 96% rename from server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/NodeJoinTests.java index 7bca36c44d71e..d559274034ba3 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/NodeJoinTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.Version; @@ -25,37 +25,25 @@ import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.OpenSearchAllocationTestCase; import org.opensearch.cluster.block.ClusterBlocks; -import org.opensearch.cluster.coordination.CoordinationMetadata; import org.opensearch.cluster.coordination.CoordinationMetadata.VotingConfiguration; -import org.opensearch.cluster.coordination.DeterministicTaskQueue; import org.opensearch.cluster.metadata.Metadata; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.FakeThreadPoolMasterService; import org.opensearch.cluster.service.MasterService; -import org.elasticsearch.cluster.service.MasterServiceTests; +import org.opensearch.cluster.service.MasterServiceTests; import org.opensearch.common.Randomness; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.BaseFuture; import org.opensearch.common.util.concurrent.FutureUtils; -import org.elasticsearch.monitor.NodeHealthService; -import org.elasticsearch.monitor.StatusInfo; +import org.opensearch.monitor.NodeHealthService; +import org.opensearch.monitor.StatusInfo; import org.opensearch.node.Node; import org.opensearch.test.ClusterServiceUtils; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.transport.CapturingTransport; -import org.opensearch.cluster.coordination.CoordinationStateRejectedException; -import org.opensearch.cluster.coordination.Coordinator; -import org.opensearch.cluster.coordination.ElectionStrategy; -import org.opensearch.cluster.coordination.FollowersChecker; -import org.opensearch.cluster.coordination.InMemoryPersistedState; -import org.opensearch.cluster.coordination.Join; -import org.opensearch.cluster.coordination.JoinHelper; -import org.opensearch.cluster.coordination.JoinRequest; -import org.opensearch.cluster.coordination.PublishRequest; -import org.opensearch.cluster.coordination.StartJoinRequest; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.RequestHandlerRegistry; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/NodeRemovalClusterStateTaskExecutorTests.java b/server/src/test/java/org/opensearch/cluster/coordination/NodeRemovalClusterStateTaskExecutorTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/coordination/NodeRemovalClusterStateTaskExecutorTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/NodeRemovalClusterStateTaskExecutorTests.java index 50e699fc67cc6..f3be05cbfc898 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/NodeRemovalClusterStateTaskExecutorTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/NodeRemovalClusterStateTaskExecutorTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.Version; import org.opensearch.cluster.ClusterName; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/OpenSearchNodeCommandTests.java b/server/src/test/java/org/opensearch/cluster/coordination/OpenSearchNodeCommandTests.java similarity index 96% rename from server/src/test/java/org/elasticsearch/cluster/coordination/OpenSearchNodeCommandTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/OpenSearchNodeCommandTests.java index e94d13b1a0027..9626e89fb454b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/OpenSearchNodeCommandTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/OpenSearchNodeCommandTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.cluster.ClusterModule; import org.opensearch.cluster.metadata.DataStream; @@ -31,8 +31,8 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.Index; -import org.elasticsearch.indices.IndicesModule; +import org.opensearch.index.Index; +import org.opensearch.indices.IndicesModule; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.coordination.OpenSearchNodeCommand; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/PreVoteCollectorTests.java b/server/src/test/java/org/opensearch/cluster/coordination/PreVoteCollectorTests.java similarity index 95% rename from server/src/test/java/org/elasticsearch/cluster/coordination/PreVoteCollectorTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/PreVoteCollectorTests.java index 6fe7d109c0e4a..bdf75602c06a1 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/PreVoteCollectorTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/PreVoteCollectorTests.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,12 +17,11 @@ * under the License. */ -package org.elasticsearch.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.Version; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.coordination.CoordinationMetadata.VotingConfiguration; -import org.opensearch.cluster.coordination.DeterministicTaskQueue; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.lease.Releasable; @@ -37,16 +36,6 @@ import org.opensearch.transport.TransportResponseHandler; import org.opensearch.transport.TransportService; import org.junit.Before; -import org.opensearch.cluster.coordination.CoordinationState; -import org.opensearch.cluster.coordination.CoordinationStateRejectedException; -import org.opensearch.cluster.coordination.ElectionStrategy; -import org.opensearch.cluster.coordination.InMemoryPersistedState; -import org.opensearch.cluster.coordination.Join; -import org.opensearch.cluster.coordination.NodeHealthCheckFailureException; -import org.opensearch.cluster.coordination.PreVoteCollector; -import org.opensearch.cluster.coordination.PreVoteRequest; -import org.opensearch.cluster.coordination.PreVoteResponse; -import org.opensearch.cluster.coordination.StartJoinRequest; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTests.java b/server/src/test/java/org/opensearch/cluster/coordination/PublicationTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/PublicationTests.java index 51e8e6de0133b..6f06182964d54 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/PublicationTests.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.cluster.ClusterState; -import org.opensearch.cluster.coordination.ApplyCommitRequest; -import org.opensearch.cluster.coordination.CoordinationMetadata; import org.opensearch.cluster.coordination.CoordinationMetadata.VotingConfiguration; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; @@ -37,15 +35,6 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.transport.TransportException; import org.opensearch.transport.TransportResponse; -import org.opensearch.cluster.coordination.CoordinationState; -import org.opensearch.cluster.coordination.ElectionStrategy; -import org.opensearch.cluster.coordination.InMemoryPersistedState; -import org.opensearch.cluster.coordination.Join; -import org.opensearch.cluster.coordination.Publication; -import org.opensearch.cluster.coordination.PublishRequest; -import org.opensearch.cluster.coordination.PublishResponse; -import org.opensearch.cluster.coordination.PublishWithJoinResponse; -import org.opensearch.cluster.coordination.StartJoinRequest; import java.util.ArrayList; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java b/server/src/test/java/org/opensearch/cluster/coordination/PublicationTransportHandlerTests.java similarity index 92% rename from server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/PublicationTransportHandlerTests.java index 9dd681ccfafed..4469a8b683934 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/PublicationTransportHandlerTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.OpenSearchException; import org.opensearch.Version; @@ -24,17 +24,15 @@ import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.Diff; import org.opensearch.cluster.coordination.CoordinationMetadata.VotingConfiguration; -import org.opensearch.cluster.coordination.DeterministicTaskQueue; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.settings.ClusterSettings; -import org.elasticsearch.common.settings.Settings; +import org.opensearch.common.settings.ClusterSettings; +import org.opensearch.common.settings.Settings; import org.opensearch.node.Node; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.transport.CapturingTransport; import org.opensearch.transport.TransportService; -import org.opensearch.cluster.coordination.PublicationTransportHandler; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/ReconfiguratorTests.java b/server/src/test/java/org/opensearch/cluster/coordination/ReconfiguratorTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/coordination/ReconfiguratorTests.java rename to server/src/test/java/org/opensearch/cluster/coordination/ReconfiguratorTests.java index 4c9a584754e8c..e7b65c88e44ad 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/ReconfiguratorTests.java +++ b/server/src/test/java/org/opensearch/cluster/coordination/ReconfiguratorTests.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.cluster.coordination; +package org.opensearch.cluster.coordination; import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.Version; diff --git a/server/src/test/java/org/elasticsearch/cluster/health/ClusterHealthAllocationTests.java b/server/src/test/java/org/opensearch/cluster/health/ClusterHealthAllocationTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/health/ClusterHealthAllocationTests.java rename to server/src/test/java/org/opensearch/cluster/health/ClusterHealthAllocationTests.java index 0b82d011eaf65..95428de718ed3 100644 --- a/server/src/test/java/org/elasticsearch/cluster/health/ClusterHealthAllocationTests.java +++ b/server/src/test/java/org/opensearch/cluster/health/ClusterHealthAllocationTests.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.cluster.health; +package org.opensearch.cluster.health; import org.opensearch.Version; import org.opensearch.cluster.ClusterName; diff --git a/server/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java b/server/src/test/java/org/opensearch/cluster/health/ClusterIndexHealthTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java rename to server/src/test/java/org/opensearch/cluster/health/ClusterIndexHealthTests.java index 7ba31c91a14f2..ff835718a8815 100644 --- a/server/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java +++ b/server/src/test/java/org/opensearch/cluster/health/ClusterIndexHealthTests.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,16 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.cluster.health; +package org.opensearch.cluster.health; import org.opensearch.Version; import org.opensearch.action.admin.cluster.health.ClusterHealthRequest; -import org.opensearch.cluster.health.ClusterHealthStatus; -import org.opensearch.cluster.health.ClusterIndexHealth; -import org.opensearch.cluster.health.ClusterShardHealth; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.routing.IndexRoutingTable; -import org.elasticsearch.cluster.routing.RoutingTableGenerator; +import org.opensearch.cluster.routing.RoutingTableGenerator; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentParser; diff --git a/server/src/test/java/org/elasticsearch/cluster/health/ClusterShardHealthTests.java b/server/src/test/java/org/opensearch/cluster/health/ClusterShardHealthTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/health/ClusterShardHealthTests.java rename to server/src/test/java/org/opensearch/cluster/health/ClusterShardHealthTests.java index b88961bbbf97a..2e947f58379c5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/health/ClusterShardHealthTests.java +++ b/server/src/test/java/org/opensearch/cluster/health/ClusterShardHealthTests.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.cluster.health; +package org.opensearch.cluster.health; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.xcontent.XContentParser; diff --git a/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java b/server/src/test/java/org/opensearch/cluster/health/ClusterStateHealthTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java rename to server/src/test/java/org/opensearch/cluster/health/ClusterStateHealthTests.java index c676db70799f5..6baa3c84f51db 100644 --- a/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java +++ b/server/src/test/java/org/opensearch/cluster/health/ClusterStateHealthTests.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.cluster.health; +package org.opensearch.cluster.health; import com.carrotsearch.hppc.cursors.IntObjectCursor; import com.carrotsearch.hppc.cursors.ObjectCursor; @@ -29,8 +29,6 @@ import org.opensearch.action.support.PlainActionFuture; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; -import org.opensearch.cluster.health.ClusterHealthStatus; -import org.opensearch.cluster.health.ClusterStateHealth; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.metadata.Metadata; @@ -39,7 +37,7 @@ import org.opensearch.cluster.routing.IndexShardRoutingTable; import org.opensearch.cluster.routing.RecoverySource; import org.opensearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.RoutingTableGenerator; +import org.opensearch.cluster.routing.RoutingTableGenerator; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.UnassignedInfo; import org.opensearch.cluster.routing.allocation.AllocationService; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/AliasMetadataTests.java b/server/src/test/java/org/opensearch/cluster/metadata/AliasMetadataTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/metadata/AliasMetadataTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/AliasMetadataTests.java index 37fc33b25cbdf..f7710b7ae52a3 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/AliasMetadataTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/AliasMetadataTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.AliasMetadata.Builder; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java b/server/src/test/java/org/opensearch/cluster/metadata/AliasValidatorTests.java similarity index 94% rename from server/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/AliasValidatorTests.java index 36b884f2113aa..f3583f689d98c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/AliasValidatorTests.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,9 +17,9 @@ * under the License. */ -package org.elasticsearch.cluster.metadata; +package org.opensearch.cluster.metadata; -import org.elasticsearch.indices.InvalidAliasNameException; +import org.opensearch.indices.InvalidAliasNameException; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.AliasValidator; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java b/server/src/test/java/org/opensearch/cluster/metadata/AutoExpandReplicasTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/AutoExpandReplicasTests.java index c18cc599bf915..0fc57b2d53e50 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/AutoExpandReplicasTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.Version; import org.opensearch.action.admin.cluster.reroute.ClusterRerouteRequest; @@ -34,8 +34,8 @@ import org.opensearch.cluster.routing.ShardRoutingState; import org.opensearch.common.settings.Settings; import org.opensearch.indices.cluster.ClusterStateChanges; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java b/server/src/test/java/org/opensearch/cluster/metadata/ClusterNameExpressionResolverTests.java similarity index 96% rename from server/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/ClusterNameExpressionResolverTests.java index a74d855c3cd13..48bff17619a50 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/ClusterNameExpressionResolverTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.ClusterNameExpressionResolver; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateMetadataTests.java b/server/src/test/java/org/opensearch/cluster/metadata/ComponentTemplateMetadataTests.java similarity index 92% rename from server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateMetadataTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/ComponentTemplateMetadataTests.java index c9f69e96cbeb7..2e7699a66113d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateMetadataTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/ComponentTemplateMetadataTests.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,12 +17,10 @@ * under the License. */ -package org.elasticsearch.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.test.AbstractNamedWriteableTestCase; -import org.opensearch.cluster.metadata.ComponentTemplate; -import org.opensearch.cluster.metadata.ComponentTemplateMetadata; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateTests.java b/server/src/test/java/org/opensearch/cluster/metadata/ComponentTemplateTests.java similarity index 95% rename from server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/ComponentTemplateTests.java index 4d8d9eeec8143..63914510a2b4b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/ComponentTemplateTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.cluster.Diff; import org.opensearch.common.compress.CompressedXContent; @@ -26,10 +26,6 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.test.AbstractDiffableSerializationTestCase; import org.opensearch.test.OpenSearchTestCase; -import org.opensearch.cluster.metadata.AliasMetadata; -import org.opensearch.cluster.metadata.ComponentTemplate; -import org.opensearch.cluster.metadata.IndexMetadata; -import org.opensearch.cluster.metadata.Template; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateMetadataTests.java b/server/src/test/java/org/opensearch/cluster/metadata/ComposableIndexTemplateMetadataTests.java similarity index 90% rename from server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateMetadataTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/ComposableIndexTemplateMetadataTests.java index 6d9863070ac0a..d6fd1ec0c4ed7 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateMetadataTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/ComposableIndexTemplateMetadataTests.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,12 +17,10 @@ * under the License. */ -package org.elasticsearch.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.test.AbstractNamedWriteableTestCase; -import org.opensearch.cluster.metadata.ComposableIndexTemplate; -import org.opensearch.cluster.metadata.ComposableIndexTemplateMetadata; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java b/server/src/test/java/org/opensearch/cluster/metadata/ComposableIndexTemplateTests.java similarity index 96% rename from server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/ComposableIndexTemplateTests.java index 33da7eaa5d9a2..e43334ffa1366 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/ComposableIndexTemplateTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.cluster.Diff; import org.opensearch.common.compress.CompressedXContent; @@ -26,10 +26,6 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.test.AbstractDiffableSerializationTestCase; import org.opensearch.test.OpenSearchTestCase; -import org.opensearch.cluster.metadata.AliasMetadata; -import org.opensearch.cluster.metadata.ComposableIndexTemplate; -import org.opensearch.cluster.metadata.IndexMetadata; -import org.opensearch.cluster.metadata.Template; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamMetadataTests.java b/server/src/test/java/org/opensearch/cluster/metadata/DataStreamMetadataTests.java similarity index 91% rename from server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamMetadataTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/DataStreamMetadataTests.java index d0aa9b791faa1..c459547665fcb 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamMetadataTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/DataStreamMetadataTests.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,12 +17,10 @@ * under the License. */ -package org.elasticsearch.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.test.AbstractNamedWriteableTestCase; -import org.opensearch.cluster.metadata.DataStream; -import org.opensearch.cluster.metadata.DataStreamMetadata; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamTests.java b/server/src/test/java/org/opensearch/cluster/metadata/DataStreamTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/DataStreamTests.java index a076f1f0be6e1..a90fd64762bb3 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/DataStreamTests.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,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.common.UUIDs; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.index.Index; +import org.opensearch.index.Index; import org.opensearch.test.AbstractSerializingTestCase; import org.opensearch.cluster.metadata.DataStream; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java b/server/src/test/java/org/opensearch/cluster/metadata/DateMathExpressionResolverTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/DateMathExpressionResolverTests.java index 8aea9f4ccbfdb..468103e3644a2 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/DateMathExpressionResolverTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.OpenSearchParseException; import org.opensearch.action.support.IndicesOptions; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DiffableStringMapTests.java b/server/src/test/java/org/opensearch/cluster/metadata/DiffableStringMapTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/metadata/DiffableStringMapTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/DiffableStringMapTests.java index dac77e36c3b55..f8d0a43d46ed8 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/DiffableStringMapTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/DiffableStringMapTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.cluster.Diff; import org.opensearch.common.io.stream.BytesStreamOutput; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java b/server/src/test/java/org/opensearch/cluster/metadata/HumanReadableIndexSettingsTests.java similarity index 95% rename from server/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/HumanReadableIndexSettingsTests.java index 033a6f8d3f13f..04b9f8e429dec 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/HumanReadableIndexSettingsTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.Version; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexAbstractionTests.java b/server/src/test/java/org/opensearch/cluster/metadata/IndexAbstractionTests.java similarity index 87% rename from server/src/test/java/org/elasticsearch/cluster/metadata/IndexAbstractionTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/IndexAbstractionTests.java index 1485e643987e4..d93fc25246965 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexAbstractionTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/IndexAbstractionTests.java @@ -1,25 +1,23 @@ /* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * * Licensed to Elasticsearch under one or more contributor - * * license agreements. See the NOTICE file distributed with - * * this work for additional information regarding copyright - * * ownership. Elasticsearch licenses this file to you under - * * the Apache License, Version 2.0 (the "License"); you may - * * 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 - * * - * * Unless required by applicable law or agreed to in writing, - * * software distributed under the License is distributed on an - * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * * KIND, either express or implied. See the License for the - * * specific language governing permissions and limitations - * * under the License. + * 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 + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ -package org.elasticsearch.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.Version; import org.opensearch.common.Nullable; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java b/server/src/test/java/org/opensearch/cluster/metadata/IndexGraveyardTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/IndexGraveyardTests.java index a3450cc771f36..a578f73728467 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/IndexGraveyardTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.common.Strings; import org.opensearch.common.UUIDs; @@ -29,7 +29,7 @@ import org.opensearch.common.xcontent.XContentOpenSearchExtension; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.Index; +import org.opensearch.index.Index; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.IndexGraveyard; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java b/server/src/test/java/org/opensearch/cluster/metadata/IndexMetadataTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/IndexMetadataTests.java index df4d263ad8482..a7e6fdbc05489 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/IndexMetadataTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.Version; import org.opensearch.action.admin.indices.rollover.MaxAgeCondition; @@ -39,9 +39,9 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.indices.IndicesModule; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.shard.ShardId; +import org.opensearch.indices.IndicesModule; import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import org.opensearch.cluster.metadata.DiffableStringMap; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverAliasIterationTests.java b/server/src/test/java/org/opensearch/cluster/metadata/IndexNameExpressionResolverAliasIterationTests.java similarity index 88% rename from server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverAliasIterationTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/IndexNameExpressionResolverAliasIterationTests.java index bf4143eb3fa73..3d2018a5015c2 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverAliasIterationTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/IndexNameExpressionResolverAliasIterationTests.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,11 +17,10 @@ * under the License. */ -package org.elasticsearch.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; -import org.opensearch.cluster.metadata.IndexNameExpressionResolver; public class IndexNameExpressionResolverAliasIterationTests extends IndexNameExpressionResolverTests { diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverExpressionsIterationTests.java b/server/src/test/java/org/opensearch/cluster/metadata/IndexNameExpressionResolverExpressionsIterationTests.java similarity index 89% rename from server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverExpressionsIterationTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/IndexNameExpressionResolverExpressionsIterationTests.java index 02c1f5e77c564..1927a41adacf3 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverExpressionsIterationTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/IndexNameExpressionResolverExpressionsIterationTests.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,11 +17,10 @@ * under the License. */ -package org.elasticsearch.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; -import org.opensearch.cluster.metadata.IndexNameExpressionResolver; public class IndexNameExpressionResolverExpressionsIterationTests extends IndexNameExpressionResolverTests { diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java b/server/src/test/java/org/opensearch/cluster/metadata/IndexNameExpressionResolverTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/IndexNameExpressionResolverTests.java index c310fb135428f..8e0b5ad5e6865 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/IndexNameExpressionResolverTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.Version; import org.opensearch.action.DocWriteRequest; @@ -1733,7 +1733,7 @@ public void testIndicesAliasesRequestTargetDataStreams() { Metadata.Builder mdBuilder = Metadata.builder() .put(backingIndex, false) .put(new DataStream(dataStreamName, createTimestampField("@timestamp"), - org.elasticsearch.common.collect.List.of(backingIndex.getIndex()), 1)); + org.opensearch.common.collect.List.of(backingIndex.getIndex()), 1)); ClusterState state = ClusterState.builder(new ClusterName("_name")).metadata(mdBuilder).build(); { @@ -1903,7 +1903,7 @@ public void testDataStreams() { .put(index1, false) .put(index2, false) .put(new DataStream(dataStreamName, createTimestampField("@timestamp"), - org.elasticsearch.common.collect.List.of(index1.getIndex(), index2.getIndex()), 2)); + org.opensearch.common.collect.List.of(index1.getIndex(), index2.getIndex()), 2)); ClusterState state = ClusterState.builder(new ClusterName("_name")).metadata(mdBuilder).build(); { @@ -1978,9 +1978,9 @@ public void testDataStreamsWithWildcardExpression() { .put(index3, false) .put(index4, false) .put(new DataStream(dataStream1, createTimestampField("@timestamp"), - org.elasticsearch.common.collect.List.of(index1.getIndex(), index2.getIndex()))) + org.opensearch.common.collect.List.of(index1.getIndex(), index2.getIndex()))) .put(new DataStream(dataStream2, createTimestampField("@timestamp"), - org.elasticsearch.common.collect.List.of(index3.getIndex(), index4.getIndex()))); + org.opensearch.common.collect.List.of(index3.getIndex(), index4.getIndex()))); ClusterState state = ClusterState.builder(new ClusterName("_name")).metadata(mdBuilder).build(); { @@ -2032,9 +2032,9 @@ public void testDataStreamsWithClosedBackingIndicesAndWildcardExpressions() { .put(index3, false) .put(index4, false) .put(new DataStream(dataStream1, createTimestampField("@timestamp"), - org.elasticsearch.common.collect.List.of(index1.getIndex(), index2.getIndex()))) + org.opensearch.common.collect.List.of(index1.getIndex(), index2.getIndex()))) .put(new DataStream(dataStream2, createTimestampField("@timestamp"), - org.elasticsearch.common.collect.List.of(index3.getIndex(), index4.getIndex()))); + org.opensearch.common.collect.List.of(index3.getIndex(), index4.getIndex()))); ClusterState state = ClusterState.builder(new ClusterName("_name")).metadata(mdBuilder).build(); IndicesOptions indicesOptions = IndicesOptions.STRICT_EXPAND_OPEN; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetadataTests.java b/server/src/test/java/org/opensearch/cluster/metadata/IndexTemplateMetadataTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetadataTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/IndexTemplateMetadataTests.java index 3c5ec7d03a0fa..e595d51695785 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetadataTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/IndexTemplateMetadataTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ManifestTests.java b/server/src/test/java/org/opensearch/cluster/metadata/ManifestTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/metadata/ManifestTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/ManifestTests.java index fd38f8a89d9b9..98f0bb462f97b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ManifestTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/ManifestTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.common.UUIDs; import org.opensearch.common.bytes.BytesReference; @@ -25,7 +25,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.Index; +import org.opensearch.index.Index; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.Manifest; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java index c9707c608ed28..5f6f7974e00e9 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.ResourceAlreadyExistsException; import org.opensearch.Version; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java index 04956c2d8ad1b..1c94a0eb02f69 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.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,9 +17,11 @@ * under the License. */ -package org.elasticsearch.cluster.metadata; +package org.opensearch.cluster.metadata; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; +import org.hamcrest.Matchers; +import org.junit.Before; import org.opensearch.ExceptionsHelper; import org.opensearch.ResourceAlreadyExistsException; import org.opensearch.Version; @@ -28,16 +30,9 @@ import org.opensearch.action.admin.indices.shrink.ResizeType; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; -import org.opensearch.cluster.OpenSearchAllocationTestCase; import org.opensearch.cluster.EmptyClusterInfoService; +import org.opensearch.cluster.OpenSearchAllocationTestCase; import org.opensearch.cluster.block.ClusterBlocks; -import org.opensearch.cluster.metadata.AliasMetadata; -import org.opensearch.cluster.metadata.AliasValidator; -import org.opensearch.cluster.metadata.IndexMetadata; -import org.opensearch.cluster.metadata.IndexTemplateMetadata; -import org.opensearch.cluster.metadata.Metadata; -import org.opensearch.cluster.metadata.MetadataCreateIndexService; -import org.opensearch.cluster.metadata.MetadataIndexTemplateService; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.cluster.node.DiscoveryNodes; @@ -57,16 +52,16 @@ import org.opensearch.common.util.BigArrays; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContentFactory; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexNotFoundException; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.indices.InvalidAliasNameException; -import org.elasticsearch.indices.InvalidIndexNameException; -import org.elasticsearch.indices.ShardLimitValidator; -import org.elasticsearch.indices.SystemIndexDescriptor; -import org.elasticsearch.indices.SystemIndices; +import org.opensearch.index.Index; +import org.opensearch.index.IndexNotFoundException; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.indices.InvalidAliasNameException; +import org.opensearch.indices.InvalidIndexNameException; +import org.opensearch.indices.ShardLimitValidator; +import org.opensearch.indices.SystemIndexDescriptor; +import org.opensearch.indices.SystemIndices; import org.opensearch.snapshots.EmptySnapshotsInfoService; import org.opensearch.test.ClusterServiceUtils; import org.opensearch.test.OpenSearchTestCase; @@ -74,8 +69,6 @@ import org.opensearch.test.gateway.TestGatewayAllocator; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; -import org.hamcrest.Matchers; -import org.junit.Before; import java.io.IOException; import java.util.ArrayList; @@ -101,6 +94,15 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; +import static org.opensearch.index.IndexSettings.INDEX_SOFT_DELETES_SETTING; +import static org.hamcrest.Matchers.endsWith; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasKey; +import static org.hamcrest.Matchers.hasValue; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.Matchers.startsWith; import static org.opensearch.cluster.metadata.IndexMetadata.INDEX_NUMBER_OF_ROUTING_SHARDS_SETTING; import static org.opensearch.cluster.metadata.IndexMetadata.INDEX_NUMBER_OF_SHARDS_SETTING; import static org.opensearch.cluster.metadata.IndexMetadata.INDEX_READ_ONLY_BLOCK; @@ -114,16 +116,7 @@ import static org.opensearch.cluster.metadata.MetadataCreateIndexService.getIndexNumberOfRoutingShards; import static org.opensearch.cluster.metadata.MetadataCreateIndexService.parseV1Mappings; import static org.opensearch.cluster.metadata.MetadataCreateIndexService.resolveAndValidateAliases; -import static org.elasticsearch.index.IndexSettings.INDEX_SOFT_DELETES_SETTING; import static org.opensearch.indices.ShardLimitValidatorTests.createTestShardLimitService; -import static org.hamcrest.Matchers.endsWith; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasKey; -import static org.hamcrest.Matchers.hasValue; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.Matchers.startsWith; public class MetadataCreateIndexServiceTests extends OpenSearchTestCase { @@ -929,7 +922,7 @@ public void testSoftDeletesDisabledDeprecation() { aggregateIndexSettings(ClusterState.EMPTY_STATE, request, Settings.EMPTY, null, Settings.EMPTY, IndexScopedSettings.DEFAULT_SCOPED_SETTINGS, randomShardLimitService(), Collections.emptySet()); - assertWarnings("Creating indices with soft-deletes disabled is deprecated and will be removed in future Elasticsearch versions. " + assertWarnings("Creating indices with soft-deletes disabled is deprecated and will be removed in future OpenSearch versions. " + "Please do not specify value for setting [index.soft_deletes.enabled] of index [test]."); request = new CreateIndexClusterStateUpdateRequest("create index", "test", "test"); if (randomBoolean()) { diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataDeleteIndexServiceTests.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataDeleteIndexServiceTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/metadata/MetadataDeleteIndexServiceTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/MetadataDeleteIndexServiceTests.java index db4a67334290f..63de00f6e2687 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataDeleteIndexServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/MetadataDeleteIndexServiceTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; @@ -29,8 +29,8 @@ import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexNotFoundException; +import org.opensearch.index.Index; +import org.opensearch.index.IndexNotFoundException; import org.opensearch.repositories.IndexId; import org.opensearch.cluster.metadata.DataStream; import org.opensearch.cluster.metadata.IndexMetadata; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesServiceTests.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexAliasesServiceTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesServiceTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexAliasesServiceTests.java index 74b9e23fe4455..0c11f0545d2e4 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexAliasesServiceTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.Version; import org.opensearch.cluster.ClusterName; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexStateServiceTests.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexStateServiceTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexStateServiceTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexStateServiceTests.java index e1d382d944d70..739e39ed4d27b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexStateServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexStateServiceTests.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.Version; import org.opensearch.action.admin.indices.close.CloseIndexClusterStateUpdateRequest; import org.opensearch.action.admin.indices.close.CloseIndexResponse; import org.opensearch.action.admin.indices.close.CloseIndexResponse.IndexResult; -import org.elasticsearch.action.admin.indices.datastream.DeleteDataStreamRequestTests; +import org.opensearch.action.admin.indices.datastream.DeleteDataStreamRequestTests; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.RestoreInProgress; @@ -49,9 +49,9 @@ import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexNotFoundException; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.IndexNotFoundException; +import org.opensearch.index.shard.ShardId; import org.opensearch.repositories.IndexId; import org.opensearch.snapshots.Snapshot; import org.opensearch.snapshots.SnapshotId; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexStateServiceUtils.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexStateServiceUtils.java similarity index 94% rename from server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexStateServiceUtils.java rename to server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexStateServiceUtils.java index 10d5e07dc321f..e7098890e28fb 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexStateServiceUtils.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexStateServiceUtils.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,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.action.admin.indices.close.CloseIndexResponse; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.block.ClusterBlock; -import org.elasticsearch.index.Index; +import org.opensearch.index.Index; import org.opensearch.cluster.metadata.MetadataIndexStateService; import java.util.Map; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexTemplateServiceTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexTemplateServiceTests.java index 09997ffdf7b5e..cd62b27ba656d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexTemplateServiceTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.apache.lucene.search.Query; import org.opensearch.Version; @@ -25,17 +25,6 @@ import org.opensearch.action.admin.indices.alias.Alias; import org.opensearch.action.support.master.AcknowledgedResponse; import org.opensearch.cluster.ClusterState; -import org.opensearch.cluster.metadata.AliasMetadata; -import org.opensearch.cluster.metadata.AliasValidator; -import org.opensearch.cluster.metadata.ComponentTemplate; -import org.opensearch.cluster.metadata.ComposableIndexTemplate; -import org.opensearch.cluster.metadata.ComposableIndexTemplateMetadata; -import org.opensearch.cluster.metadata.DataStream; -import org.opensearch.cluster.metadata.IndexMetadata; -import org.opensearch.cluster.metadata.IndexTemplateMetadata; -import org.opensearch.cluster.metadata.Metadata; -import org.opensearch.cluster.metadata.MetadataCreateIndexService; -import org.opensearch.cluster.metadata.MetadataIndexTemplateService; import org.opensearch.cluster.metadata.MetadataIndexTemplateService.PutRequest; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Strings; @@ -48,27 +37,26 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.mapper.FieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.Mapper; -import org.elasticsearch.index.mapper.MapperParsingException; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.MetadataFieldMapper; -import org.elasticsearch.index.mapper.ParametrizedFieldMapper; -import org.elasticsearch.index.mapper.TextSearchInfo; -import org.elasticsearch.index.mapper.ValueFetcher; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.indices.IndexTemplateMissingException; -import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.indices.InvalidIndexTemplateException; -import org.elasticsearch.indices.SystemIndices; -import org.elasticsearch.plugins.MapperPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.env.Environment; +import org.opensearch.index.Index; +import org.opensearch.index.mapper.FieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.Mapper; +import org.opensearch.index.mapper.MapperParsingException; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.MetadataFieldMapper; +import org.opensearch.index.mapper.ParametrizedFieldMapper; +import org.opensearch.index.mapper.TextSearchInfo; +import org.opensearch.index.mapper.ValueFetcher; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.indices.IndexTemplateMissingException; +import org.opensearch.indices.IndicesService; +import org.opensearch.indices.InvalidIndexTemplateException; +import org.opensearch.indices.SystemIndices; +import org.opensearch.plugins.MapperPlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.search.lookup.SearchLookup; import org.opensearch.test.OpenSearchSingleNodeTestCase; -import org.opensearch.cluster.metadata.Template; import java.io.IOException; import java.util.ArrayList; @@ -89,7 +77,7 @@ import static java.util.Collections.singletonList; import static org.opensearch.cluster.metadata.MetadataIndexTemplateService.DEFAULT_TIMESTAMP_FIELD; import static org.opensearch.common.settings.Settings.builder; -import static org.elasticsearch.index.mapper.ParametrizedFieldMapper.Parameter; +import static org.opensearch.index.mapper.ParametrizedFieldMapper.Parameter; import static org.opensearch.indices.ShardLimitValidatorTests.createTestShardLimitService; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.containsStringIgnoringCase; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexUpgradeServiceTests.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexUpgradeServiceTests.java similarity index 95% rename from server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexUpgradeServiceTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexUpgradeServiceTests.java index 4f34b7c0976c0..c29c13ea33f0f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexUpgradeServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexUpgradeServiceTests.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,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.Version; import org.opensearch.common.settings.IndexScopedSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.indices.SystemIndexDescriptor; -import org.elasticsearch.indices.SystemIndices; -import org.elasticsearch.indices.mapper.MapperRegistry; -import org.elasticsearch.plugins.MapperPlugin; +import org.opensearch.indices.SystemIndexDescriptor; +import org.opensearch.indices.SystemIndices; +import org.opensearch.indices.mapper.MapperRegistry; +import org.opensearch.plugins.MapperPlugin; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.VersionUtils; import org.opensearch.cluster.metadata.IndexMetadata; @@ -121,7 +121,7 @@ public void testFailUpgrade() { Version.CURRENT.minimumIndexCompatibilityVersion())).getMessage(); assertEquals(message, "The index [[foo/BOOM]] was created with version [" + indexCreated + "] " + "but the minimum compatible version is [" + minCompat + "]." + - " It should be re-indexed in Elasticsearch " + minCompat.major + ".x before upgrading to " + Version.CURRENT.toString() + "."); + " It should be re-indexed in OpenSearch " + minCompat.major + ".x before upgrading to " + Version.CURRENT.toString() + "."); indexCreated = VersionUtils.randomVersionBetween(random(), minCompat, Version.CURRENT); indexUpgraded = VersionUtils.randomVersionBetween(random(), indexCreated, Version.CURRENT); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataMappingServiceTests.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataMappingServiceTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/metadata/MetadataMappingServiceTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/MetadataMappingServiceTests.java index 6ad6de9b69559..274df88341843 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataMappingServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/MetadataMappingServiceTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.opensearch.action.admin.indices.mapping.put.PutMappingClusterStateUpdateRequest; @@ -28,10 +28,10 @@ import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.index.Index; +import org.opensearch.index.IndexService; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.test.InternalSettingsPlugin; import org.opensearch.cluster.metadata.MappingMetadata; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/MetadataTests.java index 1f088b09f8b2e..40d64b2b072b5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/MetadataTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.Version; import org.opensearch.action.admin.indices.alias.get.GetAliasesRequest; @@ -42,15 +42,6 @@ import org.opensearch.index.Index; import org.opensearch.plugins.MapperPlugin; import org.opensearch.test.OpenSearchTestCase; -import org.opensearch.cluster.metadata.AliasMetadata; -import org.opensearch.cluster.metadata.DataStream; -import org.opensearch.cluster.metadata.DataStreamMetadata; -import org.opensearch.cluster.metadata.IndexAbstraction; -import org.opensearch.cluster.metadata.IndexGraveyard; -import org.opensearch.cluster.metadata.IndexMetadata; -import org.opensearch.cluster.metadata.IndexTemplateMetadata; -import org.opensearch.cluster.metadata.MappingMetadata; -import org.opensearch.cluster.metadata.Metadata; import java.io.IOException; import java.util.ArrayList; @@ -989,7 +980,7 @@ public void testBuilderRejectsDataStreamThatConflictsWithIndex() { .numberOfReplicas(1) .build(), false) .put(new DataStream(dataStreamName, createTimestampField("@timestamp"), - org.elasticsearch.common.collect.List.of(idx.getIndex()))); + org.opensearch.common.collect.List.of(idx.getIndex()))); IllegalStateException e = expectThrows(IllegalStateException.class, b::build); assertThat(e.getMessage(), @@ -1005,7 +996,7 @@ public void testBuilderRejectsDataStreamThatConflictsWithAlias() { Metadata.Builder b = Metadata.builder() .put(idx, false) .put(new DataStream(dataStreamName, createTimestampField("@timestamp"), - org.elasticsearch.common.collect.List.of(idx.getIndex()))); + org.opensearch.common.collect.List.of(idx.getIndex()))); IllegalStateException e = expectThrows(IllegalStateException.class, b::build); assertThat(e.getMessage(), @@ -1023,7 +1014,7 @@ public void testBuilderRejectsDataStreamWithConflictingBackingIndices() { .put(validIdx, false) .put(invalidIdx, false) .put(new DataStream(dataStreamName, createTimestampField("@timestamp"), - org.elasticsearch.common.collect.List.of(validIdx.getIndex()))); + org.opensearch.common.collect.List.of(validIdx.getIndex()))); IllegalStateException e = expectThrows(IllegalStateException.class, b::build); assertThat(e.getMessage(), containsString("data stream [" + dataStreamName + @@ -1039,7 +1030,7 @@ public void testBuilderRejectsDataStreamWithConflictingBackingAlias() { Metadata.Builder b = Metadata.builder() .put(idx, false) .put(new DataStream(dataStreamName, createTimestampField("@timestamp"), - org.elasticsearch.common.collect.List.of(idx.getIndex()))); + org.opensearch.common.collect.List.of(idx.getIndex()))); IllegalStateException e = expectThrows(IllegalStateException.class, b::build); assertThat(e.getMessage(), containsString("data stream [" + dataStreamName + @@ -1163,7 +1154,7 @@ public void testValidateDataStreamsThrowsExceptionOnConflict() { Index index = standaloneIndexConflictingWithBackingIndices.getIndex(); indicesLookup.put(index.getName(), new IndexAbstraction.Index(standaloneIndexConflictingWithBackingIndices, null)); - DataStreamMetadata dataStreamMetadata = new DataStreamMetadata(org.elasticsearch.common.collect.Map.of(dataStreamName, dataStream)); + DataStreamMetadata dataStreamMetadata = new DataStreamMetadata(org.opensearch.common.collect.Map.of(dataStreamName, dataStream)); IllegalStateException illegalStateException = expectThrows(IllegalStateException.class, () -> validateDataStreams(indicesLookup, dataStreamMetadata)); @@ -1253,7 +1244,7 @@ public void testValidateDataStreamsAllowsPrefixedBackingIndices() { indicesLookup.put(indexMeta.getIndex().getName(), new IndexAbstraction.Index(indexMeta, dataStreamAbstraction)); } } - DataStreamMetadata dataStreamMetadata = new DataStreamMetadata(org.elasticsearch.common.collect.Map.of(dataStreamName, dataStream)); + DataStreamMetadata dataStreamMetadata = new DataStreamMetadata(org.opensearch.common.collect.Map.of(dataStreamName, dataStream)); // prefixed indices with a lower generation than the data stream's generation are allowed even if the non-prefixed, matching the // data stream backing indices naming pattern, indices are already in the system diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java b/server/src/test/java/org/opensearch/cluster/metadata/TemplateUpgradeServiceTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/TemplateUpgradeServiceTests.java index 198453e74009a..e359f410b1e22 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/TemplateUpgradeServiceTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.Version; import org.opensearch.action.ActionListener; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetadataTests.java b/server/src/test/java/org/opensearch/cluster/metadata/ToAndFromJsonMetadataTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetadataTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/ToAndFromJsonMetadataTests.java index 9e5b2fdd1c53d..a73ffeee5d545 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetadataTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/ToAndFromJsonMetadataTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.Version; import org.opensearch.action.admin.indices.rollover.RolloverInfo; @@ -112,9 +112,9 @@ public void testSimpleJsonFromAndTo() throws IOException { .put(idx1, false) .put(idx2, false) .put(new DataStream("data-stream1", createTimestampField("@timestamp"), - org.elasticsearch.common.collect.List.of(idx1.getIndex()))) + org.opensearch.common.collect.List.of(idx1.getIndex()))) .put(new DataStream("data-stream2", createTimestampField("@timestamp"), - org.elasticsearch.common.collect.List.of(idx2.getIndex()))) + org.opensearch.common.collect.List.of(idx2.getIndex()))) .build(); XContentBuilder builder = JsonXContent.contentBuilder(); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java b/server/src/test/java/org/opensearch/cluster/metadata/WildcardExpressionResolverTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java rename to server/src/test/java/org/opensearch/cluster/metadata/WildcardExpressionResolverTests.java index 316026119cf08..18681fa3f5007 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java +++ b/server/src/test/java/org/opensearch/cluster/metadata/WildcardExpressionResolverTests.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.cluster.metadata; +package org.opensearch.cluster.metadata; import org.opensearch.Version; import org.opensearch.action.support.IndicesOptions; @@ -27,7 +27,7 @@ import org.opensearch.cluster.metadata.DataStream; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.IndexMetadata.State; -import org.elasticsearch.index.IndexNotFoundException; +import org.opensearch.index.IndexNotFoundException; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.metadata.Metadata; @@ -231,7 +231,7 @@ public void testResolveDataStreams() { .put(firstBackingIndexMetadata, true) .put(secondBackingIndexMetadata, true) .put(new DataStream(dataStreamName, createTimestampField("@timestamp"), - org.elasticsearch.common.collect.List.of(firstBackingIndexMetadata.getIndex(), secondBackingIndexMetadata.getIndex()))); + org.opensearch.common.collect.List.of(firstBackingIndexMetadata.getIndex(), secondBackingIndexMetadata.getIndex()))); ClusterState state = ClusterState.builder(new ClusterName("_name")).metadata(mdBuilder).build(); diff --git a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java b/server/src/test/java/org/opensearch/cluster/node/DiscoveryNodeFiltersTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java rename to server/src/test/java/org/opensearch/cluster/node/DiscoveryNodeFiltersTests.java index d99f5ab5e6c9b..4dfd7ca2af569 100644 --- a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java +++ b/server/src/test/java/org/opensearch/cluster/node/DiscoveryNodeFiltersTests.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.cluster.node; +package org.opensearch.cluster.node; import org.opensearch.Version; import org.opensearch.common.settings.Setting; diff --git a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeRoleSettingTests.java b/server/src/test/java/org/opensearch/cluster/node/DiscoveryNodeRoleSettingTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeRoleSettingTests.java rename to server/src/test/java/org/opensearch/cluster/node/DiscoveryNodeRoleSettingTests.java index 7831167e558c1..22c157dfc73fa 100644 --- a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeRoleSettingTests.java +++ b/server/src/test/java/org/opensearch/cluster/node/DiscoveryNodeRoleSettingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cluster.node; +package org.opensearch.cluster.node; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeRoleTests.java b/server/src/test/java/org/opensearch/cluster/node/DiscoveryNodeRoleTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeRoleTests.java rename to server/src/test/java/org/opensearch/cluster/node/DiscoveryNodeRoleTests.java index 19959b7775419..592ccd9c5562d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeRoleTests.java +++ b/server/src/test/java/org/opensearch/cluster/node/DiscoveryNodeRoleTests.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.cluster.node; +package org.opensearch.cluster.node; import org.opensearch.common.settings.Setting; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java b/server/src/test/java/org/opensearch/cluster/node/DiscoveryNodeTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java rename to server/src/test/java/org/opensearch/cluster/node/DiscoveryNodeTests.java index 5e2efbea26dc5..0f0d90df2d3d3 100644 --- a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java +++ b/server/src/test/java/org/opensearch/cluster/node/DiscoveryNodeTests.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.cluster.node; +package org.opensearch.cluster.node; import org.opensearch.Version; import org.opensearch.common.io.stream.BytesStreamOutput; diff --git a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java b/server/src/test/java/org/opensearch/cluster/node/DiscoveryNodesTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java rename to server/src/test/java/org/opensearch/cluster/node/DiscoveryNodesTests.java index 7fbd0f68c02ff..bae25da855c63 100644 --- a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java +++ b/server/src/test/java/org/opensearch/cluster/node/DiscoveryNodesTests.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.cluster.node; +package org.opensearch.cluster.node; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.opensearch.Version; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java b/server/src/test/java/org/opensearch/cluster/routing/AllocationIdTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java rename to server/src/test/java/org/opensearch/cluster/routing/AllocationIdTests.java index 91fadf6f91c51..f27ee67060317 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/AllocationIdTests.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.cluster.routing; +package org.opensearch.cluster.routing; import org.opensearch.cluster.routing.AllocationId; import org.opensearch.cluster.routing.RecoverySource.ExistingStoreRecoverySource; @@ -25,7 +25,7 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.UnassignedInfo; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/BatchedRerouteServiceTests.java b/server/src/test/java/org/opensearch/cluster/routing/BatchedRerouteServiceTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/BatchedRerouteServiceTests.java rename to server/src/test/java/org/opensearch/cluster/routing/BatchedRerouteServiceTests.java index af660ac2ba23b..db3b4ad40ae0f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/BatchedRerouteServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/BatchedRerouteServiceTests.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.cluster.routing; +package org.opensearch.cluster.routing; import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java b/server/src/test/java/org/opensearch/cluster/routing/DelayedAllocationServiceTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java rename to server/src/test/java/org/opensearch/cluster/routing/DelayedAllocationServiceTests.java index 89c9172745f87..ad0aff8fdecdb 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/DelayedAllocationServiceTests.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.cluster.routing; +package org.opensearch.cluster.routing; import org.opensearch.Version; import org.opensearch.cluster.ClusterChangedEvent; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java b/server/src/test/java/org/opensearch/cluster/routing/GroupShardsIteratorTests.java similarity index 93% rename from server/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java rename to server/src/test/java/org/opensearch/cluster/routing/GroupShardsIteratorTests.java index b8b9988a1b843..d47cfc4703de3 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/GroupShardsIteratorTests.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,19 +17,14 @@ * under the License. */ -package org.elasticsearch.cluster.routing; +package org.opensearch.cluster.routing; import org.apache.lucene.util.CollectionUtil; -import org.elasticsearch.action.OriginalIndicesTests; +import org.opensearch.action.OriginalIndicesTests; import org.opensearch.action.search.SearchShardIterator; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; -import org.opensearch.cluster.routing.GroupShardsIterator; -import org.opensearch.cluster.routing.PlainShardIterator; -import org.opensearch.cluster.routing.ShardIterator; -import org.opensearch.cluster.routing.ShardRouting; -import org.opensearch.cluster.routing.TestShardRouting; import java.util.ArrayList; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/IndexShardRoutingTableTests.java b/server/src/test/java/org/opensearch/cluster/routing/IndexShardRoutingTableTests.java similarity index 93% rename from server/src/test/java/org/elasticsearch/cluster/routing/IndexShardRoutingTableTests.java rename to server/src/test/java/org/opensearch/cluster/routing/IndexShardRoutingTableTests.java index cf16a5dfe53b8..61395e02d3f39 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/IndexShardRoutingTableTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/IndexShardRoutingTableTests.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.cluster.routing; +package org.opensearch.cluster.routing; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.routing.IndexShardRoutingTable; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java b/server/src/test/java/org/opensearch/cluster/routing/OperationRoutingTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java rename to server/src/test/java/org/opensearch/cluster/routing/OperationRoutingTests.java index 92af6f4059626..f0dcd704bb6ec 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/OperationRoutingTests.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.cluster.routing; +package org.opensearch.cluster.routing; import org.opensearch.Version; import org.opensearch.action.support.replication.ClusterStateCreationUtils; @@ -34,8 +34,8 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; import org.opensearch.node.ResponseCollectorService; import org.opensearch.test.ClusterServiceUtils; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/PlainShardIteratorTests.java b/server/src/test/java/org/opensearch/cluster/routing/PlainShardIteratorTests.java similarity index 95% rename from server/src/test/java/org/elasticsearch/cluster/routing/PlainShardIteratorTests.java rename to server/src/test/java/org/opensearch/cluster/routing/PlainShardIteratorTests.java index 1c8f334cd4b9a..2f0a3bafb1d5f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/PlainShardIteratorTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/PlainShardIteratorTests.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,13 +17,12 @@ * under the License. */ -package org.elasticsearch.cluster.routing; +package org.opensearch.cluster.routing; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.EqualsHashCodeTestUtils; import org.hamcrest.Matchers; -import org.opensearch.cluster.routing.PlainShardIterator; import java.util.ArrayList; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java b/server/src/test/java/org/opensearch/cluster/routing/PrimaryTermsTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java rename to server/src/test/java/org/opensearch/cluster/routing/PrimaryTermsTests.java index 6b4ec175c6862..22c9a5665540f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/PrimaryTermsTests.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.cluster.routing; +package org.opensearch.cluster.routing; import org.opensearch.Version; import org.opensearch.cluster.ClusterState; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java b/server/src/test/java/org/opensearch/cluster/routing/RandomShardRoutingMutator.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java rename to server/src/test/java/org/opensearch/cluster/routing/RandomShardRoutingMutator.java index 1f4355ec68bb5..3c848ec53f76f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java +++ b/server/src/test/java/org/opensearch/cluster/routing/RandomShardRoutingMutator.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.cluster.routing; +package org.opensearch.cluster.routing; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.UnassignedInfo; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java b/server/src/test/java/org/opensearch/cluster/routing/RecoverySourceTests.java similarity index 96% rename from server/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java rename to server/src/test/java/org/opensearch/cluster/routing/RecoverySourceTests.java index f25a1a47d0598..8851ea984f2ae 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/RecoverySourceTests.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.cluster.routing; +package org.opensearch.cluster.routing; import org.opensearch.cluster.routing.TestShardRouting; import org.opensearch.common.io.stream.BytesStreamOutput; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingNodeTests.java b/server/src/test/java/org/opensearch/cluster/routing/RoutingNodeTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/RoutingNodeTests.java rename to server/src/test/java/org/opensearch/cluster/routing/RoutingNodeTests.java index b529f9fc8bd5c..f700ec35d02d7 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingNodeTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/RoutingNodeTests.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,15 +17,15 @@ * under the License. */ -package org.elasticsearch.cluster.routing; +package org.opensearch.cluster.routing; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.routing.TestShardRouting; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.routing.RoutingNode; import org.opensearch.cluster.routing.ShardRouting; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java b/server/src/test/java/org/opensearch/cluster/routing/RoutingTableGenerator.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java rename to server/src/test/java/org/opensearch/cluster/routing/RoutingTableGenerator.java index 942d636344099..8cce2e902bcf8 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableGenerator.java +++ b/server/src/test/java/org/opensearch/cluster/routing/RoutingTableGenerator.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,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.cluster.routing; +package org.opensearch.cluster.routing; import com.carrotsearch.randomizedtesting.RandomizedContext; import org.opensearch.OpenSearchException; import org.opensearch.cluster.health.ClusterHealthStatus; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.cluster.routing.IndexRoutingTable; import org.opensearch.cluster.routing.IndexShardRoutingTable; import org.opensearch.cluster.routing.ShardRouting; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java b/server/src/test/java/org/opensearch/cluster/routing/RoutingTableTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java rename to server/src/test/java/org/opensearch/cluster/routing/RoutingTableTests.java index d50b015b4f826..5c7218b90b692 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/RoutingTableTests.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.cluster.routing; +package org.opensearch.cluster.routing; import org.opensearch.Version; import org.opensearch.cluster.ClusterState; @@ -27,18 +27,11 @@ import org.opensearch.cluster.metadata.MetadataIndexStateService; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.node.DiscoveryNodes.Builder; -import org.opensearch.cluster.routing.IndexRoutingTable; -import org.opensearch.cluster.routing.IndexShardRoutingTable; -import org.opensearch.cluster.routing.RecoverySource; -import org.opensearch.cluster.routing.RoutingTable; -import org.opensearch.cluster.routing.ShardRouting; -import org.opensearch.cluster.routing.ShardRoutingState; -import org.opensearch.cluster.routing.TestShardRouting; import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexNotFoundException; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.IndexNotFoundException; +import org.opensearch.index.shard.ShardId; import org.junit.Before; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java b/server/src/test/java/org/opensearch/cluster/routing/ShardRoutingTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java rename to server/src/test/java/org/opensearch/cluster/routing/ShardRoutingTests.java index a58609808cb59..bacea2c5ec90c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/ShardRoutingTests.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,14 +17,14 @@ * under the License. */ -package org.elasticsearch.cluster.routing; +package org.opensearch.cluster.routing; import org.opensearch.Version; import org.opensearch.cluster.routing.ShardRoutingHelper; import org.opensearch.cluster.routing.TestShardRouting; import org.opensearch.common.UUIDs; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; import org.opensearch.cluster.routing.RecoverySource; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.ShardRoutingState; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java b/server/src/test/java/org/opensearch/cluster/routing/UnassignedInfoTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java rename to server/src/test/java/org/opensearch/cluster/routing/UnassignedInfoTests.java index cea9677f66e14..e7438dfe62662 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/UnassignedInfoTests.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.cluster.routing; +package org.opensearch.cluster.routing; import com.carrotsearch.hppc.IntHashSet; import com.carrotsearch.randomizedtesting.generators.RandomPicks; @@ -45,7 +45,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.index.Index; +import org.opensearch.index.Index; import org.opensearch.repositories.IndexId; import org.opensearch.snapshots.Snapshot; import org.opensearch.snapshots.SnapshotId; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/AddIncrementallyTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/AddIncrementallyTests.java index 898dfffdb0c93..7aeaf2ac5c13f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/AddIncrementallyTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import com.carrotsearch.hppc.cursors.ObjectCursor; @@ -33,7 +33,6 @@ import org.opensearch.cluster.routing.RoutingNode; import org.opensearch.cluster.routing.RoutingNodes; import org.opensearch.cluster.routing.RoutingTable; -import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.CollectionUtils; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java index 0f96e0d92d51c..44a35510242d3 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.Version; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationCommandsTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationCommandsTests.java index 24ac500b525e3..b7d5373d96fa2 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationCommandsTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -36,8 +36,6 @@ import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.ShardRoutingState; -import org.opensearch.cluster.routing.allocation.AllocationService; -import org.opensearch.cluster.routing.allocation.RoutingAllocation; import org.opensearch.cluster.routing.allocation.command.AbstractAllocateAllocationCommand; import org.opensearch.cluster.routing.allocation.command.AllocateEmptyPrimaryAllocationCommand; import org.opensearch.cluster.routing.allocation.command.AllocateReplicaAllocationCommand; @@ -56,10 +54,10 @@ import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexNotFoundException; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.index.shard.ShardNotFoundException; +import org.opensearch.index.Index;routing/allocation/AllocationPriorityTests.javarouting/allocation/AllocationPriorityTests.java +import org.opensearch.index.IndexNotFoundException; +import org.opensearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardNotFoundException; import org.opensearch.snapshots.SnapshotShardSizeInfo; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationDecisionTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationDecisionTests.java index 14120fb66187c..c1a657fa741f5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationDecisionTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.cluster.routing.UnassignedInfo.AllocationStatus; import org.opensearch.cluster.routing.allocation.AbstractAllocationDecision; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationPriorityTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationPriorityTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationPriorityTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationPriorityTests.java index 7861417bdd83d..9360575eb45d2 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationPriorityTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationPriorityTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.Version; import org.opensearch.cluster.ClusterState; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationServiceTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationServiceTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationServiceTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationServiceTests.java index 7202fa635c051..e2e912f27fba5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationServiceTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.Version; import org.opensearch.cluster.ClusterInfo; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/AwarenessAllocationTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/AwarenessAllocationTests.java index 455e379d86bb9..681e01fb72e39 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/AwarenessAllocationTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -30,7 +30,6 @@ import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.ShardRoutingState; -import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.routing.allocation.command.AllocationCommands; import org.opensearch.cluster.routing.allocation.command.CancelAllocationCommand; import org.opensearch.cluster.routing.allocation.command.MoveAllocationCommand; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/BalanceConfigurationTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/BalanceConfigurationTests.java index fb63440f251dd..fa9b650128483 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/BalanceConfigurationTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import com.carrotsearch.hppc.cursors.ObjectCursor; import org.apache.logging.log4j.LogManager; @@ -36,9 +36,6 @@ import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.ShardRoutingState; -import org.opensearch.cluster.routing.allocation.AllocationService; -import org.opensearch.cluster.routing.allocation.RoutingAllocation; -import org.opensearch.cluster.routing.allocation.ShardAllocationDecision; import org.opensearch.cluster.routing.allocation.allocator.BalancedShardsAllocator; import org.opensearch.cluster.routing.allocation.allocator.ShardsAllocator; import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java similarity index 94% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java index c7fa9daf528c0..e177de91e9ab4 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.lucene.util.TestUtil; import org.opensearch.Version; @@ -28,7 +28,6 @@ import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.common.settings.Settings; -import org.opensearch.cluster.routing.allocation.AllocationService; import java.io.IOException; import java.io.InputStream; @@ -47,7 +46,7 @@ public class BalanceUnbalancedClusterTests extends CatAllocationTestCase { @Override protected Path getCatPath() throws IOException { Path tmp = createTempDir(); - try (InputStream stream = Files.newInputStream(getDataPath("/org/elasticsearch/cluster/routing/issue_9023.zip"))) { + try (InputStream stream = Files.newInputStream(getDataPath("/org/opensearch/routing/issue_9023.zip"))) { TestUtil.unzip(stream, tmp); } return tmp.resolve("issue_9023"); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/BalancedSingleShardTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/BalancedSingleShardTests.java index 8f9859eff07cd..6808fae04d1ea 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/BalancedSingleShardTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.action.support.replication.ClusterStateCreationUtils; import org.opensearch.cluster.ClusterInfo; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/CatAllocationTestCase.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/CatAllocationTestCase.java index 1ff9448b299eb..64e8c672ebd1a 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/CatAllocationTestCase.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.Version; import org.opensearch.cluster.ClusterState; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java index b50bffdad6ebe..d6fd01cf18ef1 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -31,8 +31,6 @@ import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.UnassignedInfo; -import org.opensearch.cluster.routing.allocation.AllocationService; -import org.opensearch.cluster.routing.allocation.RoutingAllocation; import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.opensearch.common.settings.Settings; import org.opensearch.test.gateway.TestGatewayAllocator; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java index 8e86c3ed3405b..13b201848f2ba 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -29,7 +29,6 @@ import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.common.settings.Settings; -import org.opensearch.cluster.routing.allocation.AllocationService; import static org.opensearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.opensearch.cluster.routing.ShardRoutingState.RELOCATING; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/DeadNodesAllocationTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/DeadNodesAllocationTests.java index fee22e6fadfab..cca21759459f8 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/DeadNodesAllocationTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -28,7 +28,6 @@ import org.opensearch.cluster.metadata.Metadata; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.routing.RoutingTable; -import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.routing.allocation.command.AllocationCommands; import org.opensearch.cluster.routing.allocation.command.MoveAllocationCommand; import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java index 5fe740af7523a..38399ee5c1074 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.Version; import org.opensearch.cluster.ClusterName; @@ -40,7 +40,7 @@ import org.opensearch.cluster.routing.allocation.decider.AllocationDeciders; import org.opensearch.cluster.routing.allocation.decider.Decision; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.snapshots.EmptySnapshotsInfoService; import org.opensearch.test.gateway.TestGatewayAllocator; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/DiskThresholdMonitorTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/DiskThresholdMonitorTests.java index 2a38d219d7df5..97c0edf00806e 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/DiskThresholdMonitorTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/DiskThresholdSettingsTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/DiskThresholdSettingsTests.java index eb306a411d2fc..caf77e9bc2be0 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/DiskThresholdSettingsTests.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,13 +17,12 @@ * under the License. */ -package org.elasticsearch.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.test.OpenSearchTestCase; -import org.opensearch.cluster.routing.allocation.DiskThresholdSettings; import java.util.Locale; @@ -75,7 +74,7 @@ public void testUpdate() { assertFalse(diskThresholdSettings.isEnabled()); assertFalse(diskThresholdSettings.includeRelocations()); - assertWarnings("[cluster.routing.allocation.disk.include_relocations] setting was deprecated in Elasticsearch and " + + assertWarnings("[cluster.routing.allocation.disk.include_relocations] setting was deprecated in OpenSearch and " + "will be removed in a future release! See the breaking changes documentation for the next major version."); } diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java similarity index 96% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java index 9f994ad591a03..c62d0b0d969cb 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -31,7 +31,6 @@ import org.opensearch.cluster.routing.RoutingNodes; import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.common.settings.Settings; -import org.opensearch.cluster.routing.allocation.AllocationService; import static org.opensearch.cluster.routing.ShardRoutingState.STARTED; import static org.hamcrest.Matchers.equalTo; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java index 04e4735311544..a5f46f6571896 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/ExpectedShardSizeAllocationTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -31,7 +31,6 @@ import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.ShardRoutingState; -import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.routing.allocation.command.AllocationCommands; import org.opensearch.cluster.routing.allocation.command.MoveAllocationCommand; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/FailedNodeRoutingTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/FailedNodeRoutingTests.java index 382134fdc3068..20d4a3bf8f9da 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/FailedNodeRoutingTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import com.carrotsearch.hppc.cursors.ObjectCursor; import org.apache.logging.log4j.LogManager; @@ -38,12 +38,10 @@ import org.opensearch.cluster.routing.RoutingNodes; import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.cluster.routing.ShardRouting; -import org.opensearch.cluster.routing.allocation.AllocationService; -import org.opensearch.cluster.routing.allocation.FailedShard; import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.opensearch.common.settings.Settings; import org.opensearch.indices.cluster.ClusterStateChanges; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.VersionUtils; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/FailedShardsRoutingTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/FailedShardsRoutingTests.java index 78d73db10e738..e76d73f57e661 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/FailedShardsRoutingTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import com.carrotsearch.hppc.cursors.ObjectCursor; import org.apache.logging.log4j.LogManager; @@ -32,13 +32,11 @@ import org.opensearch.cluster.routing.RoutingNodes; import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.cluster.routing.ShardRouting; -import org.opensearch.cluster.routing.allocation.AllocationService; -import org.opensearch.cluster.routing.allocation.FailedShard; import org.opensearch.cluster.routing.allocation.command.AllocationCommands; import org.opensearch.cluster.routing.allocation.command.MoveAllocationCommand; import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.VersionUtils; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/FilterRoutingTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/FilterRoutingTests.java index e9a1856a5f37c..835fd4fd17278 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/FilterRoutingTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.Version; import org.opensearch.cluster.ClusterState; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/InSyncAllocationIdTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/InSyncAllocationIdTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/InSyncAllocationIdTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/InSyncAllocationIdTests.java index c197c66796fe6..0e1e694d1044c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/InSyncAllocationIdTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/InSyncAllocationIdTests.java @@ -1,5 +1,3 @@ -package org.elasticsearch.cluster.routing.allocation; - /* * Licensed to Elasticsearch under one or more contributor * license agreements. See the NOTICE file distributed with @@ -9,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 @@ -19,6 +17,8 @@ * under the License. */ +package org.opensearch.cluster.routing.allocation; + import org.opensearch.Version; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.OpenSearchAllocationTestCase; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/IndexBalanceTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/IndexBalanceTests.java index 714a6fca27853..da624e21acbb7 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/IndexBalanceTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -29,7 +29,6 @@ import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.routing.RoutingNodes; import org.opensearch.cluster.routing.RoutingTable; -import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java index 2b8dadc63e10c..89780d7c427b7 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.Version; import org.opensearch.cluster.ClusterName; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/MoveDecisionTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/MoveDecisionTests.java index f68d46c5faf99..e1367a6eaf793 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/MoveDecisionTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.Version; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/NodeAllocationResultTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/NodeAllocationResultTests.java index 9ccbdab60bdd3..d499bf28d2b61 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/NodeAllocationResultTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.Version; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java index aedffd010656c..807ef6b0b521d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -41,8 +41,6 @@ import org.opensearch.cluster.routing.ShardRoutingHelper; import org.opensearch.cluster.routing.ShardRoutingState; import org.opensearch.cluster.routing.TestShardRouting; -import org.opensearch.cluster.routing.allocation.AllocationService; -import org.opensearch.cluster.routing.allocation.RoutingAllocation; import org.opensearch.cluster.routing.allocation.allocator.BalancedShardsAllocator; import org.opensearch.cluster.routing.allocation.command.AllocationCommands; import org.opensearch.cluster.routing.allocation.decider.AllocationDeciders; @@ -52,7 +50,7 @@ import org.opensearch.cluster.routing.allocation.decider.ReplicaAfterPrimaryActiveAllocationDecider; import org.opensearch.common.UUIDs; import org.opensearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.common.settings.Settings; +import org.opensearch.common.settings.Settings; import org.opensearch.common.util.set.Sets; import org.opensearch.index.Index; import org.opensearch.index.shard.ShardId; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java index 4378e3e069e6d..a39c4bf071409 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.Version; import org.opensearch.cluster.ClusterState; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java similarity index 96% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java index 1259bccc15f34..f84a3a0fae5ef 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/PreferPrimaryAllocationTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -28,7 +28,6 @@ import org.opensearch.cluster.metadata.Metadata; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.routing.RoutingTable; -import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.routing.allocation.decider.ThrottlingAllocationDecider; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java index f4ef73f1f7124..7e437f1a3ba58 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/PrimaryElectionRoutingTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -30,7 +30,6 @@ import org.opensearch.cluster.routing.RoutingNodes; import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.common.settings.Settings; -import org.opensearch.cluster.routing.allocation.AllocationService; import static org.opensearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.opensearch.cluster.routing.ShardRoutingState.STARTED; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java similarity index 96% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java index 7898badeb876b..6cf0f06d3b1de 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -30,7 +30,6 @@ import org.opensearch.cluster.routing.RoutingNodes; import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.common.settings.Settings; -import org.opensearch.cluster.routing.allocation.AllocationService; import static org.opensearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.opensearch.cluster.routing.ShardRoutingState.STARTED; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/RandomAllocationDeciderTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/RandomAllocationDeciderTests.java index b1ff6ff98c9a3..dc5c8b0fe7620 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/RandomAllocationDeciderTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.Version; import org.opensearch.cluster.ClusterState; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/RebalanceAfterActiveTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/RebalanceAfterActiveTests.java index 5e0a7c29448c6..13ee1b939e525 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/RebalanceAfterActiveTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -32,7 +32,6 @@ import org.opensearch.cluster.routing.RoutingNodes; import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.cluster.routing.ShardRouting; -import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java index 101dd739812d0..9298fb170e617 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -30,7 +30,6 @@ import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.common.settings.Settings; import org.opensearch.cluster.OpenSearchAllocationTestCase; -import org.opensearch.cluster.routing.allocation.AllocationService; import static org.opensearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.opensearch.cluster.routing.ShardRoutingState.STARTED; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java index cbd0acd93d30d..b44a18b1aef0f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/ResizeAllocationDeciderTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.Version; import org.opensearch.cluster.ClusterName; @@ -38,8 +38,8 @@ import org.opensearch.cluster.routing.allocation.decider.Decision; import org.opensearch.cluster.routing.allocation.decider.ResizeAllocationDecider; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; import org.opensearch.snapshots.EmptySnapshotsInfoService; import org.opensearch.test.gateway.TestGatewayAllocator; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RetryFailedAllocationTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/RetryFailedAllocationTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/RetryFailedAllocationTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/RetryFailedAllocationTests.java index f6fcc41059144..69f6ccf81c47f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RetryFailedAllocationTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/RetryFailedAllocationTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.OpenSearchException; import org.opensearch.Version; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java index 6aa1f6b297c2d..0416de9631715 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/RoutingNodesIntegrityTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -30,7 +30,6 @@ import org.opensearch.cluster.routing.IndexShardRoutingTable; import org.opensearch.cluster.routing.RoutingNodes; import org.opensearch.cluster.routing.RoutingTable; -import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.opensearch.cluster.routing.allocation.decider.ThrottlingAllocationDecider; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/RoutingNodesUtils.java similarity index 92% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/RoutingNodesUtils.java index 49982a00bf32b..9e21d765a7ce4 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesUtils.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/RoutingNodesUtils.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.cluster.routing.RoutingNode; import org.opensearch.cluster.routing.RoutingNodes; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/SameShardRoutingTests.java similarity index 94% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/SameShardRoutingTests.java index 998071d0f81a8..feb93bb300bd1 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/SameShardRoutingTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -37,21 +37,19 @@ import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.ShardRoutingState; import org.opensearch.cluster.routing.TestShardRouting; -import org.opensearch.cluster.routing.allocation.AllocationService; -import org.opensearch.cluster.routing.allocation.RoutingAllocation; import org.opensearch.cluster.routing.allocation.decider.AllocationDeciders; import org.opensearch.cluster.routing.allocation.decider.Decision; import org.opensearch.cluster.routing.allocation.decider.SameShardAllocationDecider; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; +import org.opensearch.index.Index; import org.opensearch.snapshots.SnapshotShardSizeInfo; import java.util.Collections; import static java.util.Collections.emptyMap; import static org.opensearch.cluster.routing.ShardRoutingState.INITIALIZING; -import static org.elasticsearch.cluster.routing.allocation.RoutingNodesUtils.numberOfShardsOfType; +import static org.opensearch.cluster.routing.allocation.RoutingNodesUtils.numberOfShardsOfType; import static org.hamcrest.Matchers.equalTo; public class SameShardRoutingTests extends OpenSearchAllocationTestCase { diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/ShardVersioningTests.java similarity index 96% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/ShardVersioningTests.java index f919d739cc2e7..64aa7320c6f74 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/ShardVersioningTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -28,7 +28,6 @@ import org.opensearch.cluster.metadata.Metadata; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.routing.RoutingTable; -import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/ShardsLimitAllocationTests.java similarity index 96% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/ShardsLimitAllocationTests.java index 5004a452e5464..0c231d0f011f6 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/ShardsLimitAllocationTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -30,13 +30,11 @@ import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.ShardRoutingState; -import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.routing.allocation.decider.ShardsLimitAllocationDecider; import org.opensearch.common.settings.Settings; import static org.opensearch.cluster.routing.ShardRoutingState.RELOCATING; import static org.opensearch.cluster.routing.ShardRoutingState.STARTED; -import static org.elasticsearch.cluster.routing.allocation.RoutingNodesUtils.numberOfShardsOfType; import static org.hamcrest.Matchers.equalTo; public class ShardsLimitAllocationTests extends OpenSearchAllocationTestCase { @@ -168,7 +166,7 @@ public void testIndexLevelShardsLimitRemain() { logger.info("Start the primary shards"); clusterState = startInitializingShardsAndReroute(strategy, clusterState); - assertThat(numberOfShardsOfType(clusterState.getRoutingNodes(), STARTED), equalTo(5)); + assertThat(RoutingNodesUtils.numberOfShardsOfType(clusterState.getRoutingNodes(), STARTED), equalTo(5)); logger.info("add another index with 5 shards"); metadata = Metadata.builder(clusterState.metadata()) @@ -190,7 +188,7 @@ public void testIndexLevelShardsLimitRemain() { clusterState = startInitializingShardsAndReroute(strategy, clusterState); - assertThat(numberOfShardsOfType(clusterState.getRoutingNodes(), STARTED), equalTo(10)); + assertThat(RoutingNodesUtils.numberOfShardsOfType(clusterState.getRoutingNodes(), STARTED), equalTo(10)); for (ShardRouting shardRouting : clusterState.getRoutingNodes().node("node1")) { assertThat(shardRouting.getIndexName(), equalTo("test")); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java index fd10f323a581e..f69a30519d1f5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -31,7 +31,6 @@ import org.opensearch.cluster.routing.RoutingNodes; import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.cluster.routing.ShardRouting; -import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.opensearch.common.settings.Settings; @@ -42,7 +41,7 @@ import static org.opensearch.cluster.routing.ShardRoutingState.RELOCATING; import static org.opensearch.cluster.routing.ShardRoutingState.STARTED; import static org.opensearch.cluster.routing.ShardRoutingState.UNASSIGNED; -import static org.elasticsearch.cluster.routing.allocation.RoutingNodesUtils.numberOfShardsOfType; +import static org.opensearch.cluster.routing.allocation.RoutingNodesUtils.numberOfShardsOfType; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java index 934a87e8e80bf..3e16438c28144 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -30,7 +30,6 @@ import org.opensearch.cluster.routing.RoutingNodes; import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.common.settings.Settings; -import org.opensearch.cluster.routing.allocation.AllocationService; import static org.opensearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.opensearch.cluster.routing.ShardRoutingState.STARTED; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/StartedShardsRoutingTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/StartedShardsRoutingTests.java index 8b81339794749..d535c73577ecf 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/StartedShardsRoutingTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.Version; import org.opensearch.cluster.ClusterName; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java index 59ae55e9b9ab3..b673d3417706e 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -29,7 +29,6 @@ import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.routing.RoutingNodes; import org.opensearch.cluster.routing.RoutingTable; -import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/ThrottlingAllocationTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/ThrottlingAllocationTests.java index bfcd82499fd91..df1b479641faf 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/ThrottlingAllocationTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import com.carrotsearch.hppc.IntHashSet; import com.carrotsearch.hppc.cursors.ObjectCursor; @@ -37,7 +37,6 @@ import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.ShardRoutingHelper; import org.opensearch.cluster.routing.UnassignedInfo; -import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.routing.allocation.command.AllocationCommands; import org.opensearch.cluster.routing.allocation.command.MoveAllocationCommand; import org.opensearch.cluster.routing.allocation.decider.Decision; @@ -45,8 +44,8 @@ import org.opensearch.common.UUIDs; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; import org.opensearch.repositories.IndexId; import org.opensearch.snapshots.InternalSnapshotsInfoService; import org.opensearch.snapshots.Snapshot; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/TrackFailedAllocationNodesTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/TrackFailedAllocationNodesTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/TrackFailedAllocationNodesTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/TrackFailedAllocationNodesTests.java index 89bc154ba2125..71f4784c19a0f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/TrackFailedAllocationNodesTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/TrackFailedAllocationNodesTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.opensearch.Version; import org.opensearch.cluster.ClusterName; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java index 0b3bed67ff528..d4c0c25d72647 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.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.cluster.routing.allocation; +package org.opensearch.cluster.routing.allocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -30,7 +30,6 @@ import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.common.settings.Settings; -import org.opensearch.cluster.routing.allocation.AllocationService; import static org.opensearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.opensearch.cluster.routing.ShardRoutingState.STARTED; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/AllocationDecidersTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/decider/AllocationDecidersTests.java index 250f088516f64..324158addfc3c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/AllocationDecidersTests.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.cluster.routing.allocation.decider; +package org.opensearch.cluster.routing.allocation.decider; import org.opensearch.Version; import org.opensearch.cluster.ClusterName; @@ -29,7 +29,7 @@ import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.UnassignedInfo; import org.opensearch.cluster.routing.allocation.RoutingAllocation; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matcher; import org.hamcrest.Matchers; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/DecisionTests.java similarity index 94% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/decider/DecisionTests.java index 986f3a2615fa4..cbd452bcda625 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/DecisionTests.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.cluster.routing.allocation.decider; +package org.opensearch.cluster.routing.allocation.decider; import org.opensearch.cluster.routing.allocation.decider.Decision; import org.opensearch.cluster.routing.allocation.decider.Decision.Type; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java index 3b9fcb2fd72b0..dd46e2dc95738 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cluster.routing.allocation.decider; +package org.opensearch.cluster.routing.allocation.decider; import com.carrotsearch.hppc.IntHashSet; import org.opensearch.Version; @@ -56,8 +56,8 @@ import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; import org.opensearch.cluster.routing.allocation.decider.AllocationDeciders; import org.opensearch.cluster.routing.allocation.decider.Decision; import org.opensearch.cluster.routing.allocation.decider.DiskThresholdDecider; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java index 7261a16d75a03..a3aca88c65e4b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.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.cluster.routing.allocation.decider; +package org.opensearch.cluster.routing.allocation.decider; import org.opensearch.Version; import org.opensearch.cluster.ClusterInfo; @@ -25,7 +25,6 @@ import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.DiskUsage; import org.opensearch.cluster.OpenSearchAllocationTestCase; -import org.elasticsearch.cluster.routing.allocation.decider.DiskThresholdDeciderTests.DevNullClusterInfo; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.Metadata; import org.opensearch.cluster.node.DiscoveryNode; @@ -45,11 +44,8 @@ import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; -import org.opensearch.cluster.routing.allocation.decider.AllocationDeciders; -import org.opensearch.cluster.routing.allocation.decider.Decision; -import org.opensearch.cluster.routing.allocation.decider.DiskThresholdDecider; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; import java.util.Collections; import java.util.HashSet; @@ -287,7 +283,7 @@ public void testShardSizeAndRelocatingSize() { shardSizes.put("[test][1][r]", 100L); shardSizes.put("[test][2][r]", 1000L); shardSizes.put("[other][0][p]", 10000L); - ClusterInfo info = new DevNullClusterInfo(ImmutableOpenMap.of(), ImmutableOpenMap.of(), shardSizes.build()); + ClusterInfo info = new DiskThresholdDeciderTests.DevNullClusterInfo(ImmutableOpenMap.of(), ImmutableOpenMap.of(), shardSizes.build()); Metadata.Builder metaBuilder = Metadata.builder(); metaBuilder.put(IndexMetadata.builder("test").settings(settings(Version.CURRENT) .put("index.uuid", "1234")).numberOfShards(3).numberOfReplicas(1)); @@ -366,7 +362,7 @@ public void testSizeShrinkIndex() { shardSizes.put("[test][2][p]", 500L); shardSizes.put("[test][3][p]", 500L); - ClusterInfo info = new DevNullClusterInfo(ImmutableOpenMap.of(), ImmutableOpenMap.of(), shardSizes.build()); + ClusterInfo info = new DiskThresholdDeciderTests.DevNullClusterInfo(ImmutableOpenMap.of(), ImmutableOpenMap.of(), shardSizes.build()); Metadata.Builder metaBuilder = Metadata.builder(); metaBuilder.put(IndexMetadata.builder("test").settings(settings(Version.CURRENT).put("index.uuid", "1234")) .numberOfShards(4).numberOfReplicas(0)); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationShortCircuitTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/EnableAllocationShortCircuitTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationShortCircuitTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/decider/EnableAllocationShortCircuitTests.java index 33b5e20585513..ad2a26ec42437 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationShortCircuitTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/EnableAllocationShortCircuitTests.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.cluster.routing.allocation.decider; +package org.opensearch.cluster.routing.allocation.decider; import org.opensearch.Version; import org.opensearch.cluster.ClusterModule; @@ -36,7 +36,7 @@ import org.opensearch.cluster.routing.allocation.allocator.BalancedShardsAllocator; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.plugins.ClusterPlugin; +import org.opensearch.plugins.ClusterPlugin; import org.opensearch.cluster.routing.allocation.decider.AllocationDecider; import org.opensearch.cluster.routing.allocation.decider.AllocationDeciders; import org.opensearch.cluster.routing.allocation.decider.Decision; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/EnableAllocationTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/decider/EnableAllocationTests.java index 9e06bf9bfc41f..fb7912df5d705 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/EnableAllocationTests.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.cluster.routing.allocation.decider; +package org.opensearch.cluster.routing.allocation.decider; import com.carrotsearch.randomizedtesting.generators.RandomPicks; @@ -32,13 +32,10 @@ import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.allocation.AllocationService; -import org.opensearch.cluster.routing.allocation.decider.ConcurrentRebalanceAllocationDecider; -import org.opensearch.cluster.routing.allocation.decider.EnableAllocationDecider; import org.opensearch.cluster.routing.allocation.decider.EnableAllocationDecider.Allocation; import org.opensearch.cluster.routing.allocation.decider.EnableAllocationDecider.Rebalance; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.opensearch.cluster.routing.allocation.decider.ThrottlingAllocationDecider; import java.util.EnumSet; import java.util.List; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java index ba58ca7d8c7d9..e7442d40e0ea1 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.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.cluster.routing.allocation.decider; +package org.opensearch.cluster.routing.allocation.decider; import org.opensearch.Version; import org.opensearch.cluster.ClusterState; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java rename to server/src/test/java/org/opensearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java index 1520beb39afdc..6e6a69b0c5767 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/RestoreInProgressAllocationDeciderTests.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.cluster.routing.allocation.decider; +package org.opensearch.cluster.routing.allocation.decider; import com.carrotsearch.hppc.cursors.ObjectCursor; import org.opensearch.Version; @@ -40,7 +40,7 @@ import org.opensearch.cluster.routing.allocation.RoutingAllocation; import org.opensearch.common.UUIDs; import org.opensearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.cluster.routing.allocation.decider.AllocationDecider; import org.opensearch.cluster.routing.allocation.decider.AllocationDeciders; import org.opensearch.cluster.routing.allocation.decider.Decision; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java b/server/src/test/java/org/opensearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java similarity index 92% rename from server/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java rename to server/src/test/java/org/opensearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java index 69a310ed1a794..8c89b4049a30c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java +++ b/server/src/test/java/org/opensearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.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.cluster.routing.operation.hash.murmur3; +package org.opensearch.cluster.routing.operation.hash.murmur3; import org.opensearch.cluster.routing.Murmur3HashFunction; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java b/server/src/test/java/org/opensearch/cluster/serialization/ClusterSerializationTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java rename to server/src/test/java/org/opensearch/cluster/serialization/ClusterSerializationTests.java index 77b3dce31e2bb..141ef606109cc 100644 --- a/server/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java +++ b/server/src/test/java/org/opensearch/cluster/serialization/ClusterSerializationTests.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.cluster.serialization; +package org.opensearch.cluster.serialization; import org.opensearch.Version; import org.opensearch.cluster.AbstractNamedDiffable; diff --git a/server/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java b/server/src/test/java/org/opensearch/cluster/serialization/ClusterStateToStringTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java rename to server/src/test/java/org/opensearch/cluster/serialization/ClusterStateToStringTests.java index b1b982419d7c1..ead3a37dcf2fd 100644 --- a/server/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java +++ b/server/src/test/java/org/opensearch/cluster/serialization/ClusterStateToStringTests.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.cluster.serialization; +package org.opensearch.cluster.serialization; import org.opensearch.Version; import org.opensearch.cluster.ClusterName; diff --git a/server/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java b/server/src/test/java/org/opensearch/cluster/serialization/DiffableTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java rename to server/src/test/java/org/opensearch/cluster/serialization/DiffableTests.java index 4187a6494430d..8f2ed6737b85c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java +++ b/server/src/test/java/org/opensearch/cluster/serialization/DiffableTests.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.cluster.serialization; +package org.opensearch.cluster.serialization; import org.opensearch.cluster.AbstractDiffable; import org.opensearch.cluster.Diff; diff --git a/server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java b/server/src/test/java/org/opensearch/cluster/service/ClusterApplierServiceTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java rename to server/src/test/java/org/opensearch/cluster/service/ClusterApplierServiceTests.java index c5a312531fa44..3c2c487f37b7a 100644 --- a/server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/service/ClusterApplierServiceTests.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.cluster.service; +package org.opensearch.cluster.service; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -42,7 +42,6 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.MockLogAppender; import org.opensearch.test.junit.annotations.TestLogging; -import org.opensearch.cluster.service.ClusterApplierService; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -111,7 +110,7 @@ private TimedClusterApplierService createTimedClusterService(boolean makeMaster) return timedClusterApplierService; } - @TestLogging(value = "org.elasticsearch.cluster.service:TRACE", reason = "to ensure that we log cluster state events on TRACE level") + @TestLogging(value = "org.opensearch.cluster.service:TRACE", reason = "to ensure that we log cluster state events on TRACE level") public void testClusterStateUpdateLogging() throws Exception { MockLogAppender mockAppender = new MockLogAppender(); mockAppender.start(); @@ -182,7 +181,7 @@ public void onFailure(String source, Exception e) { } } - @TestLogging(value = "org.elasticsearch.cluster.service:WARN", reason = "to ensure that we log cluster state events on WARN level") + @TestLogging(value = "org.opensearch.cluster.service:WARN", reason = "to ensure that we log cluster state events on WARN level") public void testLongClusterStateUpdateLogging() throws Exception { MockLogAppender mockAppender = new MockLogAppender(); mockAppender.start(); diff --git a/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java b/server/src/test/java/org/opensearch/cluster/service/MasterServiceTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java rename to server/src/test/java/org/opensearch/cluster/service/MasterServiceTests.java index 4f86708f803be..931c8523aa5e1 100644 --- a/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/service/MasterServiceTests.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.cluster.service; +package org.opensearch.cluster.service; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -51,7 +51,6 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.MockLogAppender; import org.opensearch.test.junit.annotations.TestLogging; -import org.opensearch.cluster.service.MasterService; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.AfterClass; @@ -309,7 +308,7 @@ public void onFailure(String source, Exception e) { } } - @TestLogging(value = "org.elasticsearch.cluster.service:TRACE", reason = "to ensure that we log cluster state events on TRACE level") + @TestLogging(value = "org.opensearch.cluster.service:TRACE", reason = "to ensure that we log cluster state events on TRACE level") public void testClusterStateUpdateLogging() throws Exception { MockLogAppender mockAppender = new MockLogAppender(); mockAppender.start(); @@ -694,7 +693,7 @@ public void onFailure(String source, Exception e) { } } - @TestLogging(value = "org.elasticsearch.cluster.service:WARN", reason = "to ensure that we log cluster state events on WARN level") + @TestLogging(value = "org.opensearch.cluster.service:WARN", reason = "to ensure that we log cluster state events on WARN level") public void testLongClusterStateUpdateLogging() throws Exception { MockLogAppender mockAppender = new MockLogAppender(); mockAppender.start(); diff --git a/server/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java b/server/src/test/java/org/opensearch/cluster/service/TaskBatcherTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java rename to server/src/test/java/org/opensearch/cluster/service/TaskBatcherTests.java index d3130a842096d..c910687dac092 100644 --- a/server/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java +++ b/server/src/test/java/org/opensearch/cluster/service/TaskBatcherTests.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.cluster.service; +package org.opensearch.cluster.service; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; @@ -28,7 +28,6 @@ import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.PrioritizedOpenSearchThreadPoolExecutor; import org.junit.Before; -import org.opensearch.cluster.service.TaskBatcher; import java.util.ArrayList; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java b/server/src/test/java/org/opensearch/cluster/service/TaskExecutorTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java rename to server/src/test/java/org/opensearch/cluster/service/TaskExecutorTests.java index 7cd129a9c6cf4..a6e14e196295d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java +++ b/server/src/test/java/org/opensearch/cluster/service/TaskExecutorTests.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.cluster.service; +package org.opensearch.cluster.service; import org.opensearch.cluster.ClusterStateTaskConfig; import org.opensearch.cluster.metadata.ProcessClusterEventTimeoutException; @@ -28,7 +28,6 @@ import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.PrioritizedOpenSearchThreadPoolExecutor; import org.opensearch.test.OpenSearchTestCase; -import org.opensearch.cluster.service.SourcePrioritizedRunnable; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; diff --git a/server/src/test/java/org/elasticsearch/cluster/shards/ShardCounts.java b/server/src/test/java/org/opensearch/cluster/shards/ShardCounts.java similarity index 98% rename from server/src/test/java/org/elasticsearch/cluster/shards/ShardCounts.java rename to server/src/test/java/org/opensearch/cluster/shards/ShardCounts.java index 7d7571117c770..81b6c6e40bd94 100644 --- a/server/src/test/java/org/elasticsearch/cluster/shards/ShardCounts.java +++ b/server/src/test/java/org/opensearch/cluster/shards/ShardCounts.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cluster.shards; +package org.opensearch.cluster.shards; import org.opensearch.test.OpenSearchTestCase; import org.junit.Assert; diff --git a/server/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java b/server/src/test/java/org/opensearch/cluster/structure/RoutingIteratorTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java rename to server/src/test/java/org/opensearch/cluster/structure/RoutingIteratorTests.java index 122dbb4ad1d45..72eae281d80ff 100644 --- a/server/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java +++ b/server/src/test/java/org/opensearch/cluster/structure/RoutingIteratorTests.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.cluster.structure; +package org.opensearch.cluster.structure; import org.opensearch.Version; import org.opensearch.cluster.ClusterName; @@ -39,7 +39,7 @@ import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import java.util.Arrays; import java.util.Collections; diff --git a/server/src/test/java/org/opensearch/indices/ShardLimitValidatorTests.java b/server/src/test/java/org/opensearch/indices/ShardLimitValidatorTests.java index b6aacc325d89c..e72efea7d13d9 100644 --- a/server/src/test/java/org/opensearch/indices/ShardLimitValidatorTests.java +++ b/server/src/test/java/org/opensearch/indices/ShardLimitValidatorTests.java @@ -27,7 +27,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.cluster.shards.ShardCounts; +import org.opensearch.cluster.shards.ShardCounts; import org.opensearch.common.ValidationException; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.settings.ClusterSettings; @@ -39,9 +39,9 @@ import java.util.Optional; import java.util.stream.Collectors; -import static org.elasticsearch.cluster.metadata.MetadataIndexStateServiceTests.addClosedIndex; -import static org.elasticsearch.cluster.metadata.MetadataIndexStateServiceTests.addOpenedIndex; -import static org.elasticsearch.cluster.shards.ShardCounts.forDataNodeCount; +import static org.opensearch.cluster.metadata.MetadataIndexStateServiceTests.addClosedIndex; +import static org.opensearch.cluster.metadata.MetadataIndexStateServiceTests.addOpenedIndex; +import static org.opensearch.cluster.shards.ShardCounts.forDataNodeCount; import static org.elasticsearch.indices.ShardLimitValidator.SETTING_CLUSTER_MAX_SHARDS_PER_NODE; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java b/server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java index f364425bda9f3..76ae37ca39764 100644 --- a/server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java +++ b/server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java @@ -62,14 +62,14 @@ import org.opensearch.cluster.metadata.MetadataCreateIndexService; import org.opensearch.cluster.metadata.MetadataDeleteIndexService; import org.opensearch.cluster.metadata.MetadataIndexStateService; -import org.elasticsearch.cluster.metadata.MetadataIndexStateServiceUtils; +import org.opensearch.cluster.metadata.MetadataIndexStateServiceUtils; import org.opensearch.cluster.metadata.MetadataIndexUpgradeService; import org.opensearch.cluster.metadata.MetadataUpdateSettingsService; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.routing.allocation.FailedShard; -import org.elasticsearch.cluster.routing.allocation.RandomAllocationDeciderTests; +import org.opensearch.cluster.routing.allocation.RandomAllocationDeciderTests; import org.opensearch.cluster.routing.allocation.allocator.BalancedShardsAllocator; import org.opensearch.cluster.routing.allocation.decider.AllocationDeciders; import org.opensearch.cluster.routing.allocation.decider.ReplicaAfterPrimaryActiveAllocationDecider; diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java index 66a9ad23c34e6..71444b4d192af 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java @@ -108,7 +108,7 @@ import org.opensearch.cluster.coordination.CoordinationMetadata.VotingConfiguration; import org.opensearch.cluster.coordination.CoordinationState; import org.opensearch.cluster.coordination.Coordinator; -import org.elasticsearch.cluster.coordination.CoordinatorTests; +import org.opensearch.cluster.coordination.CoordinatorTests; import org.opensearch.cluster.coordination.DeterministicTaskQueue; import org.opensearch.cluster.coordination.ElectionStrategy; import org.opensearch.cluster.coordination.InMemoryPersistedState;