[Rename] o.e.discovery

server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java

@@ -70,15 +70,15 @@
 import org.elasticsearch.common.util.PageCacheRecycler;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
-import org.elasticsearch.discovery.DiscoveryModule;
-import org.elasticsearch.discovery.DiscoverySettings;
-import org.elasticsearch.discovery.HandshakingTransportAddressConnector;
-import org.elasticsearch.discovery.PeerFinder;
-import org.elasticsearch.discovery.SeedHostsResolver;
-import org.elasticsearch.discovery.SettingsBasedSeedHostsProvider;
-import org.elasticsearch.discovery.zen.ElectMasterService;
-import org.elasticsearch.discovery.zen.FaultDetection;
-import org.elasticsearch.discovery.zen.ZenDiscovery;
+import org.opensearch.discovery.DiscoveryModule;
+import org.opensearch.discovery.DiscoverySettings;
+import org.opensearch.discovery.HandshakingTransportAddressConnector;
+import org.opensearch.discovery.PeerFinder;
+import org.opensearch.discovery.SeedHostsResolver;
+import org.opensearch.discovery.SettingsBasedSeedHostsProvider;
+import org.opensearch.discovery.zen.ElectMasterService;
+import org.opensearch.discovery.zen.FaultDetection;
+import org.opensearch.discovery.zen.ZenDiscovery;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.env.NodeEnvironment;
 import org.opensearch.gateway.DanglingIndicesState;

server/src/main/java/org/opensearch/OpenSearchException.java

@@ -738,8 +738,8 @@ private enum OpenSearchExceptionHandle {
                 org.opensearch.search.dfs.DfsPhaseExecutionException::new, 1, UNKNOWN_VERSION_ADDED),
         EXECUTION_CANCELLED_EXCEPTION(org.elasticsearch.common.util.CancellableThreads.ExecutionCancelledException.class,
                 org.elasticsearch.common.util.CancellableThreads.ExecutionCancelledException::new, 2, UNKNOWN_VERSION_ADDED),
