From eceb9f130903b52c0fe74f375170de3a0f28f42d Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Fri, 22 May 2020 18:52:44 +0300
Subject: [PATCH] Renamed class

---
 .../rpc/constructor/EntityViewUpdateMsgConstructor.java    | 7 ++++---
 common/edge-api/src/main/proto/edge.proto                  | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/EntityViewUpdateMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/EntityViewUpdateMsgConstructor.java
index ef5445ac81..857986cb1f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/EntityViewUpdateMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/EntityViewUpdateMsgConstructor.java
@@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.dao.device.DeviceService;
+import org.thingsboard.server.gen.edge.EdgeEntityType;
 import org.thingsboard.server.gen.edge.EntityViewUpdateMsg;
 import org.thingsboard.server.gen.edge.UpdateMsgType;
 
@@ -42,17 +43,17 @@ public class EntityViewUpdateMsgConstructor {
     public EntityViewUpdateMsg constructEntityViewUpdatedMsg(UpdateMsgType msgType, EntityView entityView) {
         String relatedName;
         String relatedType;
-        org.thingsboard.server.gen.edge.EntityType relatedEntityType;
+        EdgeEntityType relatedEntityType;
         if (entityView.getEntityId().getEntityType().equals(EntityType.DEVICE)) {
             Device device = deviceService.findDeviceById(entityView.getTenantId(), new DeviceId(entityView.getEntityId().getId()));
             relatedName = device.getName();
             relatedType = device.getType();
-            relatedEntityType = org.thingsboard.server.gen.edge.EntityType.DEVICE;
+            relatedEntityType = EdgeEntityType.DEVICE;
         } else {
             Asset asset = assetService.findAssetById(entityView.getTenantId(), new AssetId(entityView.getEntityId().getId()));
             relatedName = asset.getName();
             relatedType = asset.getType();
-            relatedEntityType = org.thingsboard.server.gen.edge.EntityType.ASSET;
+            relatedEntityType = EdgeEntityType.ASSET;
         }
         EntityViewUpdateMsg.Builder builder = EntityViewUpdateMsg.newBuilder()
                 .setMsgType(msgType)
diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto
index a8aa95f824..5fca55f9fa 100644
--- a/common/edge-api/src/main/proto/edge.proto
+++ b/common/edge-api/src/main/proto/edge.proto
@@ -182,7 +182,7 @@ message EntityViewUpdateMsg {
   string type = 3;
   string relatedName = 4;
   string relatedType = 5;
-  EntityType relatedEntityType = 6;
+  EdgeEntityType relatedEntityType = 6;
   string groupName = 7;
 }
 
@@ -238,7 +238,7 @@ message RuleChainMetadataRequestMsg {
   int64 ruleChainIdLSB = 2;
 }
 
-enum EntityType {
+enum EdgeEntityType {
     DEVICE = 0;
     ASSET = 1;
 }