From 2fffa660ab2a7436c0a2fe9944b1664134d4e335 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Thu, 9 Jul 2020 17:48:46 +0300
Subject: [PATCH] Refacroting to handle null cases

---
 .../rule/engine/edge/TbMsgPushToEdgeNode.java | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
index 6208976e55..eef30d5d22 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
@@ -86,26 +86,33 @@ public class TbMsgPushToEdgeNode implements TbNode {
                 Futures.addCallback(getEdgeIdFuture, new FutureCallback<EdgeId>() {
                     @Override
                     public void onSuccess(@Nullable EdgeId edgeId) {
-                        EdgeEvent edgeEvent = null;
                         try {
-                            edgeEvent = buildEdgeEvent(msg, ctx);
-                            edgeEvent.setEdgeId(edgeId);
+                            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);
+                                    }
+
+                                    @Override
+                                    public void onFailure(Throwable th) {
+                                        log.error("Could not save edge event", th);
+                                        ctx.tellFailure(msg, th);
+                                    }
+                                }, ctx.getDbCallbackExecutor());
+                            }
                         } catch (JsonProcessingException e) {
                             log.error("Failed to build edge event", e);
+                            ctx.tellFailure(msg, e);
                         }
-                        ListenableFuture<EdgeEvent> saveFuture = ctx.getEdgeEventService().saveAsync(edgeEvent);
-                        Futures.addCallback(saveFuture, new FutureCallback<EdgeEvent>() {
-                            @Override
-                            public void onSuccess(@Nullable EdgeEvent event) {
-                                ctx.tellNext(msg, SUCCESS);
-                            }
-                            @Override
-                            public void onFailure(Throwable th) {
-                                log.error("Could not save edge event", th);
-                                ctx.tellFailure(msg, th);
-                            }
-                        }, ctx.getDbCallbackExecutor());
                     }
+
                     @Override
                     public void onFailure(Throwable t) {
                         ctx.tellFailure(msg, t);
@@ -128,8 +135,7 @@ public class TbMsgPushToEdgeNode implements TbNode {
         } else {
             EdgeEventType edgeEventTypeByEntityType = EdgeUtils.getEdgeEventTypeByEntityType(msg.getOriginator().getEntityType());
             if (edgeEventTypeByEntityType == 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() + "'"));
+                return null;
             }
             return buildEdgeEvent(ctx.getTenantId(), getActionTypeByMsgType(msg.getType()), msg.getOriginator().getId(), edgeEventTypeByEntityType, json.readTree(msg.getData()));
         }