SONAR-9741 move NodeType to sonar-cluster

7 files changed, 8 insertions, 8 deletions

diff --git a/server/sonar-cluster/src/main/java/org/sonar/cluster/ClusterObjectKeys.java b/server/sonar-cluster/src/main/java/org/sonar/cluster/ClusterObjectKeys.java
index ce0a4185850..16464b6c53e 100644
--- a/server/sonar-cluster/src/main/java/org/sonar/cluster/ClusterObjectKeys.java
+++ b/server/sonar-cluster/src/main/java/org/sonar/cluster/ClusterObjectKeys.java
@@ -51,7 +51,7 @@ public final class ClusterObjectKeys {
   public static final String NODE_NAME = "NODE_NAME";
   /**
    * The role of the sonar-application inside the SonarQube cluster
-   * {@link org.sonar.process.NodeType}
+   * {@link org.sonar.cluster.NodeType}
    */
   public static final String NODE_TYPE = "NODE_TYPE";
   /**
diff --git a/server/sonar-process/src/main/java/org/sonar/process/NodeType.java b/server/sonar-cluster/src/main/java/org/sonar/cluster/NodeType.java
index ecd8e44bc95..6a2ce537c34 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/NodeType.java
+++ b/server/sonar-cluster/src/main/java/org/sonar/cluster/NodeType.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.process;
+package org.sonar.cluster;
 
 import static java.util.Arrays.stream;
 import static org.sonar.cluster.ClusterProperties.CLUSTER_NODE_TYPE;
diff --git a/server/sonar-process/src/test/java/org/sonar/process/NodeTypeTest.java b/server/sonar-cluster/src/test/java/org/sonar/cluster/NodeTypeTest.java
index 180600a5ecb..12d9e6a5be1 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/NodeTypeTest.java
+++ b/server/sonar-cluster/src/test/java/org/sonar/cluster/NodeTypeTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.process;
+package org.sonar.cluster;
 
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProperties.java b/server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProperties.java
index bb25b4f9a0b..4f7dc00e876 100644
--- a/server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProperties.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProperties.java
@@ -31,7 +31,7 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.application.config.AppSettings;
-import org.sonar.process.NodeType;
+import org.sonar.cluster.NodeType;
 
 import static org.sonar.cluster.ClusterProperties.CLUSTER_HOSTS;
 import static org.sonar.cluster.ClusterProperties.CLUSTER_NODE_HOST;
diff --git a/server/sonar-main/src/main/java/org/sonar/application/cluster/HazelcastCluster.java b/server/sonar-main/src/main/java/org/sonar/application/cluster/HazelcastCluster.java
index 98f279e6e1e..6625cd2e926 100644
--- a/server/sonar-main/src/main/java/org/sonar/application/cluster/HazelcastCluster.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/cluster/HazelcastCluster.java
@@ -53,7 +53,7 @@ import org.sonar.application.AppStateListener;
 import org.sonar.cluster.ClusterObjectKeys;
 import org.sonar.cluster.localclient.HazelcastClient;
 import org.sonar.process.MessageException;
-import org.sonar.process.NodeType;
+import org.sonar.cluster.NodeType;
 import org.sonar.process.ProcessId;
 
 import static java.lang.String.format;
diff --git a/server/sonar-main/src/main/java/org/sonar/application/config/ClusterSettings.java b/server/sonar-main/src/main/java/org/sonar/application/config/ClusterSettings.java
index d8ec697ddc7..3eb66a2d1b1 100644
--- a/server/sonar-main/src/main/java/org/sonar/application/config/ClusterSettings.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/config/ClusterSettings.java
@@ -31,7 +31,7 @@ import java.util.List;
 import java.util.function.Consumer;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.process.MessageException;
-import org.sonar.process.NodeType;
+import org.sonar.cluster.NodeType;
 import org.sonar.process.ProcessId;
 import org.sonar.process.Props;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/EsClientProvider.java b/server/sonar-server/src/main/java/org/sonar/server/es/EsClientProvider.java
index 138ea698fcd..110ae95f6fa 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/es/EsClientProvider.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/es/EsClientProvider.java
@@ -34,14 +34,14 @@ import org.sonar.api.config.Configuration;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
-import org.sonar.process.NodeType;
+import org.sonar.cluster.NodeType;
 import org.sonar.process.ProcessProperties;
 
 import static org.sonar.cluster.ClusterProperties.CLUSTER_ENABLED;
 import static org.sonar.cluster.ClusterProperties.CLUSTER_NAME;
 import static org.sonar.cluster.ClusterProperties.CLUSTER_NODE_TYPE;
 import static org.sonar.cluster.ClusterProperties.CLUSTER_SEARCH_HOSTS;
-import static org.sonar.process.NodeType.SEARCH;
+import static org.sonar.cluster.NodeType.SEARCH;
 
 @ComputeEngineSide
 @ServerSide