From ed9d84a2022ec00a06596c7e475abb24aab3a6de Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Wed, 19 May 2021 17:08:49 +0300 Subject: [PATCH] Processors renaming --- .../service/edge/EdgeContextComponent.java | 85 +++++++------------ ...r.java => AdminSettingsEdgeProcessor.java} | 2 +- ...Processor.java => AlarmEdgeProcessor.java} | 2 +- ...Processor.java => AssetEdgeProcessor.java} | 2 +- ...eProcessor.java => BaseEdgeProcessor.java} | 2 +- ...cessor.java => CustomerEdgeProcessor.java} | 2 +- ...essor.java => DashboardEdgeProcessor.java} | 2 +- ...rocessor.java => DeviceEdgeProcessor.java} | 2 +- ...r.java => DeviceProfileEdgeProcessor.java} | 2 +- ...rocessor.java => EntityEdgeProcessor.java} | 2 +- ...ssor.java => EntityViewEdgeProcessor.java} | 2 +- ...cessor.java => RelationEdgeProcessor.java} | 2 +- ...essor.java => RuleChainEdgeProcessor.java} | 2 +- ...essor.java => TelemetryEdgeProcessor.java} | 2 +- ...rProcessor.java => UserEdgeProcessor.java} | 2 +- ...or.java => WidgetBundleEdgeProcessor.java} | 3 +- ...ssor.java => WidgetTypeEdgeProcessor.java} | 2 +- 17 files changed, 46 insertions(+), 72 deletions(-) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{AdminSettingsProcessor.java => AdminSettingsEdgeProcessor.java} (95%) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{AlarmProcessor.java => AlarmEdgeProcessor.java} (99%) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{AssetProcessor.java => AssetEdgeProcessor.java} (97%) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{BaseProcessor.java => BaseEdgeProcessor.java} (99%) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{CustomerProcessor.java => CustomerEdgeProcessor.java} (97%) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{DashboardProcessor.java => DashboardEdgeProcessor.java} (97%) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{DeviceProcessor.java => DeviceEdgeProcessor.java} (99%) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{DeviceProfileProcessor.java => DeviceProfileEdgeProcessor.java} (97%) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{EntityProcessor.java => EntityEdgeProcessor.java} (98%) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{EntityViewProcessor.java => EntityViewEdgeProcessor.java} (97%) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{RelationProcessor.java => RelationEdgeProcessor.java} (98%) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{RuleChainProcessor.java => RuleChainEdgeProcessor.java} (98%) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{TelemetryProcessor.java => TelemetryEdgeProcessor.java} (99%) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{UserProcessor.java => UserEdgeProcessor.java} (98%) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{WidgetBundleProcessor.java => WidgetBundleEdgeProcessor.java} (96%) rename application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/{WidgetTypeProcessor.java => WidgetTypeEdgeProcessor.java} (97%) diff --git a/application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java b/application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java index c1fbcbc69b..bdc5c26889 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/EdgeContextComponent.java +++ b/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 diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AdminSettingsProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AdminSettingsEdgeProcessor.java similarity index 95% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AdminSettingsProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AdminSettingsEdgeProcessor.java index 53f46900fa..e39b3eda4c 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AdminSettingsProcessor.java +++ b/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); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AlarmProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AlarmEdgeProcessor.java similarity index 99% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AlarmProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AlarmEdgeProcessor.java index 5ceb82381a..f936540290 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AlarmProcessor.java +++ b/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 processAlarmFromEdge(TenantId tenantId, AlarmUpdateMsg alarmUpdateMsg) { log.trace("[{}] onAlarmUpdate [{}]", tenantId, alarmUpdateMsg); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AssetProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AssetEdgeProcessor.java similarity index 97% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AssetProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AssetEdgeProcessor.java index e3c8d9d1e8..cf0180c85f 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AssetProcessor.java +++ b/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()); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java similarity index 99% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java index 8ea8eac1df..6846cb8904 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseProcessor.java +++ b/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(); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/CustomerProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/CustomerEdgeProcessor.java similarity index 97% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/CustomerProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/CustomerEdgeProcessor.java index 476458bd05..573152e103 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/CustomerProcessor.java +++ b/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()); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DashboardProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DashboardEdgeProcessor.java similarity index 97% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DashboardProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DashboardEdgeProcessor.java index f6df66cf0e..730e928a2d 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DashboardProcessor.java +++ b/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()); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceEdgeProcessor.java similarity index 99% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceEdgeProcessor.java index 2325b6736d..b3ec44195e 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProcessor.java +++ b/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(); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProfileProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProfileEdgeProcessor.java similarity index 97% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProfileProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProfileEdgeProcessor.java index 6aab6838fd..d66dc2b67c 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProfileProcessor.java +++ b/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()); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/EntityProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/EntityEdgeProcessor.java similarity index 98% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/EntityProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/EntityEdgeProcessor.java index c5865b0ff9..f930e316be 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/EntityProcessor.java +++ b/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; diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/EntityViewProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/EntityViewEdgeProcessor.java similarity index 97% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/EntityViewProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/EntityViewEdgeProcessor.java index e62e084471..ab0e2e868f 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/EntityViewProcessor.java +++ b/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()); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RelationProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RelationEdgeProcessor.java similarity index 98% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RelationProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RelationEdgeProcessor.java index eb96df6729..8e3a429d18 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RelationProcessor.java +++ b/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 processRelationFromEdge(TenantId tenantId, RelationUpdateMsg relationUpdateMsg) { log.trace("[{}] onRelationUpdate [{}]", tenantId, relationUpdateMsg); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RuleChainProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RuleChainEdgeProcessor.java similarity index 98% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RuleChainProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RuleChainEdgeProcessor.java index c30e9bf45f..90fc8abe0e 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RuleChainProcessor.java +++ b/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()); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/TelemetryProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/TelemetryEdgeProcessor.java similarity index 99% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/TelemetryProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/TelemetryEdgeProcessor.java index b42ceb40ab..c475542892 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/TelemetryProcessor.java +++ b/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(); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/UserProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/UserEdgeProcessor.java similarity index 98% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/UserProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/UserEdgeProcessor.java index 74afa02b15..747d2ab4fd 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/UserProcessor.java +++ b/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()); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/WidgetBundleProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/WidgetBundleEdgeProcessor.java similarity index 96% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/WidgetBundleProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/WidgetBundleEdgeProcessor.java index 370cf3419f..8c0d28226d 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/WidgetBundleProcessor.java +++ b/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()); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/WidgetTypeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/WidgetTypeEdgeProcessor.java similarity index 97% rename from application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/WidgetTypeProcessor.java rename to application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/WidgetTypeEdgeProcessor.java index 795207567e..891b224a6e 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/WidgetTypeProcessor.java +++ b/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());