From 7da08551806b3c9ec15ac58afb8f738eb2af2a38 Mon Sep 17 00:00:00 2001 From: IrynaMatveieva Date: Wed, 21 Aug 2024 12:10:07 +0300 Subject: [PATCH] renamed enum --- ...angeOriginatorSource.java => OriginatorSource.java} | 2 +- .../rule/engine/transform/TbChangeOriginatorNode.java | 4 ++-- .../transform/TbChangeOriginatorNodeConfiguration.java | 4 ++-- .../engine/transform/TbChangeOriginatorNodeTest.java | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) rename rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/{ChangeOriginatorSource.java => OriginatorSource.java} (95%) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/ChangeOriginatorSource.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/OriginatorSource.java similarity index 95% rename from rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/ChangeOriginatorSource.java rename to rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/OriginatorSource.java index 57b3ded5fa..2ae5402404 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/ChangeOriginatorSource.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/OriginatorSource.java @@ -15,7 +15,7 @@ */ package org.thingsboard.rule.engine.transform; -public enum ChangeOriginatorSource { +public enum OriginatorSource { CUSTOMER, TENANT, RELATED, 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 522756c880..d590bbbb75 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 @@ -36,8 +36,8 @@ import org.thingsboard.server.common.msg.TbMsg; import java.util.List; import java.util.NoSuchElementException; -import static org.thingsboard.rule.engine.transform.ChangeOriginatorSource.ENTITY; -import static org.thingsboard.rule.engine.transform.ChangeOriginatorSource.RELATED; +import static org.thingsboard.rule.engine.transform.OriginatorSource.ENTITY; +import static org.thingsboard.rule.engine.transform.OriginatorSource.RELATED; @Slf4j @RuleNode( diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java index 8fcf2e8ce1..76d42c2ef0 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeConfiguration.java @@ -24,12 +24,12 @@ import org.thingsboard.server.common.data.relation.RelationEntityTypeFilter; import java.util.Collections; -import static org.thingsboard.rule.engine.transform.ChangeOriginatorSource.CUSTOMER; +import static org.thingsboard.rule.engine.transform.OriginatorSource.CUSTOMER; @Data public class TbChangeOriginatorNodeConfiguration implements NodeConfiguration { - private ChangeOriginatorSource originatorSource; + private OriginatorSource originatorSource; private RelationsQuery relationsQuery; private String entityType; private String entityNamePattern; 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 9334f9ccb1..098fe3efda 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 @@ -69,11 +69,11 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.then; -import static org.thingsboard.rule.engine.transform.ChangeOriginatorSource.ALARM_ORIGINATOR; -import static org.thingsboard.rule.engine.transform.ChangeOriginatorSource.CUSTOMER; -import static org.thingsboard.rule.engine.transform.ChangeOriginatorSource.ENTITY; -import static org.thingsboard.rule.engine.transform.ChangeOriginatorSource.RELATED; -import static org.thingsboard.rule.engine.transform.ChangeOriginatorSource.TENANT; +import static org.thingsboard.rule.engine.transform.OriginatorSource.ALARM_ORIGINATOR; +import static org.thingsboard.rule.engine.transform.OriginatorSource.CUSTOMER; +import static org.thingsboard.rule.engine.transform.OriginatorSource.ENTITY; +import static org.thingsboard.rule.engine.transform.OriginatorSource.RELATED; +import static org.thingsboard.rule.engine.transform.OriginatorSource.TENANT; @ExtendWith(MockitoExtension.class) public class TbChangeOriginatorNodeTest {