From d49c83b2641169dc1ef19ab75e8286da12c3a3b5 Mon Sep 17 00:00:00 2001 From: ShvaykaD Date: Wed, 3 May 2023 16:33:59 +0300 Subject: [PATCH] changed exception text for mapping based rule nodes --- .../rule/engine/metadata/TbAbstractGetEntityAttrNode.java | 2 +- .../rule/engine/metadata/TbGetOriginatorFieldsNode.java | 2 +- .../rule/engine/metadata/TbGetCustomerAttributeNodeTest.java | 2 +- .../rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java | 2 +- .../rule/engine/metadata/TbGetRelatedAttributeNodeTest.java | 2 +- .../rule/engine/metadata/TbGetTenantAttributeNodeTest.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityAttrNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityAttrNode.java index 7fae935e96..220ed79abf 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityAttrNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityAttrNode.java @@ -50,7 +50,7 @@ public abstract class TbAbstractGetEntityAttrNode extends Tb protected void checkIfMappingIsNotEmptyOrElseThrow(Map attrMapping) throws TbNodeException { if (attrMapping == null || attrMapping.isEmpty()) { - throw new TbNodeException("At least one attribute mapping should be specified!"); + throw new TbNodeException("At least one mapping entry should be specified!"); } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java index e23bde6c28..a75e0e50a0 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java @@ -51,7 +51,7 @@ public class TbGetOriginatorFieldsNode extends TbAbstractNodeWithFetchTo node.init(ctxMock, nodeConfiguration)); // THEN - assertThat(exception.getMessage()).isEqualTo("At least one field mapping should be specified!"); + assertThat(exception.getMessage()).isEqualTo("At least one mapping entry should be specified!"); verify(ctxMock, never()).tellSuccess(any()); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java index 5228cd41b4..a033f18cf8 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java @@ -197,7 +197,7 @@ public class TbGetRelatedAttributeNodeTest { @Test public void givenEmptyAttributesMapping_whenInit_thenException() { // GIVEN - var expectedExceptionMessage = "At least one attribute mapping should be specified!"; + var expectedExceptionMessage = "At least one mapping entry should be specified!"; config.setAttrMapping(Collections.emptyMap()); nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config)); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java index c5c4539377..0f1863255c 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java @@ -156,7 +156,7 @@ public class TbGetTenantAttributeNodeTest { @Test public void givenEmptyAttributesMapping_whenInit_thenException() { // GIVEN - var expectedExceptionMessage = "At least one attribute mapping should be specified!"; + var expectedExceptionMessage = "At least one mapping entry should be specified!"; config.setAttrMapping(Collections.emptyMap()); nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));