-        MASTER_NOT_DISCOVERED_EXCEPTION(org.elasticsearch.discovery.MasterNotDiscoveredException.class,
-                org.elasticsearch.discovery.MasterNotDiscoveredException::new, 3, UNKNOWN_VERSION_ADDED),
+        MASTER_NOT_DISCOVERED_EXCEPTION(org.opensearch.discovery.MasterNotDiscoveredException.class,
+                org.opensearch.discovery.MasterNotDiscoveredException::new, 3, UNKNOWN_VERSION_ADDED),
         ELASTICSEARCH_SECURITY_EXCEPTION(org.elasticsearch.OpenSearchSecurityException.class,
                 org.elasticsearch.OpenSearchSecurityException::new, 4, UNKNOWN_VERSION_ADDED),
         INDEX_SHARD_RESTORE_EXCEPTION(org.elasticsearch.index.snapshots.IndexShardRestoreException.class,

server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodeStats.java

@@ -28,7 +28,7 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.ToXContentFragment;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.discovery.DiscoveryStats;
+import org.opensearch.discovery.DiscoveryStats;
 import org.opensearch.http.HttpStats;
 import org.opensearch.index.stats.IndexingPressureStats;
 import org.opensearch.indices.NodeIndicesStats;

server/src/main/java/org/opensearch/action/admin/cluster/stats/ClusterStatsNodes.java

@@ -35,7 +35,7 @@
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.ToXContentFragment;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.discovery.DiscoveryModule;
+import org.opensearch.discovery.DiscoveryModule;
 import org.elasticsearch.monitor.fs.FsInfo;
 import org.elasticsearch.monitor.jvm.JvmInfo;
 import org.elasticsearch.monitor.os.OsInfo;

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

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

server/src/main/java/org/opensearch/bootstrap/BootstrapChecks.java

@@ -30,7 +30,7 @@
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.transport.BoundTransportAddress;
 import org.elasticsearch.common.transport.TransportAddress;
-import org.elasticsearch.discovery.DiscoveryModule;
+import org.opensearch.discovery.DiscoveryModule;
 import org.elasticsearch.index.IndexModule;
 import org.elasticsearch.monitor.jvm.JvmInfo;
 import org.elasticsearch.monitor.process.ProcessProbe;
@@ -53,8 +53,8 @@
 import java.util.stream.Stream;
 
 import static org.opensearch.cluster.coordination.ClusterBootstrapService.INITIAL_MASTER_NODES_SETTING;
-import static org.elasticsearch.discovery.DiscoveryModule.DISCOVERY_SEED_PROVIDERS_SETTING;
-import static org.elasticsearch.discovery.SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING;
+import static org.opensearch.discovery.DiscoveryModule.DISCOVERY_SEED_PROVIDERS_SETTING;
+import static org.opensearch.discovery.SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING;
 
 /**
  * We enforce bootstrap checks once a node has the transport protocol bound to a non-loopback interface or if the system property {@code

server/src/main/java/org/opensearch/cluster/ClusterState.java

@@ -53,7 +53,7 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.ToXContentFragment;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.discovery.Discovery;
+import org.opensearch.discovery.Discovery;
 
 import java.io.IOException;
 import java.util.EnumSet;

server/src/main/java/org/opensearch/cluster/coordination/ClusterBootstrapService.java

@@ -29,7 +29,7 @@
 import org.elasticsearch.common.settings.Setting.Property;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.discovery.DiscoveryModule;
+import org.opensearch.discovery.DiscoveryModule;
 import org.opensearch.node.Node;
 import org.opensearch.threadpool.ThreadPool.Names;
 import org.opensearch.transport.TransportService;
@@ -51,10 +51,10 @@
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.unmodifiableSet;
-import static org.elasticsearch.discovery.DiscoveryModule.DISCOVERY_SEED_PROVIDERS_SETTING;
-import static org.elasticsearch.discovery.DiscoveryModule.LEGACY_DISCOVERY_HOSTS_PROVIDER_SETTING;
-import static org.elasticsearch.discovery.SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING;
-import static org.elasticsearch.discovery.SettingsBasedSeedHostsProvider.LEGACY_DISCOVERY_ZEN_PING_UNICAST_HOSTS_SETTING;
+import static org.opensearch.discovery.DiscoveryModule.DISCOVERY_SEED_PROVIDERS_SETTING;
+import static org.opensearch.discovery.DiscoveryModule.LEGACY_DISCOVERY_HOSTS_PROVIDER_SETTING;
+import static org.opensearch.discovery.SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING;
+import static org.opensearch.discovery.SettingsBasedSeedHostsProvider.LEGACY_DISCOVERY_ZEN_PING_UNICAST_HOSTS_SETTING;
 
 public class ClusterBootstrapService {
 

server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java

@@ -62,14 +62,14 @@
 import org.elasticsearch.common.util.concurrent.ListenableFuture;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.common.xcontent.json.JsonXContent;
-import org.elasticsearch.discovery.Discovery;
-import org.elasticsearch.discovery.DiscoveryModule;
-import org.elasticsearch.discovery.DiscoveryStats;
-import org.elasticsearch.discovery.HandshakingTransportAddressConnector;
-import org.elasticsearch.discovery.PeerFinder;
-import org.elasticsearch.discovery.SeedHostsProvider;
-import org.elasticsearch.discovery.SeedHostsResolver;
-import org.elasticsearch.discovery.zen.PendingClusterStateStats;
+import org.opensearch.discovery.Discovery;
+import org.opensearch.discovery.DiscoveryModule;
+import org.opensearch.discovery.DiscoveryStats;
+import org.opensearch.discovery.HandshakingTransportAddressConnector;
+import org.opensearch.discovery.PeerFinder;
+import org.opensearch.discovery.SeedHostsProvider;
+import org.opensearch.discovery.SeedHostsResolver;
+import org.opensearch.discovery.zen.PendingClusterStateStats;
 import org.opensearch.monitor.NodeHealthService;
 import org.opensearch.monitor.StatusInfo;
 import org.opensearch.threadpool.Scheduler;

server/src/main/java/org/opensearch/cluster/coordination/DiscoveryUpgradeService.java

@@ -33,12 +33,12 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.util.concurrent.CountDown;
-import org.elasticsearch.discovery.zen.ElectMasterService;
-import org.elasticsearch.discovery.zen.ElectMasterService.MasterCandidate;
-import org.elasticsearch.discovery.zen.UnicastZenPing;
-import org.elasticsearch.discovery.zen.UnicastZenPing.UnicastPingRequest;
-import org.elasticsearch.discovery.zen.UnicastZenPing.UnicastPingResponse;
-import org.elasticsearch.discovery.zen.ZenPing.PingResponse;
+import org.opensearch.discovery.zen.ElectMasterService;
+import org.opensearch.discovery.zen.ElectMasterService.MasterCandidate;
+import org.opensearch.discovery.zen.UnicastZenPing;
+import org.opensearch.discovery.zen.UnicastZenPing.UnicastPingRequest;
+import org.opensearch.discovery.zen.UnicastZenPing.UnicastPingResponse;
+import org.opensearch.discovery.zen.ZenPing.PingResponse;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.threadpool.ThreadPool.Names;
 import org.opensearch.transport.TransportException;
@@ -62,8 +62,8 @@
 import static org.opensearch.cluster.ClusterName.CLUSTER_NAME_SETTING;
 import static org.opensearch.cluster.ClusterState.UNKNOWN_VERSION;
 import static org.elasticsearch.common.util.concurrent.ConcurrentCollections.newConcurrentSet;
-import static org.elasticsearch.discovery.zen.ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING;
-import static org.elasticsearch.discovery.zen.ZenDiscovery.PING_TIMEOUT_SETTING;
+import static org.opensearch.discovery.zen.ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING;
+import static org.opensearch.discovery.zen.ZenDiscovery.PING_TIMEOUT_SETTING;
 
 /**
  * Deals with rolling upgrades of the cluster coordination layer. In mixed clusters we prefer to elect the older nodes, but

server/src/main/java/org/opensearch/cluster/coordination/FollowersChecker.java

@@ -33,7 +33,7 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.util.concurrent.AbstractRunnable;
-import org.elasticsearch.discovery.zen.NodesFaultDetection;
+import org.opensearch.discovery.zen.NodesFaultDetection;
 import org.elasticsearch.monitor.NodeHealthService;
 import org.elasticsearch.monitor.StatusInfo;
 import org.opensearch.threadpool.ThreadPool.Names;

server/src/main/java/org/opensearch/cluster/coordination/JoinHelper.java

@@ -40,8 +40,8 @@
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.discovery.zen.MembershipAction;
-import org.elasticsearch.discovery.zen.ZenDiscovery;
+import org.opensearch.discovery.zen.MembershipAction;
+import org.opensearch.discovery.zen.ZenDiscovery;
 import org.elasticsearch.monitor.NodeHealthService;
 import org.elasticsearch.monitor.StatusInfo;
 import org.opensearch.threadpool.ThreadPool;

server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java

@@ -33,7 +33,7 @@
 import org.elasticsearch.cluster.routing.allocation.AllocationService;
 import org.opensearch.common.Priority;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.discovery.zen.ElectMasterService;
+import org.opensearch.discovery.zen.ElectMasterService;
 import org.elasticsearch.persistent.PersistentTasksCustomMetadata;
 
 import java.util.ArrayList;

server/src/main/java/org/opensearch/cluster/coordination/LeaderChecker.java

@@ -33,7 +33,7 @@
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.discovery.zen.MasterFaultDetection;
+import org.opensearch.discovery.zen.MasterFaultDetection;
 import org.elasticsearch.monitor.NodeHealthService;
 import org.elasticsearch.monitor.StatusInfo;
 import org.opensearch.threadpool.ThreadPool.Names;

server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java

@@ -41,8 +41,8 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.core.internal.io.IOUtils;
-import org.elasticsearch.discovery.zen.PublishClusterStateAction;
-import org.elasticsearch.discovery.zen.PublishClusterStateStats;
+import org.opensearch.discovery.zen.PublishClusterStateAction;
+import org.opensearch.discovery.zen.PublishClusterStateStats;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.BytesTransportRequest;
 import org.opensearch.transport.TransportChannel;

server/src/main/java/org/opensearch/cluster/service/MasterService.java

@@ -53,7 +53,7 @@
 import org.elasticsearch.common.util.concurrent.FutureUtils;
 import org.elasticsearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor;
 import org.elasticsearch.common.util.concurrent.ThreadContext;
-import org.elasticsearch.discovery.Discovery;
+import org.opensearch.discovery.Discovery;
 import org.opensearch.node.Node;
 import org.opensearch.threadpool.Scheduler;
 import org.opensearch.threadpool.ThreadPool;

server/src/main/java/org/elasticsearch/discovery/AckClusterStatePublishResponseHandler.java → server/src/main/java/org/opensearch/discovery/AckClusterStatePublishResponseHandler.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.discovery;
+package org.opensearch.discovery;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
@@ -27,7 +27,7 @@
 
 /**
  * Allows to wait for all nodes to reply to the publish of a new cluster state
- * and notifies the {@link org.elasticsearch.discovery.Discovery.AckListener}
+ * and notifies the {@link org.opensearch.discovery.Discovery.AckListener}
  * so that the cluster state update can be acknowledged
  */
 public class AckClusterStatePublishResponseHandler extends BlockingClusterStatePublishResponseHandler {
@@ -39,7 +39,7 @@ public class AckClusterStatePublishResponseHandler extends BlockingClusterStateP
     /**
      * Creates a new AckClusterStatePublishResponseHandler
      * @param publishingToNodes the set of nodes to which the cluster state will be published and should respond
-     * @param ackListener the {@link org.elasticsearch.discovery.Discovery.AckListener} to notify for each response
+     * @param ackListener the {@link org.opensearch.discovery.Discovery.AckListener} to notify for each response
      *                    gotten from non master nodes
      */
     public AckClusterStatePublishResponseHandler(Set<DiscoveryNode> publishingToNodes, Discovery.AckListener ackListener) {

server/src/main/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandler.java → server/src/main/java/org/opensearch/discovery/BlockingClusterStatePublishResponseHandler.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.discovery;
+package org.opensearch.discovery;
 
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.unit.TimeValue;

server/src/main/java/org/elasticsearch/discovery/Discovery.java → server/src/main/java/org/opensearch/discovery/Discovery.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.discovery;
+package org.opensearch.discovery;
 
 import org.opensearch.cluster.coordination.ClusterStatePublisher;
 import org.elasticsearch.common.component.LifecycleComponent;

server/src/main/java/org/elasticsearch/discovery/DiscoveryModule.java → server/src/main/java/org/opensearch/discovery/DiscoveryModule.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.discovery;
+package org.opensearch.discovery;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -38,7 +38,7 @@
 import org.elasticsearch.common.settings.Setting.Property;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.TransportAddress;
-import org.elasticsearch.discovery.zen.ZenDiscovery;
+import org.opensearch.discovery.zen.ZenDiscovery;
 import org.elasticsearch.gateway.GatewayMetaState;
 import org.elasticsearch.monitor.NodeHealthService;
 import org.elasticsearch.plugins.DiscoveryPlugin;

server/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java → server/src/main/java/org/opensearch/discovery/DiscoverySettings.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.discovery;
+package org.opensearch.discovery;
 
 import org.elasticsearch.common.settings.ClusterSettings;
 import org.elasticsearch.common.settings.Setting;

server/src/main/java/org/elasticsearch/discovery/DiscoveryStats.java → server/src/main/java/org/opensearch/discovery/DiscoveryStats.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,16 +17,16 @@
  * under the License.
  */
 
-package org.elasticsearch.discovery;
+package org.opensearch.discovery;
 
 import org.opensearch.Version;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ToXContentFragment;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.discovery.zen.PendingClusterStateStats;
-import org.elasticsearch.discovery.zen.PublishClusterStateStats;
+import org.opensearch.discovery.zen.PendingClusterStateStats;
+import org.opensearch.discovery.zen.PublishClusterStateStats;
 
 import java.io.IOException;
 

server/src/main/java/org/elasticsearch/discovery/FileBasedSeedHostsProvider.java → server/src/main/java/org/opensearch/discovery/FileBasedSeedHostsProvider.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.discovery;
+package org.opensearch.discovery;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;