Tech depts. Added support for Edge entity on push to edge node

Volodymyr Babak
1 parent 69994adb
Showing 8 changed files with 95 additions and 81 deletions
application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java
application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java
common/data/src/main/java/org/thingsboard/server/common/data/EdgeUtils.java
dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/entity/AbstractEntityService.java
dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
--- a/application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java
View file @0c7a512
+++ b/application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java
View file @0c7a512
@@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.EdgeUtils;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.alarm.Alarm;
@@ -445,7 +446,7 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
             @Override
             public void onSuccess(@Nullable Alarm alarm) {
                 if (alarm != null) {
-                    EdgeEventType type = getEdgeQueueTypeByEntityType(alarm.getOriginator().getEntityType());
+                    EdgeEventType type = EdgeUtils.getEdgeEventTypeByEntityType(alarm.getOriginator().getEntityType());
                     if (type != null) {
                         ListenableFuture<List<EdgeId>> relatedEdgeIdsByEntityIdFuture = edgeService.findRelatedEdgeIdsByEntityId(tenantId, alarm.getOriginator());
                         Futures.addCallback(relatedEdgeIdsByEntityIdFuture, new FutureCallback<List<EdgeId>>() {
@@ -518,20 +519,6 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
             }, dbCallbackExecutorService);
         }
     }
-
-    private EdgeEventType getEdgeQueueTypeByEntityType(EntityType entityType) {
-        switch (entityType) {
-            case DEVICE:
-                return EdgeEventType.DEVICE;
-            case ASSET:
-                return EdgeEventType.ASSET;
-            case ENTITY_VIEW:
-                return EdgeEventType.ENTITY_VIEW;
-            default:
-                log.debug("Unsupported entity type: [{}]", entityType);
-                return null;
-        }
-    }
 }
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
View file @0c7a512
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
View file @0c7a512
@@ -431,6 +431,9 @@ public final class EdgeGrpcSession implements Closeable {
             case CUSTOMER:
                 entityId = new CustomerId(edgeEvent.getEntityId());
                 break;
+            case EDGE:
+                entityId = new EdgeId(edgeEvent.getEntityId());
+                break;
         }
         DownlinkMsg downlinkMsg = null;
         if (entityId != null) {
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java
View file @0c7a512
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java
View file @0c7a512
@@ -35,6 +35,7 @@ import org.thingsboard.server.common.data.AdminSettings;
 import org.thingsboard.server.common.data.DashboardInfo;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.EdgeUtils;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.User;
@@ -146,7 +147,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
     @Override
     public void sync(Edge edge) {
-        log.trace("[{}] staring sync process for edge [{}]", edge.getTenantId(), edge.getName());
+        log.trace("[{}][{}] Staring edge sync process", edge.getTenantId(), edge.getId());
         try {
             syncWidgetsBundleAndWidgetTypes(edge);
             syncAdminSettings(edge);
@@ -157,7 +158,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
             syncEntityViews(edge, new TimePageLink(DEFAULT_LIMIT));
             syncDashboards(edge, new TimePageLink(DEFAULT_LIMIT));
         } catch (Exception e) {
-            log.error("Exception during sync process", e);
+            log.error("[{}][{}] Exception during sync process", edge.getTenantId(), edge.getId(), e);
         }
     }
@@ -461,7 +462,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
         EntityId entityId = EntityIdFactory.getByTypeAndUuid(
                 EntityType.valueOf(attributesRequestMsg.getEntityType()),
                 new UUID(attributesRequestMsg.getEntityIdMSB(), attributesRequestMsg.getEntityIdLSB()));
-        final EdgeEventType type = getEdgeQueueTypeByEntityType(entityId.getEntityType());
+        final EdgeEventType type = EdgeUtils.getEdgeEventTypeByEntityType(entityId.getEntityType());
         if (type != null) {
             SettableFuture<Void> futureToSet = SettableFuture.create();
             String scope = attributesRequestMsg.getScope();
@@ -520,19 +521,6 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
         }
     }
