Processors renaming

application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java

@@ -20,59 +20,34 @@ import lombok.Getter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
-import org.thingsboard.server.actors.service.ActorService;
-import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.dao.attributes.AttributesService;
-import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.dao.dashboard.DashboardService;
-import org.thingsboard.server.dao.device.DeviceCredentialsService;
 import org.thingsboard.server.dao.device.DeviceProfileService;
-import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.edge.EdgeEventService;
 import org.thingsboard.server.dao.edge.EdgeService;
-import org.thingsboard.server.dao.entityview.EntityViewService;
-import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.user.UserService;
-import org.thingsboard.server.dao.widget.WidgetTypeService;
 import org.thingsboard.server.dao.widget.WidgetsBundleService;
-import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.edge.rpc.EdgeEventStorageSettings;
-import org.thingsboard.server.service.edge.rpc.constructor.AdminSettingsMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.constructor.AlarmMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.constructor.AssetMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.constructor.CustomerMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.constructor.DashboardMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.constructor.DeviceMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.constructor.DeviceProfileMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.constructor.EntityDataMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.constructor.EntityViewMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.constructor.RelationMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.constructor.RuleChainMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.constructor.UserMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.constructor.WidgetTypeMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.constructor.WidgetsBundleMsgConstructor;
-import org.thingsboard.server.service.edge.rpc.processor.AdminSettingsProcessor;
-import org.thingsboard.server.service.edge.rpc.processor.AssetProcessor;
-import org.thingsboard.server.service.edge.rpc.processor.CustomerProcessor;
-import org.thingsboard.server.service.edge.rpc.processor.DashboardProcessor;
-import org.thingsboard.server.service.edge.rpc.processor.DeviceProfileProcessor;
-import org.thingsboard.server.service.edge.rpc.processor.EntityProcessor;
-import org.thingsboard.server.service.edge.rpc.processor.EntityViewProcessor;
-import org.thingsboard.server.service.edge.rpc.processor.RuleChainProcessor;
-import org.thingsboard.server.service.edge.rpc.processor.UserProcessor;
-import org.thingsboard.server.service.edge.rpc.processor.WidgetBundleProcessor;
-import org.thingsboard.server.service.edge.rpc.processor.WidgetTypeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.AdminSettingsEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.AlarmEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.AssetEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.CustomerEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.DashboardEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.DeviceEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.DeviceProfileEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.EntityEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.EntityViewEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.RelationEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.RuleChainEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.TelemetryEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.UserEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.WidgetBundleEdgeProcessor;
+import org.thingsboard.server.service.edge.rpc.processor.WidgetTypeEdgeProcessor;
 import org.thingsboard.server.service.edge.rpc.sync.EdgeRequestsService;
-import org.thingsboard.server.service.edge.rpc.processor.AlarmProcessor;
-import org.thingsboard.server.service.edge.rpc.processor.DeviceProcessor;
-import org.thingsboard.server.service.edge.rpc.processor.RelationProcessor;
-import org.thingsboard.server.service.edge.rpc.processor.TelemetryProcessor;
 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
-import org.thingsboard.server.service.queue.TbClusterService;
-import org.thingsboard.server.service.state.DeviceStateService;
 
 @Component
 @TbCoreComponent
