diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeConfiguration.java index df5dee1743..c49a1d3c30 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeConfiguration.java @@ -18,9 +18,8 @@ package org.thingsboard.rule.engine.metadata; import lombok.Data; import lombok.EqualsAndHashCode; import org.thingsboard.rule.engine.api.NodeConfiguration; -import org.thingsboard.rule.engine.util.EntityDetails; -import java.util.List; +import java.util.Collections; @Data @EqualsAndHashCode(callSuper = true) @@ -29,7 +28,7 @@ public class TbGetCustomerDetailsNodeConfiguration extends TbAbstractGetEntityDe @Override public TbGetCustomerDetailsNodeConfiguration defaultConfiguration() { var configuration = new TbGetCustomerDetailsNodeConfiguration(); - configuration.setDetailsList(List.of(EntityDetails.STATE, EntityDetails.CITY)); + configuration.setDetailsList(Collections.emptyList()); configuration.setFetchTo(FetchTo.DATA); return configuration; } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeConfiguration.java index 8ab7088442..35cdc42a54 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeConfiguration.java @@ -18,9 +18,8 @@ package org.thingsboard.rule.engine.metadata; import lombok.Data; import lombok.EqualsAndHashCode; import org.thingsboard.rule.engine.api.NodeConfiguration; -import org.thingsboard.rule.engine.util.EntityDetails; -import java.util.List; +import java.util.Collections; @Data @EqualsAndHashCode(callSuper = true) @@ -29,7 +28,7 @@ public class TbGetTenantDetailsNodeConfiguration extends TbAbstractGetEntityDeta @Override public TbGetTenantDetailsNodeConfiguration defaultConfiguration() { var configuration = new TbGetTenantDetailsNodeConfiguration(); - configuration.setDetailsList(List.of(EntityDetails.STATE, EntityDetails.TITLE)); + configuration.setDetailsList(Collections.emptyList()); configuration.setFetchTo(FetchTo.DATA); return configuration; } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java index f835fcde96..0c78d8e346 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java @@ -113,6 +113,7 @@ public class TbGetCustomerDetailsNodeTest { @Test public void givenConfigWithNullFetchTo_whenInit_thenException() { // GIVEN + config.setDetailsList(List.of(EntityDetails.ID)); config.setFetchTo(null); nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config)); @@ -141,15 +142,9 @@ public class TbGetCustomerDetailsNodeTest { } @Test - public void givenDefaultConfig_whenInit_thenOK() throws TbNodeException { - // GIVEN-WHEN - node.init(ctxMock, nodeConfiguration); - - // THEN - assertThat(node.config).isEqualTo(config); - assertThat(config.getDetailsList()).isEqualTo(List.of(EntityDetails.STATE, EntityDetails.CITY)); + public void givenDefaultConfig_whenInit_thenOK() { + assertThat(config.getDetailsList()).isEqualTo(Collections.emptyList()); assertThat(config.getFetchTo()).isEqualTo(FetchTo.DATA); - assertThat(node.fetchTo).isEqualTo(FetchTo.DATA); } @Test diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java index d05ad23db6..06d1c46338 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java @@ -84,6 +84,7 @@ public class TbGetTenantDetailsNodeTest { @Test public void givenConfigWithNullFetchTo_whenInit_thenException() { // GIVEN + config.setDetailsList(List.of(EntityDetails.ID)); config.setFetchTo(null); nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config)); @@ -112,15 +113,10 @@ public class TbGetTenantDetailsNodeTest { } @Test - public void givenDefaultConfig_whenInit_thenOK() throws TbNodeException { - // GIVEN-WHEN - node.init(ctxMock, nodeConfiguration); - + public void givenDefaultConfig_whenInit_thenOK() { // THEN - assertThat(node.config).isEqualTo(config); - assertThat(config.getDetailsList()).isEqualTo(List.of(EntityDetails.STATE, EntityDetails.TITLE)); + assertThat(config.getDetailsList()).isEqualTo(Collections.emptyList()); assertThat(config.getFetchTo()).isEqualTo(FetchTo.DATA); - assertThat(node.fetchTo).isEqualTo(FetchTo.DATA); } @Test