Code review changes

application/src/main/java/org/thingsboard/server/controller/AssetController.java

@@ -397,7 +397,7 @@ public class AssetController extends BaseController {
 
             logEntityAction(assetId, asset,
                     asset.getCustomerId(),
-                    ActionType.UNASSIGNED_FROM_EDGE, null, strAssetId, edge.getId().toString(), edge.getName());
+                    ActionType.UNASSIGNED_FROM_EDGE, null, strAssetId, strEdgeId, edge.getName());
 
             sendNotificationMsgToEdgeService(getTenantId(), edgeId, savedAsset.getId(), EdgeEventActionType.UNASSIGNED_FROM_EDGE);
 
@@ -406,7 +406,7 @@ public class AssetController extends BaseController {
 
             logEntityAction(emptyId(EntityType.ASSET), null,
                     null,
-                    ActionType.UNASSIGNED_FROM_EDGE, e, strAssetId);
+                    ActionType.UNASSIGNED_FROM_EDGE, e, strAssetId, strEdgeId);
 
             throw handleException(e);
         }

application/src/main/java/org/thingsboard/server/controller/BaseController.java

@@ -680,10 +680,14 @@ public abstract class BaseController {
                     metaData.putValue("assignedToTenantName", strTenantName);
                 } else if (actionType == ActionType.ASSIGNED_TO_EDGE) {
                     String strEdgeId = extractParameter(String.class, 1, additionalInfo);
+                    String strEdgeName = extractParameter(String.class, 2, additionalInfo);
                     metaData.putValue("assignedEdgeId", strEdgeId);
+                    metaData.putValue("assignedEdgeName", strEdgeName);
                 } else if (actionType == ActionType.UNASSIGNED_FROM_EDGE) {
                     String strEdgeId = extractParameter(String.class, 1, additionalInfo);
+                    String strEdgeName = extractParameter(String.class, 2, additionalInfo);
                     metaData.putValue("unassignedEdgeId", strEdgeId);
+                    metaData.putValue("unassignedEdgeName", strEdgeName);
                 }
                 ObjectNode entityNode;
                 if (entity != null) {

application/src/main/java/org/thingsboard/server/controller/DashboardController.java

@@ -535,7 +535,7 @@ public class DashboardController extends BaseController {
 
             logEntityAction(dashboardId, dashboard,
                     null,
-                    ActionType.UNASSIGNED_FROM_EDGE, null, strDashboardId, edge.getId().toString(), edge.getName());
+                    ActionType.UNASSIGNED_FROM_EDGE, null, strDashboardId, strEdgeId, edge.getName());
 
             sendNotificationMsgToEdgeService(getTenantId(), edgeId, savedDashboard.getId(), EdgeEventActionType.UNASSIGNED_FROM_EDGE);
 
@@ -544,7 +544,7 @@ public class DashboardController extends BaseController {
 
             logEntityAction(emptyId(EntityType.DASHBOARD), null,
                     null,
-                    ActionType.UNASSIGNED_FROM_EDGE, e, strDashboardId);
+                    ActionType.UNASSIGNED_FROM_EDGE, e, strDashboardId, strEdgeId);
 
             throw handleException(e);
         }

application/src/main/java/org/thingsboard/server/controller/DeviceController.java

@@ -608,7 +608,7 @@ public class DeviceController extends BaseController {
 
             logEntityAction(deviceId, device,
                     device.getCustomerId(),
-                    ActionType.UNASSIGNED_FROM_EDGE, null, strDeviceId, edge.getId().toString(), edge.getName());
+                    ActionType.UNASSIGNED_FROM_EDGE, null, strDeviceId, strEdgeId, edge.getName());
 
             sendNotificationMsgToEdgeService(getTenantId(), edgeId, savedDevice.getId(), EdgeEventActionType.UNASSIGNED_FROM_EDGE);
 
@@ -616,7 +616,7 @@ public class DeviceController extends BaseController {
         } catch (Exception e) {
             logEntityAction(emptyId(EntityType.DEVICE), null,
                     null,
-                    ActionType.UNASSIGNED_FROM_EDGE, e, strDeviceId);
+                    ActionType.UNASSIGNED_FROM_EDGE, e, strDeviceId, strEdgeId);
             throw handleException(e);
         }
     }

