honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename org.elasticsearch.node to org.opensearch.node (#351) 

Signed-off-by: Harold Wang <harowang@amazon.com>
This commit is contained in:
Harold Wang 2021-03-17 12:09:29 -07:00 committed by Nick Knize
parent 07ca47a256
commit 182a86ea63
66 changed files with 113 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/org/opensearch/action/admin/cluster/node/info/PluginsAndModules.java
View File

@ -22,7 +22,7 @@ package org.opensearch.action.admin.cluster.node.info;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.node.ReportingService;
import org.opensearch.node.ReportingService;
import org.opensearch.plugins.PluginInfo;
import java.io.IOException;

4
server/src/main/java/org/opensearch/action/main/TransportMainAction.java
View File

@ -27,8 +27,8 @@ import org.opensearch.action.support.HandledTransportAction;
import org.opensearch.cluster.ClusterState;
import org.elasticsearch.cluster.service.ClusterService;
import org.opensearch.common.inject.Inject;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.node.Node;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.node.Node;
import org.opensearch.tasks.Task;
import org.opensearch.transport.TransportService;

2
server/src/main/java/org/opensearch/action/search/SearchExecutionStatsCollector.java
View File

@ -20,7 +20,7 @@
package org.opensearch.action.search;
import org.opensearch.action.ActionListener;
import org.elasticsearch.node.ResponseCollectorService;
import org.opensearch.node.ResponseCollectorService;
import org.opensearch.search.SearchPhaseResult;
import org.opensearch.search.query.QuerySearchResult;
import org.opensearch.transport.Transport;

4
server/src/main/java/org/opensearch/action/support/ActiveShardsObserver.java
View File

@ -25,8 +25,8 @@ import org.opensearch.action.ActionListener;
import org.opensearch.cluster.ClusterState;
import org.opensearch.cluster.ClusterStateObserver;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.node.NodeClosedException;
import org.elasticsearch.common.unit.TimeValue;
import org.opensearch.node.NodeClosedException;
import org.opensearch.threadpool.ThreadPool;
import java.util.Arrays;

2
server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java
View File

@ -42,7 +42,7 @@ import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.Writeable;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.discovery.MasterNotDiscoveredException;
import org.elasticsearch.node.NodeClosedException;
import org.opensearch.node.NodeClosedException;
import org.opensearch.tasks.Task;
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.ConnectTransportException;

2
server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java
View File

@ -40,7 +40,7 @@ import org.opensearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.index.seqno.SequenceNumbers;
import org.elasticsearch.index.shard.ReplicationGroup;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.node.NodeClosedException;
import org.opensearch.node.NodeClosedException;
import org.opensearch.rest.RestStatus;
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.ConnectTransportException;

2
server/src/main/java/org/opensearch/action/support/replication/TransportReplicationAction.java
View File

@ -67,7 +67,7 @@ import org.elasticsearch.index.shard.ShardNotFoundException;
import org.elasticsearch.index.shard.ShardNotInPrimaryModeException;
import org.elasticsearch.indices.IndexClosedException;
import org.elasticsearch.indices.IndicesService;
import org.elasticsearch.node.NodeClosedException;
import org.opensearch.node.NodeClosedException;
import org.opensearch.tasks.Task;
import org.opensearch.tasks.TaskId;
import org.opensearch.threadpool.ThreadPool;

2
server/src/main/java/org/opensearch/action/support/single/instance/TransportInstanceSingleOperationAction.java
View File

@ -40,7 +40,7 @@ import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.concurrent.AbstractRunnable;
import org.elasticsearch.index.IndexNotFoundException;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.node.NodeClosedException;
import org.opensearch.node.NodeClosedException;
import org.opensearch.tasks.Task;
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.threadpool.ThreadPool.Names;

6
server/src/main/java/org/opensearch/bootstrap/Bootstrap.java
View File

@ -49,9 +49,9 @@ import org.elasticsearch.env.Environment;
import org.elasticsearch.monitor.jvm.JvmInfo;
import org.elasticsearch.monitor.os.OsProbe;
import org.elasticsearch.monitor.process.ProcessProbe;
import org.elasticsearch.node.InternalSettingsPreparer;
import org.elasticsearch.node.Node;
import org.elasticsearch.node.NodeValidationException;
import org.opensearch.node.InternalSettingsPreparer;
import org.opensearch.node.Node;
import org.opensearch.node.NodeValidationException;
import java.io.ByteArrayOutputStream;
import java.io.IOException;

2
server/src/main/java/org/opensearch/bootstrap/BootstrapChecks.java
View File

@ -33,7 +33,7 @@ import org.opensearch.discovery.DiscoveryModule;
import org.elasticsearch.index.IndexModule;
import org.elasticsearch.monitor.jvm.JvmInfo;
import org.elasticsearch.monitor.process.ProcessProbe;
import org.elasticsearch.node.NodeValidationException;
import org.opensearch.node.NodeValidationException;
import java.io.BufferedReader;
import java.io.IOException;

2
server/src/main/java/org/opensearch/cli/EnvironmentAwareCommand.java
View File

@ -25,7 +25,7 @@ import joptsimple.util.KeyValuePair;
import org.opensearch.common.SuppressForbidden;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.node.InternalSettingsPreparer;
import org.opensearch.node.InternalSettingsPreparer;
import java.nio.file.Path;
import java.nio.file.Paths;

4
server/src/main/java/org/opensearch/cluster/node/DiscoveryNode.java
View File

@ -29,7 +29,7 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.common.xcontent.ToXContentFragment;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.node.Node;
import org.opensearch.node.Node;
import java.io.IOException;
import java.util.Collections;
@ -46,7 +46,7 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.elasticsearch.node.NodeRoleSettings.NODE_ROLES_SETTING;
import static org.opensearch.node.NodeRoleSettings.NODE_ROLES_SETTING;
/**

8
server/src/main/java/org/opensearch/cluster/node/DiscoveryNodeRole.java
View File

@ -153,7 +153,7 @@ public abstract class DiscoveryNodeRole implements Comparable<DiscoveryNodeRole>
@Override
public Setting<Boolean> legacySetting() {
// copy the setting here so we can mark it private in org.elasticsearch.node.Node
// copy the setting here so we can mark it private in org.opensearch.node.Node
return Setting.boolSetting("node.data", true, Property.Deprecated, Property.NodeScope);
}
@ -166,7 +166,7 @@ public abstract class DiscoveryNodeRole implements Comparable<DiscoveryNodeRole>
@Override
public Setting<Boolean> legacySetting() {
// copy the setting here so we can mark it private in org.elasticsearch.node.Node
// copy the setting here so we can mark it private in org.opensearch.node.Node
return Setting.boolSetting("node.ingest", true, Property.Deprecated, Property.NodeScope);
}
@ -179,7 +179,7 @@ public abstract class DiscoveryNodeRole implements Comparable<DiscoveryNodeRole>
@Override
public Setting<Boolean> legacySetting() {
// copy the setting here so we can mark it private in org.elasticsearch.node.Node
// copy the setting here so we can mark it private in org.opensearch.node.Node
return Setting.boolSetting("node.master", true, Property.Deprecated, Property.NodeScope);
}
@ -189,7 +189,7 @@ public abstract class DiscoveryNodeRole implements Comparable<DiscoveryNodeRole>
@Override
public Setting<Boolean> legacySetting() {
// copy the setting here so we can mark it private in org.elasticsearch.node.Node
// copy the setting here so we can mark it private in org.opensearch.node.Node
return Setting.boolSetting(
"node.remote_cluster_client",
RemoteClusterService.ENABLE_REMOTE_CLUSTERS,

4
server/src/main/java/org/opensearch/cluster/routing/IndexShardRoutingTable.java
View File

@ -27,8 +27,8 @@ import org.opensearch.common.collect.MapBuilder;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.util.set.Sets;
import org.opensearch.index.Index;
import org.opensearch.index.shard.ShardId;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.shard.ShardId;
import org.opensearch.node.ResponseCollectorService;
import java.io.IOException;

10
server/src/main/java/org/opensearch/cluster/routing/OperationRouting.java
View File

@ -27,11 +27,11 @@ import org.opensearch.cluster.routing.allocation.decider.AwarenessAllocationDeci
import org.opensearch.common.Nullable;
import org.opensearch.common.Strings;
import org.opensearch.common.logging.DeprecationLogger;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Settings;
import org.opensearch.index.IndexNotFoundException;
import org.opensearch.index.shard.ShardId;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.IndexNotFoundException;
import org.elasticsearch.index.shard.ShardId;
import org.opensearch.node.ResponseCollectorService;
import java.util.ArrayList;

8
server/src/main/java/org/opensearch/cluster/service/ClusterService.java
View File

@ -32,10 +32,10 @@ import org.opensearch.cluster.node.DiscoveryNode;
import org.opensearch.cluster.routing.OperationRouting;
import org.opensearch.cluster.routing.RerouteService;
import org.opensearch.common.component.AbstractLifecycleComponent;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Setting.Property;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.node.Node;
import org.opensearch.threadpool.ThreadPool;

8
server/src/main/java/org/opensearch/common/util/concurrent/EsExecutors.java
View File

@ -22,10 +22,10 @@ package org.opensearch.common.util.concurrent;
import org.opensearch.ExceptionsHelper;
import org.opensearch.common.SuppressForbidden;
import org.opensearch.common.logging.DeprecationLogger;
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Setting.Property;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.opensearch.node.Node;
import java.util.List;

2
server/src/main/java/org/opensearch/discovery/DiscoveryModule.java
View File

@ -60,7 +60,7 @@ import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import static org.elasticsearch.node.Node.NODE_NAME_SETTING;
import static org.opensearch.node.Node.NODE_NAME_SETTING;
/**
* A module for loading classes for node discovery.

2
server/src/main/java/org/opensearch/discovery/zen/UnicastZenPing.java
View File

@ -48,7 +48,7 @@ import org.elasticsearch.common.util.concurrent.EsThreadPoolExecutor;
import org.elasticsearch.common.util.concurrent.KeyedLock;
import org.opensearch.discovery.SeedHostsProvider;
import org.opensearch.discovery.SeedHostsResolver;
import org.elasticsearch.node.Node;
import org.opensearch.node.Node;
import org.opensearch.tasks.Task;
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.ConnectTransportException;

2
server/src/main/java/org/opensearch/search/SearchService.java
View File

@ -72,7 +72,7 @@ import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.indices.IndicesService;
import org.elasticsearch.indices.breaker.CircuitBreakerService;
import org.elasticsearch.indices.cluster.IndicesClusterStateService.AllocatedIndices.IndexRemovalReason;
import org.elasticsearch.node.ResponseCollectorService;
import org.opensearch.node.ResponseCollectorService;
import org.opensearch.script.FieldScript;
import org.opensearch.script.ScriptService;
import org.opensearch.search.aggregations.AggregationInitializationException;

2
server/src/main/java/org/opensearch/search/aggregations/support/AggregationInfo.java
View File

@ -22,7 +22,7 @@ package org.opensearch.search.aggregations.support;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.node.ReportingService;
import org.opensearch.node.ReportingService;
import java.io.IOException;
import java.util.Collections;

2
server/src/main/java/org/opensearch/search/aggregations/support/AggregationUsageService.java
View File

@ -19,7 +19,7 @@
package org.opensearch.search.aggregations.support;
import org.elasticsearch.node.ReportingService;
import org.opensearch.node.ReportingService;
import java.util.HashMap;
import java.util.Map;

2
server/src/main/java/org/opensearch/threadpool/AutoQueueAdjustingExecutorBuilder.java
View File

@ -25,7 +25,7 @@ import org.opensearch.common.unit.SizeValue;
import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.node.Node;
import org.opensearch.node.Node;
import java.util.Arrays;
import java.util.Collections;

2
server/src/main/java/org/opensearch/threadpool/FixedExecutorBuilder.java
View File

@ -24,7 +24,7 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.SizeValue;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.node.Node;
import org.opensearch.node.Node;
import java.util.Arrays;
import java.util.List;

2
server/src/main/java/org/opensearch/threadpool/ScalingExecutorBuilder.java
View File

@ -24,7 +24,7 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.node.Node;
import org.opensearch.node.Node;
import java.util.Arrays;
import java.util.List;

2
server/src/main/java/org/opensearch/transport/TcpTransport.java
View File

@ -55,7 +55,7 @@ import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
import org.elasticsearch.common.util.concurrent.CountDown;
import org.elasticsearch.indices.breaker.CircuitBreakerService;
import org.elasticsearch.monitor.jvm.JvmInfo;
import org.elasticsearch.node.Node;
import org.opensearch.node.Node;
import org.opensearch.rest.RestStatus;
import org.opensearch.threadpool.ThreadPool;

2
server/src/main/java/org/opensearch/transport/TransportInfo.java
View File

@ -27,7 +27,7 @@ import org.opensearch.common.network.InetAddresses;
import org.opensearch.common.transport.BoundTransportAddress;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.node.ReportingService;
import org.opensearch.node.ReportingService;
import java.io.IOException;
import java.util.HashMap;

6
server/src/main/java/org/opensearch/transport/TransportService.java
View File

@ -47,9 +47,9 @@ import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.AbstractRunnable;
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.opensearch.core.internal.io.IOUtils;
import org.elasticsearch.node.NodeClosedException;
import org.elasticsearch.node.ReportingService;
import org.elasticsearch.core.internal.io.IOUtils;
import org.opensearch.node.NodeClosedException;
import org.opensearch.node.ReportingService;
import org.opensearch.tasks.Task;
import org.opensearch.tasks.TaskManager;
import org.opensearch.threadpool.Scheduler;

2
server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java
View File

@ -51,7 +51,7 @@ import static org.opensearch.cluster.coordination.ClusterBootstrapService.UNCONF
import static org.opensearch.common.settings.Settings.builder;
import static org.opensearch.discovery.DiscoveryModule.DISCOVERY_SEED_PROVIDERS_SETTING;
import static org.opensearch.discovery.SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING;
import static org.elasticsearch.node.Node.NODE_NAME_SETTING;
import static org.opensearch.node.Node.NODE_NAME_SETTING;
import static org.elasticsearch.test.NodeRoles.nonMasterNode;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.containsInAnyOrder;

2
server/src/test/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelperTests.java
View File

@ -50,7 +50,7 @@ import static org.opensearch.cluster.coordination.ClusterBootstrapService.BOOTST
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.elasticsearch.node.Node.NODE_NAME_SETTING;
import static org.opensearch.node.Node.NODE_NAME_SETTING;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.oneOf;

2
server/src/test/java/org/elasticsearch/cluster/coordination/ElectionSchedulerFactoryTests.java
View File

@ -33,7 +33,7 @@ import static org.opensearch.cluster.coordination.ElectionSchedulerFactory.ELECT
import static org.opensearch.cluster.coordination.ElectionSchedulerFactory.ELECTION_INITIAL_TIMEOUT_SETTING;
import static org.opensearch.cluster.coordination.ElectionSchedulerFactory.ELECTION_MAX_TIMEOUT_SETTING;
import static org.opensearch.cluster.coordination.ElectionSchedulerFactory.toPositiveLongAtMost;
import static org.elasticsearch.node.Node.NODE_NAME_SETTING;
import static org.opensearch.node.Node.NODE_NAME_SETTING;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;

2
server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java
View File

@ -69,7 +69,7 @@ import static org.opensearch.cluster.coordination.FollowersChecker.FOLLOWER_CHEC
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.elasticsearch.node.Node.NODE_NAME_SETTING;
import static org.opensearch.node.Node.NODE_NAME_SETTING;
import static org.opensearch.transport.TransportService.HANDSHAKE_ACTION_NAME;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;

2
server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java
View File

@ -50,7 +50,7 @@ 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.elasticsearch.node.Node.NODE_NAME_SETTING;
import static org.opensearch.node.Node.NODE_NAME_SETTING;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.core.Is.is;

2
server/src/test/java/org/elasticsearch/cluster/coordination/LagDetectorTests.java
View File

@ -31,7 +31,7 @@ import java.util.HashSet;
import java.util.Set;
import static org.opensearch.cluster.coordination.LagDetector.CLUSTER_FOLLOWER_LAG_TIMEOUT_SETTING;
import static org.elasticsearch.node.Node.NODE_NAME_SETTING;
import static org.opensearch.node.Node.NODE_NAME_SETTING;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.greaterThan;

2
server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java
View File

@ -56,7 +56,7 @@ import static org.opensearch.cluster.coordination.LeaderChecker.LEADER_CHECK_RET
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.elasticsearch.node.Node.NODE_NAME_SETTING;
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;
import static org.hamcrest.Matchers.anyOf;

4
server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinTests.java
View File

@ -39,8 +39,8 @@ 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.opensearch.monitor.NodeHealthService;
import org.opensearch.monitor.StatusInfo;
import org.elasticsearch.monitor.NodeHealthService;
import org.elasticsearch.monitor.StatusInfo;
import org.opensearch.node.Node;
import org.elasticsearch.test.ClusterServiceUtils;
import org.elasticsearch.test.ESTestCase;

2
server/src/test/java/org/elasticsearch/cluster/coordination/PreVoteCollectorTests.java
View File

@ -59,7 +59,7 @@ import static java.util.Collections.emptySet;
import static org.opensearch.cluster.coordination.PreVoteCollector.REQUEST_PRE_VOTE_ACTION_NAME;
import static org.elasticsearch.monitor.StatusInfo.Status.HEALTHY;
import static org.elasticsearch.monitor.StatusInfo.Status.UNHEALTHY;
import static org.elasticsearch.node.Node.NODE_NAME_SETTING;
import static org.opensearch.node.Node.NODE_NAME_SETTING;
import static org.opensearch.threadpool.ThreadPool.Names.SAME;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;

6
server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java
View File

@ -27,9 +27,9 @@ import org.opensearch.cluster.coordination.CoordinationMetadata.VotingConfigurat
import org.opensearch.cluster.node.DiscoveryNode;
import org.opensearch.cluster.node.DiscoveryNodes;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.node.Node;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.node.Node;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.transport.CapturingTransport;
import org.opensearch.transport.TransportService;

2
server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseActionsTests.java
View File

@ -29,7 +29,7 @@ import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.index.IndexService;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.node.Node;
import org.opensearch.node.Node;
import org.elasticsearch.test.ESSingleNodeTestCase;
import org.opensearch.threadpool.ThreadPool;

18
server/src/test/java/org/elasticsearch/indices/IndicesServiceCloseTests.java
View File

@ -28,15 +28,15 @@ import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.cache.RemovalNotification;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.util.concurrent.EsExecutors;
import org.opensearch.env.Environment;
import org.opensearch.env.NodeEnvironment;
import org.opensearch.index.IndexModule;
import org.opensearch.index.IndexService;
import org.opensearch.index.engine.Engine;
import org.opensearch.index.shard.IndexShard;
import org.opensearch.indices.IndicesRequestCache.Key;
import org.opensearch.indices.breaker.HierarchyCircuitBreakerService;
import org.elasticsearch.node.MockNode;
import org.elasticsearch.env.Environment;
import org.elasticsearch.env.NodeEnvironment;
import org.elasticsearch.index.IndexModule;
import org.elasticsearch.index.IndexService;
import org.elasticsearch.index.engine.Engine;
import org.elasticsearch.index.shard.IndexShard;
import org.elasticsearch.indices.IndicesRequestCache.Key;
import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService;
import org.opensearch.node.MockNode;
import org.opensearch.node.Node;
import org.opensearch.node.NodeValidationException;
import org.elasticsearch.test.ESTestCase;

4
server/src/test/java/org/elasticsearch/monitor/fs/FsHealthServiceTests.java
View File

@ -50,8 +50,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import static org.opensearch.monitor.StatusInfo.Status.HEALTHY;
import static org.opensearch.monitor.StatusInfo.Status.UNHEALTHY;
import static org.elasticsearch.monitor.StatusInfo.Status.HEALTHY;
import static org.elasticsearch.monitor.StatusInfo.Status.UNHEALTHY;
import static org.opensearch.node.Node.NODE_NAME_SETTING;
import static org.hamcrest.Matchers.is;

2
server/src/test/java/org/elasticsearch/plugins/IndexStorePluginTests.java
View File

@ -26,7 +26,7 @@ import org.opensearch.common.settings.Settings;
import org.elasticsearch.index.IndexModule;
import org.elasticsearch.index.store.FsDirectoryFactory;
import org.elasticsearch.indices.recovery.RecoveryState;
import org.elasticsearch.node.MockNode;
import org.opensearch.node.MockNode;
import org.elasticsearch.test.ESTestCase;
import java.util.Arrays;

2
server/src/test/java/org/elasticsearch/node/InternalSettingsPreparerTests.java → server/src/test/java/org/opensearch/node/InternalSettingsPreparerTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.node;
package org.opensearch.node;
import org.opensearch.cluster.ClusterName;
import org.elasticsearch.common.settings.MockSecureSettings;

2
server/src/test/java/org/elasticsearch/node/NodeTests.java → server/src/test/java/org/opensearch/node/NodeTests.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.node;
package org.opensearch.node;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.SetOnce;

2
server/src/test/java/org/elasticsearch/node/ResponseCollectorServiceTests.java → server/src/test/java/org/opensearch/node/ResponseCollectorServiceTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.node;
package org.opensearch.node;
import org.opensearch.cluster.ClusterChangedEvent;
import org.opensearch.cluster.ClusterName;

2
server/src/test/java/org/elasticsearch/nodesinfo/NodeInfoStreamingTests.java → server/src/test/java/org/opensearch/nodesinfo/NodeInfoStreamingTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.nodesinfo;
package org.opensearch.nodesinfo;
import org.opensearch.Build;
import org.opensearch.action.admin.cluster.node.info.NodeInfo;

2
server/src/test/java/org/opensearch/threadpool/ScheduleWithFixedDelayTests.java
View File

@ -24,7 +24,7 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.concurrent.BaseFuture;
import org.opensearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.node.Node;
import org.opensearch.node.Node;
import org.elasticsearch.test.ESTestCase;
import org.opensearch.threadpool.Scheduler.Cancellable;
import org.opensearch.threadpool.ThreadPool.Names;

8
server/src/test/java/org/opensearch/transport/RemoteClusterSettingsTests.java
View File

@ -21,10 +21,10 @@ package org.opensearch.transport;
import org.opensearch.cluster.node.DiscoveryNode;
import org.opensearch.cluster.node.DiscoveryNodeRole;
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.node.NodeRoleSettings;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.opensearch.node.NodeRoleSettings;
import org.elasticsearch.test.ESTestCase;
import java.util.ArrayList;

2
server/src/test/java/org/opensearch/transport/TransportServiceDeserializationFailureTests.java
View File

@ -36,7 +36,7 @@ import org.opensearch.threadpool.ThreadPool;
import java.util.Collections;
import java.util.List;
import static org.elasticsearch.node.Node.NODE_NAME_SETTING;
import static org.opensearch.node.Node.NODE_NAME_SETTING;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasSize;

2
test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java
View File

@ -138,7 +138,7 @@ import static org.opensearch.cluster.coordination.Reconfigurator.CLUSTER_AUTO_SH
import static org.opensearch.discovery.PeerFinder.DISCOVERY_FIND_PEERS_INTERVAL_SETTING;
import static org.opensearch.gateway.GatewayService.STATE_NOT_RECOVERED_BLOCK;
import static org.elasticsearch.monitor.StatusInfo.Status.HEALTHY;
import static org.elasticsearch.node.Node.NODE_NAME_SETTING;
import static org.opensearch.node.Node.NODE_NAME_SETTING;
import static org.opensearch.transport.TransportService.NOOP_TRANSPORT_INTERCEPTOR;
import static org.opensearch.transport.TransportSettings.CONNECT_TIMEOUT;
import static org.hamcrest.Matchers.empty;

2
test/framework/src/main/java/org/elasticsearch/cluster/service/FakeThreadPoolMasterService.java
View File

@ -31,7 +31,7 @@ import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.concurrent.EsExecutors;
import org.opensearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.node.Node;
import org.opensearch.node.Node;
import org.opensearch.cluster.service.MasterService;
import org.opensearch.threadpool.ThreadPool;

6
test/framework/src/main/java/org/elasticsearch/test/ClusterServiceUtils.java
View File

@ -35,9 +35,9 @@ import org.opensearch.cluster.service.ClusterApplier.ClusterApplyListener;
import org.opensearch.cluster.service.ClusterApplierService;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.cluster.service.MasterService;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.node.Node;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.node.Node;
import org.opensearch.threadpool.ThreadPool;
import java.util.Collections;

2
test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java
View File

@ -131,7 +131,7 @@ import org.opensearch.indices.IndicesRequestCache;
import org.opensearch.indices.store.IndicesStore;
import org.opensearch.ingest.IngestMetadata;
import org.opensearch.monitor.os.OsInfo;
import org.elasticsearch.node.NodeMocksPlugin;
import org.opensearch.node.NodeMocksPlugin;
import org.opensearch.plugins.NetworkPlugin;
import org.opensearch.plugins.Plugin;
import org.opensearch.rest.RestStatus;

6
test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java
View File

@ -47,9 +47,9 @@ import org.elasticsearch.index.IndexService;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.indices.IndicesService;
import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService;
import org.elasticsearch.node.MockNode;
import org.elasticsearch.node.Node;
import org.elasticsearch.node.NodeValidationException;
import org.opensearch.node.MockNode;
import org.opensearch.node.Node;
import org.opensearch.node.NodeValidationException;
import org.elasticsearch.plugins.Plugin;
import org.opensearch.script.MockScriptService;
import org.opensearch.search.internal.SearchContext;

10
test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
View File

@ -103,11 +103,11 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService;
import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService;
import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache;
import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.node.MockNode;
import org.elasticsearch.node.Node;
import org.elasticsearch.node.NodeRoleSettings;
import org.elasticsearch.node.NodeService;
import org.elasticsearch.node.NodeValidationException;
import org.opensearch.node.MockNode;
import org.opensearch.node.Node;
import org.opensearch.node.NodeRoleSettings;
import org.opensearch.node.NodeService;
import org.opensearch.node.NodeValidationException;
import org.elasticsearch.plugins.Plugin;
import org.opensearch.script.ScriptModule;
import org.opensearch.script.ScriptService;

2
test/framework/src/main/java/org/elasticsearch/test/MockHttpTransport.java
View File

@ -33,7 +33,7 @@ import org.elasticsearch.plugins.Plugin;
public class MockHttpTransport extends AbstractLifecycleComponent implements HttpServerTransport {
/**
* Marker plugin used by {@link org.elasticsearch.node.MockNode} to enable {@link MockHttpTransport}.
* Marker plugin used by {@link org.opensearch.node.MockNode} to enable {@link MockHttpTransport}.
*/
public static class TestPlugin extends Plugin {}

4
test/framework/src/main/java/org/elasticsearch/test/NodeRoles.java
View File

@ -20,8 +20,8 @@
package org.elasticsearch.test;
import org.opensearch.cluster.node.DiscoveryNodeRole;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.node.NodeRoleSettings;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.node.NodeRoleSettings;
import java.util.Collections;
import java.util.Set;

2
test/framework/src/main/java/org/elasticsearch/node/MockNode.java → test/framework/src/main/java/org/opensearch/node/MockNode.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.node;
package org.opensearch.node;
import org.opensearch.client.node.NodeClient;
import org.opensearch.cluster.ClusterInfoService;

2
test/framework/src/main/java/org/elasticsearch/node/NodeMocksPlugin.java → test/framework/src/main/java/org/opensearch/node/NodeMocksPlugin.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.node;
package org.opensearch.node;
import org.elasticsearch.plugins.Plugin;

2
test/framework/src/main/java/org/elasticsearch/node/RecoverySettingsChunkSizePlugin.java → test/framework/src/main/java/org/opensearch/node/RecoverySettingsChunkSizePlugin.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.node;
package org.opensearch.node;
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Setting.Property;

5
test/framework/src/main/java/org/opensearch/script/MockScriptService.java
View File

@ -19,8 +19,9 @@
package org.opensearch.script;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.node.MockNode;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.node.MockNode;
import org.opensearch.plugins.Plugin;
import java.util.Map;

2
test/framework/src/main/java/org/opensearch/search/MockSearchService.java
View File

@ -23,7 +23,7 @@ import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.util.BigArrays;
import org.elasticsearch.indices.IndicesService;
import org.elasticsearch.indices.breaker.CircuitBreakerService;
import org.elasticsearch.node.MockNode;
import org.opensearch.node.MockNode;
import org.elasticsearch.plugins.Plugin;
import org.opensearch.script.ScriptService;
import org.opensearch.search.fetch.FetchPhase;

2
test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java
View File

@ -51,7 +51,7 @@ import org.opensearch.common.util.concurrent.AbstractRunnable;
import org.opensearch.common.util.concurrent.ConcurrentCollections;
import org.opensearch.core.internal.io.IOUtils;
import org.elasticsearch.mocksocket.MockServerSocket;
import org.elasticsearch.node.Node;
import org.opensearch.node.Node;
import org.opensearch.tasks.Task;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.MockLogAppender;

2
test/framework/src/test/java/org/elasticsearch/cluster/coordination/DeterministicTaskQueueTests.java
View File

@ -31,7 +31,7 @@ import java.util.Random;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import static org.elasticsearch.node.Node.NODE_NAME_SETTING;
import static org.opensearch.node.Node.NODE_NAME_SETTING;
import static org.opensearch.threadpool.ThreadPool.Names.GENERIC;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;

2
test/framework/src/test/java/org/elasticsearch/test/disruption/DisruptableMockTransportTests.java
View File

@ -27,7 +27,7 @@ import org.opensearch.common.collect.Tuple;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.node.Node;
import org.opensearch.node.Node;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.disruption.DisruptableMockTransport.ConnectionStatus;
import org.opensearch.threadpool.ThreadPool;

2
test/framework/src/test/java/org/elasticsearch/node/MockNodeTests.java → test/framework/src/test/java/org/opensearch/node/MockNodeTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.node;
package org.opensearch.node;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.util.BigArrays;