From e32f893ffff6372fd8fcafedaf6ea63f0e183c45 Mon Sep 17 00:00:00 2001 From: Dmytro Skarzhynets Date: Tue, 18 Apr 2023 13:02:13 +0300 Subject: [PATCH] Refactor: remove unnecessary check tenant entity check --- .../metadata/TbAbstractGetAttributesNode.java | 1 - .../metadata/TbAbstractGetEntityAttrNode.java | 1 - .../TbAbstractGetEntityDetailsNode.java | 1 - .../TbFetchDeviceCredentialsNode.java | 1 - .../metadata/TbGetOriginatorFieldsNode.java | 1 - .../TbGetCustomerAttributeNodeTest.java | 18 ------------------ .../TbGetCustomerDetailsNodeTest.java | 18 ------------------ .../TbGetOriginatorFieldsNodeTest.java | 19 ------------------- .../TbGetRelatedAttributeNodeTest.java | 18 ------------------ .../TbGetTenantAttributeNodeTest.java | 18 ------------------ .../metadata/TbGetTenantDetailsNodeTest.java | 18 ------------------ 11 files changed, 114 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java index 43ee96c917..ffa735fd4f 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java @@ -66,7 +66,6 @@ public abstract class TbAbstractGetAttributesNode extends Tb @Override public void onMsg(TbContext ctx, TbMsg msg) { - ctx.checkTenantEntity(msg.getOriginator()); var msgDataAsObjectNode = FetchTo.DATA.equals(fetchTo) ? getMsgDataAsObjectNode(msg) : null; withCallback(findEntityAsync(ctx, msg.getOriginator()), entityId -> safeGetAttributes(ctx, msg, entityId, msgDataAsObjectNode), diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java index e91bfd8410..48d4415693 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java @@ -37,7 +37,6 @@ public abstract class TbAbstractGetEntityDetailsNode { diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java index 3f45ae8d6d..3eb830da99 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java @@ -69,7 +69,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -203,23 +202,6 @@ public class TbGetCustomerAttributeNodeTest { verify(ctxMock, never()).tellSuccess(any()); } - @Test - public void givenEntityThatDoesNotBelongToTheCurrentTenant_whenOnMsg_thenException() { - // GIVEN - var expectedExceptionMessage = "Entity with id: '" + DUMMY_DEVICE_ORIGINATOR + - "' specified in the configuration doesn't belong to the current tenant."; - - doThrow(new RuntimeException(expectedExceptionMessage)).when(ctxMock).checkTenantEntity(DUMMY_DEVICE_ORIGINATOR); - msg = TbMsg.newMsg("POST_TELEMETRY_REQUEST", DUMMY_DEVICE_ORIGINATOR, new TbMsgMetaData(), "{}"); - - // WHEN - var exception = assertThrows(RuntimeException.class, () -> node.onMsg(ctxMock, msg)); - - // THEN - assertThat(exception.getMessage()).isEqualTo(expectedExceptionMessage); - verify(ctxMock, never()).tellSuccess(any()); - } - @Test public void givenDidNotFindEntity_whenOnMsg_thenShouldTellFailure() { // GIVEN 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 1cb1449078..e2ab2f7863 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 @@ -64,7 +64,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -197,23 +196,6 @@ public class TbGetCustomerDetailsNodeTest { verify(ctxMock, never()).tellSuccess(any()); } - @Test - public void givenEntityThatDoesNotBelongToTheCurrentTenant_whenOnMsg_thenException() { - // GIVEN - var expectedExceptionMessage = "Entity with id: '" + DUMMY_DEVICE_ORIGINATOR + - "' specified in the configuration doesn't belong to the current tenant."; - - doThrow(new RuntimeException(expectedExceptionMessage)).when(ctxMock).checkTenantEntity(DUMMY_DEVICE_ORIGINATOR); - msg = TbMsg.newMsg("SOME_MESSAGE_TYPE", DUMMY_DEVICE_ORIGINATOR, new TbMsgMetaData(), "{}"); - - // WHEN - var exception = assertThrows(RuntimeException.class, () -> node.onMsg(ctxMock, msg)); - - // THEN - assertThat(exception.getMessage()).isEqualTo(expectedExceptionMessage); - verify(ctxMock, never()).tellSuccess(any()); - } - @Test public void givenAllEntityDetailsAndFetchToData_whenOnMsg_thenShouldTellSuccessAndFetchAllToData() { // GIVEN diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java index 8428165ab9..c7aeab1d8c 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java @@ -46,7 +46,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -158,24 +157,6 @@ public class TbGetOriginatorFieldsNodeTest { verify(ctxMock, never()).tellSuccess(any()); } - @Test - public void givenEntityThatDoesNotBelongToTheCurrentTenant_whenOnMsg_thenException() { - // SETUP - var expectedExceptionMessage = "Entity with id: '" + DUMMY_DEVICE_ORIGINATOR + - "' specified in the configuration doesn't belong to the current tenant."; - - // GIVEN - doThrow(new RuntimeException(expectedExceptionMessage)).when(ctxMock).checkTenantEntity(DUMMY_DEVICE_ORIGINATOR); - msg = TbMsg.newMsg("SOME_MESSAGE_TYPE", DUMMY_DEVICE_ORIGINATOR, new TbMsgMetaData(), "{}"); - - // WHEN - var exception = assertThrows(RuntimeException.class, () -> node.onMsg(ctxMock, msg)); - - // THEN - assertThat(exception.getMessage()).isEqualTo(expectedExceptionMessage); - verify(ctxMock, never()).tellSuccess(any()); - } - @Test public void givenValidMsgAndFetchToData_whenOnMsg_thenShouldTellSuccessAndFetchToData() { // GIVEN 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 07b25b15e8..5228cd41b4 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 @@ -74,7 +74,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -225,23 +224,6 @@ public class TbGetRelatedAttributeNodeTest { verify(ctxMock, never()).tellSuccess(any()); } - @Test - public void givenEntityThatDoesNotBelongToTheCurrentTenant_whenOnMsg_thenException() { - // GIVEN - var expectedExceptionMessage = "Entity with id: '" + DUMMY_DEVICE_ORIGINATOR + - "' specified in the configuration doesn't belong to the current tenant."; - - doThrow(new RuntimeException(expectedExceptionMessage)).when(ctxMock).checkTenantEntity(DUMMY_DEVICE_ORIGINATOR); - msg = TbMsg.newMsg("POST_TELEMETRY_REQUEST", DUMMY_DEVICE_ORIGINATOR, new TbMsgMetaData(), "{}"); - - // WHEN - var exception = assertThrows(RuntimeException.class, () -> node.onMsg(ctxMock, msg)); - - // THEN - assertThat(exception.getMessage()).isEqualTo(expectedExceptionMessage); - verify(ctxMock, never()).tellSuccess(any()); - } - @Test public void givenDidNotFindEntity_whenOnMsg_thenShouldTellFailure() { // GIVEN 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 76af5fabb4..c5c4539377 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 @@ -57,7 +57,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -184,23 +183,6 @@ public class TbGetTenantAttributeNodeTest { verify(ctxMock, never()).tellSuccess(any()); } - @Test - public void givenEntityThatDoesNotBelongToTheCurrentTenant_whenOnMsg_thenException() { - // GIVEN - var expectedExceptionMessage = "Entity with id: '" + DUMMY_DEVICE_ORIGINATOR + - "' specified in the configuration doesn't belong to the current tenant."; - - doThrow(new RuntimeException(expectedExceptionMessage)).when(ctxMock).checkTenantEntity(DUMMY_DEVICE_ORIGINATOR); - msg = TbMsg.newMsg("POST_TELEMETRY_REQUEST", DUMMY_DEVICE_ORIGINATOR, new TbMsgMetaData(), "{}"); - - // WHEN - var exception = assertThrows(RuntimeException.class, () -> node.onMsg(ctxMock, msg)); - - // THEN - assertThat(exception.getMessage()).isEqualTo(expectedExceptionMessage); - verify(ctxMock, never()).tellSuccess(any()); - } - @Test public void givenFetchAttributesToData_whenOnMsg_thenShouldFetchAttributesToData() { // GIVEN 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 06d1c46338..67d70b83bb 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 @@ -42,7 +42,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -150,23 +149,6 @@ public class TbGetTenantDetailsNodeTest { verify(ctxMock, never()).tellSuccess(any()); } - @Test - public void givenEntityThatDoesNotBelongToTheCurrentTenant_whenOnMsg_thenException() { - // GIVEN - var expectedExceptionMessage = "Entity with id: '" + DUMMY_DEVICE_ORIGINATOR + - "' specified in the configuration doesn't belong to the current tenant."; - - doThrow(new RuntimeException(expectedExceptionMessage)).when(ctxMock).checkTenantEntity(DUMMY_DEVICE_ORIGINATOR); - msg = TbMsg.newMsg("SOME_MESSAGE_TYPE", DUMMY_DEVICE_ORIGINATOR, new TbMsgMetaData(), "{}"); - - // WHEN - var exception = assertThrows(RuntimeException.class, () -> node.onMsg(ctxMock, msg)); - - // THEN - assertThat(exception.getMessage()).isEqualTo(expectedExceptionMessage); - verify(ctxMock, never()).tellSuccess(any()); - } - @Test public void givenAllEntityDetailsAndFetchToData_whenOnMsg_thenShouldTellSuccessAndFetchAllToData() { // GIVEN