refactoring: tests comments1

application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbNotificationEntityService.java

@@ -179,16 +179,16 @@ public class DefaultTbNotificationEntityService implements TbNotificationEntityS
 
     @Override
     public void notifyUpdateDeviceCredentials(TenantId tenantId, DeviceId deviceId, CustomerId customerId, Device device,
-                                              DeviceCredentials deviceCredentials, ActionType actionType, User user) {
+                                              DeviceCredentials deviceCredentials, User user) {
         tbClusterService.pushMsgToCore(new DeviceCredentialsUpdateNotificationMsg(tenantId, deviceCredentials.getDeviceId(), deviceCredentials), null);
-        sendEntityNotificationMsg(tenantId, deviceId, edgeTypeByActionType(actionType));
+        sendEntityNotificationMsg(tenantId, deviceId, EdgeEventActionType.CREDENTIALS_UPDATED);
-        logEntityAction(tenantId, deviceId, device, customerId, actionType, user, deviceCredentials);
+        logEntityAction(tenantId, deviceId, device, customerId, ActionType.CREDENTIALS_UPDATED, user, deviceCredentials);
     }
 
     @Override
     public void notifyAssignDeviceToTenant(TenantId tenantId, TenantId newTenantId, DeviceId deviceId, CustomerId customerId,
-                                           Device device, Tenant tenant, ActionType actionType, User user, Object... additionalInfo) {
+                                           Device device, Tenant tenant, User user, Object... additionalInfo) {
-        logEntityAction(tenantId, deviceId, device, customerId, actionType, user, additionalInfo);
+        logEntityAction(tenantId, deviceId, device, customerId, ActionType.ASSIGNED_TO_TENANT, user, additionalInfo);
         pushAssignedFromNotification(tenant, newTenantId, device);
     }
 

application/src/main/java/org/thingsboard/server/service/entitiy/TbNotificationEntityService.java

@@ -92,10 +92,10 @@ public interface TbNotificationEntityService {
                             List<EdgeId> relatedEdgeIds, User user, Object... additionalInfo);
 
     void notifyUpdateDeviceCredentials(TenantId tenantId, DeviceId deviceId, CustomerId customerId, Device device,
-                                       DeviceCredentials deviceCredentials, ActionType actionType, User user);
+                                       DeviceCredentials deviceCredentials, User user);
 
     void notifyAssignDeviceToTenant(TenantId tenantId, TenantId newTenantId, DeviceId deviceId, CustomerId customerId,
-                                    Device device, Tenant tenant, ActionType actionType, User user, Object... additionalInfo);
+                                    Device device, Tenant tenant, User user, Object... additionalInfo);
 
     void notifyEdge(TenantId tenantId, EdgeId edgeId, CustomerId customerId, Edge edge, ActionType actionType,
                     User user, Object... additionalInfo);

application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java

@@ -185,14 +185,13 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
     public DeviceCredentials updateDeviceCredentials(Device device, DeviceCredentials deviceCredentials, User user) throws ThingsboardException {
         TenantId tenantId = device.getTenantId();
         DeviceId deviceId = device.getId();
-        ActionType actionType = ActionType.CREDENTIALS_UPDATED;
         try {
             DeviceCredentials result = checkNotNull(deviceCredentialsService.updateDeviceCredentials(tenantId, deviceCredentials));
-            notificationEntityService.notifyUpdateDeviceCredentials(tenantId, deviceId, device.getCustomerId(), device, result, actionType, user);
+            notificationEntityService.notifyUpdateDeviceCredentials(tenantId, deviceId, device.getCustomerId(), device, result, user);
             return result;
         } catch (Exception e) {
             notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE),
-                    actionType, user, e, deviceCredentials);
+                    ActionType.CREDENTIALS_UPDATED, user, e, deviceCredentials);
             throw e;
         }
     }
@@ -231,18 +230,17 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
         TenantId tenantId = device.getTenantId();
         TenantId newTenantId = newTenant.getId();
         DeviceId deviceId = device.getId();
-        ActionType actionType = ActionType.ASSIGNED_TO_TENANT;
         try {
             Tenant tenant = tenantService.findTenantById(tenantId);
             Device assignedDevice = deviceService.assignDeviceToTenant(newTenantId, device);
 
             notificationEntityService.notifyAssignDeviceToTenant(tenantId, newTenantId, deviceId,
-                    assignedDevice.getCustomerId(), assignedDevice, tenant, actionType, user, newTenantId.toString(), newTenant.getName());
+                    assignedDevice.getCustomerId(), assignedDevice, tenant, user, newTenantId.toString(), newTenant.getName());
 
             return assignedDevice;
         } catch (Exception e) {
             notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.DEVICE),
-                    actionType, user, e, deviceId.toString());
+                    ActionType.ASSIGNED_TO_TENANT, user, e, deviceId.toString());
             throw e;
         }
     }

application/src/test/java/org/thingsboard/server/controller/BaseAssetControllerTest.java

@@ -1,12 +1,12 @@
 /**
  * Copyright © 2016-2022 The Thingsboard Authors
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
+ *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.