@@ -121,63 +96,63 @@ public class EdgeContextComponent {
 
     @Lazy
     @Autowired
-    private AlarmProcessor alarmProcessor;
+    private AlarmEdgeProcessor alarmProcessor;
 
     @Lazy
     @Autowired
-    private DeviceProfileProcessor deviceProfileProcessor;
+    private DeviceProfileEdgeProcessor deviceProfileProcessor;
 
     @Lazy
     @Autowired
-    private DeviceProcessor deviceProcessor;
+    private DeviceEdgeProcessor deviceProcessor;
 
     @Lazy
     @Autowired
-    private EntityProcessor entityProcessor;
+    private EntityEdgeProcessor entityProcessor;
 
     @Lazy
     @Autowired
-    private AssetProcessor assetProcessor;
+    private AssetEdgeProcessor assetProcessor;
 
     @Lazy
     @Autowired
-    private EntityViewProcessor entityViewProcessor;
+    private EntityViewEdgeProcessor entityViewProcessor;
 
     @Lazy
     @Autowired
-    private UserProcessor userProcessor;
+    private UserEdgeProcessor userProcessor;
 
     @Lazy
     @Autowired
-    private RelationProcessor relationProcessor;
+    private RelationEdgeProcessor relationProcessor;
 
     @Lazy
     @Autowired
-    private TelemetryProcessor telemetryProcessor;
+    private TelemetryEdgeProcessor telemetryProcessor;
 
     @Lazy
     @Autowired
-    private DashboardProcessor dashboardProcessor;
+    private DashboardEdgeProcessor dashboardProcessor;
 
     @Lazy
     @Autowired
-    private RuleChainProcessor ruleChainProcessor;
+    private RuleChainEdgeProcessor ruleChainProcessor;
 
     @Lazy
     @Autowired
-    private CustomerProcessor customerProcessor;
+    private CustomerEdgeProcessor customerProcessor;
 
     @Lazy
     @Autowired
-    private WidgetBundleProcessor widgetBundleProcessor;
+    private WidgetBundleEdgeProcessor widgetBundleProcessor;
 
     @Lazy
     @Autowired
-    private WidgetTypeProcessor widgetTypeProcessor;
+    private WidgetTypeEdgeProcessor widgetTypeProcessor;
 
     @Lazy
     @Autowired
-    private AdminSettingsProcessor adminSettingsProcessor;
+    private AdminSettingsEdgeProcessor adminSettingsProcessor;
 
     @Lazy
     @Autowired

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AdminSettingsProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AdminSettingsEdgeProcessor.java

@@ -28,7 +28,7 @@ import java.util.Collections;
 @Component
 @Slf4j
 @TbCoreComponent
-public class AdminSettingsProcessor extends BaseProcessor {
+public class AdminSettingsEdgeProcessor extends BaseEdgeProcessor {
 
     public DownlinkMsg processAdminSettingsToEdge(EdgeEvent edgeEvent) {
         AdminSettings adminSettings = mapper.convertValue(edgeEvent.getBody(), AdminSettings.class);

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AlarmProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AlarmEdgeProcessor.java

@@ -38,7 +38,7 @@ import java.util.Collections;
 @Component
 @Slf4j
 @TbCoreComponent
-public class AlarmProcessor extends BaseProcessor {
+public class AlarmEdgeProcessor extends BaseEdgeProcessor {
 
     public ListenableFuture<Void> processAlarmFromEdge(TenantId tenantId, AlarmUpdateMsg alarmUpdateMsg) {
         log.trace("[{}] onAlarmUpdate [{}]", tenantId, alarmUpdateMsg);

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AssetProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AssetEdgeProcessor.java

@@ -33,7 +33,7 @@ import java.util.Collections;
 @Component
 @Slf4j
 @TbCoreComponent
-public class AssetProcessor extends BaseProcessor {
+public class AssetEdgeProcessor extends BaseEdgeProcessor {
 
     public DownlinkMsg processAssetToEdge(Edge edge, EdgeEvent edgeEvent, UpdateMsgType msgType, EdgeEventActionType action) {
         AssetId assetId = new AssetId(edgeEvent.getEntityId());

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java

@@ -68,7 +68,7 @@ import org.thingsboard.server.service.queue.TbClusterService;
 import org.thingsboard.server.service.state.DeviceStateService;
 
 @Slf4j
-public abstract class BaseProcessor {
+public abstract class BaseEdgeProcessor {
 
     protected static final ObjectMapper mapper = new ObjectMapper();
 

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/CustomerProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/CustomerEdgeProcessor.java

@@ -31,7 +31,7 @@ import java.util.Collections;
 @Component
 @Slf4j
 @TbCoreComponent
-public class CustomerProcessor extends BaseProcessor {
+public class CustomerEdgeProcessor extends BaseEdgeProcessor {
 
     public DownlinkMsg processCustomerToEdge(EdgeEvent edgeEvent, UpdateMsgType msgType, EdgeEventActionType action) {
         CustomerId customerId = new CustomerId(edgeEvent.getEntityId());

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DashboardProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DashboardEdgeProcessor.java

@@ -33,7 +33,7 @@ import java.util.Collections;
 @Component
 @Slf4j
 @TbCoreComponent
-public class DashboardProcessor extends BaseProcessor {
+public class DashboardEdgeProcessor extends BaseEdgeProcessor {
 
     public DownlinkMsg processDashboardToEdge(Edge edge, EdgeEvent edgeEvent, UpdateMsgType msgType, EdgeEventActionType action) {
         DashboardId dashboardId = new DashboardId(edgeEvent.getEntityId());

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceEdgeProcessor.java

@@ -68,7 +68,7 @@ import java.util.concurrent.locks.ReentrantLock;
 @Component
 @Slf4j
 @TbCoreComponent
-public class DeviceProcessor extends BaseProcessor {
+public class DeviceEdgeProcessor extends BaseEdgeProcessor {
 
     private static final ReentrantLock deviceCreationLock = new ReentrantLock();
 

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProfileProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProfileEdgeProcessor.java

@@ -31,7 +31,7 @@ import java.util.Collections;
 @Component
 @Slf4j
 @TbCoreComponent
-public class DeviceProfileProcessor extends BaseProcessor {
+public class DeviceProfileEdgeProcessor extends BaseEdgeProcessor {
 
     public DownlinkMsg processDeviceProfileToEdge(EdgeEvent edgeEvent, UpdateMsgType msgType, EdgeEventActionType action) {
         DeviceProfileId deviceProfileId = new DeviceProfileId(edgeEvent.getEntityId());

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/EntityProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/EntityEdgeProcessor.java

@@ -34,7 +34,7 @@ import java.util.Collections;
 @Component
 @Slf4j
 @TbCoreComponent
-public class EntityProcessor extends BaseProcessor {
+public class EntityEdgeProcessor extends BaseEdgeProcessor {
 
     public DownlinkMsg processEntityMergeRequestMessageToEdge(Edge edge, EdgeEvent edgeEvent) {
         DownlinkMsg downlinkMsg = null;

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/EntityViewProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/EntityViewEdgeProcessor.java

@@ -33,7 +33,7 @@ import java.util.Collections;
 @Component
 @Slf4j
 @TbCoreComponent
-public class EntityViewProcessor extends BaseProcessor {
+public class EntityViewEdgeProcessor extends BaseEdgeProcessor {
 
     public DownlinkMsg processEntityViewToEdge(Edge edge, EdgeEvent edgeEvent, UpdateMsgType msgType, EdgeEventActionType action) {
         EntityViewId entityViewId = new EntityViewId(edgeEvent.getEntityId());

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RelationProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RelationEdgeProcessor.java

@@ -45,7 +45,7 @@ import java.util.UUID;
 @Component
 @Slf4j
 @TbCoreComponent
-public class RelationProcessor extends BaseProcessor {
+public class RelationEdgeProcessor extends BaseEdgeProcessor {
 
     public ListenableFuture<Void> processRelationFromEdge(TenantId tenantId, RelationUpdateMsg relationUpdateMsg) {
         log.trace("[{}] onRelationUpdate [{}]", tenantId, relationUpdateMsg);

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RuleChainProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RuleChainEdgeProcessor.java

@@ -34,7 +34,7 @@ import java.util.Collections;
 @Component
 @Slf4j
 @TbCoreComponent
-public class RuleChainProcessor extends BaseProcessor {
+public class RuleChainEdgeProcessor extends BaseEdgeProcessor {
 
     public DownlinkMsg processRuleChainToEdge(Edge edge, EdgeEvent edgeEvent, UpdateMsgType msgType, EdgeEventActionType action) {
         RuleChainId ruleChainId = new RuleChainId(edgeEvent.getEntityId());

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/TelemetryProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/TelemetryEdgeProcessor.java

@@ -73,7 +73,7 @@ import java.util.UUID;
 @Component
 @Slf4j
 @TbCoreComponent
-public class TelemetryProcessor extends BaseProcessor {
+public class TelemetryEdgeProcessor extends BaseEdgeProcessor {
 
     private final Gson gson = new Gson();
 

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/UserProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/UserEdgeProcessor.java

@@ -34,7 +34,7 @@ import java.util.Collections;
 @Component
 @Slf4j
 @TbCoreComponent
-public class UserProcessor extends BaseProcessor {
+public class UserEdgeProcessor extends BaseEdgeProcessor {
 
     public DownlinkMsg processUserToEdge(Edge edge, EdgeEvent edgeEvent, UpdateMsgType msgType, EdgeEventActionType edgeEdgeEventActionType) {
         UserId userId = new UserId(edgeEvent.getEntityId());

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/WidgetBundleProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/WidgetBundleEdgeProcessor.java

@@ -17,7 +17,6 @@ package org.thingsboard.server.service.edge.rpc.processor;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.edge.EdgeEvent;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.id.WidgetsBundleId;
@@ -32,7 +31,7 @@ import java.util.Collections;
 @Component
 @Slf4j
 @TbCoreComponent
-public class WidgetBundleProcessor extends BaseProcessor {
+public class WidgetBundleEdgeProcessor extends BaseEdgeProcessor {
 
     public DownlinkMsg processWidgetsBundleToEdge(EdgeEvent edgeEvent, UpdateMsgType msgType, EdgeEventActionType edgeEdgeEventActionType) {
         WidgetsBundleId widgetsBundleId = new WidgetsBundleId(edgeEvent.getEntityId());

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/WidgetTypeProcessor.java → application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/WidgetTypeEdgeProcessor.java

@@ -31,7 +31,7 @@ import java.util.Collections;
 @Component
 @Slf4j
 @TbCoreComponent
-public class WidgetTypeProcessor extends BaseProcessor {
+public class WidgetTypeEdgeProcessor extends BaseEdgeProcessor {
 
     public DownlinkMsg processWidgetTypeToEdge(EdgeEvent edgeEvent, UpdateMsgType msgType, EdgeEventActionType edgeEdgeEventActionType) {
         WidgetTypeId widgetTypeId = new WidgetTypeId(edgeEvent.getEntityId());