application/src/main/java/org/thingsboard/server/controller/EntityViewController.java

@@ -433,7 +433,7 @@ public class EntityViewController extends BaseController {
             EntityView savedEntityView = checkNotNull(entityViewService.unassignEntityViewFromEdge(getTenantId(), entityViewId, edgeId));
             logEntityAction(entityViewId, entityView,
                     entityView.getCustomerId(),
-                    ActionType.UNASSIGNED_FROM_EDGE, null, strEntityViewId, edge.getId().toString(), edge.getName());
+                    ActionType.UNASSIGNED_FROM_EDGE, null, strEntityViewId, strEdgeId, edge.getName());
 
             sendNotificationMsgToEdgeService(getTenantId(), edgeId, savedEntityView.getId(), EdgeEventActionType.UNASSIGNED_FROM_EDGE);
 
@@ -441,7 +441,7 @@ public class EntityViewController extends BaseController {
         } catch (Exception e) {
             logEntityAction(emptyId(EntityType.ENTITY_VIEW), null,
                     null,
-                    ActionType.UNASSIGNED_FROM_EDGE, e, strEntityViewId);
+                    ActionType.UNASSIGNED_FROM_EDGE, e, strEntityViewId, strEdgeId);
             throw handleException(e);
         }
     }

application/src/main/java/org/thingsboard/server/controller/RuleChainController.java

@@ -5,7 +5,7 @@
  * you may 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 "AS IS" BASIS,
@@ -42,7 +42,6 @@ import org.thingsboard.server.common.data.Event;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
-import org.thingsboard.server.common.data.edge.EdgeEventType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.RuleChainId;
@@ -454,7 +453,7 @@ public class RuleChainController extends BaseController {
 
             logEntityAction(ruleChainId, ruleChain,
                     null,
-                    ActionType.UNASSIGNED_FROM_EDGE, null, strRuleChainId, edge.getId().toString(), edge.getName());
+                    ActionType.UNASSIGNED_FROM_EDGE, null, strRuleChainId, strEdgeId, edge.getName());
 
             sendNotificationMsgToEdgeService(getTenantId(), edgeId, savedRuleChain.getId(), EdgeEventActionType.UNASSIGNED_FROM_EDGE);
 
@@ -463,7 +462,7 @@ public class RuleChainController extends BaseController {
 
             logEntityAction(emptyId(EntityType.RULE_CHAIN), null,
                     null,
-                    ActionType.UNASSIGNED_FROM_EDGE, e, strRuleChainId);
+                    ActionType.UNASSIGNED_FROM_EDGE, e, strRuleChainId, strEdgeId);
 
             throw handleException(e);
         }

common/edge-api/src/main/proto/edge.proto

@@ -105,7 +105,6 @@ message EntityDataProto {
   transport.PostAttributeMsg attributesUpdatedMsg = 6;
   string postAttributeScope = 7;
   AttributeDeleteMsg attributeDeleteMsg = 8;
-  // transport.ToDeviceRpcRequestMsg ???
 }
 
 message AttributeDeleteMsg {

dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java

@@ -385,7 +385,7 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
         }
     }
 