-    private EdgeEventType getEdgeQueueTypeByEntityType(EntityType entityType) {
-        switch (entityType) {
-            case DEVICE:
-                return EdgeEventType.DEVICE;
-            case ASSET:
-                return EdgeEventType.ASSET;
-            case ENTITY_VIEW:
-                return EdgeEventType.ENTITY_VIEW;
-            default:
-                return null;
-        }
-    }
-
     @Override
     public ListenableFuture<Void> processRelationRequestMsg(Edge edge, RelationRequestMsg relationRequestMsg) {
         log.trace("[{}] processRelationRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), relationRequestMsg);
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EdgeUtils.java
View file @0c7a512
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EdgeUtils.java
View file @0c7a512
@@ -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,
@@ -15,8 +15,10 @@
  */
 package org.thingsboard.server.common.data;
+import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.edge.EdgeEventType;
+@Slf4j
 public final class EdgeUtils {
     private EdgeUtils() {
@@ -49,6 +51,7 @@ public final class EdgeUtils {
             case WIDGET_TYPE:
                 return EdgeEventType.WIDGET_TYPE;
             default:
+                log.warn("Unsupported entity type [{}]", entityType);
                 return null;
         }
     }
--- a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
View file @0c7a512
+++ b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
View file @0c7a512
@@ -469,12 +469,16 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
     @Override
     public ListenableFuture<List<EdgeId>> findRelatedEdgeIdsByEntityId(TenantId tenantId, EntityId entityId) {
         log.trace("[{}] Executing findRelatedEdgeIdsByEntityId [{}]", tenantId, entityId);
-        if (EntityType.TENANT.equals(entityId.getEntityType())) {
+        if (EntityType.TENANT.equals(entityId.getEntityType()) || EntityType.CUSTOMER.equals(entityId.getEntityType())) {
             List<EdgeId> result = new ArrayList<>();
             TextPageLink pageLink = new TextPageLink(DEFAULT_LIMIT);
             TextPageData<Edge> pageData;
             do {
-                pageData = findEdgesByTenantId(tenantId, pageLink);
+                if (EntityType.TENANT.equals(entityId.getEntityType())) {
+                    pageData = findEdgesByTenantId(tenantId, pageLink);
+                } else {
+                    pageData = findEdgesByTenantIdAndCustomerId(tenantId, new CustomerId(entityId.getId()), pageLink);
+                }
                 if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
                     for (Edge edge : pageData.getData()) {
                         result.add(edge.getId());
--- a/dao/src/main/java/org/thingsboard/server/dao/entity/AbstractEntityService.java
View file @0c7a512
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/AbstractEntityService.java
View file @0c7a512
@@ -90,6 +90,7 @@ public abstract class AbstractEntityService {
             List<EntityView> entityViews = entityViewService.findEntityViewsByTenantIdAndEntityIdAsync(tenantId, entityId).get();
             if (entityViews != null && !entityViews.isEmpty()) {
                 EntityView entityView = entityViews.get(0);
+                // TODO: voba - refactor this blocking operation in 3.3+
                 Boolean relationExists = relationService.checkRelation(tenantId,edgeId, entityView.getId(),
                         EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE).get();
                 if (relationExists) {
@@ -97,7 +98,7 @@ public abstract class AbstractEntityService {
                 }
             }
         } catch (ExecutionException | InterruptedException e) {
-            log.error("Exception while finding entity views for entityId [{}]", entityId, e);
+            log.error("[{}] Exception while finding entity views for entityId [{}]", tenantId, entityId, e);
             throw new RuntimeException("Exception while finding entity views for entityId [" + entityId + "]", e);
         }
     }
--- a/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java
View file @0c7a512
+++ b/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java
View file @0c7a512
@@ -59,7 +59,7 @@ public class BaseEventService implements EventService {
     public Optional<Event> saveIfNotExists(Event event) {
         eventValidator.validate(event, Event::getTenantId);
         if (StringUtils.isEmpty(event.getUid())) {
-            throw new DataValidationException("Event uid should be specified!");
+            throw new DataValidationException("Event uid should be specified!.");
         }
         checkAndTruncateDebugEvent(event);
         return eventDao.saveIfNotExists(event);
@@ -79,16 +79,16 @@ public class BaseEventService implements EventService {
     @Override
     public Optional<Event> findEvent(TenantId tenantId, EntityId entityId, String eventType, String eventUid) {
         if (tenantId == null) {
-            throw new DataValidationException("Tenant id should be specified!");
+            throw new DataValidationException("Tenant id should be specified!.");
         }
         if (entityId == null) {
-            throw new DataValidationException("Entity id should be specified!");
+            throw new DataValidationException("Entity id should be specified!.");
         }
         if (StringUtils.isEmpty(eventType)) {
-            throw new DataValidationException("Event type should be specified!");
+            throw new DataValidationException("Event type should be specified!.");
         }
         if (StringUtils.isEmpty(eventUid)) {
-            throw new DataValidationException("Event uid should be specified!");
+            throw new DataValidationException("Event uid should be specified!.");
         }
         Event event = eventDao.findEvent(tenantId.getId(), entityId, eventType, eventUid);
         return event != null ? Optional.of(event) : Optional.empty();
@@ -131,13 +131,13 @@ public class BaseEventService implements EventService {
                 @Override
                 protected void validateDataImpl(TenantId tenantId, Event event) {
                     if (event.getEntityId() == null) {
-                        throw new DataValidationException("Entity id should be specified!");
+                        throw new DataValidationException("Entity id should be specified!.");
                     }
                     if (StringUtils.isEmpty(event.getType())) {
-                        throw new DataValidationException("Event type should be specified!");
+                        throw new DataValidationException("Event type should be specified!.");
                     }
                     if (event.getBody() == null) {
-                        throw new DataValidationException("Event body should be specified!");
+                        throw new DataValidationException("Event body should be specified!.");
                     }
                 }
             };
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
View file @0c7a512
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
View file @0c7a512
@@ -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,
@@ -57,7 +57,7 @@ import static org.thingsboard.rule.engine.api.TbRelationTypes.SUCCESS;
         name = "push to edge",
         configClazz = EmptyNodeConfiguration.class,
         nodeDescription = "Pushes messages to edge",
-        nodeDetails = "Pushes messages to edge, if Message Originator assigned to particular edge or is EDGE entity. This node is used only on Cloud instances to push messages from Cloud to Edge. Supports only DEVICE, ENTITY_VIEW, ASSET and EDGE Message Originator(s).",
+        nodeDetails = "Pushes messages to edge, if Message Originator assigned to particular edge or is EDGE entity. This node is used only on Cloud instances to push messages from Cloud to Edge. Supports only DEVICE, ENTITY_VIEW, ASSET, ENTITY_VIEW, DASHBOARD, TENANT, CUSTOMER and EDGE Message Originator(s).",
         uiResources = {"static/rulenode/rulenode-core-config.js", "static/rulenode/rulenode-core-config.css"},
         configDirective = "tbNodeEmptyConfig",
         icon = "cloud_download",
@@ -97,48 +97,75 @@ public class TbMsgPushToEdgeNode implements TbNode {
     }
     private void processMsg(TbContext ctx, TbMsg msg) {
-        ListenableFuture<List<EdgeId>> getEdgeIdsFuture = ctx.getEdgeService().findRelatedEdgeIdsByEntityId(ctx.getTenantId(), msg.getOriginator());
-        Futures.addCallback(getEdgeIdsFuture, new FutureCallback<List<EdgeId>>() {
-            @Override
-            public void onSuccess(@Nullable List<EdgeId> edgeIds) {
-                if (edgeIds != null && !edgeIds.isEmpty()) {
-                    for (EdgeId edgeId : edgeIds) {
-                        try {
-                            EdgeEvent edgeEvent = buildEdgeEvent(msg, ctx);
-                            if (edgeEvent == null) {
-                                log.debug("Edge event type is null. Entity Type {}", msg.getOriginator().getEntityType());
-                                ctx.tellFailure(msg, new RuntimeException("Edge event type is null. Entity Type '" + msg.getOriginator().getEntityType() + "'"));
-                            } else {
-                                edgeEvent.setEdgeId(edgeId);
-                                ListenableFuture<EdgeEvent> saveFuture = ctx.getEdgeEventService().saveAsync(edgeEvent);
-                                Futures.addCallback(saveFuture, new FutureCallback<EdgeEvent>() {
-                                    @Override
-                                    public void onSuccess(@Nullable EdgeEvent event) {
-                                        ctx.tellNext(msg, SUCCESS);
-                                        ctx.onEdgeEventUpdate(ctx.getTenantId(), edgeId);
-                                    }
-
-                                    @Override
-                                    public void onFailure(Throwable th) {
-                                        log.warn("[{}] Can't save edge event [{}] for edge [{}]", ctx.getTenantId().getId(), edgeEvent, edgeId.getId(), th);
-                                        ctx.tellFailure(msg, th);
-                                    }
-                                }, ctx.getDbCallbackExecutor());
+        if (EntityType.EDGE.equals(msg.getOriginator().getEntityType())) {
+            try {
+                EdgeEvent edgeEvent = buildEdgeEvent(msg, ctx);
+                if (edgeEvent != null) {
+                    EdgeId edgeId = new EdgeId(msg.getOriginator().getId());
+                    edgeEvent.setEdgeId(edgeId);
+                    ListenableFuture<EdgeEvent> saveFuture = ctx.getEdgeEventService().saveAsync(edgeEvent);
+                    Futures.addCallback(saveFuture, new FutureCallback<EdgeEvent>() {
+                        @Override
+                        public void onSuccess(@Nullable EdgeEvent event) {
+                            ctx.tellNext(msg, SUCCESS);
+                            ctx.onEdgeEventUpdate(ctx.getTenantId(), edgeId);
+                        }
+
+                        @Override
+                        public void onFailure(Throwable th) {
+                            log.warn("[{}] Can't save edge event [{}] for edge [{}]", ctx.getTenantId().getId(), edgeEvent, edgeId.getId(), th);
+                            ctx.tellFailure(msg, th);
+                        }
+                    }, ctx.getDbCallbackExecutor());
+                }
+            } catch (JsonProcessingException e) {
+                log.error("Failed to build edge event", e);
+                ctx.tellFailure(msg, e);
+            }
+        } else {
+            ListenableFuture<List<EdgeId>> getEdgeIdsFuture = ctx.getEdgeService().findRelatedEdgeIdsByEntityId(ctx.getTenantId(), msg.getOriginator());
+            Futures.addCallback(getEdgeIdsFuture, new FutureCallback<List<EdgeId>>() {
+                @Override
+                public void onSuccess(@Nullable List<EdgeId> edgeIds) {
+                    if (edgeIds != null && !edgeIds.isEmpty()) {
+                        for (EdgeId edgeId : edgeIds) {
+                            try {
+                                EdgeEvent edgeEvent = buildEdgeEvent(msg, ctx);
+                                if (edgeEvent == null) {
+                                    log.debug("Edge event type is null. Entity Type {}", msg.getOriginator().getEntityType());
+                                    ctx.tellFailure(msg, new RuntimeException("Edge event type is null. Entity Type '" + msg.getOriginator().getEntityType() + "'"));
+                                } else {
+                                    edgeEvent.setEdgeId(edgeId);
+                                    ListenableFuture<EdgeEvent> saveFuture = ctx.getEdgeEventService().saveAsync(edgeEvent);
+                                    Futures.addCallback(saveFuture, new FutureCallback<EdgeEvent>() {
+                                        @Override
+                                        public void onSuccess(@Nullable EdgeEvent event) {
+                                            ctx.tellNext(msg, SUCCESS);
+                                            ctx.onEdgeEventUpdate(ctx.getTenantId(), edgeId);
+                                        }
+
+                                        @Override
+                                        public void onFailure(Throwable th) {
+                                            log.warn("[{}] Can't save edge event [{}] for edge [{}]", ctx.getTenantId().getId(), edgeEvent, edgeId.getId(), th);
+                                            ctx.tellFailure(msg, th);
+                                        }
+                                    }, ctx.getDbCallbackExecutor());
+                                }
+                            } catch (JsonProcessingException e) {
+                                log.error("Failed to build edge event", e);
+                                ctx.tellFailure(msg, e);
                             }
-                        } catch (JsonProcessingException e) {
-                            log.error("Failed to build edge event", e);
-                            ctx.tellFailure(msg, e);
                         }
                     }
                 }
-            }
-            @Override
-            public void onFailure(Throwable t) {
-                ctx.tellFailure(msg, t);
-            }
+                @Override
+                public void onFailure(Throwable t) {
+                    ctx.tellFailure(msg, t);
+                }
-        }, ctx.getDbCallbackExecutor());
+            }, ctx.getDbCallbackExecutor());
+        }
     }
     private EdgeEvent buildEdgeEvent(TbMsg msg, TbContext ctx) throws JsonProcessingException {
@@ -221,6 +248,7 @@ public class TbMsgPushToEdgeNode implements TbNode {
             case DASHBOARD:
             case TENANT:
             case CUSTOMER:
+            case EDGE:
                 return true;
             default:
                 return false;