thingsboard-memoizeit
Changes
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/DonAsynchron.java 7(+6 -1)
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java 28(+16 -12)
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java 2(+1 -1)
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java 4(+3 -1)
Details
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/DonAsynchron.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/DonAsynchron.java
index 18ad394..4fed574 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/DonAsynchron.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/DonAsynchron.java
@@ -28,7 +28,12 @@ public class DonAsynchron {
Futures.addCallback(future, new FutureCallback<T>() {
@Override
public void onSuccess(@Nullable T result) {
- onSuccess.accept(result);
+ try {
+ onSuccess.accept(result);
+ } catch (Throwable th) {
+ onFailure(th);
+ }
+
}
@Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java
index 834daa1..7ba7dbc 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java
@@ -1,12 +1,12 @@
/**
* Copyright © 2016-2018 The Thingsboard Authors
- *
+ * <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,14 +38,18 @@ public abstract class TbEntityGetAttrNode<T extends EntityId> implements TbNode
@Override
public void onMsg(TbContext ctx, TbMsg msg) {
- withCallback(
- findEntityAsync(ctx, msg.getOriginator()),
- entityId -> withCallback(
- ctx.getAttributesService().find(entityId, SERVER_SCOPE, config.getAttrMapping().keySet()),
- attributes -> putAttributesAndTell(ctx, msg, attributes),
- t -> ctx.tellError(msg, t)
- ),
- t -> ctx.tellError(msg, t));
+ try {
+ withCallback(
+ findEntityAsync(ctx, msg.getOriginator()),
+ entityId -> withCallback(
+ ctx.getAttributesService().find(entityId, SERVER_SCOPE, config.getAttrMapping().keySet()),
+ attributes -> putAttributesAndTell(ctx, msg, attributes),
+ t -> ctx.tellError(msg, t)
+ ),
+ t -> ctx.tellError(msg, t));
+ } catch (Throwable th) {
+ ctx.tellError(msg, th);
+ }
}
private void putAttributesAndTell(TbContext ctx, TbMsg msg, List<AttributeKvEntry> attributes) {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java
index 34357ee..4d41921 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNode.java
@@ -44,7 +44,7 @@ public class TbGetAttributesNode implements TbNode {
@Override
public void onMsg(TbContext ctx, TbMsg msg) throws TbNodeException {
- ListenableFuture<List<Void>> future = Futures.successfulAsList(
+ ListenableFuture<List<Void>> future = Futures.allAsList(
putAttrAsync(ctx, msg, CLIENT_SCOPE, config.getClientAttributeNames(), "cs."),
putAttrAsync(ctx, msg, SHARED_SCOPE, config.getSharedAttributeNames(), "shared."),
putAttrAsync(ctx, msg, SERVER_SCOPE, config.getServerAttributeNames(), "ss."));
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java
index a138886..57f9b79 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNode.java
@@ -43,7 +43,9 @@ public class TbGetCustomerAttributeNode extends TbEntityGetAttrNode<CustomerId>
}
private <T extends HasCustomerId> ListenableFuture<CustomerId> getCustomerAsync(ListenableFuture<T> future) {
- return Futures.transform(future, (AsyncFunction<HasCustomerId, CustomerId>) in -> Futures.immediateFuture(in.getCustomerId()));
+ return Futures.transform(future, (AsyncFunction<HasCustomerId, CustomerId>) in -> {
+ return in != null ? Futures.immediateFuture(in.getCustomerId())
+ : Futures.immediateFailedFuture(new IllegalStateException("Customer not found"));});
}
}
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java
index eaa61ea..2cf9a97 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNode.java
@@ -56,7 +56,9 @@ public class TbGetTenantAttributeNode extends TbEntityGetAttrNode<TenantId> {
}
private <T extends HasTenantId> ListenableFuture<TenantId> getTenantAsync(ListenableFuture<T> future) {
- return Futures.transform(future, (AsyncFunction<HasTenantId, TenantId>) in -> Futures.immediateFuture(in.getTenantId()));
+ return Futures.transform(future, (AsyncFunction<HasTenantId, TenantId>) in -> {
+ return in != null ? Futures.immediateFuture(in.getTenantId())
+ : Futures.immediateFailedFuture(new IllegalStateException("Tenant not found"));});
}
}
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 5daf619..ae41c00 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
@@ -1,12 +1,12 @@
/**
* Copyright © 2016-2018 The Thingsboard Authors
- *
+ * <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,30 +15,214 @@
*/
package org.thingsboard.rule.engine.metadata;
+import com.datastax.driver.core.utils.UUIDs;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Futures;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.thingsboard.rule.engine.api.TbContext;
+import org.thingsboard.rule.engine.api.TbNodeConfiguration;
+import org.thingsboard.rule.engine.api.TbNodeException;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.asset.Asset;
+import org.thingsboard.server.common.data.id.AssetId;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.kv.AttributeKvEntry;
+import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
+import org.thingsboard.server.common.data.kv.StringDataEntry;
import org.thingsboard.server.common.msg.TbMsg;
+import org.thingsboard.server.common.msg.TbMsgMetaData;
+import org.thingsboard.server.dao.asset.AssetService;
+import org.thingsboard.server.dao.attributes.AttributesService;
+import org.thingsboard.server.dao.device.DeviceService;
+import org.thingsboard.server.dao.user.UserService;
-import static org.junit.Assert.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.same;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.thingsboard.server.common.data.DataConstants.SERVER_SCOPE;
@RunWith(MockitoJUnitRunner.class)
public class TbGetCustomerAttributeNodeTest {
- //todo-vp: return to this after fixing compilation problem with protobuff
-// private TbGetCustomerAttributeNode node;
-//
-// @Mock
-// private TbContext ctx;
-//
-// private TbMsg msg;
-//
-// @Test
-// public void customerAttributeAddedInMetadata() {
-// msg = new TbMsg();
-// node.onMsg(ctx, );
-// }
+ private TbGetCustomerAttributeNode node;
+
+ @Mock
+ private TbContext ctx;
+
+ @Mock
+ private AttributesService attributesService;
+ @Mock
+ private UserService userService;
+ @Mock
+ private AssetService assetService;
+ @Mock
+ private DeviceService deviceService;
+
+ private TbMsg msg;
+
+ @Before
+ public void init() throws TbNodeException {
+ TbGetEntityAttrNodeConfiguration config = new TbGetEntityAttrNodeConfiguration();
+ Map<String, String> attrMapping = new HashMap<>();
+ attrMapping.putIfAbsent("temperature", "tempo");
+ config.setAttrMapping(attrMapping);
+ ObjectMapper mapper = new ObjectMapper();
+ TbNodeConfiguration nodeConfiguration = new TbNodeConfiguration();
+ nodeConfiguration.setData(mapper.valueToTree(config));
+
+ node = new TbGetCustomerAttributeNode();
+ node.init(nodeConfiguration, null);
+ }
+
+ @Test
+ public void errorThrownIfCannotLoadAttributes() {
+ UserId userId = new UserId(UUIDs.timeBased());
+ CustomerId customerId = new CustomerId(UUIDs.timeBased());
+ User user = new User();
+ user.setCustomerId(customerId);
+
+ msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), new byte[4]);
+
+ when(ctx.getUserService()).thenReturn(userService);
+ when(userService.findUserByIdAsync(userId)).thenReturn(Futures.immediateFuture(user));
+
+ when(ctx.getAttributesService()).thenReturn(attributesService);
+ when(attributesService.find(customerId, SERVER_SCOPE, Collections.singleton("temperature")))
+ .thenThrow(new IllegalStateException("something wrong"));
+
+ node.onMsg(ctx, msg);
+ final ArgumentCaptor<Throwable> captor = ArgumentCaptor.forClass(Throwable.class);
+ verify(ctx).tellError(same(msg), captor.capture());
+
+ Throwable value = captor.getValue();
+ assertEquals("something wrong", value.getMessage());
+ assertTrue(msg.getMetaData().getData().isEmpty());
+ }
+
+ @Test
+ public void errorThrownIfCannotLoadAttributesAsync() {
+ UserId userId = new UserId(UUIDs.timeBased());
+ CustomerId customerId = new CustomerId(UUIDs.timeBased());
+ User user = new User();
+ user.setCustomerId(customerId);
+
+ msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), new byte[4]);
+
+ when(ctx.getUserService()).thenReturn(userService);
+ when(userService.findUserByIdAsync(userId)).thenReturn(Futures.immediateFuture(user));
+
+ when(ctx.getAttributesService()).thenReturn(attributesService);
+ when(attributesService.find(customerId, SERVER_SCOPE, Collections.singleton("temperature")))
+ .thenReturn(Futures.immediateFailedFuture(new IllegalStateException("something wrong")));
+
+ node.onMsg(ctx, msg);
+ final ArgumentCaptor<Throwable> captor = ArgumentCaptor.forClass(Throwable.class);
+ verify(ctx).tellError(same(msg), captor.capture());
+
+ Throwable value = captor.getValue();
+ assertEquals("something wrong", value.getMessage());
+ assertTrue(msg.getMetaData().getData().isEmpty());
+ }
+
+ @Test
+ public void errorThrownIfCustomerCannotBeFound() {
+ UserId userId = new UserId(UUIDs.timeBased());
+ CustomerId customerId = new CustomerId(UUIDs.timeBased());
+ User user = new User();
+ user.setCustomerId(customerId);
+
+ msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), new byte[4]);
+
+ when(ctx.getUserService()).thenReturn(userService);
+ when(userService.findUserByIdAsync(userId)).thenReturn(Futures.immediateFuture(null));
+
+ node.onMsg(ctx, msg);
+ final ArgumentCaptor<Throwable> captor = ArgumentCaptor.forClass(Throwable.class);
+ verify(ctx).tellError(same(msg), captor.capture());
+
+ Throwable value = captor.getValue();
+ assertEquals(IllegalStateException.class, value.getClass());
+ assertEquals("Customer not found", value.getMessage());
+ assertTrue(msg.getMetaData().getData().isEmpty());
+ }
+
+ @Test
+ public void customerAttributeAddedInMetadata() {
+ CustomerId customerId = new CustomerId(UUIDs.timeBased());
+ msg = new TbMsg(UUIDs.timeBased(), "CUSTOMER", customerId, new TbMsgMetaData(), new byte[4]);
+ entityAttributeFetched(customerId);
+ }
+
+ @Test
+ public void usersCustomerAttributesFetched() {
+ UserId userId = new UserId(UUIDs.timeBased());
+ CustomerId customerId = new CustomerId(UUIDs.timeBased());
+ User user = new User();
+ user.setCustomerId(customerId);
+
+ msg = new TbMsg(UUIDs.timeBased(), "USER", userId, new TbMsgMetaData(), new byte[4]);
+
+ when(ctx.getUserService()).thenReturn(userService);
+ when(userService.findUserByIdAsync(userId)).thenReturn(Futures.immediateFuture(user));
+
+ entityAttributeFetched(customerId);
+ }
+
+ @Test
+ public void assetsCustomerAttributesFetched() {
+ AssetId assetId = new AssetId(UUIDs.timeBased());
+ CustomerId customerId = new CustomerId(UUIDs.timeBased());
+ Asset asset = new Asset();
+ asset.setCustomerId(customerId);
+
+ msg = new TbMsg(UUIDs.timeBased(), "USER", assetId, new TbMsgMetaData(), new byte[4]);
+
+ when(ctx.getAssetService()).thenReturn(assetService);
+ when(assetService.findAssetByIdAsync(assetId)).thenReturn(Futures.immediateFuture(asset));
+
+ entityAttributeFetched(customerId);
+ }
+
+ @Test
+ public void deviceCustomerAttributesFetched() {
+ DeviceId deviceId = new DeviceId(UUIDs.timeBased());
+ CustomerId customerId = new CustomerId(UUIDs.timeBased());
+ Device device = new Device();
+ device.setCustomerId(customerId);
+
+ msg = new TbMsg(UUIDs.timeBased(), "USER", deviceId, new TbMsgMetaData(), new byte[4]);
+
+ when(ctx.getDeviceService()).thenReturn(deviceService);
+ when(deviceService.findDeviceByIdAsync(deviceId)).thenReturn(Futures.immediateFuture(device));
+
+ entityAttributeFetched(customerId);
+ }
+
+ private void entityAttributeFetched(CustomerId customerId) {
+ List<AttributeKvEntry> attributes = Lists.newArrayList(new BaseAttributeKvEntry(new StringDataEntry("temperature", "high"), 1L));
+
+ when(ctx.getAttributesService()).thenReturn(attributesService);
+ when(attributesService.find(customerId, SERVER_SCOPE, Collections.singleton("temperature")))
+ .thenReturn(Futures.immediateFuture(attributes));
+ node.onMsg(ctx, msg);
+ verify(ctx).tellNext(msg);
+ assertEquals(msg.getMetaData().getValue("tempo"), "high");
+ }
}
\ No newline at end of file