Browse Source

Review fixes: rollback default configs for get details nodes

pull/8661/head
Dmytro Skarzhynets 4 years ago
parent
commit
9fe9964039
  1. 5
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeConfiguration.java
  2. 5
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeConfiguration.java
  3. 11
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java
  4. 10
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java

5
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.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.thingsboard.rule.engine.api.NodeConfiguration; import org.thingsboard.rule.engine.api.NodeConfiguration;
import org.thingsboard.rule.engine.util.EntityDetails;
import java.util.List; import java.util.Collections;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ -29,7 +28,7 @@ public class TbGetCustomerDetailsNodeConfiguration extends TbAbstractGetEntityDe
@Override @Override
public TbGetCustomerDetailsNodeConfiguration defaultConfiguration() { public TbGetCustomerDetailsNodeConfiguration defaultConfiguration() {
var configuration = new TbGetCustomerDetailsNodeConfiguration(); var configuration = new TbGetCustomerDetailsNodeConfiguration();
configuration.setDetailsList(List.of(EntityDetails.STATE, EntityDetails.CITY)); configuration.setDetailsList(Collections.emptyList());
configuration.setFetchTo(FetchTo.DATA); configuration.setFetchTo(FetchTo.DATA);
return configuration; return configuration;
} }

5
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.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.thingsboard.rule.engine.api.NodeConfiguration; import org.thingsboard.rule.engine.api.NodeConfiguration;
import org.thingsboard.rule.engine.util.EntityDetails;
import java.util.List; import java.util.Collections;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ -29,7 +28,7 @@ public class TbGetTenantDetailsNodeConfiguration extends TbAbstractGetEntityDeta
@Override @Override
public TbGetTenantDetailsNodeConfiguration defaultConfiguration() { public TbGetTenantDetailsNodeConfiguration defaultConfiguration() {
var configuration = new TbGetTenantDetailsNodeConfiguration(); var configuration = new TbGetTenantDetailsNodeConfiguration();
configuration.setDetailsList(List.of(EntityDetails.STATE, EntityDetails.TITLE)); configuration.setDetailsList(Collections.emptyList());
configuration.setFetchTo(FetchTo.DATA); configuration.setFetchTo(FetchTo.DATA);
return configuration; return configuration;
} }

11
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java

@ -113,6 +113,7 @@ public class TbGetCustomerDetailsNodeTest {
@Test @Test
public void givenConfigWithNullFetchTo_whenInit_thenException() { public void givenConfigWithNullFetchTo_whenInit_thenException() {
// GIVEN // GIVEN
config.setDetailsList(List.of(EntityDetails.ID));
config.setFetchTo(null); config.setFetchTo(null);
nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config)); nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
@ -141,15 +142,9 @@ public class TbGetCustomerDetailsNodeTest {
} }
@Test @Test
public void givenDefaultConfig_whenInit_thenOK() throws TbNodeException { public void givenDefaultConfig_whenInit_thenOK() {
// GIVEN-WHEN assertThat(config.getDetailsList()).isEqualTo(Collections.emptyList());
node.init(ctxMock, nodeConfiguration);
// THEN
assertThat(node.config).isEqualTo(config);
assertThat(config.getDetailsList()).isEqualTo(List.of(EntityDetails.STATE, EntityDetails.CITY));
assertThat(config.getFetchTo()).isEqualTo(FetchTo.DATA); assertThat(config.getFetchTo()).isEqualTo(FetchTo.DATA);
assertThat(node.fetchTo).isEqualTo(FetchTo.DATA);
} }
@Test @Test

10
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java

@ -84,6 +84,7 @@ public class TbGetTenantDetailsNodeTest {
@Test @Test
public void givenConfigWithNullFetchTo_whenInit_thenException() { public void givenConfigWithNullFetchTo_whenInit_thenException() {
// GIVEN // GIVEN
config.setDetailsList(List.of(EntityDetails.ID));
config.setFetchTo(null); config.setFetchTo(null);
nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config)); nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
@ -112,15 +113,10 @@ public class TbGetTenantDetailsNodeTest {
} }
@Test @Test
public void givenDefaultConfig_whenInit_thenOK() throws TbNodeException { public void givenDefaultConfig_whenInit_thenOK() {
// GIVEN-WHEN
node.init(ctxMock, nodeConfiguration);
// THEN // THEN
assertThat(node.config).isEqualTo(config); assertThat(config.getDetailsList()).isEqualTo(Collections.emptyList());
assertThat(config.getDetailsList()).isEqualTo(List.of(EntityDetails.STATE, EntityDetails.TITLE));
assertThat(config.getFetchTo()).isEqualTo(FetchTo.DATA); assertThat(config.getFetchTo()).isEqualTo(FetchTo.DATA);
assertThat(node.fetchTo).isEqualTo(FetchTo.DATA);
} }
@Test @Test

Loading…
Cancel
Save