From feb51793b18e247d654460e5e3c68f740206e733 Mon Sep 17 00:00:00 2001
From: IrynaMatveieva <irina.m2004@icloud.com>
Date: Tue, 13 Aug 2024 10:47:22 +0300
Subject: [PATCH] added check for originator source for null

---
 .../engine/transform/TbChangeOriginatorNode.java     | 12 +++++++-----
 .../engine/transform/TbChangeOriginatorNodeTest.java |  9 +++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java
index d04736461d..522756c880 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java
@@ -103,11 +103,13 @@ public class TbChangeOriginatorNode extends TbAbstractTransformNode<TbChangeOrig
     }
 
     private void validateConfig(TbChangeOriginatorNodeConfiguration conf) {
-        if (conf.getOriginatorSource().equals(RELATED)) {
-            if (conf.getRelationsQuery() == null) {
-                log.debug("Relations query should be specified if 'Related entity' source is selected.");
-                throw new IllegalArgumentException("Relations query should be specified if 'Related entity' source is selected.");
-            }
+        if (conf.getOriginatorSource() == null) {
+            log.debug("Originator source should be specified.");
+            throw new IllegalArgumentException("Originator source should be specified.");
+        }
+        if (conf.getOriginatorSource().equals(RELATED) && conf.getRelationsQuery() == null) {
+            log.debug("Relations query should be specified if 'Related entity' source is selected.");
+            throw new IllegalArgumentException("Relations query should be specified if 'Related entity' source is selected.");
         }
         if (conf.getOriginatorSource().equals(ENTITY)) {
             if (conf.getEntityType() == null) {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java
index d91515d32f..9334f9ccb1 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java
@@ -119,6 +119,15 @@ public class TbChangeOriginatorNodeTest {
         assertThat(config.getEntityNamePattern()).isNull();
     }
 
+    @Test
+    public void givenRelatedSourceIsNull_whenInit_thenThrowsException() {
+        config.setOriginatorSource(null);
+
+        assertThatThrownBy(() -> node.init(ctxMock, new TbNodeConfiguration(JacksonUtil.valueToTree(config))))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Originator source should be specified.");
+    }
+
     @Test
     public void givenRelatedSourceAndRelatedQueryIsNull_whenInit_thenThrowsException() {
         config.setOriginatorSource(RELATED);