From b2098fc11258fd37af36057b2f308cb8eadc0345 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Tue, 24 Oct 2023 12:30:17 +0300
Subject: [PATCH] Fix compatibility between CE and PE

---
 common/cluster-api/src/main/proto/queue.proto | 40 +++++++++----------
 .../server/common/data/EntityType.java        | 38 +++++++++---------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/common/cluster-api/src/main/proto/queue.proto b/common/cluster-api/src/main/proto/queue.proto
index e560dfccf5..8202f1c749 100644
--- a/common/cluster-api/src/main/proto/queue.proto
+++ b/common/cluster-api/src/main/proto/queue.proto
@@ -32,28 +32,28 @@ enum EntityTypeProto {
   ASSET                 = 5;
   DEVICE                = 6;
   ALARM                 = 7;
+  // next 3 reserved for PE;
+  RULE_CHAIN            = 11;
+  RULE_NODE             = 12;
   // next 2 reserved for PE;
-  RULE_CHAIN            = 10;
-  RULE_NODE             = 11;
+  ENTITY_VIEW           = 15;
+  WIDGETS_BUNDLE        = 16;
+  WIDGET_TYPE           = 17;
   // next 2 reserved for PE;
-  ENTITY_VIEW           = 14;
-  WIDGETS_BUNDLE        = 15;
-  WIDGET_TYPE           = 16;
-  // next 2 reserved for PE;
-  TENANT_PROFILE        = 19;
-  DEVICE_PROFILE        = 20;
-  ASSET_PROFILE         = 21;
-  API_USAGE_STATE       = 22;
-  TB_RESOURCE           = 23;
-  OTA_PACKAGE           = 24;
-  EDGE                  = 25;
-  RPC                   = 26;
-  QUEUE                 = 27;
-  NOTIFICATION_TARGET   = 28;
-  NOTIFICATION_TEMPLATE = 29;
-  NOTIFICATION_REQUEST  = 30;
-  NOTIFICATION          = 31;
-  NOTIFICATION_RULE     = 32;
+  TENANT_PROFILE        = 20;
+  DEVICE_PROFILE        = 21;
+  ASSET_PROFILE         = 22;
+  API_USAGE_STATE       = 23;
+  TB_RESOURCE           = 24;
+  OTA_PACKAGE           = 25;
+  EDGE                  = 26;
+  RPC                   = 27;
+  QUEUE                 = 28;
+  NOTIFICATION_TARGET   = 29;
+  NOTIFICATION_TEMPLATE = 30;
+  NOTIFICATION_REQUEST  = 31;
+  NOTIFICATION          = 32;
+  NOTIFICATION_RULE     = 33;
 }
 
 /**
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
index c755659966..ce87edf43a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
@@ -33,32 +33,32 @@ public enum EntityType {
     ASSET(5),
     DEVICE(6),
     ALARM (7),
-    RULE_CHAIN (10),
-    RULE_NODE (11),
+    RULE_CHAIN (11),
+    RULE_NODE (12),
 
-    ENTITY_VIEW (14) {
+    ENTITY_VIEW (15) {
         // backward compatibility for TbOriginatorTypeSwitchNode to return correct rule node connection.
         @Override
         public String getNormalName () {
             return "Entity View";
         }
     },
-    WIDGETS_BUNDLE (15),
-    WIDGET_TYPE (16),
-    TENANT_PROFILE (19),
-    DEVICE_PROFILE (20),
-    ASSET_PROFILE (21),
-    API_USAGE_STATE (22),
-    TB_RESOURCE (23),
-    OTA_PACKAGE (24),
-    EDGE (25),
-    RPC (26),
-    QUEUE (27),
-    NOTIFICATION_TARGET (28),
-    NOTIFICATION_TEMPLATE (29),
-    NOTIFICATION_REQUEST (30),
-    NOTIFICATION (31),
-    NOTIFICATION_RULE (32);
+    WIDGETS_BUNDLE (16),
+    WIDGET_TYPE (17),
+    TENANT_PROFILE (20),
+    DEVICE_PROFILE (21),
+    ASSET_PROFILE (22),
+    API_USAGE_STATE (23),
+    TB_RESOURCE (24),
+    OTA_PACKAGE (25),
+    EDGE (26),
+    RPC (27),
+    QUEUE (28),
+    NOTIFICATION_TARGET (29),
+    NOTIFICATION_TEMPLATE (30),
+    NOTIFICATION_REQUEST (31),
+    NOTIFICATION (32),
+    NOTIFICATION_RULE (33);
 
     @Getter
     private final int protoNumber; // Corresponds to EntityTypeProto