-    private void createAlarmRelation(TenantId tenantId, EntityId entityId, EntityId alarmId, AlarmStatus status, boolean createAnyRelation) throws ExecutionException, InterruptedException {
+    private void createAlarmRelation(TenantId tenantId, EntityId entityId, EntityId alarmId, AlarmStatus status, boolean createAnyRelation) {
         if (createAnyRelation) {
             createRelation(tenantId, new EntityRelation(entityId, alarmId, ALARM_RELATION_PREFIX + AlarmSearchStatus.ANY.name(), RelationTypeGroup.ALARM));
         }
@@ -394,13 +394,13 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
         createRelation(tenantId, new EntityRelation(entityId, alarmId, ALARM_RELATION_PREFIX + status.getAckSearchStatus().name(), RelationTypeGroup.ALARM));
     }
 
-    private void deleteAlarmRelation(TenantId tenantId, EntityId entityId, EntityId alarmId, AlarmStatus status) throws ExecutionException, InterruptedException {
+    private void deleteAlarmRelation(TenantId tenantId, EntityId entityId, EntityId alarmId, AlarmStatus status) {
         deleteRelation(tenantId, new EntityRelation(entityId, alarmId, ALARM_RELATION_PREFIX + status.name(), RelationTypeGroup.ALARM));
         deleteRelation(tenantId, new EntityRelation(entityId, alarmId, ALARM_RELATION_PREFIX + status.getClearSearchStatus().name(), RelationTypeGroup.ALARM));
         deleteRelation(tenantId, new EntityRelation(entityId, alarmId, ALARM_RELATION_PREFIX + status.getAckSearchStatus().name(), RelationTypeGroup.ALARM));
     }
 
-    private void updateAlarmRelation(TenantId tenantId, EntityId entityId, EntityId alarmId, AlarmStatus oldStatus, AlarmStatus newStatus) throws ExecutionException, InterruptedException {
+    private void updateAlarmRelation(TenantId tenantId, EntityId entityId, EntityId alarmId, AlarmStatus oldStatus, AlarmStatus newStatus) {
         deleteAlarmRelation(tenantId, entityId, alarmId, oldStatus);
         createAlarmRelation(tenantId, entityId, alarmId, newStatus, false);
     }

dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java

@@ -80,6 +80,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 import static org.thingsboard.server.common.data.CacheConstants.EDGE_CACHE;
 import static org.thingsboard.server.dao.DaoUtil.toUUIDs;
 import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
@@ -518,9 +519,9 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
     }
 
     private void initRestTemplate() {
-        boolean jdkHttpClientEnabled = org.apache.commons.lang3.StringUtils.isNotEmpty(System.getProperty("tb.proxy.jdk")) && System.getProperty("tb.proxy.jdk").equalsIgnoreCase("true");
-        boolean systemProxyEnabled = org.apache.commons.lang3.StringUtils.isNotEmpty(System.getProperty("tb.proxy.system")) && System.getProperty("tb.proxy.system").equalsIgnoreCase("true");
-        boolean proxyEnabled = org.apache.commons.lang3.StringUtils.isNotEmpty(System.getProperty("tb.proxy.host")) && org.apache.commons.lang3.StringUtils.isNotEmpty(System.getProperty("tb.proxy.port"));
+        boolean jdkHttpClientEnabled = isNotEmpty(System.getProperty("tb.proxy.jdk")) && System.getProperty("tb.proxy.jdk").equalsIgnoreCase("true");
+        boolean systemProxyEnabled = isNotEmpty(System.getProperty("tb.proxy.system")) && System.getProperty("tb.proxy.system").equalsIgnoreCase("true");
+        boolean proxyEnabled = isNotEmpty(System.getProperty("tb.proxy.host")) && isNotEmpty(System.getProperty("tb.proxy.port"));
         if (jdkHttpClientEnabled) {
             log.warn("Going to use plain JDK Http Client!");
             SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();

dao/src/main/java/org/thingsboard/server/dao/entity/AbstractEntityService.java

@@ -60,12 +60,12 @@ public abstract class AbstractEntityService {
         sqlDatabaseUsed = "sql".equalsIgnoreCase(databaseType);
     }
 
-    protected void createRelation(TenantId tenantId, EntityRelation relation) throws ExecutionException, InterruptedException {
+    protected void createRelation(TenantId tenantId, EntityRelation relation) {
         log.debug("Creating relation: {}", relation);
         relationService.saveRelation(tenantId, relation);
     }
 
-    protected void deleteRelation(TenantId tenantId, EntityRelation relation) throws ExecutionException, InterruptedException {
+    protected void deleteRelation(TenantId tenantId, EntityRelation relation) {
         log.debug("Deleting relation: {}", relation);
         relationService.deleteRelation(tenantId, relation);
     }

dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleChainEntity.java

@@ -25,7 +25,6 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -50,7 +49,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.RULE_CHAIN_TENANT_
 import static org.thingsboard.server.dao.model.ModelConstants.RULE_CHAIN_TYPE_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.SEARCH_TEXT_PROPERTY;
 
-@Slf4j
 @Table(name = RULE_CHAIN_COLUMN_FAMILY_NAME)
 @EqualsAndHashCode
 @ToString

dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainEntity.java

@@ -19,7 +19,6 @@ import com.datastax.driver.core.utils.UUIDs;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.extern.slf4j.Slf4j;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.UUIDConverter;
@@ -43,7 +42,6 @@ import javax.persistence.Table;
 import static org.thingsboard.server.dao.model.ModelConstants.RULE_CHAIN_TYPE_PROPERTY;
 
 @Data
-@Slf4j
 @EqualsAndHashCode(callSuper = true)
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)

dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractDao.java

@@ -35,6 +35,7 @@ import org.thingsboard.server.dao.model.type.ComponentLifecycleStateCodec;
 import org.thingsboard.server.dao.model.type.ComponentScopeCodec;
 import org.thingsboard.server.dao.model.type.ComponentTypeCodec;
 import org.thingsboard.server.dao.model.type.DeviceCredentialsTypeCodec;
+import org.thingsboard.server.dao.model.type.EdgeEventActionTypeCodec;
 import org.thingsboard.server.dao.model.type.EdgeEventTypeCodec;
 import org.thingsboard.server.dao.model.type.EntityTypeCodec;
 import org.thingsboard.server.dao.model.type.JsonCodec;
@@ -75,6 +76,7 @@ public abstract class CassandraAbstractDao {
             registerCodecIfNotFound(registry, new EntityTypeCodec());
             registerCodecIfNotFound(registry, new EdgeEventTypeCodec());
             registerCodecIfNotFound(registry, new RuleChainTypeCodec());
+            registerCodecIfNotFound(registry, new EdgeEventActionTypeCodec());
         }
         return session;
     }

dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java

@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.dao.sql.user;
 
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.repository.CrudRepository;
@@ -42,7 +41,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID_STR;
  */
 @Component
 @SqlDao
-@Slf4j
 public class JpaUserDao extends JpaAbstractSearchTextDao<UserEntity, User> implements UserDao {
 
     @Autowired

dao/src/test/resources/sql/hsql/drop-all-tables.sql

@@ -22,4 +22,4 @@ DROP TABLE IF EXISTS rule_node;
 DROP TABLE IF EXISTS rule_chain;
 DROP TABLE IF EXISTS entity_view;
 DROP TABLE IF EXISTS edge;
-DROP TABLE IF EXISTS edge_event;
+DROP TABLE IF EXISTS edge_event;

dao/src/test/resources/sql/psql/drop-all-tables.sql

@@ -23,4 +23,4 @@ DROP TABLE IF EXISTS rule_chain;
 DROP TABLE IF EXISTS entity_view;
 DROP TABLE IF EXISTS edge;
 DROP TABLE IF EXISTS edge_event;
-DROP TABLE IF EXISTS tb_schema_settings;
+DROP TABLE IF EXISTS tb_schema_settings;

dao/src/test/resources/sql/timescale/drop-all-tables.sql

@@ -23,4 +23,4 @@ DROP TABLE IF EXISTS rule_chain;
 DROP TABLE IF EXISTS entity_view;
 DROP TABLE IF EXISTS edge;
 DROP TABLE IF EXISTS edge_event;
-DROP TABLE IF EXISTS tb_schema_settings;
+DROP TABLE IF EXISTS tb_schema_settings;

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbSaveToCustomCassandraTableNode.java

@@ -48,6 +48,7 @@ import org.thingsboard.server.dao.model.type.ComponentLifecycleStateCodec;
 import org.thingsboard.server.dao.model.type.ComponentScopeCodec;
 import org.thingsboard.server.dao.model.type.ComponentTypeCodec;
 import org.thingsboard.server.dao.model.type.DeviceCredentialsTypeCodec;
+import org.thingsboard.server.dao.model.type.EdgeEventActionTypeCodec;
 import org.thingsboard.server.dao.model.type.EdgeEventTypeCodec;
 import org.thingsboard.server.dao.model.type.EntityTypeCodec;
 import org.thingsboard.server.dao.model.type.JsonCodec;
@@ -148,6 +149,7 @@ public class TbSaveToCustomCassandraTableNode implements TbNode {
             registerCodecIfNotFound(registry, new EntityTypeCodec());
             registerCodecIfNotFound(registry, new EdgeEventTypeCodec());
             registerCodecIfNotFound(registry, new RuleChainTypeCodec());
+            registerCodecIfNotFound(registry, new EdgeEventActionTypeCodec());
         }
         return session;
     }