From bc3b55d572d3bdfcadec54356fd66ab8a83a6b8c Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Mon, 16 Apr 2018 20:09:47 +0300 Subject: [PATCH 1/4] RPC refactoring --- .../device/DeviceActorMessageProcessor.java | 2 + .../plugin/PluginProcessingContext.java | 20 +- .../plugin/SharedPluginProcessingContext.java | 4 +- .../actors/plugin/ValidationResult.java | 23 +- .../actors/rpc/BasicRpcSessionListener.java | 19 +- .../server/controller/BaseController.java | 2 +- .../server/controller/RpcController.java | 148 +++++++++++++ .../cluster/rpc/ClusterGrpcService.java | 23 +- .../cluster/rpc/ClusterRpcService.java | 5 +- .../server/service/rpc/DefaultRpcService.java | 201 ++++++++++++++++++ .../service}/rpc/LocalRequestMetaData.java | 8 +- .../server/service/rpc/RpcService.java | 37 ++++ .../service/rpc/ToDeviceRpcRequestMsg.java | 57 +++++ .../service/security/AccessValidator.java | 54 +++-- application/src/main/proto/cluster.proto | 3 - .../server/common/data/rpc}/RpcRequest.java | 2 +- .../data/rpc}/ToDeviceRpcRequestBody.java | 2 +- .../server/common/data/rule/RuleNode.java | 4 + .../common/msg/rpc}/ToDeviceRpcRequest.java | 5 +- .../server/dao/model/ModelConstants.java | 1 + .../dao/model/nosql/RuleNodeEntity.java | 18 +- .../server/dao/model/sql/RuleNodeEntity.java | 11 + .../server/dao/rule/BaseRuleChainService.java | 10 +- .../server/dao/rule/RuleChainService.java | 2 + dao/src/main/resources/cassandra/schema.cql | 1 + dao/src/main/resources/sql/schema.sql | 1 + .../extensions/api/plugins/PluginContext.java | 3 +- .../msg/ToDeviceRpcRequestPluginMsg.java | 1 + .../DeviceMessagingRuleMsgHandler.java | 15 +- .../core/plugin/rpc/RpcManager.java | 69 ------ .../extensions/core/plugin/rpc/RpcPlugin.java | 86 -------- .../plugin/rpc/RpcPluginConfiguration.java | 26 --- .../rpc/handlers/RpcRestMsgHandler.java | 161 -------------- .../rpc/handlers/RpcRuleMsgHandler.java | 102 --------- 34 files changed, 595 insertions(+), 531 deletions(-) create mode 100644 application/src/main/java/org/thingsboard/server/controller/RpcController.java create mode 100644 application/src/main/java/org/thingsboard/server/service/rpc/DefaultRpcService.java rename {extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin => application/src/main/java/org/thingsboard/server/service}/rpc/LocalRequestMetaData.java (78%) create mode 100644 application/src/main/java/org/thingsboard/server/service/rpc/RpcService.java create mode 100644 application/src/main/java/org/thingsboard/server/service/rpc/ToDeviceRpcRequestMsg.java rename {extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/cmd => common/data/src/main/java/org/thingsboard/server/common/data/rpc}/RpcRequest.java (92%) rename {extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg => common/data/src/main/java/org/thingsboard/server/common/data/rpc}/ToDeviceRpcRequestBody.java (93%) rename {extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg => common/message/src/main/java/org/thingsboard/server/common/msg/rpc}/ToDeviceRpcRequest.java (84%) delete mode 100644 extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/RpcManager.java delete mode 100644 extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/RpcPlugin.java delete mode 100644 extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/RpcPluginConfiguration.java delete mode 100644 extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/handlers/RpcRestMsgHandler.java delete mode 100644 extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/handlers/RpcRuleMsgHandler.java diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java index 3644a491a4..07b6b9b836 100644 --- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java @@ -26,11 +26,13 @@ import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.SessionId; import org.thingsboard.server.common.data.kv.AttributeKey; import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.msg.core.*; import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; import org.thingsboard.server.common.msg.kv.BasicAttributeKVMsg; +import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; import org.thingsboard.server.common.msg.session.FromDeviceMsg; import org.thingsboard.server.common.msg.session.MsgType; import org.thingsboard.server.common.msg.session.SessionType; diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java index 10f16ce8b1..7862d23ed1 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java @@ -36,9 +36,11 @@ import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.relation.RelationTypeGroup; +import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody; import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.rule.RuleMetaData; import org.thingsboard.server.common.msg.cluster.ServerAddress; +import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; import org.thingsboard.server.extensions.api.device.DeviceAttributesEventNotificationMsg; import org.thingsboard.server.extensions.api.plugins.PluginApiCallSecurityContext; import org.thingsboard.server.extensions.api.plugins.PluginCallback; @@ -348,7 +350,7 @@ public final class PluginProcessingContext implements PluginContext { throw new IllegalStateException("Not Implemented!"); } } else { - callback.onSuccess(this, ValidationResult.ok()); + callback.onSuccess(this, ValidationResult.ok(null)); } } @@ -366,7 +368,7 @@ public final class PluginProcessingContext implements PluginContext { } else if (ctx.isCustomerUser() && !device.getCustomerId().equals(ctx.getCustomerId())) { return ValidationResult.accessDenied("Device doesn't belong to the current Customer!"); } else { - return ValidationResult.ok(); + return ValidationResult.ok(null); } } })); @@ -387,7 +389,7 @@ public final class PluginProcessingContext implements PluginContext { } else if (ctx.isCustomerUser() && !asset.getCustomerId().equals(ctx.getCustomerId())) { return ValidationResult.accessDenied("Asset doesn't belong to the current Customer!"); } else { - return ValidationResult.ok(); + return ValidationResult.ok(null); } } })); @@ -408,7 +410,7 @@ public final class PluginProcessingContext implements PluginContext { } else if (ctx.isSystemAdmin() && !rule.getTenantId().isNullUid()) { return ValidationResult.accessDenied("Rule is not in system scope!"); } else { - return ValidationResult.ok(); + return ValidationResult.ok(null); } } })); @@ -429,7 +431,7 @@ public final class PluginProcessingContext implements PluginContext { } else if (ctx.isSystemAdmin() && !ruleChain.getTenantId().isNullUid()) { return ValidationResult.accessDenied("Rule chain is not in system scope!"); } else { - return ValidationResult.ok(); + return ValidationResult.ok(null); } } })); @@ -451,7 +453,7 @@ public final class PluginProcessingContext implements PluginContext { } else if (ctx.isSystemAdmin() && !plugin.getTenantId().isNullUid()) { return ValidationResult.accessDenied("Plugin is not in system scope!"); } else { - return ValidationResult.ok(); + return ValidationResult.ok(null); } } })); @@ -472,7 +474,7 @@ public final class PluginProcessingContext implements PluginContext { } else if (ctx.isCustomerUser() && !customer.getId().equals(ctx.getCustomerId())) { return ValidationResult.accessDenied("Customer doesn't relate to the currently authorized customer user!"); } else { - return ValidationResult.ok(); + return ValidationResult.ok(null); } } })); @@ -483,7 +485,7 @@ public final class PluginProcessingContext implements PluginContext { if (ctx.isCustomerUser()) { callback.onSuccess(this, ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); } else if (ctx.isSystemAdmin()) { - callback.onSuccess(this, ValidationResult.ok()); + callback.onSuccess(this, ValidationResult.ok(null)); } else { ListenableFuture tenantFuture = pluginCtx.tenantService.findTenantByIdAsync(new TenantId(entityId.getId())); Futures.addCallback(tenantFuture, getCallback(callback, tenant -> { @@ -492,7 +494,7 @@ public final class PluginProcessingContext implements PluginContext { } else if (!tenant.getId().equals(ctx.getTenantId())) { return ValidationResult.accessDenied("Tenant doesn't relate to the currently authorized user!"); } else { - return ValidationResult.ok(); + return ValidationResult.ok(null); } })); } diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/SharedPluginProcessingContext.java b/application/src/main/java/org/thingsboard/server/actors/plugin/SharedPluginProcessingContext.java index 182897025e..ad3fef519c 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/SharedPluginProcessingContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/SharedPluginProcessingContext.java @@ -18,9 +18,7 @@ package org.thingsboard.server.actors.plugin; import akka.actor.ActorRef; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.actors.ActorSystemContext; -import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.id.DeviceId; -import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.controller.plugin.PluginWebSocketMsgEndpoint; @@ -38,7 +36,7 @@ import org.thingsboard.server.dao.tenant.TenantService; import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.extensions.api.device.DeviceAttributesEventNotificationMsg; import org.thingsboard.server.extensions.api.plugins.msg.TimeoutMsg; -import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequest; +import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequestPluginMsg; import org.thingsboard.server.service.cluster.routing.ClusterRoutingService; import org.thingsboard.server.service.cluster.rpc.ClusterRpcService; diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/ValidationResult.java b/application/src/main/java/org/thingsboard/server/actors/plugin/ValidationResult.java index f135ffbd53..0319a3e4f9 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/ValidationResult.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/ValidationResult.java @@ -20,29 +20,30 @@ import lombok.Data; @Data @AllArgsConstructor -public class ValidationResult { +public class ValidationResult { private final ValidationResultCode resultCode; private final String message; + private final V v; - public static ValidationResult ok() { - return new ValidationResult(ValidationResultCode.OK, "Ok"); + public static ValidationResult ok(V v) { + return new ValidationResult<>(ValidationResultCode.OK, "Ok", v); } - public static ValidationResult accessDenied(String message) { - return new ValidationResult(ValidationResultCode.ACCESS_DENIED, message); + public static ValidationResult accessDenied(String message) { + return new ValidationResult<>(ValidationResultCode.ACCESS_DENIED, message, null); } - public static ValidationResult entityNotFound(String message) { - return new ValidationResult(ValidationResultCode.ENTITY_NOT_FOUND, message); + public static ValidationResult entityNotFound(String message) { + return new ValidationResult<>(ValidationResultCode.ENTITY_NOT_FOUND, message, null); } - public static ValidationResult unauthorized(String message) { - return new ValidationResult(ValidationResultCode.UNAUTHORIZED, message); + public static ValidationResult unauthorized(String message) { + return new ValidationResult<>(ValidationResultCode.UNAUTHORIZED, message, null); } - public static ValidationResult internalError(String message) { - return new ValidationResult(ValidationResultCode.INTERNAL_ERROR, message); + public static ValidationResult internalError(String message) { + return new ValidationResult<>(ValidationResultCode.INTERNAL_ERROR, message, null); } } diff --git a/application/src/main/java/org/thingsboard/server/actors/rpc/BasicRpcSessionListener.java b/application/src/main/java/org/thingsboard/server/actors/rpc/BasicRpcSessionListener.java index 4fa222755d..22fce84586 100644 --- a/application/src/main/java/org/thingsboard/server/actors/rpc/BasicRpcSessionListener.java +++ b/application/src/main/java/org/thingsboard/server/actors/rpc/BasicRpcSessionListener.java @@ -24,10 +24,12 @@ import org.thingsboard.server.actors.service.ActorService; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.PluginId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.msg.cluster.ToAllNodesMsg; import org.thingsboard.server.common.msg.core.ToDeviceSessionActorMsg; import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; import org.thingsboard.server.extensions.api.plugins.msg.*; import org.thingsboard.server.extensions.api.plugins.rpc.PluginRpcMsg; @@ -35,6 +37,7 @@ import org.thingsboard.server.extensions.api.plugins.rpc.RpcMsg; import org.thingsboard.server.gen.cluster.ClusterAPIProtos; import org.thingsboard.server.service.cluster.rpc.GrpcSession; import org.thingsboard.server.service.cluster.rpc.GrpcSessionListener; +import org.thingsboard.server.service.rpc.ToDeviceRpcRequestMsg; import java.io.Serializable; import java.util.UUID; @@ -139,28 +142,20 @@ public class BasicRpcSessionListener implements GrpcSessionListener { return new UUID(uid.getPluginUuidMsb(), uid.getPluginUuidLsb()); } - private static ToDeviceRpcRequestPluginMsg deserialize(ServerAddress serverAddress, ClusterAPIProtos.ToDeviceRpcRequestRpcMessage msg) { - ClusterAPIProtos.PluginAddress address = msg.getAddress(); - TenantId pluginTenantId = new TenantId(toUUID(address.getTenantId())); - PluginId pluginId = new PluginId(toUUID(address.getPluginId())); - + private static ToDeviceRpcRequestMsg deserialize(ServerAddress serverAddress, ClusterAPIProtos.ToDeviceRpcRequestRpcMessage msg) { TenantId deviceTenantId = new TenantId(toUUID(msg.getDeviceTenantId())); DeviceId deviceId = new DeviceId(toUUID(msg.getDeviceId())); ToDeviceRpcRequestBody requestBody = new ToDeviceRpcRequestBody(msg.getMethod(), msg.getParams()); - ToDeviceRpcRequest request = new ToDeviceRpcRequest(toUUID(msg.getMsgId()), null, deviceTenantId, deviceId, msg.getOneway(), msg.getExpTime(), requestBody); + ToDeviceRpcRequest request = new ToDeviceRpcRequest(toUUID(msg.getMsgId()), deviceTenantId, deviceId, msg.getOneway(), msg.getExpTime(), requestBody); - return new ToDeviceRpcRequestPluginMsg(serverAddress, pluginId, pluginTenantId, request); + return new ToDeviceRpcRequestMsg(serverAddress, request); } private static ToPluginRpcResponseDeviceMsg deserialize(ServerAddress serverAddress, ClusterAPIProtos.ToPluginRpcResponseRpcMessage msg) { - ClusterAPIProtos.PluginAddress address = msg.getAddress(); - TenantId pluginTenantId = new TenantId(toUUID(address.getTenantId())); - PluginId pluginId = new PluginId(toUUID(address.getPluginId())); - RpcError error = !StringUtils.isEmpty(msg.getError()) ? RpcError.valueOf(msg.getError()) : null; FromDeviceRpcResponse response = new FromDeviceRpcResponse(toUUID(msg.getMsgId()), msg.getResponse(), error); - return new ToPluginRpcResponseDeviceMsg(pluginId, pluginTenantId, response); + return new ToPluginRpcResponseDeviceMsg(null, null, response); } @SuppressWarnings("unchecked") diff --git a/application/src/main/java/org/thingsboard/server/controller/BaseController.java b/application/src/main/java/org/thingsboard/server/controller/BaseController.java index c7574e86ba..f08feec133 100644 --- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java +++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java @@ -602,7 +602,7 @@ public abstract class BaseController { auditLogService.logEntityAction(user.getTenantId(), customerId, user.getId(), user.getName(), entityId, entity, actionType, e, additionalInfo); } - protected static Exception toException(Throwable error) { + public static Exception toException(Throwable error) { return Exception.class.isInstance(error) ? (Exception) error : new Exception(error); } diff --git a/application/src/main/java/org/thingsboard/server/controller/RpcController.java b/application/src/main/java/org/thingsboard/server/controller/RpcController.java new file mode 100644 index 0000000000..9810c031b6 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/controller/RpcController.java @@ -0,0 +1,148 @@ +/** + * Copyright © 2016-2018 The Thingsboard Authors + * + * 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 + * + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.controller; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.util.concurrent.FutureCallback; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.async.DeferredResult; +import org.thingsboard.server.actors.plugin.ValidationResult; +import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; +import org.thingsboard.server.common.data.exception.ThingsboardException; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody; +import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; +import org.thingsboard.server.extensions.api.exception.ToErrorResponseEntity; +import org.thingsboard.server.extensions.api.plugins.PluginConstants; +import org.thingsboard.server.common.data.rpc.RpcRequest; +import org.thingsboard.server.service.rpc.LocalRequestMetaData; +import org.thingsboard.server.service.rpc.RpcService; +import org.thingsboard.server.service.security.AccessValidator; +import org.thingsboard.server.service.security.model.SecurityUser; + +import javax.annotation.Nullable; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import java.io.IOException; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +/** + * Created by ashvayka on 22.03.18. + */ +@RestController +@RequestMapping(PluginConstants.RPC_URL_PREFIX) +@Slf4j +public class RpcController extends BaseController { + + public static final int DEFAULT_TIMEOUT = 10000; + protected final ObjectMapper jsonMapper = new ObjectMapper(); + + @Autowired + private RpcService rpcService; + + @Autowired + private AccessValidator accessValidator; + + private ExecutorService executor; + + @PostConstruct + public void initExecutor() { + executor = Executors.newSingleThreadExecutor(); + } + + @PreDestroy + public void shutdownExecutor() { + if (executor != null) { + executor.shutdownNow(); + } + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/oneway/{deviceId}", method = RequestMethod.POST) + @ResponseBody + public DeferredResult handleOneWayDeviceRPCRequest(@PathVariable("deviceId") String deviceIdStr, @RequestBody String requestBody) throws ThingsboardException { + return handleDeviceRPCRequest(true, new DeviceId(UUID.fromString(deviceIdStr)), requestBody); + } + + @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/twoway/{deviceId}", method = RequestMethod.POST) + @ResponseBody + public DeferredResult handleTwoWayDeviceRPCRequest(@PathVariable("deviceId") String deviceIdStr, @RequestBody String requestBody) throws ThingsboardException { + return handleDeviceRPCRequest(false, new DeviceId(UUID.fromString(deviceIdStr)), requestBody); + } + + + private DeferredResult handleDeviceRPCRequest(boolean oneWay, DeviceId deviceId, String requestBody) throws ThingsboardException { + try { + JsonNode rpcRequestBody = jsonMapper.readTree(requestBody); + RpcRequest cmd = new RpcRequest(rpcRequestBody.get("method").asText(), + jsonMapper.writeValueAsString(rpcRequestBody.get("params"))); + + if (rpcRequestBody.has("timeout")) { + cmd.setTimeout(rpcRequestBody.get("timeout").asLong()); + } + SecurityUser currentUser = getCurrentUser(); + TenantId tenantId = currentUser.getTenantId(); + final DeferredResult response = new DeferredResult<>(); + long timeout = System.currentTimeMillis() + (cmd.getTimeout() != null ? cmd.getTimeout() : DEFAULT_TIMEOUT); + ToDeviceRpcRequestBody body = new ToDeviceRpcRequestBody(cmd.getMethodName(), cmd.getRequestData()); + accessValidator.validate(currentUser, deviceId, new FutureCallback() { + @Override + public void onSuccess(@Nullable ValidationResult result) { + ToDeviceRpcRequest rpcRequest = new ToDeviceRpcRequest(UUID.randomUUID(), + tenantId, + deviceId, + oneWay, + timeout, + body + ); + rpcService.process(rpcRequest, new LocalRequestMetaData(rpcRequest, currentUser, response)); + } + + @Override + public void onFailure(Throwable e) { + ResponseEntity entity; + if (e instanceof ToErrorResponseEntity) { + entity = ((ToErrorResponseEntity) e).toErrorResponseEntity(); + } else { + entity = new ResponseEntity(HttpStatus.UNAUTHORIZED); + } + rpcService.logRpcCall(currentUser, deviceId, body, oneWay, Optional.empty(), e); + response.setResult(entity); + } + }); + return response; + } catch (IOException ioe) { + throw new ThingsboardException("Invalid request body", ioe, ThingsboardErrorCode.BAD_REQUEST_PARAMS); + } + } + +} diff --git a/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterGrpcService.java b/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterGrpcService.java index 5a6b30735e..f73c5ebe08 100644 --- a/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterGrpcService.java +++ b/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterGrpcService.java @@ -19,7 +19,6 @@ import com.google.protobuf.ByteString; import io.grpc.Server; import io.grpc.ServerBuilder; import io.grpc.stub.StreamObserver; -import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,7 +26,6 @@ import org.springframework.util.SerializationUtils; import org.thingsboard.server.actors.rpc.RpcBroadcastMsg; import org.thingsboard.server.actors.rpc.RpcSessionCreateRequestMsg; import org.thingsboard.server.actors.rpc.RpcSessionTellMsg; -import org.thingsboard.server.actors.service.ActorService; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.msg.cluster.ToAllNodesMsg; @@ -35,21 +33,18 @@ import org.thingsboard.server.common.msg.core.ToDeviceSessionActorMsg; import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; -import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequest; +import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequestPluginMsg; import org.thingsboard.server.extensions.api.plugins.msg.ToPluginRpcResponseDeviceMsg; import org.thingsboard.server.extensions.api.plugins.rpc.PluginRpcMsg; import org.thingsboard.server.gen.cluster.ClusterAPIProtos; import org.thingsboard.server.gen.cluster.ClusterRpcServiceGrpc; -import org.thingsboard.server.service.cluster.discovery.DiscoveryService; import org.thingsboard.server.service.cluster.discovery.ServerInstance; import org.thingsboard.server.service.cluster.discovery.ServerInstanceService; -import org.thingsboard.server.service.cluster.routing.ClusterRoutingService; +import org.thingsboard.server.service.rpc.ToDeviceRpcRequestMsg; -import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import java.io.IOException; -import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -138,7 +133,7 @@ public class ClusterGrpcService extends ClusterRpcServiceGrpc.ClusterRpcServiceI } @Override - public void tell(ServerAddress serverAddress, ToDeviceRpcRequestPluginMsg toForward) { + public void tell(ServerAddress serverAddress, ToDeviceRpcRequestMsg toForward) { ClusterAPIProtos.ToRpcServerMessage msg = ClusterAPIProtos.ToRpcServerMessage.newBuilder() .setToDeviceRpcRequestRpcMsg(toProtoMsg(toForward)).build(); tell(serverAddress, msg); @@ -202,15 +197,10 @@ public class ClusterGrpcService extends ClusterRpcServiceGrpc.ClusterRpcServiceI ).build(); } - private static ClusterAPIProtos.ToDeviceRpcRequestRpcMessage toProtoMsg(ToDeviceRpcRequestPluginMsg msg) { + private static ClusterAPIProtos.ToDeviceRpcRequestRpcMessage toProtoMsg(ToDeviceRpcRequestMsg msg) { ClusterAPIProtos.ToDeviceRpcRequestRpcMessage.Builder builder = ClusterAPIProtos.ToDeviceRpcRequestRpcMessage.newBuilder(); ToDeviceRpcRequest request = msg.getMsg(); - builder.setAddress(ClusterAPIProtos.PluginAddress.newBuilder() - .setTenantId(toUid(msg.getPluginTenantId().getId())) - .setPluginId(toUid(msg.getPluginId().getId())) - .build()); - builder.setDeviceTenantId(toUid(msg.getTenantId())); builder.setDeviceId(toUid(msg.getDeviceId())); @@ -227,11 +217,6 @@ public class ClusterGrpcService extends ClusterRpcServiceGrpc.ClusterRpcServiceI ClusterAPIProtos.ToPluginRpcResponseRpcMessage.Builder builder = ClusterAPIProtos.ToPluginRpcResponseRpcMessage.newBuilder(); FromDeviceRpcResponse request = msg.getResponse(); - builder.setAddress(ClusterAPIProtos.PluginAddress.newBuilder() - .setTenantId(toUid(msg.getPluginTenantId().getId())) - .setPluginId(toUid(msg.getPluginId().getId())) - .build()); - builder.setMsgId(toUid(request.getId())); request.getResponse().ifPresent(builder::setResponse); request.getError().ifPresent(e -> builder.setError(e.name())); diff --git a/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterRpcService.java b/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterRpcService.java index 8c50bb7207..b2b9e88cbc 100644 --- a/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterRpcService.java +++ b/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterRpcService.java @@ -20,11 +20,13 @@ import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.msg.cluster.ToAllNodesMsg; import org.thingsboard.server.common.msg.core.ToDeviceSessionActorMsg; import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequestPluginMsg; import org.thingsboard.server.extensions.api.plugins.msg.ToPluginRpcResponseDeviceMsg; import org.thingsboard.server.extensions.api.plugins.rpc.PluginRpcMsg; import org.thingsboard.server.gen.cluster.ClusterAPIProtos; +import org.thingsboard.server.service.rpc.ToDeviceRpcRequestMsg; import java.util.UUID; @@ -41,7 +43,7 @@ public interface ClusterRpcService { void tell(ServerAddress serverAddress, ToDeviceActorNotificationMsg toForward); - void tell(ServerAddress serverAddress, ToDeviceRpcRequestPluginMsg toForward); + void tell(ServerAddress serverAddress, ToDeviceRpcRequestMsg toForward); void tell(ServerAddress serverAddress, ToPluginRpcResponseDeviceMsg toForward); @@ -50,4 +52,5 @@ public interface ClusterRpcService { void broadcast(ToAllNodesMsg msg); void onSessionCreated(UUID msgUid, StreamObserver inputStream); + } diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultRpcService.java b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultRpcService.java new file mode 100644 index 0000000000..f81de99ece --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultRpcService.java @@ -0,0 +1,201 @@ +/** + * Copyright © 2016-2018 The Thingsboard Authors + * + * 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 + * + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.service.rpc; + +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; +import org.springframework.web.context.request.async.DeferredResult; +import org.thingsboard.server.actors.service.ActorService; +import org.thingsboard.server.common.data.audit.ActionType; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.UUIDBased; +import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody; +import org.thingsboard.server.common.msg.cluster.ServerAddress; +import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; +import org.thingsboard.server.controller.BaseController; +import org.thingsboard.server.dao.audit.AuditLogService; +import org.thingsboard.server.extensions.api.plugins.PluginContext; +import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; +import org.thingsboard.server.extensions.api.plugins.msg.RpcError; +import org.thingsboard.server.service.cluster.routing.ClusterRoutingService; +import org.thingsboard.server.service.cluster.rpc.ClusterRpcService; +import org.thingsboard.server.service.security.model.SecurityUser; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import java.io.IOException; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.function.BiConsumer; + +/** + * Created by ashvayka on 27.03.18. + */ +@Service +@Slf4j +public class DefaultRpcService implements RpcService { + + private static final ObjectMapper jsonMapper = new ObjectMapper(); + + @Autowired + private ClusterRoutingService routingService; + + @Autowired + private ClusterRpcService rpcService; + + @Autowired + private ActorService actorService; + + @Autowired + private AuditLogService auditLogService; + + private ScheduledExecutorService rpcCallBackExecutor; + + private final ConcurrentMap localRpcRequests = new ConcurrentHashMap<>(); + + + @PostConstruct + public void initExecutor() { + rpcCallBackExecutor = Executors.newSingleThreadScheduledExecutor(); + } + + @PreDestroy + public void shutdownExecutor() { + if (rpcCallBackExecutor != null) { + rpcCallBackExecutor.shutdownNow(); + } + } + + @Override + public void process(ToDeviceRpcRequest request, LocalRequestMetaData metaData) { + log.trace("[{}] Processing local rpc call for device [{}]", request.getTenantId(), request.getDeviceId()); + sendRpcRequest(request); + UUID requestId = request.getId(); + localRpcRequests.put(requestId, metaData); + long timeout = Math.max(0, System.currentTimeMillis() - request.getExpirationTime()); + rpcCallBackExecutor.schedule(() -> { + LocalRequestMetaData localMetaData = localRpcRequests.remove(requestId); + if (localMetaData != null) { + reply(localMetaData, new FromDeviceRpcResponse(requestId, null, RpcError.TIMEOUT)); + } + }, timeout, TimeUnit.MILLISECONDS); + } + + @Override + public void process(FromDeviceRpcResponse response) { + UUID requestId = response.getId(); + LocalRequestMetaData md = localRpcRequests.remove(requestId); + if (md != null) { + log.trace("[{}] Processing local rpc response from device [{}]", requestId, md.getRequest().getDeviceId()); + reply(md, response); + } else { + log.trace("[{}] Unknown or stale rpc response received [{}]", requestId, response); + } + } + + public void reply(LocalRequestMetaData rpcRequest, FromDeviceRpcResponse response) { + Optional rpcError = response.getError(); + DeferredResult responseWriter = rpcRequest.getResponseWriter(); + if (rpcError.isPresent()) { + logRpcCall(rpcRequest, rpcError, null); + RpcError error = rpcError.get(); + switch (error) { + case TIMEOUT: + responseWriter.setResult(new ResponseEntity<>(HttpStatus.REQUEST_TIMEOUT)); + break; + case NO_ACTIVE_CONNECTION: + responseWriter.setResult(new ResponseEntity<>(HttpStatus.CONFLICT)); + break; + default: + responseWriter.setResult(new ResponseEntity<>(HttpStatus.REQUEST_TIMEOUT)); + break; + } + } else { + Optional responseData = response.getResponse(); + if (responseData.isPresent() && !StringUtils.isEmpty(responseData.get())) { + String data = responseData.get(); + try { + logRpcCall(rpcRequest, rpcError, null); + responseWriter.setResult(new ResponseEntity<>(jsonMapper.readTree(data), HttpStatus.OK)); + } catch (IOException e) { + log.debug("Failed to decode device response: {}", data, e); + logRpcCall(rpcRequest, rpcError, e); + responseWriter.setResult(new ResponseEntity<>(HttpStatus.NOT_ACCEPTABLE)); + } + } else { + logRpcCall(rpcRequest, rpcError, null); + responseWriter.setResult(new ResponseEntity<>(HttpStatus.OK)); + } + } + } + + private void sendRpcRequest(ToDeviceRpcRequest msg) { + log.trace("[{}] Forwarding msg {} to device actor!", msg.getDeviceId(), msg); + ToDeviceRpcRequestMsg rpcMsg = new ToDeviceRpcRequestMsg(msg); + forward(msg.getDeviceId(), rpcMsg, rpcService::tell); + } + + private void forward(DeviceId deviceId, ToDeviceRpcRequestMsg msg, BiConsumer rpcFunction) { + Optional instance = routingService.resolveById(deviceId); + if (instance.isPresent()) { + log.trace("[{}] Forwarding msg {} to remote device actor!", msg.getTenantId(), msg); + rpcFunction.accept(instance.get(), msg); + } else { + log.trace("[{}] Forwarding msg {} to local device actor!", msg.getTenantId(), msg); + actorService.onMsg(msg); + } + } + + private void logRpcCall(LocalRequestMetaData rpcRequest, Optional rpcError, Throwable e) { + logRpcCall(rpcRequest.getUser(), rpcRequest.getRequest().getDeviceId(), rpcRequest.getRequest().getBody(), rpcRequest.getRequest().isOneway(), rpcError, null); + } + + @Override + public void logRpcCall(SecurityUser user, EntityId entityId, ToDeviceRpcRequestBody body, boolean oneWay, Optional rpcError, Throwable e) { + String rpcErrorStr = ""; + if (rpcError.isPresent()) { + rpcErrorStr = "RPC Error: " + rpcError.get().name(); + } + String method = body.getMethod(); + String params = body.getParams(); + + auditLogService.logEntityAction( + user.getTenantId(), + user.getCustomerId(), + user.getId(), + user.getName(), + (UUIDBased & EntityId) entityId, + null, + ActionType.RPC_CALL, + BaseController.toException(e), + rpcErrorStr, + oneWay, + method, + params); + } +} diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/LocalRequestMetaData.java b/application/src/main/java/org/thingsboard/server/service/rpc/LocalRequestMetaData.java similarity index 78% rename from extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/LocalRequestMetaData.java rename to application/src/main/java/org/thingsboard/server/service/rpc/LocalRequestMetaData.java index 67dff86b3d..1416c97963 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/LocalRequestMetaData.java +++ b/application/src/main/java/org/thingsboard/server/service/rpc/LocalRequestMetaData.java @@ -13,18 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.extensions.core.plugin.rpc; +package org.thingsboard.server.service.rpc; import lombok.Data; import org.springframework.http.ResponseEntity; import org.springframework.web.context.request.async.DeferredResult; -import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequest; +import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; +import org.thingsboard.server.service.security.model.SecurityUser; /** - * @author Andrew Shvayka + * Created by ashvayka on 16.04.18. */ @Data public class LocalRequestMetaData { private final ToDeviceRpcRequest request; + private final SecurityUser user; private final DeferredResult responseWriter; } diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/RpcService.java b/application/src/main/java/org/thingsboard/server/service/rpc/RpcService.java new file mode 100644 index 0000000000..2f6c2b168d --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/rpc/RpcService.java @@ -0,0 +1,37 @@ +/** + * Copyright © 2016-2018 The Thingsboard Authors + * + * 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 + * + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.service.rpc; + +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody; +import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; +import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; +import org.thingsboard.server.extensions.api.plugins.msg.RpcError; +import org.thingsboard.server.service.security.model.SecurityUser; + +import java.util.Optional; + +/** + * Created by ashvayka on 16.04.18. + */ +public interface RpcService { + + void process(ToDeviceRpcRequest request, LocalRequestMetaData metaData); + + void process(FromDeviceRpcResponse response); + + void logRpcCall(SecurityUser user, EntityId entityId, ToDeviceRpcRequestBody body, boolean oneWay, Optional rpcError, Throwable e); +} diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/ToDeviceRpcRequestMsg.java b/application/src/main/java/org/thingsboard/server/service/rpc/ToDeviceRpcRequestMsg.java new file mode 100644 index 0000000000..4ff2a7ca70 --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/rpc/ToDeviceRpcRequestMsg.java @@ -0,0 +1,57 @@ +/** + * Copyright © 2016-2018 The Thingsboard Authors + * + * 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 + * + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.service.rpc; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.ToString; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.msg.cluster.ServerAddress; +import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; +import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; + +import java.util.Optional; + +/** + * Created by ashvayka on 16.04.18. + */ +@ToString +@RequiredArgsConstructor +public class ToDeviceRpcRequestMsg implements ToDeviceActorNotificationMsg { + + private final ServerAddress serverAddress; + @Getter + private final ToDeviceRpcRequest msg; + + public ToDeviceRpcRequestMsg(ToDeviceRpcRequest msg) { + this(null, msg); + } + + public Optional getServerAddress() { + return Optional.ofNullable(serverAddress); + } + + @Override + public DeviceId getDeviceId() { + return msg.getDeviceId(); + } + + @Override + public TenantId getTenantId() { + return msg.getTenantId(); + } +} diff --git a/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java index c1f3688e92..8487279ca6 100644 --- a/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java +++ b/application/src/main/java/org/thingsboard/server/service/security/AccessValidator.java @@ -25,6 +25,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; import org.springframework.web.context.request.async.DeferredResult; import org.thingsboard.server.actors.plugin.ValidationResult; +import org.thingsboard.server.common.data.BaseData; import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.Tenant; @@ -35,8 +36,10 @@ import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityIdFactory; import org.thingsboard.server.common.data.id.RuleChainId; +import org.thingsboard.server.common.data.id.RuleNodeId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.common.data.rule.RuleNode; import org.thingsboard.server.controller.HttpValidationCallback; import org.thingsboard.server.dao.alarm.AlarmService; import org.thingsboard.server.dao.asset.AssetService; @@ -140,7 +143,7 @@ public class AccessValidator { return response; } - public void validate(SecurityUser currentUser, EntityId entityId, FutureCallback callback) { + public void validate(SecurityUser currentUser, EntityId entityId, FutureCallback callback) { switch (entityId.getEntityType()) { case DEVICE: validateDevice(currentUser, entityId, callback); @@ -177,14 +180,14 @@ public class AccessValidator { } else if (currentUser.isCustomerUser() && !device.getCustomerId().equals(currentUser.getCustomerId())) { return ValidationResult.accessDenied("Device doesn't belong to the current Customer!"); } else { - return ValidationResult.ok(); + return ValidationResult.ok(device); } } }), executor); } } - private void validateAsset(final SecurityUser currentUser, EntityId entityId, FutureCallback callback) { + private void validateAsset(final SecurityUser currentUser, EntityId entityId, FutureCallback callback) { if (currentUser.isSystemAdmin()) { callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); } else { @@ -198,15 +201,14 @@ public class AccessValidator { } else if (currentUser.isCustomerUser() && !asset.getCustomerId().equals(currentUser.getCustomerId())) { return ValidationResult.accessDenied("Asset doesn't belong to the current Customer!"); } else { - return ValidationResult.ok(); + return ValidationResult.ok(asset); } } }), executor); } } - - private void validateRuleChain(final SecurityUser currentUser, EntityId entityId, FutureCallback callback) { + private void validateRuleChain(final SecurityUser currentUser, EntityId entityId, FutureCallback callback) { if (currentUser.isCustomerUser()) { callback.onSuccess(ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); } else { @@ -220,14 +222,40 @@ public class AccessValidator { } else if (currentUser.isSystemAdmin() && !ruleChain.getTenantId().isNullUid()) { return ValidationResult.accessDenied("Rule chain is not in system scope!"); } else { - return ValidationResult.ok(); + return ValidationResult.ok(ruleChain); + } + } + }), executor); + } + } + + private void validateRule(final SecurityUser currentUser, EntityId entityId, FutureCallback callback) { + if (currentUser.isCustomerUser()) { + callback.onSuccess(ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); + } else { + ListenableFuture ruleNodeFuture = ruleChainService.findRuleNodeByIdAsync(new RuleNodeId(entityId.getId())); + Futures.addCallback(ruleNodeFuture, getCallback(callback, ruleNodeTmp -> { + RuleNode ruleNode = ruleNodeTmp; + if (ruleNode == null) { + return ValidationResult.entityNotFound("Rule node with requested id wasn't found!"); + } else if (ruleNode.getRuleChainId() == null) { + return ValidationResult.entityNotFound("Rule chain with requested node id wasn't found!"); + } else { + //TODO: make async + RuleChain ruleChain = ruleChainService.findRuleChainById(ruleNode.getRuleChainId()); + if (currentUser.isTenantAdmin() && !ruleChain.getTenantId().equals(currentUser.getTenantId())) { + return ValidationResult.accessDenied("Rule chain doesn't belong to the current Tenant!"); + } else if (currentUser.isSystemAdmin() && !ruleChain.getTenantId().isNullUid()) { + return ValidationResult.accessDenied("Rule chain is not in system scope!"); + } else { + return ValidationResult.ok(ruleNode); } } }), executor); } } - private void validateCustomer(final SecurityUser currentUser, EntityId entityId, FutureCallback callback) { + private void validateCustomer(final SecurityUser currentUser, EntityId entityId, FutureCallback callback) { if (currentUser.isSystemAdmin()) { callback.onSuccess(ValidationResult.accessDenied(SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); } else { @@ -241,18 +269,18 @@ public class AccessValidator { } else if (currentUser.isCustomerUser() && !customer.getId().equals(currentUser.getCustomerId())) { return ValidationResult.accessDenied("Customer doesn't relate to the currently authorized customer user!"); } else { - return ValidationResult.ok(); + return ValidationResult.ok(customer); } } }), executor); } } - private void validateTenant(final SecurityUser currentUser, EntityId entityId, FutureCallback callback) { + private void validateTenant(final SecurityUser currentUser, EntityId entityId, FutureCallback callback) { if (currentUser.isCustomerUser()) { callback.onSuccess(ValidationResult.accessDenied(CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION)); } else if (currentUser.isSystemAdmin()) { - callback.onSuccess(ValidationResult.ok()); + callback.onSuccess(ValidationResult.ok(null)); } else { ListenableFuture tenantFuture = tenantService.findTenantByIdAsync(new TenantId(entityId.getId())); Futures.addCallback(tenantFuture, getCallback(callback, tenant -> { @@ -261,13 +289,13 @@ public class AccessValidator { } else if (!tenant.getId().equals(currentUser.getTenantId())) { return ValidationResult.accessDenied("Tenant doesn't relate to the currently authorized user!"); } else { - return ValidationResult.ok(); + return ValidationResult.ok(tenant); } }), executor); } } - private FutureCallback getCallback(FutureCallback callback, Function transformer) { + private FutureCallback getCallback(FutureCallback callback, Function> transformer) { return new FutureCallback() { @Override public void onSuccess(@Nullable T result) { diff --git a/application/src/main/proto/cluster.proto b/application/src/main/proto/cluster.proto index e106d1bf00..3bb0db71ff 100644 --- a/application/src/main/proto/cluster.proto +++ b/application/src/main/proto/cluster.proto @@ -61,7 +61,6 @@ message ConnectRpcMessage { } message ToDeviceRpcRequestRpcMessage { - PluginAddress address = 1; Uid deviceTenantId = 2; Uid deviceId = 3; @@ -73,8 +72,6 @@ message ToDeviceRpcRequestRpcMessage { } message ToPluginRpcResponseRpcMessage { - PluginAddress address = 1; - Uid msgId = 2; string response = 3; string error = 4; diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/cmd/RpcRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/rpc/RpcRequest.java similarity index 92% rename from extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/cmd/RpcRequest.java rename to common/data/src/main/java/org/thingsboard/server/common/data/rpc/RpcRequest.java index 31a6911be9..a915df8ffc 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/cmd/RpcRequest.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rpc/RpcRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.extensions.core.plugin.rpc.cmd; +package org.thingsboard.server.common.data.rpc; import lombok.Data; diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/ToDeviceRpcRequestBody.java b/common/data/src/main/java/org/thingsboard/server/common/data/rpc/ToDeviceRpcRequestBody.java similarity index 93% rename from extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/ToDeviceRpcRequestBody.java rename to common/data/src/main/java/org/thingsboard/server/common/data/rpc/ToDeviceRpcRequestBody.java index b6503363bd..73eb83e7f7 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/ToDeviceRpcRequestBody.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rpc/ToDeviceRpcRequestBody.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.extensions.api.plugins.msg; +package org.thingsboard.server.common.data.rpc; import lombok.Data; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java index fbc1103dee..808166ba99 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java @@ -22,6 +22,7 @@ import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.HasName; import org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo; +import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.id.RuleNodeId; import org.thingsboard.server.common.data.id.TenantId; @@ -32,6 +33,7 @@ public class RuleNode extends SearchTextBasedWithAdditionalInfo impl private static final long serialVersionUID = -5656679015121235465L; + private RuleChainId ruleChainId; private String type; private String name; private boolean debugMode; @@ -49,8 +51,10 @@ public class RuleNode extends SearchTextBasedWithAdditionalInfo impl public RuleNode(RuleNode ruleNode) { super(ruleNode); + this.ruleChainId = ruleNode.getRuleChainId(); this.type = ruleNode.getType(); this.name = ruleNode.getName(); + this.debugMode = ruleNode.isDebugMode(); this.setConfiguration(ruleNode.getConfiguration()); } diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/ToDeviceRpcRequest.java b/common/message/src/main/java/org/thingsboard/server/common/msg/rpc/ToDeviceRpcRequest.java similarity index 84% rename from extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/ToDeviceRpcRequest.java rename to common/message/src/main/java/org/thingsboard/server/common/msg/rpc/ToDeviceRpcRequest.java index a303b69445..c5cb6bd2f8 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/ToDeviceRpcRequest.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/rpc/ToDeviceRpcRequest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.extensions.api.plugins.msg; +package org.thingsboard.server.common.msg.rpc; import lombok.Data; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.extensions.api.plugins.PluginApiCallSecurityContext; +import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody; import java.io.Serializable; import java.util.UUID; @@ -29,7 +29,6 @@ import java.util.UUID; @Data public class ToDeviceRpcRequest implements Serializable { private final UUID id; - private final PluginApiCallSecurityContext securityCtx; private final TenantId tenantId; private final DeviceId deviceId; private final boolean oneway; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java index 8c34cd3540..aff6381b05 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java @@ -350,6 +350,7 @@ public class ModelConstants { * Cassandra rule node constants. */ public static final String RULE_NODE_COLUMN_FAMILY_NAME = "rule_node"; + public static final String RULE_NODE_CHAIN_ID_PROPERTY = "rule_chain_id"; public static final String RULE_NODE_TYPE_PROPERTY = "type"; public static final String RULE_NODE_NAME_PROPERTY = "name"; public static final String RULE_NODE_CONFIGURATION_PROPERTY = "configuration"; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleNodeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleNodeEntity.java index 8d3f3c3eaf..ec13022600 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleNodeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleNodeEntity.java @@ -24,6 +24,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; +import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.id.RuleNodeId; import org.thingsboard.server.common.data.rule.RuleNode; import org.thingsboard.server.dao.model.SearchTextEntity; @@ -41,6 +42,8 @@ public class RuleNodeEntity implements SearchTextEntity { @PartitionKey @Column(name = ID_PROPERTY) private UUID id; + @Column(name = RULE_NODE_CHAIN_ID_PROPERTY) + private UUID ruleChainId; @Column(name = RULE_NODE_TYPE_PROPERTY) private String type; @Column(name = RULE_NODE_NAME_PROPERTY) @@ -56,7 +59,6 @@ public class RuleNodeEntity implements SearchTextEntity { @Column(name = DEBUG_MODE) private boolean debugMode; - public RuleNodeEntity() { } @@ -64,6 +66,9 @@ public class RuleNodeEntity implements SearchTextEntity { if (ruleNode.getId() != null) { this.id = ruleNode.getUuidId(); } + if (ruleNode.getRuleChainId() != null) { + this.ruleChainId = ruleNode.getRuleChainId().getId(); + } this.type = ruleNode.getType(); this.name = ruleNode.getName(); this.debugMode = ruleNode.isDebugMode(); @@ -92,6 +97,14 @@ public class RuleNodeEntity implements SearchTextEntity { this.id = id; } + public UUID getRuleChainId() { + return ruleChainId; + } + + public void setRuleChainId(UUID ruleChainId) { + this.ruleChainId = ruleChainId; + } + public String getType() { return type; } @@ -132,6 +145,9 @@ public class RuleNodeEntity implements SearchTextEntity { public RuleNode toData() { RuleNode ruleNode = new RuleNode(new RuleNodeId(id)); ruleNode.setCreatedTime(UUIDs.unixTimestamp(id)); + if (this.ruleChainId != null) { + ruleNode.setRuleChainId(new RuleChainId(this.ruleChainId)); + } ruleNode.setType(this.type); ruleNode.setName(this.name); ruleNode.setDebugMode(this.debugMode); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeEntity.java index 6a888c2d72..1d0543341f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleNodeEntity.java @@ -21,8 +21,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; +import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.id.RuleNodeId; import org.thingsboard.server.common.data.rule.RuleNode; +import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.BaseSqlEntity; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.SearchTextEntity; @@ -39,6 +41,9 @@ import javax.persistence.Table; @Table(name = ModelConstants.RULE_NODE_COLUMN_FAMILY_NAME) public class RuleNodeEntity extends BaseSqlEntity implements SearchTextEntity { + @Column(name = ModelConstants.RULE_NODE_CHAIN_ID_PROPERTY) + private String ruleChainId; + @Column(name = ModelConstants.RULE_NODE_TYPE_PROPERTY) private String type; @@ -66,6 +71,9 @@ public class RuleNodeEntity extends BaseSqlEntity implements SearchTex if (ruleNode.getId() != null) { this.setId(ruleNode.getUuidId()); } + if (ruleNode.getRuleChainId() != null) { + this.ruleChainId = toString(DaoUtil.getId(ruleNode.getRuleChainId())); + } this.type = ruleNode.getType(); this.name = ruleNode.getName(); this.debugMode = ruleNode.isDebugMode(); @@ -88,6 +96,9 @@ public class RuleNodeEntity extends BaseSqlEntity implements SearchTex public RuleNode toData() { RuleNode ruleNode = new RuleNode(new RuleNodeId(getId())); ruleNode.setCreatedTime(UUIDs.unixTimestamp(getId())); + if (ruleChainId != null) { + ruleNode.setRuleChainId(new RuleChainId(toUUID(ruleChainId))); + } ruleNode.setType(type); ruleNode.setName(name); ruleNode.setDebugMode(debugMode); diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java index cdb9a80991..9ce1fbebbc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.thingsboard.server.dao.rule; import com.google.common.util.concurrent.ListenableFuture; @@ -124,6 +123,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC } } for (RuleNode node : toAddOrUpdate) { + node.setRuleChainId(ruleChain.getId()); RuleNode savedNode = ruleNodeDao.save(node); try { createRelation(new EntityRelation(ruleChainMetaData.getRuleChainId(), savedNode.getId(), @@ -137,7 +137,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC nodes.set(index, savedNode); ruleNodeIndexMap.put(savedNode.getId(), index); } - for (RuleNode node: toDelete) { + for (RuleNode node : toDelete) { deleteRuleNode(node.getId()); } RuleNodeId firstRuleNodeId = null; @@ -233,6 +233,12 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC return ruleChainDao.findByIdAsync(ruleChainId.getId()); } + @Override + public ListenableFuture findRuleNodeByIdAsync(RuleNodeId ruleNodeId) { + Validator.validateId(ruleNodeId, "Incorrect rule node id for search request."); + return ruleNodeDao.findByIdAsync(ruleNodeId.getId()); + } + @Override public RuleChain getRootTenantRuleChain(TenantId tenantId) { Validator.validateId(tenantId, "Incorrect tenant id for search request."); diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java index da7833d696..d516e54be4 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainService.java @@ -46,6 +46,8 @@ public interface RuleChainService { ListenableFuture findRuleChainByIdAsync(RuleChainId ruleChainId); + ListenableFuture findRuleNodeByIdAsync(RuleNodeId ruleNodeId); + RuleChain getRootTenantRuleChain(TenantId tenantId); List getRuleChainNodes(RuleChainId ruleChainId); diff --git a/dao/src/main/resources/cassandra/schema.cql b/dao/src/main/resources/cassandra/schema.cql index d0e62b2827..91505878ff 100644 --- a/dao/src/main/resources/cassandra/schema.cql +++ b/dao/src/main/resources/cassandra/schema.cql @@ -684,6 +684,7 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.rule_chain_by_tenant_and_sear CREATE TABLE IF NOT EXISTS thingsboard.rule_node ( id uuid, + rule_chain_id uuid, type text, name text, debug_mode boolean, diff --git a/dao/src/main/resources/sql/schema.sql b/dao/src/main/resources/sql/schema.sql index d7a0978140..5876fbb562 100644 --- a/dao/src/main/resources/sql/schema.sql +++ b/dao/src/main/resources/sql/schema.sql @@ -270,6 +270,7 @@ CREATE TABLE IF NOT EXISTS rule_chain ( CREATE TABLE IF NOT EXISTS rule_node ( id varchar(31) NOT NULL CONSTRAINT rule_node_pkey PRIMARY KEY, + rule_chain_id varchar(31), additional_info varchar, configuration varchar(10000000), type varchar(255), diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginContext.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginContext.java index 37f4c4a383..4cd645675f 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginContext.java +++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginContext.java @@ -22,8 +22,9 @@ import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.data.kv.TsKvQuery; import org.thingsboard.server.common.data.relation.EntityRelation; -import org.thingsboard.server.common.data.relation.RelationTypeGroup; +import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody; import org.thingsboard.server.common.msg.cluster.ServerAddress; +import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; import org.thingsboard.server.extensions.api.plugins.msg.*; import org.thingsboard.server.extensions.api.plugins.rpc.RpcMsg; import org.thingsboard.server.extensions.api.plugins.ws.PluginWebsocketSessionRef; diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/ToDeviceRpcRequestPluginMsg.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/ToDeviceRpcRequestPluginMsg.java index faf169655d..b71bcb93a5 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/ToDeviceRpcRequestPluginMsg.java +++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/ToDeviceRpcRequestPluginMsg.java @@ -22,6 +22,7 @@ import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.PluginId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.msg.cluster.ServerAddress; +import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; import java.util.Optional; diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/messaging/DeviceMessagingRuleMsgHandler.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/messaging/DeviceMessagingRuleMsgHandler.java index bd18b8b68d..5ef0650aa1 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/messaging/DeviceMessagingRuleMsgHandler.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/messaging/DeviceMessagingRuleMsgHandler.java @@ -26,15 +26,24 @@ import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.RuleId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody; import org.thingsboard.server.common.msg.core.ToServerRpcRequestMsg; import org.thingsboard.server.common.msg.core.ToServerRpcResponseMsg; +import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; import org.thingsboard.server.extensions.api.plugins.PluginCallback; import org.thingsboard.server.extensions.api.plugins.PluginContext; import org.thingsboard.server.extensions.api.plugins.handlers.RuleMsgHandler; -import org.thingsboard.server.extensions.api.plugins.msg.*; +import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; +import org.thingsboard.server.extensions.api.plugins.msg.RpcError; +import org.thingsboard.server.extensions.api.plugins.msg.RpcResponsePluginToRuleMsg; +import org.thingsboard.server.extensions.api.plugins.msg.RuleToPluginMsg; import org.thingsboard.server.extensions.api.rules.RuleException; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; /** * @author Andrew Shvayka @@ -152,7 +161,7 @@ public class DeviceMessagingRuleMsgHandler implements RuleMsgHandler { pendingMsgs.put(uid, requestMd); log.trace("[{}] Forwarding {} to [{}]", uid, params, targetDeviceId); ToDeviceRpcRequestBody requestBody = new ToDeviceRpcRequestBody(ON_MSG_METHOD_NAME, GSON.toJson(params.get("body"))); - ctx.sendRpcRequest(new ToDeviceRpcRequest(uid, null, targetDevice.getTenantId(), targetDeviceId, oneWay, System.currentTimeMillis() + timeout, requestBody)); + ctx.sendRpcRequest(new ToDeviceRpcRequest(uid, targetDevice.getTenantId(), targetDeviceId, oneWay, System.currentTimeMillis() + timeout, requestBody)); } else { replyWithError(ctx, requestMd, RpcError.FORBIDDEN); } diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/RpcManager.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/RpcManager.java deleted file mode 100644 index ff41de5efc..0000000000 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/RpcManager.java +++ /dev/null @@ -1,69 +0,0 @@ -/** - * Copyright © 2016-2018 The Thingsboard Authors - * - * 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 - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.extensions.core.plugin.rpc; - -import lombok.Setter; -import lombok.extern.slf4j.Slf4j; -import org.thingsboard.server.extensions.api.plugins.PluginContext; -import org.thingsboard.server.extensions.api.plugins.msg.*; -import org.thingsboard.server.extensions.core.plugin.rpc.handlers.RpcRestMsgHandler; - -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -/** - * @author Andrew Shvayka - */ -@Slf4j -public class RpcManager { - - @Setter - private RpcRestMsgHandler restHandler; - - private Map localRpcRequests = new HashMap<>(); - - public void process(PluginContext ctx, LocalRequestMetaData requestMd) { - ToDeviceRpcRequest request = requestMd.getRequest(); - log.trace("[{}] Processing local rpc call for device [{}]", request.getId(), request.getDeviceId()); - ctx.sendRpcRequest(request); - localRpcRequests.put(request.getId(), requestMd); - ctx.scheduleTimeoutMsg(new TimeoutUUIDMsg(request.getId(), request.getExpirationTime() - System.currentTimeMillis())); - } - - public void process(PluginContext ctx, FromDeviceRpcResponse response) { - UUID requestId = response.getId(); - LocalRequestMetaData md = localRpcRequests.remove(requestId); - if (md != null) { - log.trace("[{}] Processing local rpc response from device [{}]", requestId, md.getRequest().getDeviceId()); - restHandler.reply(ctx, md.getRequest(), md.getResponseWriter(), response); - } else { - log.trace("[{}] Unknown or stale rpc response received [{}]", requestId, response); - } - } - - public void process(PluginContext ctx, TimeoutMsg msg) { - if (msg instanceof TimeoutUUIDMsg) { - UUID requestId = ((TimeoutUUIDMsg) msg).getId(); - FromDeviceRpcResponse timeoutReponse = new FromDeviceRpcResponse(requestId, null, RpcError.TIMEOUT); - LocalRequestMetaData md = localRpcRequests.remove(requestId); - if (md != null) { - log.trace("[{}] Processing rpc timeout for local device [{}]", requestId, md.getRequest().getDeviceId()); - restHandler.reply(ctx, md.getRequest(), md.getResponseWriter(), timeoutReponse); - } - } - } -} diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/RpcPlugin.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/RpcPlugin.java deleted file mode 100644 index de8caa17f5..0000000000 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/RpcPlugin.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * Copyright © 2016-2018 The Thingsboard Authors - * - * 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 - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.extensions.core.plugin.rpc; - -import lombok.extern.slf4j.Slf4j; -import org.thingsboard.server.extensions.api.component.Plugin; -import org.thingsboard.server.extensions.api.plugins.AbstractPlugin; -import org.thingsboard.server.extensions.api.plugins.PluginContext; -import org.thingsboard.server.extensions.api.plugins.handlers.DefaultRuleMsgHandler; -import org.thingsboard.server.extensions.api.plugins.handlers.RestMsgHandler; -import org.thingsboard.server.extensions.api.plugins.handlers.RuleMsgHandler; -import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; -import org.thingsboard.server.extensions.api.plugins.msg.TimeoutMsg; -import org.thingsboard.server.extensions.core.action.rpc.ServerSideRpcCallAction; -import org.thingsboard.server.extensions.core.plugin.rpc.handlers.RpcRestMsgHandler; -import org.thingsboard.server.extensions.core.plugin.rpc.handlers.RpcRuleMsgHandler; - -/** - * @author Andrew Shvayka - */ -@Plugin(name = "RPC Plugin", actions = {ServerSideRpcCallAction.class}, descriptor = "RpcPluginDescriptor.json", configuration = RpcPluginConfiguration.class) -@Slf4j -public class RpcPlugin extends AbstractPlugin { - - private final RpcManager rpcManager; - private final RpcRestMsgHandler restMsgHandler; - - public RpcPlugin() { - this.rpcManager = new RpcManager(); - this.restMsgHandler = new RpcRestMsgHandler(rpcManager); - this.rpcManager.setRestHandler(restMsgHandler); - } - - @Override - public void process(PluginContext ctx, FromDeviceRpcResponse msg) { - rpcManager.process(ctx, msg); - } - - @Override - public void process(PluginContext ctx, TimeoutMsg msg) { - rpcManager.process(ctx, msg); - } - - @Override - protected RestMsgHandler getRestMsgHandler() { - return restMsgHandler; - } - - @Override - public void init(RpcPluginConfiguration configuration) { - restMsgHandler.setDefaultTimeout(configuration.getDefaultTimeout()); - } - - @Override - protected RuleMsgHandler getRuleMsgHandler() { - return new RpcRuleMsgHandler(); - } - - @Override - public void resume(PluginContext ctx) { - //Do nothing - } - - @Override - public void suspend(PluginContext ctx) { - //Do nothing - } - - @Override - public void stop(PluginContext ctx) { - //Do nothing - } -} diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/RpcPluginConfiguration.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/RpcPluginConfiguration.java deleted file mode 100644 index f4c52b9104..0000000000 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/RpcPluginConfiguration.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright © 2016-2018 The Thingsboard Authors - * - * 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 - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.extensions.core.plugin.rpc; - -import lombok.Data; - -/** - * @author Andrew Shvayka - */ -@Data -public class RpcPluginConfiguration { - private long defaultTimeout; -} diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/handlers/RpcRestMsgHandler.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/handlers/RpcRestMsgHandler.java deleted file mode 100644 index b2fbacadb0..0000000000 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/handlers/RpcRestMsgHandler.java +++ /dev/null @@ -1,161 +0,0 @@ -/** - * Copyright © 2016-2018 The Thingsboard Authors - * - * 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 - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.extensions.core.plugin.rpc.handlers; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.util.StringUtils; -import org.springframework.web.context.request.async.DeferredResult; -import org.thingsboard.server.common.data.DataConstants; -import org.thingsboard.server.common.data.id.DeviceId; -import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.extensions.api.exception.ToErrorResponseEntity; -import org.thingsboard.server.extensions.api.plugins.PluginApiCallSecurityContext; -import org.thingsboard.server.extensions.api.plugins.PluginCallback; -import org.thingsboard.server.extensions.api.plugins.PluginContext; -import org.thingsboard.server.extensions.api.plugins.handlers.DefaultRestMsgHandler; -import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; -import org.thingsboard.server.extensions.api.plugins.msg.RpcError; -import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequest; -import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequestBody; -import org.thingsboard.server.extensions.api.plugins.rest.PluginRestMsg; -import org.thingsboard.server.extensions.api.plugins.rest.RestRequest; -import org.thingsboard.server.extensions.core.plugin.rpc.LocalRequestMetaData; -import org.thingsboard.server.extensions.core.plugin.rpc.RpcManager; -import org.thingsboard.server.extensions.core.plugin.rpc.cmd.RpcRequest; - -import javax.servlet.ServletException; -import java.io.IOException; -import java.util.Optional; -import java.util.UUID; - -/** - * @author Andrew Shvayka - */ -@Slf4j -@RequiredArgsConstructor -public class RpcRestMsgHandler extends DefaultRestMsgHandler { - - private final RpcManager rpcManager; - @Setter - private long defaultTimeout; - - @Override - public void handleHttpPostRequest(PluginContext ctx, PluginRestMsg msg) throws ServletException { - boolean valid = false; - RestRequest request = msg.getRequest(); - try { - String[] pathParams = request.getPathParams(); - if (pathParams.length == 2) { - String method = pathParams[0].toUpperCase(); - if (DataConstants.ONEWAY.equals(method) || DataConstants.TWOWAY.equals(method)) { - final TenantId tenantId = ctx.getSecurityCtx().orElseThrow(() -> new IllegalStateException("Security context is empty!")).getTenantId(); - JsonNode rpcRequestBody = jsonMapper.readTree(request.getRequestBody()); - - RpcRequest cmd = new RpcRequest(rpcRequestBody.get("method").asText(), - jsonMapper.writeValueAsString(rpcRequestBody.get("params"))); - if (rpcRequestBody.has("timeout")) { - cmd.setTimeout(rpcRequestBody.get("timeout").asLong()); - } - - boolean oneWay = DataConstants.ONEWAY.equals(method); - - DeviceId deviceId = DeviceId.fromString(pathParams[1]); - valid = handleDeviceRPCRequest(ctx, msg, tenantId, deviceId, cmd, oneWay); - } - } - } catch (IOException e) { - log.debug("Failed to process POST request due to IO exception", e); - } catch (RuntimeException e) { - log.debug("Failed to process POST request due to Runtime exception", e); - } - if (!valid) { - msg.getResponseHolder().setResult(new ResponseEntity<>(HttpStatus.BAD_REQUEST)); - } - } - - private boolean handleDeviceRPCRequest(PluginContext ctx, final PluginRestMsg msg, TenantId tenantId, DeviceId deviceId, RpcRequest cmd, boolean oneWay) throws JsonProcessingException { - long timeout = System.currentTimeMillis() + (cmd.getTimeout() != null ? cmd.getTimeout() : defaultTimeout); - ToDeviceRpcRequestBody body = new ToDeviceRpcRequestBody(cmd.getMethodName(), cmd.getRequestData()); - ctx.checkAccess(deviceId, new PluginCallback() { - @Override - public void onSuccess(PluginContext ctx, Void value) { - ToDeviceRpcRequest rpcRequest = new ToDeviceRpcRequest(UUID.randomUUID(), - msg.getSecurityCtx(), - tenantId, - deviceId, - oneWay, - timeout, - body - ); - rpcManager.process(ctx, new LocalRequestMetaData(rpcRequest, msg.getResponseHolder())); - } - - @Override - public void onFailure(PluginContext ctx, Exception e) { - ResponseEntity response; - if (e instanceof ToErrorResponseEntity) { - response = ((ToErrorResponseEntity)e).toErrorResponseEntity(); - } else { - response = new ResponseEntity(HttpStatus.UNAUTHORIZED); - } - ctx.logRpcRequest(msg.getSecurityCtx(), deviceId, body, oneWay, Optional.empty(), e); - msg.getResponseHolder().setResult(response); - } - }); - return true; - } - - public void reply(PluginContext ctx, ToDeviceRpcRequest rpcRequest, DeferredResult responseWriter, FromDeviceRpcResponse response) { - Optional rpcError = response.getError(); - if (rpcError.isPresent()) { - ctx.logRpcRequest(rpcRequest.getSecurityCtx(), rpcRequest.getDeviceId(), rpcRequest.getBody(), rpcRequest.isOneway(), rpcError, null); - RpcError error = rpcError.get(); - switch (error) { - case TIMEOUT: - responseWriter.setResult(new ResponseEntity<>(HttpStatus.REQUEST_TIMEOUT)); - break; - case NO_ACTIVE_CONNECTION: - responseWriter.setResult(new ResponseEntity<>(HttpStatus.CONFLICT)); - break; - default: - responseWriter.setResult(new ResponseEntity<>(HttpStatus.REQUEST_TIMEOUT)); - break; - } - } else { - Optional responseData = response.getResponse(); - if (responseData.isPresent() && !StringUtils.isEmpty(responseData.get())) { - String data = responseData.get(); - try { - ctx.logRpcRequest(rpcRequest.getSecurityCtx(), rpcRequest.getDeviceId(), rpcRequest.getBody(), rpcRequest.isOneway(), rpcError, null); - responseWriter.setResult(new ResponseEntity<>(jsonMapper.readTree(data), HttpStatus.OK)); - } catch (IOException e) { - log.debug("Failed to decode device response: {}", data, e); - ctx.logRpcRequest(rpcRequest.getSecurityCtx(), rpcRequest.getDeviceId(), rpcRequest.getBody(), rpcRequest.isOneway(), rpcError, e); - responseWriter.setResult(new ResponseEntity<>(HttpStatus.NOT_ACCEPTABLE)); - } - } else { - ctx.logRpcRequest(rpcRequest.getSecurityCtx(), rpcRequest.getDeviceId(), rpcRequest.getBody(), rpcRequest.isOneway(), rpcError, null); - responseWriter.setResult(new ResponseEntity<>(HttpStatus.OK)); - } - } - } -} \ No newline at end of file diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/handlers/RpcRuleMsgHandler.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/handlers/RpcRuleMsgHandler.java deleted file mode 100644 index b7dd6675c4..0000000000 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/rpc/handlers/RpcRuleMsgHandler.java +++ /dev/null @@ -1,102 +0,0 @@ -/** - * Copyright © 2016-2018 The Thingsboard Authors - * - * 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 - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.extensions.core.plugin.rpc.handlers; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.util.StringUtils; -import org.thingsboard.server.common.data.id.DeviceId; -import org.thingsboard.server.common.data.id.EntityId; -import org.thingsboard.server.common.data.id.RuleId; -import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.data.relation.EntityRelation; -import org.thingsboard.server.extensions.api.plugins.PluginCallback; -import org.thingsboard.server.extensions.api.plugins.PluginContext; -import org.thingsboard.server.extensions.api.plugins.handlers.RuleMsgHandler; -import org.thingsboard.server.extensions.api.plugins.msg.RuleToPluginMsg; -import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequest; -import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequestBody; -import org.thingsboard.server.extensions.api.rules.RuleException; -import org.thingsboard.server.extensions.core.action.rpc.ServerSideRpcCallActionMsg; -import org.thingsboard.server.extensions.core.action.rpc.ServerSideRpcCallRuleToPluginActionMsg; - -import java.util.Collections; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - -/** - * Created by ashvayka on 14.09.17. - */ -@Slf4j -public class RpcRuleMsgHandler implements RuleMsgHandler { - - @Override - public void process(PluginContext ctx, TenantId tenantId, RuleId ruleId, RuleToPluginMsg msg) throws RuleException { - if (msg instanceof ServerSideRpcCallRuleToPluginActionMsg) { - handle(ctx, tenantId, ruleId, ((ServerSideRpcCallRuleToPluginActionMsg) msg).getPayload()); - } else { - throw new RuntimeException("Not supported msg: " + msg + "!"); - } - } - - private void handle(final PluginContext ctx, TenantId tenantId, RuleId ruleId, ServerSideRpcCallActionMsg msg) { - DeviceId deviceId = new DeviceId(UUID.fromString(msg.getDeviceId())); - ctx.checkAccess(deviceId, new PluginCallback() { - @Override - public void onSuccess(PluginContext dummy, Void value) { - try { - List deviceIds; - if (StringUtils.isEmpty(msg.getFromDeviceRelation()) && StringUtils.isEmpty(msg.getToDeviceRelation())) { - deviceIds = Collections.singletonList(deviceId); - } else if (!StringUtils.isEmpty(msg.getFromDeviceRelation())) { - List relations = ctx.findByFromAndType(deviceId, msg.getFromDeviceRelation()).get(); - deviceIds = relations.stream().map(EntityRelation::getTo).collect(Collectors.toList()); - } else { - List relations = ctx.findByToAndType(deviceId, msg.getFromDeviceRelation()).get(); - deviceIds = relations.stream().map(EntityRelation::getFrom).collect(Collectors.toList()); - } - ToDeviceRpcRequestBody body = new ToDeviceRpcRequestBody(msg.getRpcCallMethod(), msg.getRpcCallBody()); - long expirationTime = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(msg.getRpcCallTimeoutInSec()); - for (EntityId address : deviceIds) { - DeviceId tmpId = new DeviceId(address.getId()); - ctx.checkAccess(tmpId, new PluginCallback() { - @Override - public void onSuccess(PluginContext ctx, Void value) { - ctx.sendRpcRequest(new ToDeviceRpcRequest(UUID.randomUUID(), - null, tenantId, tmpId, true, expirationTime, body) - ); - log.trace("[{}] Sent RPC Call Action msg", tmpId); - } - - @Override - public void onFailure(PluginContext ctx, Exception e) { - log.info("[{}] Failed to process RPC Call Action msg", tmpId, e); - } - }); - } - } catch (Exception e) { - log.info("Failed to process RPC Call Action msg", e); - } - } - - @Override - public void onFailure(PluginContext dummy, Exception e) { - log.info("[{}] Failed to process RPC Call Action msg", deviceId, e); - } - }); - } -} From de38a77632a207938c407710fa6be5cf7bc03f53 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Mon, 16 Apr 2018 20:16:21 +0300 Subject: [PATCH 2/4] Refactoring of main DeviceRpcService name --- .../org/thingsboard/server/controller/RpcController.java | 8 ++++---- ...efaultRpcService.java => DefaultDeviceRpcService.java} | 4 +--- .../rpc/{RpcService.java => DeviceRpcService.java} | 2 +- .../org/thingsboard/rule/engine/action/TbAlarmNode.java | 8 ++++---- 4 files changed, 10 insertions(+), 12 deletions(-) rename application/src/main/java/org/thingsboard/server/service/rpc/{DefaultRpcService.java => DefaultDeviceRpcService.java} (98%) rename application/src/main/java/org/thingsboard/server/service/rpc/{RpcService.java => DeviceRpcService.java} (97%) diff --git a/application/src/main/java/org/thingsboard/server/controller/RpcController.java b/application/src/main/java/org/thingsboard/server/controller/RpcController.java index 9810c031b6..3ca73f6c96 100644 --- a/application/src/main/java/org/thingsboard/server/controller/RpcController.java +++ b/application/src/main/java/org/thingsboard/server/controller/RpcController.java @@ -41,7 +41,7 @@ import org.thingsboard.server.extensions.api.exception.ToErrorResponseEntity; import org.thingsboard.server.extensions.api.plugins.PluginConstants; import org.thingsboard.server.common.data.rpc.RpcRequest; import org.thingsboard.server.service.rpc.LocalRequestMetaData; -import org.thingsboard.server.service.rpc.RpcService; +import org.thingsboard.server.service.rpc.DeviceRpcService; import org.thingsboard.server.service.security.AccessValidator; import org.thingsboard.server.service.security.model.SecurityUser; @@ -66,7 +66,7 @@ public class RpcController extends BaseController { protected final ObjectMapper jsonMapper = new ObjectMapper(); @Autowired - private RpcService rpcService; + private DeviceRpcService deviceRpcService; @Autowired private AccessValidator accessValidator; @@ -124,7 +124,7 @@ public class RpcController extends BaseController { timeout, body ); - rpcService.process(rpcRequest, new LocalRequestMetaData(rpcRequest, currentUser, response)); + deviceRpcService.process(rpcRequest, new LocalRequestMetaData(rpcRequest, currentUser, response)); } @Override @@ -135,7 +135,7 @@ public class RpcController extends BaseController { } else { entity = new ResponseEntity(HttpStatus.UNAUTHORIZED); } - rpcService.logRpcCall(currentUser, deviceId, body, oneWay, Optional.empty(), e); + deviceRpcService.logRpcCall(currentUser, deviceId, body, oneWay, Optional.empty(), e); response.setResult(entity); } }); diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultRpcService.java b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java similarity index 98% rename from application/src/main/java/org/thingsboard/server/service/rpc/DefaultRpcService.java rename to application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java index f81de99ece..c394a57783 100644 --- a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultRpcService.java +++ b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java @@ -18,7 +18,6 @@ package org.thingsboard.server.service.rpc; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpEntity; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; @@ -34,7 +33,6 @@ import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; import org.thingsboard.server.controller.BaseController; import org.thingsboard.server.dao.audit.AuditLogService; -import org.thingsboard.server.extensions.api.plugins.PluginContext; import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; import org.thingsboard.server.extensions.api.plugins.msg.RpcError; import org.thingsboard.server.service.cluster.routing.ClusterRoutingService; @@ -58,7 +56,7 @@ import java.util.function.BiConsumer; */ @Service @Slf4j -public class DefaultRpcService implements RpcService { +public class DefaultDeviceRpcService implements DeviceRpcService { private static final ObjectMapper jsonMapper = new ObjectMapper(); diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/RpcService.java b/application/src/main/java/org/thingsboard/server/service/rpc/DeviceRpcService.java similarity index 97% rename from application/src/main/java/org/thingsboard/server/service/rpc/RpcService.java rename to application/src/main/java/org/thingsboard/server/service/rpc/DeviceRpcService.java index 2f6c2b168d..bf585a43a4 100644 --- a/application/src/main/java/org/thingsboard/server/service/rpc/RpcService.java +++ b/application/src/main/java/org/thingsboard/server/service/rpc/DeviceRpcService.java @@ -27,7 +27,7 @@ import java.util.Optional; /** * Created by ashvayka on 16.04.18. */ -public interface RpcService { +public interface DeviceRpcService { void process(ToDeviceRpcRequest request, LocalRequestMetaData metaData); diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java index 0549e6af23..a242093efc 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAlarmNode.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 The Thingsboard Authors - *

+ * * 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * 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. From a9b09da1e60731b100b3781830867ee51d36b05f Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Wed, 18 Apr 2018 15:49:56 +0300 Subject: [PATCH 3/4] Implemented Transport support for the new rule engine --- .../server/actors/ActorSystemContext.java | 25 +- .../server/actors/app/AppActor.java | 71 ++--- .../server/actors/device/DeviceActor.java | 68 ++--- .../device/DeviceActorMessageProcessor.java | 251 +++++++++++------- .../device/DeviceActorToRuleEngineMsg.java | 38 +++ .../actors/device/PendingSessionMsgData.java | 36 +++ .../device/RuleEngineQueuePutAckMsg.java | 36 +++ .../device/ToDeviceRpcRequestMetadata.java | 4 +- .../server/actors/plugin/PluginActor.java | 5 +- .../plugin/PluginActorMessageProcessor.java | 9 +- .../plugin/PluginProcessingContext.java | 1 + .../plugin/SharedPluginProcessingContext.java | 11 +- .../actors/rpc/BasicRpcSessionListener.java | 4 +- .../actors/ruleChain/RuleChainActor.java | 12 +- .../RuleChainActorMessageProcessor.java | 19 +- .../ruleChain/RuleChainManagerActor.java | 10 +- .../actors/service/DefaultActorService.java | 4 +- .../actors/session/ASyncMsgProcessor.java | 11 +- .../AbstractSessionActorMsgProcessor.java | 26 +- .../actors/session/SyncMsgProcessor.java | 4 +- .../server/actors/tenant/TenantActor.java | 71 ++--- .../install/ThingsboardInstallService.java | 4 +- .../cluster/rpc/ClusterGrpcService.java | 7 +- .../cluster/rpc/ClusterRpcService.java | 6 +- .../service/cluster/rpc/RpcMsgListener.java | 6 +- .../DefaultSystemDataLoaderService.java | 4 +- .../service/rpc/DefaultDeviceRpcService.java | 13 + .../server/service/rpc/DeviceRpcService.java | 3 + .../service/rpc/ToDeviceRpcRequestMsg.java | 6 + .../src/main/resources/thingsboard.yml | 16 +- .../server/common/msg/MsgType.java | 44 ++- .../server/common/msg/TbMsgMetaData.java | 4 +- .../common/msg/cluster/ClusterEventMsg.java | 8 +- .../msg/core/AttributesSubscribeMsg.java | 6 +- .../msg/core/AttributesUnsubscribeMsg.java | 7 +- .../core/AttributesUpdateNotification.java | 8 +- .../msg/core/BasicCommandAckResponse.java | 13 +- .../msg/core/BasicGetAttributesRequest.java | 7 +- .../msg/core/BasicGetAttributesResponse.java | 11 +- .../common/msg/core/BasicResponseMsg.java | 18 +- .../msg/core/BasicStatusCodeResponse.java | 13 +- .../msg/core/BasicTelemetryUploadRequest.java | 7 +- .../core/BasicUpdateAttributesRequest.java | 7 +- .../server/common/msg/core/ResponseMsg.java | 4 +- .../common/msg/core/RpcSubscribeMsg.java | 7 +- .../common/msg/core/RpcUnsubscribeMsg.java | 7 +- .../common/msg/core/RuleEngineError.java | 2 +- .../common/msg/core/RuleEngineErrorMsg.java | 12 +- .../common/msg/core/SessionCloseMsg.java | 7 +- .../msg/core/SessionCloseNotification.java | 8 +- .../common/msg/core/SessionOpenMsg.java | 7 +- .../msg/core/ToDeviceRpcRequestMsg.java | 8 +- .../msg/core/ToDeviceRpcResponseMsg.java | 7 +- .../msg/core/ToServerRpcRequestMsg.java | 6 +- .../msg/core/ToServerRpcResponseMsg.java | 8 +- ....java => BasicDeviceToDeviceActorMsg.java} | 20 +- ...orMsg.java => DeviceToDeviceActorMsg.java} | 5 +- .../common/msg/session/FromDeviceMsg.java | 2 +- .../{MsgType.java => SessionMsgType.java} | 6 +- .../common/msg/session/ToDeviceMsg.java | 2 +- .../timeout/DeviceActorQueueTimeoutMsg.java | 15 +- .../msg/timeout/DeviceActorRpcTimeoutMsg.java | 12 +- .../common/msg/timeout}/TimeoutMsg.java | 5 +- .../common/transport/TransportAdaptor.java | 4 +- .../server/dao/rule/BaseRuleChainService.java | 2 + .../DeviceAttributesEventNotificationMsg.java | 5 + ...eviceCredentialsUpdateNotificationMsg.java | 5 + .../api/device/DeviceNameOrTypeUpdateMsg.java | 6 + .../device/ToDeviceActorNotificationMsg.java | 3 +- .../api/plugins/AbstractPlugin.java | 2 +- .../server/extensions/api/plugins/Plugin.java | 2 +- .../extensions/api/plugins/PluginAction.java | 4 +- .../extensions/api/plugins/PluginContext.java | 1 + .../handlers/DefaultRuleMsgHandler.java | 7 +- .../msg/ToDeviceRpcRequestPluginMsg.java | 63 ----- .../extensions/api/rules/RuleFilter.java | 4 +- .../extensions/api/rules/RuleProcessor.java | 6 +- .../core/action/mail/SendMailAction.java | 6 +- .../core/action/rpc/RpcPluginAction.java | 15 +- .../action/rpc/ServerSideRpcCallAction.java | 6 +- .../telemetry/TelemetryPluginAction.java | 27 +- .../AbstractTemplatePluginAction.java | 8 +- .../extensions/core/filter/BasicJsFilter.java | 7 +- .../core/filter/DeviceAttributesFilter.java | 4 +- .../core/filter/DeviceTelemetryFilter.java | 4 +- .../core/filter/DeviceTypeFilter.java | 7 +- .../core/filter/MethodNameFilter.java | 6 +- .../extensions/core/filter/MsgTypeFilter.java | 25 +- .../AlarmDeduplicationProcessor.java | 4 +- .../core/processor/AlarmProcessor.java | 4 +- .../kafka/action/KafkaActionPayload.java | 5 +- .../kafka/action/KafkaPluginAction.java | 4 +- .../mqtt/action/MqttActionPayload.java | 4 +- .../mqtt/action/MqttPluginAction.java | 4 +- .../action/RabbitMqActionPayload.java | 4 +- .../rabbitmq/action/RabbitMqPluginAction.java | 4 +- .../rest/action/RestApiCallActionPayload.java | 5 +- .../rest/action/RestApiCallPluginAction.java | 4 +- .../sns/action/SnsTopicActionPayload.java | 4 +- .../sns/action/SnsTopicPluginAction.java | 4 +- .../fifo/SqsFifoQueueActionPayload.java | 4 +- .../action/fifo/SqsFifoQueuePluginAction.java | 7 +- .../SqsStandardQueueActionPayload.java | 5 +- .../SqsStandardQueuePluginAction.java | 4 +- .../sqs/plugin/SqsMessageHandler.java | 2 +- .../engine/telemetry/TbMsgTelemetryNode.java | 4 +- .../transport/coap/CoapTransportResource.java | 20 +- .../coap/adaptors/JsonCoapAdaptor.java | 15 +- .../server/transport/coap/CoapServerTest.java | 4 +- .../http/session/HttpSessionCtx.java | 6 +- .../transport/mqtt/MqttTransportHandler.java | 2 +- .../mqtt/adaptors/JsonMqttAdaptor.java | 10 +- .../mqtt/session/GatewayDeviceSessionCtx.java | 6 +- 113 files changed, 805 insertions(+), 647 deletions(-) create mode 100644 application/src/main/java/org/thingsboard/server/actors/device/DeviceActorToRuleEngineMsg.java create mode 100644 application/src/main/java/org/thingsboard/server/actors/device/PendingSessionMsgData.java create mode 100644 application/src/main/java/org/thingsboard/server/actors/device/RuleEngineQueuePutAckMsg.java rename common/message/src/main/java/org/thingsboard/server/common/msg/device/{BasicToDeviceActorMsg.java => BasicDeviceToDeviceActorMsg.java} (76%) rename common/message/src/main/java/org/thingsboard/server/common/msg/device/{ToDeviceActorMsg.java => DeviceToDeviceActorMsg.java} (84%) rename common/message/src/main/java/org/thingsboard/server/common/msg/session/{MsgType.java => SessionMsgType.java} (93%) rename extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/TimeoutIntMsg.java => common/message/src/main/java/org/thingsboard/server/common/msg/timeout/DeviceActorQueueTimeoutMsg.java (61%) rename extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/TimeoutUUIDMsg.java => common/message/src/main/java/org/thingsboard/server/common/msg/timeout/DeviceActorRpcTimeoutMsg.java (66%) rename {extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg => common/message/src/main/java/org/thingsboard/server/common/msg/timeout}/TimeoutMsg.java (81%) delete mode 100644 extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/ToDeviceRpcRequestPluginMsg.java diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java index 50d2530b53..63029639a4 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java @@ -61,6 +61,7 @@ import org.thingsboard.server.service.cluster.rpc.ClusterRpcService; import org.thingsboard.server.service.component.ComponentDiscoveryService; import org.thingsboard.server.service.executors.DbCallbackExecutorService; import org.thingsboard.server.service.mail.MailExecutorService; +import org.thingsboard.server.service.rpc.DeviceRpcService; import org.thingsboard.server.service.script.JsExecutorService; import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService; @@ -161,6 +162,10 @@ public class ActorSystemContext { @Getter private TelemetrySubscriptionService tsSubService; + @Autowired + @Getter + private DeviceRpcService deviceRpcService; + @Autowired @Getter @Setter @@ -186,17 +191,13 @@ public class ActorSystemContext { @Getter private long syncSessionTimeout; - @Value("${actors.plugin.termination.delay}") - @Getter - private long pluginActorTerminationDelay; - - @Value("${actors.plugin.processing.timeout}") + @Value("${actors.queue.enabled}") @Getter - private long pluginProcessingTimeout; + private boolean queuePersistenceEnabled; - @Value("${actors.plugin.error_persist_frequency}") + @Value("${actors.queue.timeout}") @Getter - private long pluginErrorPersistFrequency; + private long queuePersistenceTimeout; @Value("${actors.rule.chain.error_persist_frequency}") @Getter @@ -206,14 +207,6 @@ public class ActorSystemContext { @Getter private long ruleNodeErrorPersistFrequency; - @Value("${actors.rule.termination.delay}") - @Getter - private long ruleActorTerminationDelay; - - @Value("${actors.rule.error_persist_frequency}") - @Getter - private long ruleErrorPersistFrequency; - @Value("${actors.statistics.enabled}") @Getter private boolean statisticsEnabled; diff --git a/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java b/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java index a75158f2dd..07ff89e6b6 100644 --- a/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java @@ -29,13 +29,12 @@ import org.thingsboard.server.actors.shared.plugin.SystemPluginManager; import org.thingsboard.server.actors.shared.rulechain.SystemRuleChainManager; import org.thingsboard.server.actors.tenant.TenantActor; import org.thingsboard.server.common.data.Tenant; -import org.thingsboard.server.common.data.id.PluginId; -import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.PageDataIterable; import org.thingsboard.server.common.msg.TbActorMsg; -import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.aware.DeviceAwareMsg; +import org.thingsboard.server.common.msg.aware.TenantAwareMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg; import org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg; import org.thingsboard.server.dao.model.ModelConstants; @@ -90,12 +89,22 @@ public class AppActor extends RuleChainManagerActor { @Override protected boolean process(TbActorMsg msg) { switch (msg.getMsgType()) { + case CLUSTER_EVENT_MSG: + broadcast(msg); + break; case COMPONENT_LIFE_CYCLE_MSG: onComponentLifecycleMsg((ComponentLifecycleMsg) msg); break; case SERVICE_TO_RULE_ENGINE_MSG: onServiceToRuleEngineMsg((ServiceToRuleEngineMsg) msg); break; + case DEVICE_SESSION_TO_DEVICE_ACTOR_MSG: + case DEVICE_ATTRIBUTES_UPDATE_TO_DEVICE_ACTOR_MSG: + case DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG: + case DEVICE_NAME_OR_TYPE_UPDATE_TO_DEVICE_ACTOR_MSG: + case DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG: + onToDeviceActorMsg((DeviceToDeviceActorMsg) msg); + break; default: return false; } @@ -110,48 +119,12 @@ public class AppActor extends RuleChainManagerActor { } } - -// @Override -// public void onReceive(Object msg) throws Exception { -// logger.debug("Received message: {}", msg); -// if (msg instanceof ToDeviceActorMsg) { -// processDeviceMsg((ToDeviceActorMsg) msg); -// } else if (msg instanceof ToPluginActorMsg) { -// onToPluginMsg((ToPluginActorMsg) msg); -// } else if (msg instanceof ToDeviceActorNotificationMsg) { -// onToDeviceActorMsg((ToDeviceActorNotificationMsg) msg); -// } else if (msg instanceof Terminated) { -// processTermination((Terminated) msg); -// } else if (msg instanceof ClusterEventMsg) { -// broadcast(msg); -// } else if (msg instanceof ComponentLifecycleMsg) { -// onComponentLifecycleMsg((ComponentLifecycleMsg) msg); -// } else if (msg instanceof PluginTerminationMsg) { -// onPluginTerminated((PluginTerminationMsg) msg); -// } else { -// logger.warning("Unknown message: {}!", msg); -// } -// } - - private void onPluginTerminated(PluginTerminationMsg msg) { - pluginManager.remove(msg.getId()); - } - - private void broadcast(Object msg) { - pluginManager.broadcast(msg); + @Override + protected void broadcast(Object msg) { + super.broadcast(msg); tenantActors.values().forEach(actorRef -> actorRef.tell(msg, ActorRef.noSender())); } - private void onToPluginMsg(ToPluginActorMsg msg) { - ActorRef target; - if (SYSTEM_TENANT.equals(msg.getPluginTenantId())) { - target = pluginManager.getOrCreateActor(this.context(), msg.getPluginId()); - } else { - target = getOrCreateTenantActor(msg.getPluginTenantId()); - } - target.tell(msg, ActorRef.noSender()); - } - private void onComponentLifecycleMsg(ComponentLifecycleMsg msg) { ActorRef target; if (SYSTEM_TENANT.equals(msg.getTenantId())) { @@ -166,17 +139,17 @@ public class AppActor extends RuleChainManagerActor { } } - private void onToDeviceActorMsg(ToDeviceActorNotificationMsg msg) { + private void onToDeviceActorMsg(TenantAwareMsg msg) { getOrCreateTenantActor(msg.getTenantId()).tell(msg, ActorRef.noSender()); } - private void processDeviceMsg(ToDeviceActorMsg toDeviceActorMsg) { - TenantId tenantId = toDeviceActorMsg.getTenantId(); + private void processDeviceMsg(DeviceToDeviceActorMsg deviceToDeviceActorMsg) { + TenantId tenantId = deviceToDeviceActorMsg.getTenantId(); ActorRef tenantActor = getOrCreateTenantActor(tenantId); - if (toDeviceActorMsg.getPayload().getMsgType().requiresRulesProcessing()) { -// tenantActor.tell(new RuleChainDeviceMsg(toDeviceActorMsg, ruleManager.getRuleChain(this.context())), context().self()); + if (deviceToDeviceActorMsg.getPayload().getMsgType().requiresRulesProcessing()) { +// tenantActor.tell(new RuleChainDeviceMsg(deviceToDeviceActorMsg, ruleManager.getRuleChain(this.context())), context().self()); } else { - tenantActor.tell(toDeviceActorMsg, context().self()); + tenantActor.tell(deviceToDeviceActorMsg, context().self()); } } diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActor.java index 87bc9926d4..dfae339417 100644 --- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActor.java @@ -24,59 +24,59 @@ import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.msg.TbActorMsg; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; +import org.thingsboard.server.common.msg.timeout.DeviceActorQueueTimeoutMsg; +import org.thingsboard.server.common.msg.timeout.DeviceActorRpcTimeoutMsg; import org.thingsboard.server.extensions.api.device.DeviceAttributesEventNotificationMsg; -import org.thingsboard.server.extensions.api.device.DeviceCredentialsUpdateNotificationMsg; import org.thingsboard.server.extensions.api.device.DeviceNameOrTypeUpdateMsg; -import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; -import org.thingsboard.server.extensions.api.plugins.msg.TimeoutMsg; -import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequestPluginMsg; +import org.thingsboard.server.common.msg.timeout.TimeoutMsg; +import org.thingsboard.server.service.rpc.ToDeviceRpcRequestMsg; public class DeviceActor extends ContextAwareActor { private final LoggingAdapter logger = Logging.getLogger(getContext().system(), this); - private final TenantId tenantId; - private final DeviceId deviceId; private final DeviceActorMessageProcessor processor; private DeviceActor(ActorSystemContext systemContext, TenantId tenantId, DeviceId deviceId) { super(systemContext); - this.tenantId = tenantId; - this.deviceId = deviceId; - this.processor = new DeviceActorMessageProcessor(systemContext, logger, deviceId); + this.processor = new DeviceActorMessageProcessor(systemContext, logger, tenantId, deviceId); } @Override protected boolean process(TbActorMsg msg) { - return false; - } - - @Override - public void onReceive(Object msg) throws Exception { -// if (msg instanceof RuleChainDeviceMsg) { -// processor.process(context(), (RuleChainDeviceMsg) msg); -// } else if (msg instanceof RulesProcessedMsg) { -// processor.onRulesProcessedMsg(context(), (RulesProcessedMsg) msg); - if (msg instanceof ToDeviceActorMsg) { - processor.process(context(), (ToDeviceActorMsg) msg); - } else if (msg instanceof ToDeviceActorNotificationMsg) { - if (msg instanceof DeviceAttributesEventNotificationMsg) { + switch (msg.getMsgType()) { + case CLUSTER_EVENT_MSG: + processor.processClusterEventMsg((ClusterEventMsg) msg); + break; + case DEVICE_SESSION_TO_DEVICE_ACTOR_MSG: + processor.process(context(), (DeviceToDeviceActorMsg) msg); + break; + case DEVICE_ATTRIBUTES_UPDATE_TO_DEVICE_ACTOR_MSG: processor.processAttributesUpdate(context(), (DeviceAttributesEventNotificationMsg) msg); - } else if (msg instanceof ToDeviceRpcRequestPluginMsg) { - processor.processRpcRequest(context(), (ToDeviceRpcRequestPluginMsg) msg); - } else if (msg instanceof DeviceCredentialsUpdateNotificationMsg){ + break; + case DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG: processor.processCredentialsUpdate(); - } else if (msg instanceof DeviceNameOrTypeUpdateMsg){ + break; + case DEVICE_NAME_OR_TYPE_UPDATE_TO_DEVICE_ACTOR_MSG: processor.processNameOrTypeUpdate((DeviceNameOrTypeUpdateMsg) msg); - } - } else if (msg instanceof TimeoutMsg) { - processor.processTimeout(context(), (TimeoutMsg) msg); - } else if (msg instanceof ClusterEventMsg) { - processor.processClusterEventMsg((ClusterEventMsg) msg); - } else { - logger.debug("[{}][{}] Unknown msg type.", tenantId, deviceId, msg.getClass().getName()); + break; + case DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG: + processor.processRpcRequest(context(), (ToDeviceRpcRequestMsg) msg); + break; + case DEVICE_ACTOR_RPC_TIMEOUT_MSG: + processor.processRpcTimeout(context(), (DeviceActorRpcTimeoutMsg) msg); + break; + case DEVICE_ACTOR_QUEUE_TIMEOUT_MSG: + processor.processQueueTimeout(context(), (DeviceActorQueueTimeoutMsg) msg); + break; + case RULE_ENGINE_QUEUE_PUT_ACK_MSG: + processor.processQueueAck(context(), (RuleEngineQueuePutAckMsg) msg); + break; + default: + return false; } + return true; } public static class ActorCreator extends ContextBasedCreator { diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java index 07b6b9b836..e289f13e4d 100644 --- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java @@ -18,31 +18,63 @@ package org.thingsboard.server.actors.device; import akka.actor.ActorContext; import akka.actor.ActorRef; import akka.event.LoggingAdapter; +import com.datastax.driver.core.utils.UUIDs; +import com.google.gson.Gson; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.actors.shared.AbstractContextAwareMsgProcessor; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.SessionId; +import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.kv.AttributeKey; import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.KvEntry; import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgDataType; +import org.thingsboard.server.common.msg.TbMsgMetaData; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; -import org.thingsboard.server.common.msg.core.*; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.core.AttributesUpdateNotification; +import org.thingsboard.server.common.msg.core.BasicCommandAckResponse; +import org.thingsboard.server.common.msg.core.BasicStatusCodeResponse; +import org.thingsboard.server.common.msg.core.BasicToDeviceSessionActorMsg; +import org.thingsboard.server.common.msg.core.RuleEngineError; +import org.thingsboard.server.common.msg.core.RuleEngineErrorMsg; +import org.thingsboard.server.common.msg.core.SessionCloseMsg; +import org.thingsboard.server.common.msg.core.SessionCloseNotification; +import org.thingsboard.server.common.msg.core.SessionOpenMsg; +import org.thingsboard.server.common.msg.core.TelemetryUploadRequest; +import org.thingsboard.server.common.msg.core.ToDeviceRpcRequestMsg; +import org.thingsboard.server.common.msg.core.ToDeviceRpcResponseMsg; +import org.thingsboard.server.common.msg.core.ToDeviceSessionActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.kv.BasicAttributeKVMsg; import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; import org.thingsboard.server.common.msg.session.FromDeviceMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.FromDeviceRequestMsg; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.session.SessionType; import org.thingsboard.server.common.msg.session.ToDeviceMsg; -import org.thingsboard.server.extensions.api.device.DeviceAttributes; +import org.thingsboard.server.common.msg.timeout.DeviceActorQueueTimeoutMsg; +import org.thingsboard.server.common.msg.timeout.DeviceActorRpcTimeoutMsg; import org.thingsboard.server.extensions.api.device.DeviceAttributesEventNotificationMsg; import org.thingsboard.server.extensions.api.device.DeviceNameOrTypeUpdateMsg; -import org.thingsboard.server.extensions.api.plugins.msg.*; - -import java.util.*; +import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; +import org.thingsboard.server.extensions.api.plugins.msg.RpcError; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; import java.util.function.Consumer; @@ -54,25 +86,30 @@ import java.util.stream.Collectors; */ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor { + private final TenantId tenantId; private final DeviceId deviceId; private final Map sessions; private final Map attributeSubscriptions; private final Map rpcSubscriptions; - private final Map rpcPendingMap; + private final Map pendingMsgs; + + private final Gson gson = new Gson(); private int rpcSeq = 0; private String deviceName; private String deviceType; - private DeviceAttributes deviceAttributes; + private TbMsgMetaData defaultMetaData; - public DeviceActorMessageProcessor(ActorSystemContext systemContext, LoggingAdapter logger, DeviceId deviceId) { + public DeviceActorMessageProcessor(ActorSystemContext systemContext, LoggingAdapter logger, TenantId tenantId, DeviceId deviceId) { super(systemContext, logger); + this.tenantId = tenantId; this.deviceId = deviceId; this.sessions = new HashMap<>(); this.attributeSubscriptions = new HashMap<>(); this.rpcSubscriptions = new HashMap<>(); this.rpcPendingMap = new HashMap<>(); + this.pendingMsgs = new HashMap<>(); initAttributes(); } @@ -81,19 +118,12 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso Device device = systemContext.getDeviceService().findDeviceById(deviceId); this.deviceName = device.getName(); this.deviceType = device.getType(); - this.deviceAttributes = new DeviceAttributes(fetchAttributes(DataConstants.CLIENT_SCOPE), - fetchAttributes(DataConstants.SERVER_SCOPE), fetchAttributes(DataConstants.SHARED_SCOPE)); + this.defaultMetaData = new TbMsgMetaData(); + this.defaultMetaData.putValue("deviceName", deviceName); + this.defaultMetaData.putValue("deviceType", deviceType); } - private void refreshAttributes(DeviceAttributesEventNotificationMsg msg) { - if (msg.isDeleted()) { - msg.getDeletedKeys().forEach(key -> deviceAttributes.remove(key)); - } else { - deviceAttributes.update(msg.getScope(), msg.getValues()); - } - } - - void processRpcRequest(ActorContext context, ToDeviceRpcRequestPluginMsg msg) { + void processRpcRequest(ActorContext context, org.thingsboard.server.service.rpc.ToDeviceRpcRequestMsg msg) { ToDeviceRpcRequest request = msg.getMsg(); ToDeviceRpcRequestBody body = request.getBody(); ToDeviceRpcRequestMsg rpcRequest = new ToDeviceRpcRequestMsg( @@ -120,9 +150,8 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso syncSessionSet.forEach(rpcSubscriptions::remove); if (request.isOneway() && sent) { - ToPluginRpcResponseDeviceMsg responsePluginMsg = toPluginRpcResponseMsg(msg, (String) null); - context.parent().tell(responsePluginMsg, ActorRef.noSender()); logger.debug("[{}] Rpc command response sent [{}]!", deviceId, request.getId()); + systemContext.getDeviceRpcService().process(new FromDeviceRpcResponse(msg.getMsg().getId(), null, null)); } else { registerPendingRpcRequest(context, msg, sent, rpcRequest, timeout); } @@ -134,18 +163,36 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso } - private void registerPendingRpcRequest(ActorContext context, ToDeviceRpcRequestPluginMsg msg, boolean sent, ToDeviceRpcRequestMsg rpcRequest, long timeout) { + private void registerPendingRpcRequest(ActorContext context, org.thingsboard.server.service.rpc.ToDeviceRpcRequestMsg msg, boolean sent, ToDeviceRpcRequestMsg rpcRequest, long timeout) { rpcPendingMap.put(rpcRequest.getRequestId(), new ToDeviceRpcRequestMetadata(msg, sent)); - TimeoutIntMsg timeoutMsg = new TimeoutIntMsg(rpcRequest.getRequestId(), timeout); + DeviceActorRpcTimeoutMsg timeoutMsg = new DeviceActorRpcTimeoutMsg(rpcRequest.getRequestId(), timeout); scheduleMsgWithDelay(context, timeoutMsg, timeoutMsg.getTimeout()); } - public void processTimeout(ActorContext context, TimeoutMsg msg) { + void processRpcTimeout(ActorContext context, DeviceActorRpcTimeoutMsg msg) { ToDeviceRpcRequestMetadata requestMd = rpcPendingMap.remove(msg.getId()); if (requestMd != null) { logger.debug("[{}] RPC request [{}] timeout detected!", deviceId, msg.getId()); - ToPluginRpcResponseDeviceMsg responsePluginMsg = toPluginRpcResponseMsg(requestMd.getMsg(), requestMd.isSent() ? RpcError.TIMEOUT : RpcError.NO_ACTIVE_CONNECTION); - context.parent().tell(responsePluginMsg, ActorRef.noSender()); + systemContext.getDeviceRpcService().process(new FromDeviceRpcResponse(requestMd.getMsg().getMsg().getId(), + null, requestMd.isSent() ? RpcError.TIMEOUT : RpcError.NO_ACTIVE_CONNECTION)); + } + } + + void processQueueTimeout(ActorContext context, DeviceActorQueueTimeoutMsg msg) { + PendingSessionMsgData data = pendingMsgs.remove(msg.getId()); + if (data != null) { + logger.debug("[{}] Queue put [{}] timeout detected!", deviceId, msg.getId()); + ToDeviceMsg toDeviceMsg = new RuleEngineErrorMsg(data.getSessionMsgType(), RuleEngineError.QUEUE_PUT_TIMEOUT); + sendMsgToSessionActor(new BasicToDeviceSessionActorMsg(toDeviceMsg, data.getSessionId()), data.getServerAddress()); + } + } + + void processQueueAck(ActorContext context, RuleEngineQueuePutAckMsg msg) { + PendingSessionMsgData data = pendingMsgs.remove(msg.getId()); + if (data != null) { + logger.debug("[{}] Queue put [{}] ack detected!", deviceId, msg.getId()); + ToDeviceMsg toDeviceMsg = BasicStatusCodeResponse.onSuccess(data.getSessionMsgType(), data.getRequestId()); + sendMsgToSessionActor(new BasicToDeviceSessionActorMsg(toDeviceMsg, data.getSessionId()), data.getServerAddress()); } } @@ -175,8 +222,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso ToDeviceRpcRequestBody body = request.getBody(); if (request.isOneway()) { sentOneWayIds.add(entry.getKey()); - ToPluginRpcResponseDeviceMsg responsePluginMsg = toPluginRpcResponseMsg(entry.getValue().getMsg(), (String) null); - context.parent().tell(responsePluginMsg, ActorRef.noSender()); + systemContext.getDeviceRpcService().process(new FromDeviceRpcResponse(request.getId(), null, null)); } ToDeviceRpcRequestMsg rpcRequest = new ToDeviceRpcRequestMsg( entry.getKey(), @@ -188,14 +234,70 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso }; } - void process(ActorContext context, ToDeviceActorMsg msg) { + void process(ActorContext context, DeviceToDeviceActorMsg msg) { processSubscriptionCommands(context, msg); processRpcResponses(context, msg); processSessionStateMsgs(msg); + SessionMsgType sessionMsgType = msg.getPayload().getMsgType(); + if (sessionMsgType.requiresRulesProcessing()) { + switch (sessionMsgType) { + case GET_ATTRIBUTES_REQUEST: + handleGetAttributesRequest(msg); + break; + case POST_ATTRIBUTES_REQUEST: + break; + case POST_TELEMETRY_REQUEST: + handlePostTelemetryRequest(context, msg); + break; + case TO_SERVER_RPC_REQUEST: + break; + //TODO: push to queue and start processing! + } + } + } + + private void handleGetAttributesRequest(DeviceToDeviceActorMsg msg) { + + } + + private void handlePostTelemetryRequest(ActorContext context, DeviceToDeviceActorMsg src) { + TelemetryUploadRequest telemetry = (TelemetryUploadRequest) src.getPayload(); + + Map> tsData = telemetry.getData(); + + JsonArray json = new JsonArray(); + for (Map.Entry> entry : tsData.entrySet()) { + JsonObject ts = new JsonObject(); + ts.addProperty("ts", entry.getKey()); + JsonObject values = new JsonObject(); + for (KvEntry kv : entry.getValue()) { + kv.getBooleanValue().ifPresent(v -> values.addProperty(kv.getKey(), v)); + kv.getLongValue().ifPresent(v -> values.addProperty(kv.getKey(), v)); + kv.getDoubleValue().ifPresent(v -> values.addProperty(kv.getKey(), v)); + kv.getStrValue().ifPresent(v -> values.addProperty(kv.getKey(), v)); + } + ts.add("values", values); + json.add(ts); + } + + TbMsg tbMsg = new TbMsg(UUIDs.timeBased(), SessionMsgType.POST_TELEMETRY_REQUEST.name(), deviceId, defaultMetaData, TbMsgDataType.JSON, gson.toJson(json)); + pushToRuleEngineWithTimeout(context, tbMsg, src, telemetry); + } + + private void pushToRuleEngineWithTimeout(ActorContext context, TbMsg tbMsg, DeviceToDeviceActorMsg src, FromDeviceRequestMsg fromDeviceRequestMsg) { + SessionMsgType sessionMsgType = fromDeviceRequestMsg.getMsgType(); + int requestId = fromDeviceRequestMsg.getRequestId(); + if (systemContext.isQueuePersistenceEnabled()) { + pendingMsgs.put(tbMsg.getId(), new PendingSessionMsgData(src.getSessionId(), src.getServerAddress(), sessionMsgType, requestId)); + scheduleMsgWithDelay(context, new DeviceActorQueueTimeoutMsg(tbMsg.getId(), systemContext.getQueuePersistenceTimeout()), systemContext.getQueuePersistenceTimeout()); + } else { + ToDeviceSessionActorMsg response = new BasicToDeviceSessionActorMsg(BasicStatusCodeResponse.onSuccess(sessionMsgType, requestId), src.getSessionId()); + sendMsgToSessionActor(response, src.getServerAddress()); + } + context.parent().tell(new DeviceActorToRuleEngineMsg(context.self(), tbMsg), context.self()); } void processAttributesUpdate(ActorContext context, DeviceAttributesEventNotificationMsg msg) { - refreshAttributes(msg); if (attributeSubscriptions.size() > 0) { ToDeviceMsg notification = null; if (msg.isDeleted()) { @@ -225,50 +327,29 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso } } -// void process(ActorContext context, RuleChainDeviceMsg srcMsg) { -// ChainProcessingMetaData md = new ChainProcessingMetaData(srcMsg.getRuleChain(), -// srcMsg.getToDeviceActorMsg(), new DeviceMetaData(deviceId, deviceName, deviceType, deviceAttributes), context.self()); -// ChainProcessingContext ctx = new ChainProcessingContext(md); -// if (ctx.getChainLength() > 0) { -// RuleProcessingMsg msg = new RuleProcessingMsg(ctx); -// ActorRef ruleActorRef = ctx.getCurrentActor(); -// ruleActorRef.tell(msg, ActorRef.noSender()); -// } else { -// context.self().tell(new RulesProcessedMsg(ctx), context.self()); -// } -// } - - void processRpcResponses(ActorContext context, ToDeviceActorMsg msg) { + private void processRpcResponses(ActorContext context, DeviceToDeviceActorMsg msg) { SessionId sessionId = msg.getSessionId(); FromDeviceMsg inMsg = msg.getPayload(); - if (inMsg.getMsgType() == MsgType.TO_DEVICE_RPC_RESPONSE) { + if (inMsg.getMsgType() == SessionMsgType.TO_DEVICE_RPC_RESPONSE) { logger.debug("[{}] Processing rpc command response [{}]", deviceId, sessionId); ToDeviceRpcResponseMsg responseMsg = (ToDeviceRpcResponseMsg) inMsg; ToDeviceRpcRequestMetadata requestMd = rpcPendingMap.remove(responseMsg.getRequestId()); boolean success = requestMd != null; if (success) { - ToPluginRpcResponseDeviceMsg responsePluginMsg = toPluginRpcResponseMsg(requestMd.getMsg(), responseMsg.getData()); - Optional pluginServerAddress = requestMd.getMsg().getServerAddress(); - if (pluginServerAddress.isPresent()) { - systemContext.getRpcService().tell(pluginServerAddress.get(), responsePluginMsg); - logger.debug("[{}] Rpc command response sent to remote plugin actor [{}]!", deviceId, requestMd.getMsg().getMsg().getId()); - } else { - context.parent().tell(responsePluginMsg, ActorRef.noSender()); - logger.debug("[{}] Rpc command response sent to local plugin actor [{}]!", deviceId, requestMd.getMsg().getMsg().getId()); - } + systemContext.getDeviceRpcService().process(new FromDeviceRpcResponse(requestMd.getMsg().getMsg().getId(), responseMsg.getData(), null)); } else { logger.debug("[{}] Rpc command response [{}] is stale!", deviceId, responseMsg.getRequestId()); } if (msg.getSessionType() == SessionType.SYNC) { BasicCommandAckResponse response = success - ? BasicCommandAckResponse.onSuccess(MsgType.TO_DEVICE_RPC_REQUEST, responseMsg.getRequestId()) - : BasicCommandAckResponse.onError(MsgType.TO_DEVICE_RPC_REQUEST, responseMsg.getRequestId(), new TimeoutException()); + ? BasicCommandAckResponse.onSuccess(SessionMsgType.TO_DEVICE_RPC_REQUEST, responseMsg.getRequestId()) + : BasicCommandAckResponse.onError(SessionMsgType.TO_DEVICE_RPC_REQUEST, responseMsg.getRequestId(), new TimeoutException()); sendMsgToSessionActor(new BasicToDeviceSessionActorMsg(response, msg.getSessionId()), msg.getServerAddress()); } } } - public void processClusterEventMsg(ClusterEventMsg msg) { + void processClusterEventMsg(ClusterEventMsg msg) { if (!msg.isAdded()) { logger.debug("[{}] Clearing attributes/rpc subscription for server [{}]", deviceId, msg.getServerAddress()); Predicate> filter = e -> e.getValue().getServer() @@ -278,59 +359,27 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso } } - private ToPluginRpcResponseDeviceMsg toPluginRpcResponseMsg(ToDeviceRpcRequestPluginMsg requestMsg, String data) { - return toPluginRpcResponseMsg(requestMsg, data, null); - } - - private ToPluginRpcResponseDeviceMsg toPluginRpcResponseMsg(ToDeviceRpcRequestPluginMsg requestMsg, RpcError error) { - return toPluginRpcResponseMsg(requestMsg, null, error); - } - - private ToPluginRpcResponseDeviceMsg toPluginRpcResponseMsg(ToDeviceRpcRequestPluginMsg requestMsg, String data, RpcError error) { - return new ToPluginRpcResponseDeviceMsg( - requestMsg.getPluginId(), - requestMsg.getPluginTenantId(), - new FromDeviceRpcResponse(requestMsg.getMsg().getId(), - data, - error - ) - ); - } - -// void onRulesProcessedMsg(ActorContext context, RulesProcessedMsg msg) { -// ChainProcessingContext ctx = msg.getCtx(); -// ToDeviceActorMsg inMsg = ctx.getInMsg(); -// SessionId sid = inMsg.getSessionId(); -// ToDeviceSessionActorMsg response; -// if (ctx.getResponse() != null) { -// response = new BasicToDeviceSessionActorMsg(ctx.getResponse(), sid); -// } else { -// response = new BasicToDeviceSessionActorMsg(ctx.getError(), sid); -// } -// sendMsgToSessionActor(response, inMsg.getServerAddress()); -// } - - private void processSubscriptionCommands(ActorContext context, ToDeviceActorMsg msg) { + private void processSubscriptionCommands(ActorContext context, DeviceToDeviceActorMsg msg) { SessionId sessionId = msg.getSessionId(); SessionType sessionType = msg.getSessionType(); FromDeviceMsg inMsg = msg.getPayload(); - if (inMsg.getMsgType() == MsgType.SUBSCRIBE_ATTRIBUTES_REQUEST) { + if (inMsg.getMsgType() == SessionMsgType.SUBSCRIBE_ATTRIBUTES_REQUEST) { logger.debug("[{}] Registering attributes subscription for session [{}]", deviceId, sessionId); attributeSubscriptions.put(sessionId, new SessionInfo(sessionType, msg.getServerAddress())); - } else if (inMsg.getMsgType() == MsgType.UNSUBSCRIBE_ATTRIBUTES_REQUEST) { + } else if (inMsg.getMsgType() == SessionMsgType.UNSUBSCRIBE_ATTRIBUTES_REQUEST) { logger.debug("[{}] Canceling attributes subscription for session [{}]", deviceId, sessionId); attributeSubscriptions.remove(sessionId); - } else if (inMsg.getMsgType() == MsgType.SUBSCRIBE_RPC_COMMANDS_REQUEST) { + } else if (inMsg.getMsgType() == SessionMsgType.SUBSCRIBE_RPC_COMMANDS_REQUEST) { logger.debug("[{}] Registering rpc subscription for session [{}][{}]", deviceId, sessionId, sessionType); rpcSubscriptions.put(sessionId, new SessionInfo(sessionType, msg.getServerAddress())); sendPendingRequests(context, sessionId, sessionType, msg.getServerAddress()); - } else if (inMsg.getMsgType() == MsgType.UNSUBSCRIBE_RPC_COMMANDS_REQUEST) { + } else if (inMsg.getMsgType() == SessionMsgType.UNSUBSCRIBE_RPC_COMMANDS_REQUEST) { logger.debug("[{}] Canceling rpc subscription for session [{}][{}]", deviceId, sessionId, sessionType); rpcSubscriptions.remove(sessionId); } } - private void processSessionStateMsgs(ToDeviceActorMsg msg) { + private void processSessionStateMsgs(DeviceToDeviceActorMsg msg) { SessionId sessionId = msg.getSessionId(); FromDeviceMsg inMsg = msg.getPayload(); if (inMsg instanceof SessionOpenMsg) { @@ -364,7 +413,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso } } - public void processCredentialsUpdate() { + void processCredentialsUpdate() { sessions.forEach((k, v) -> { sendMsgToSessionActor(new BasicToDeviceSessionActorMsg(new SessionCloseNotification(), k), v.getServer()); }); @@ -372,8 +421,12 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso rpcSubscriptions.clear(); } - public void processNameOrTypeUpdate(DeviceNameOrTypeUpdateMsg msg) { + void processNameOrTypeUpdate(DeviceNameOrTypeUpdateMsg msg) { this.deviceName = msg.getDeviceName(); this.deviceType = msg.getDeviceType(); + this.defaultMetaData = new TbMsgMetaData(); + this.defaultMetaData.putValue("deviceName", deviceName); + this.defaultMetaData.putValue("deviceType", deviceType); } + } diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorToRuleEngineMsg.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorToRuleEngineMsg.java new file mode 100644 index 0000000000..1426644bce --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorToRuleEngineMsg.java @@ -0,0 +1,38 @@ +/** + * Copyright © 2016-2018 The Thingsboard Authors + * + * 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 + * + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.actors.device; + +import akka.actor.ActorRef; +import lombok.Data; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.msg.MsgType; +import org.thingsboard.server.common.msg.TbActorMsg; +import org.thingsboard.server.common.msg.TbMsg; + +/** + * Created by ashvayka on 15.03.18. + */ +@Data +public final class DeviceActorToRuleEngineMsg implements TbActorMsg { + + private final ActorRef callbackRef; + private final TbMsg tbMsg; + + @Override + public MsgType getMsgType() { + return MsgType.DEVICE_ACTOR_TO_RULE_ENGINE_MSG; + } +} diff --git a/application/src/main/java/org/thingsboard/server/actors/device/PendingSessionMsgData.java b/application/src/main/java/org/thingsboard/server/actors/device/PendingSessionMsgData.java new file mode 100644 index 0000000000..b3f381d94f --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/device/PendingSessionMsgData.java @@ -0,0 +1,36 @@ +/** + * Copyright © 2016-2018 The Thingsboard Authors + * + * 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 + * + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.actors.device; + +import lombok.Data; +import org.thingsboard.server.common.data.id.SessionId; +import org.thingsboard.server.common.msg.cluster.ServerAddress; +import org.thingsboard.server.common.msg.session.SessionMsgType; + +import java.util.Optional; + +/** + * Created by ashvayka on 17.04.18. + */ +@Data +public final class PendingSessionMsgData { + + private final SessionId sessionId; + private final Optional serverAddress; + private final SessionMsgType sessionMsgType; + private final int requestId; + +} diff --git a/application/src/main/java/org/thingsboard/server/actors/device/RuleEngineQueuePutAckMsg.java b/application/src/main/java/org/thingsboard/server/actors/device/RuleEngineQueuePutAckMsg.java new file mode 100644 index 0000000000..0b6fe54c4a --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/actors/device/RuleEngineQueuePutAckMsg.java @@ -0,0 +1,36 @@ +/** + * Copyright © 2016-2018 The Thingsboard Authors + * + * 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 + * + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.actors.device; + +import lombok.Data; +import org.thingsboard.server.common.msg.MsgType; +import org.thingsboard.server.common.msg.TbActorMsg; + +import java.util.UUID; + +/** + * Created by ashvayka on 15.03.18. + */ +@Data +public final class RuleEngineQueuePutAckMsg implements TbActorMsg { + + private final UUID id; + + @Override + public MsgType getMsgType() { + return MsgType.RULE_ENGINE_QUEUE_PUT_ACK_MSG; + } +} diff --git a/application/src/main/java/org/thingsboard/server/actors/device/ToDeviceRpcRequestMetadata.java b/application/src/main/java/org/thingsboard/server/actors/device/ToDeviceRpcRequestMetadata.java index 01342fd866..4ee9a201f8 100644 --- a/application/src/main/java/org/thingsboard/server/actors/device/ToDeviceRpcRequestMetadata.java +++ b/application/src/main/java/org/thingsboard/server/actors/device/ToDeviceRpcRequestMetadata.java @@ -16,13 +16,13 @@ package org.thingsboard.server.actors.device; import lombok.Data; -import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequestPluginMsg; +import org.thingsboard.server.service.rpc.ToDeviceRpcRequestMsg; /** * @author Andrew Shvayka */ @Data public class ToDeviceRpcRequestMetadata { - private final ToDeviceRpcRequestPluginMsg msg; + private final ToDeviceRpcRequestMsg msg; private final boolean sent; } diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActor.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActor.java index 88278f316d..7cb31610eb 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginActor.java @@ -26,7 +26,7 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.msg.TbActorMsg; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg; -import org.thingsboard.server.extensions.api.plugins.msg.TimeoutMsg; +import org.thingsboard.server.common.msg.timeout.TimeoutMsg; import org.thingsboard.server.extensions.api.plugins.msg.ToPluginRpcResponseDeviceMsg; import org.thingsboard.server.extensions.api.plugins.rest.PluginRestMsg; import org.thingsboard.server.extensions.api.plugins.rpc.PluginRpcMsg; @@ -153,6 +153,7 @@ public class PluginActor extends ComponentActor } catch (Exception ex) { logger.debug("[{}] Failed to process RuleToPlugin msg: [{}] [{}]", tenantId, msg.getMsg(), ex); RuleToPluginMsg ruleMsg = msg.getMsg(); - MsgType responceMsgType = MsgType.RULE_ENGINE_ERROR; + SessionMsgType responceMsgType = SessionMsgType.RULE_ENGINE_ERROR; Integer requestId = 0; if (ruleMsg.getPayload() instanceof FromDeviceRequestMsg) { requestId = ((FromDeviceRequestMsg) ruleMsg.getPayload()).getRequestId(); @@ -216,7 +217,7 @@ public class PluginActorMessageProcessor extends ComponentMsgProcessor @Override public void onStop(ActorContext context) { onStop(); - scheduleMsgWithDelay(context, new PluginTerminationMsg(entityId), systemContext.getPluginActorTerminationDelay()); +// scheduleMsgWithDelay(context, new PluginTerminationMsg(entityId), systemContext.getPluginActorTerminationDelay()); } private void onStop() { diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java index 7862d23ed1..5e16aabd32 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java @@ -41,6 +41,7 @@ import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.rule.RuleMetaData; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; +import org.thingsboard.server.common.msg.timeout.TimeoutMsg; import org.thingsboard.server.extensions.api.device.DeviceAttributesEventNotificationMsg; import org.thingsboard.server.extensions.api.plugins.PluginApiCallSecurityContext; import org.thingsboard.server.extensions.api.plugins.PluginCallback; diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/SharedPluginProcessingContext.java b/application/src/main/java/org/thingsboard/server/actors/plugin/SharedPluginProcessingContext.java index ad3fef519c..dcabedc88d 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/SharedPluginProcessingContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/SharedPluginProcessingContext.java @@ -19,10 +19,12 @@ import akka.actor.ActorRef; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.PluginId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.msg.cluster.ServerAddress; +import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; +import org.thingsboard.server.common.msg.timeout.TimeoutMsg; import org.thingsboard.server.controller.plugin.PluginWebSocketMsgEndpoint; -import org.thingsboard.server.common.data.id.PluginId; import org.thingsboard.server.dao.asset.AssetService; import org.thingsboard.server.dao.attributes.AttributesService; import org.thingsboard.server.dao.audit.AuditLogService; @@ -35,9 +37,6 @@ import org.thingsboard.server.dao.rule.RuleService; import org.thingsboard.server.dao.tenant.TenantService; import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.extensions.api.device.DeviceAttributesEventNotificationMsg; -import org.thingsboard.server.extensions.api.plugins.msg.TimeoutMsg; -import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; -import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequestPluginMsg; import org.thingsboard.server.service.cluster.routing.ClusterRoutingService; import org.thingsboard.server.service.cluster.rpc.ClusterRpcService; import scala.concurrent.duration.Duration; @@ -106,8 +105,8 @@ public final class SharedPluginProcessingContext { public void sendRpcRequest(ToDeviceRpcRequest msg) { log.trace("[{}] Forwarding msg {} to device actor!", pluginId, msg); - ToDeviceRpcRequestPluginMsg rpcMsg = new ToDeviceRpcRequestPluginMsg(pluginId, tenantId, msg); - forward(msg.getDeviceId(), rpcMsg, rpcService::tell); +// ToDeviceRpcRequestPluginMsg rpcMsg = new ToDeviceRpcRequestPluginMsg(pluginId, tenantId, msg); +// forward(msg.getDeviceId(), rpcMsg, rpcService::tell); } private void forward(DeviceId deviceId, T msg, BiConsumer rpcFunction) { diff --git a/application/src/main/java/org/thingsboard/server/actors/rpc/BasicRpcSessionListener.java b/application/src/main/java/org/thingsboard/server/actors/rpc/BasicRpcSessionListener.java index 22fce84586..65cbc229e7 100644 --- a/application/src/main/java/org/thingsboard/server/actors/rpc/BasicRpcSessionListener.java +++ b/application/src/main/java/org/thingsboard/server/actors/rpc/BasicRpcSessionListener.java @@ -28,7 +28,7 @@ import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.msg.cluster.ToAllNodesMsg; import org.thingsboard.server.common.msg.core.ToDeviceSessionActorMsg; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; import org.thingsboard.server.extensions.api.plugins.msg.*; @@ -86,7 +86,7 @@ public class BasicRpcSessionListener implements GrpcSessionListener { @Override public void onToDeviceActorRpcMsg(GrpcSession session, ClusterAPIProtos.ToDeviceActorRpcMessage msg) { log.trace("{} session [{}] received device actor msg {}", getType(session), session.getRemoteServer(), msg); - service.onMsg((ToDeviceActorMsg) deserialize(msg.getData().toByteArray())); + service.onMsg((DeviceToDeviceActorMsg) deserialize(msg.getData().toByteArray())); } @Override diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java index f539e32a3c..f60e7dd14c 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 The Thingsboard Authors - * + *

* 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 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* 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. @@ -18,6 +18,7 @@ package org.thingsboard.server.actors.ruleChain; import akka.actor.OneForOneStrategy; import akka.actor.SupervisorStrategy; import org.thingsboard.server.actors.ActorSystemContext; +import org.thingsboard.server.actors.device.DeviceActorToRuleEngineMsg; import org.thingsboard.server.actors.service.ComponentActor; import org.thingsboard.server.actors.service.ContextBasedCreator; import org.thingsboard.server.common.data.id.RuleChainId; @@ -44,6 +45,9 @@ public class RuleChainActor extends ComponentActor * 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 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* 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. @@ -20,6 +20,8 @@ import akka.actor.ActorRef; import akka.actor.Props; import akka.event.LoggingAdapter; import org.thingsboard.server.actors.ActorSystemContext; +import org.thingsboard.server.actors.device.DeviceActorToRuleEngineMsg; +import org.thingsboard.server.actors.device.RuleEngineQueuePutAckMsg; import org.thingsboard.server.actors.service.DefaultActorService; import org.thingsboard.server.actors.shared.ComponentMsgProcessor; import org.thingsboard.server.common.data.EntityType; @@ -157,6 +159,14 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor pendingMap = new HashMap<>(); + private Map pendingMap = new HashMap<>(); private Optional currentTargetServer; private boolean subscribedToAttributeUpdates; private boolean subscribedToRpcCommands; @@ -53,7 +52,7 @@ class ASyncMsgProcessor extends AbstractSessionActorMsgProcessor { toDeviceMsg(new SessionOpenMsg()).ifPresent(m -> forwardToAppActor(ctx, m)); firstMsg = false; } - ToDeviceActorMsg pendingMsg = toDeviceMsg(msg); + DeviceToDeviceActorMsg pendingMsg = toDeviceMsg(msg); FromDeviceMsg fromDeviceMsg = pendingMsg.getPayload(); switch (fromDeviceMsg.getMsgType()) { case POST_TELEMETRY_REQUEST: @@ -86,8 +85,8 @@ class ASyncMsgProcessor extends AbstractSessionActorMsgProcessor { @Override public void processToDeviceMsg(ActorContext context, ToDeviceMsg msg) { try { - if (msg.getMsgType() != MsgType.SESSION_CLOSE) { - switch (msg.getMsgType()) { + if (msg.getSessionMsgType() != SessionMsgType.SESSION_CLOSE) { + switch (msg.getSessionMsgType()) { case STATUS_CODE_RESPONSE: case GET_ATTRIBUTES_RESPONSE: ResponseMsg responseMsg = (ResponseMsg) msg; diff --git a/application/src/main/java/org/thingsboard/server/actors/session/AbstractSessionActorMsgProcessor.java b/application/src/main/java/org/thingsboard/server/actors/session/AbstractSessionActorMsgProcessor.java index 96526dda88..bbaef5d8e5 100644 --- a/application/src/main/java/org/thingsboard/server/actors/session/AbstractSessionActorMsgProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/session/AbstractSessionActorMsgProcessor.java @@ -22,8 +22,8 @@ import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.SessionId; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; -import org.thingsboard.server.common.msg.device.BasicToDeviceActorMsg; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.BasicDeviceToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.*; import org.thingsboard.server.common.msg.session.ctrl.SessionCloseMsg; @@ -37,7 +37,7 @@ abstract class AbstractSessionActorMsgProcessor extends AbstractContextAwareMsgP protected final SessionId sessionId; protected SessionContext sessionCtx; - protected ToDeviceActorMsg toDeviceActorMsgPrototype; + protected DeviceToDeviceActorMsg deviceToDeviceActorMsgPrototype; protected AbstractSessionActorMsgProcessor(ActorSystemContext ctx, LoggingAdapter logger, SessionId sessionId) { super(ctx, logger); @@ -64,29 +64,29 @@ abstract class AbstractSessionActorMsgProcessor extends AbstractContextAwareMsgP protected void updateSessionCtx(ToDeviceActorSessionMsg msg, SessionType type) { sessionCtx = msg.getSessionMsg().getSessionContext(); - toDeviceActorMsgPrototype = new BasicToDeviceActorMsg(msg, type); + deviceToDeviceActorMsgPrototype = new BasicDeviceToDeviceActorMsg(msg, type); } - protected ToDeviceActorMsg toDeviceMsg(ToDeviceActorSessionMsg msg) { + protected DeviceToDeviceActorMsg toDeviceMsg(ToDeviceActorSessionMsg msg) { AdaptorToSessionActorMsg adaptorMsg = msg.getSessionMsg(); - return new BasicToDeviceActorMsg(toDeviceActorMsgPrototype, adaptorMsg.getMsg()); + return new BasicDeviceToDeviceActorMsg(deviceToDeviceActorMsgPrototype, adaptorMsg.getMsg()); } - protected Optional toDeviceMsg(FromDeviceMsg msg) { - if (toDeviceActorMsgPrototype != null) { - return Optional.of(new BasicToDeviceActorMsg(toDeviceActorMsgPrototype, msg)); + protected Optional toDeviceMsg(FromDeviceMsg msg) { + if (deviceToDeviceActorMsgPrototype != null) { + return Optional.of(new BasicDeviceToDeviceActorMsg(deviceToDeviceActorMsgPrototype, msg)); } else { return Optional.empty(); } } - protected Optional forwardToAppActor(ActorContext ctx, ToDeviceActorMsg toForward) { + protected Optional forwardToAppActor(ActorContext ctx, DeviceToDeviceActorMsg toForward) { Optional address = systemContext.getRoutingService().resolveById(toForward.getDeviceId()); forwardToAppActor(ctx, toForward, address); return address; } - protected Optional forwardToAppActorIfAdressChanged(ActorContext ctx, ToDeviceActorMsg toForward, Optional oldAddress) { + protected Optional forwardToAppActorIfAdressChanged(ActorContext ctx, DeviceToDeviceActorMsg toForward, Optional oldAddress) { Optional newAddress = systemContext.getRoutingService().resolveById(toForward.getDeviceId()); if (!newAddress.equals(oldAddress)) { if (newAddress.isPresent()) { @@ -99,7 +99,7 @@ abstract class AbstractSessionActorMsgProcessor extends AbstractContextAwareMsgP return newAddress; } - protected void forwardToAppActor(ActorContext ctx, ToDeviceActorMsg toForward, Optional address) { + protected void forwardToAppActor(ActorContext ctx, DeviceToDeviceActorMsg toForward, Optional address) { if (address.isPresent()) { systemContext.getRpcService().tell(address.get(), toForward.toOtherAddress(systemContext.getRoutingService().getCurrentServer())); @@ -114,6 +114,6 @@ abstract class AbstractSessionActorMsgProcessor extends AbstractContextAwareMsgP } public DeviceId getDeviceId() { - return toDeviceActorMsgPrototype.getDeviceId(); + return deviceToDeviceActorMsgPrototype.getDeviceId(); } } diff --git a/application/src/main/java/org/thingsboard/server/actors/session/SyncMsgProcessor.java b/application/src/main/java/org/thingsboard/server/actors/session/SyncMsgProcessor.java index d69650347b..7f520b51e1 100644 --- a/application/src/main/java/org/thingsboard/server/actors/session/SyncMsgProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/session/SyncMsgProcessor.java @@ -20,7 +20,7 @@ import org.thingsboard.server.actors.shared.SessionTimeoutMsg; import org.thingsboard.server.common.data.id.SessionId; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.*; import org.thingsboard.server.common.msg.session.ToDeviceActorSessionMsg; import org.thingsboard.server.common.msg.session.ctrl.SessionCloseMsg; @@ -32,7 +32,7 @@ import akka.event.LoggingAdapter; import java.util.Optional; class SyncMsgProcessor extends AbstractSessionActorMsgProcessor { - private ToDeviceActorMsg pendingMsg; + private DeviceToDeviceActorMsg pendingMsg; private Optional currentTargetServer; private boolean pendingResponse; diff --git a/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java b/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java index d53c054414..fb38134114 100644 --- a/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java @@ -17,10 +17,9 @@ package org.thingsboard.server.actors.tenant; import akka.actor.ActorRef; import akka.actor.Props; -import akka.event.Logging; -import akka.event.LoggingAdapter; import org.thingsboard.server.actors.ActorSystemContext; import org.thingsboard.server.actors.device.DeviceActor; +import org.thingsboard.server.actors.device.DeviceActorToRuleEngineMsg; import org.thingsboard.server.actors.plugin.PluginTerminationMsg; import org.thingsboard.server.actors.ruleChain.RuleChainManagerActor; import org.thingsboard.server.actors.service.ContextBasedCreator; @@ -30,7 +29,8 @@ import org.thingsboard.server.actors.shared.rulechain.TenantRuleChainManager; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.msg.TbActorMsg; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.aware.DeviceAwareMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg; import org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg; import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; @@ -64,63 +64,47 @@ public class TenantActor extends RuleChainManagerActor { @Override protected boolean process(TbActorMsg msg) { switch (msg.getMsgType()) { + case CLUSTER_EVENT_MSG: + broadcast(msg); + break; case COMPONENT_LIFE_CYCLE_MSG: onComponentLifecycleMsg((ComponentLifecycleMsg) msg); break; case SERVICE_TO_RULE_ENGINE_MSG: onServiceToRuleEngineMsg((ServiceToRuleEngineMsg) msg); break; + case DEVICE_ACTOR_TO_RULE_ENGINE_MSG: + onDeviceActorToRuleEngineMsg((DeviceActorToRuleEngineMsg) msg); + break; + case DEVICE_SESSION_TO_DEVICE_ACTOR_MSG: + case DEVICE_ATTRIBUTES_UPDATE_TO_DEVICE_ACTOR_MSG: + case DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG: + case DEVICE_NAME_OR_TYPE_UPDATE_TO_DEVICE_ACTOR_MSG: + case DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG: + onToDeviceActorMsg((DeviceToDeviceActorMsg) msg); + break; default: return false; } return true; } - private void onServiceToRuleEngineMsg(ServiceToRuleEngineMsg msg) { - ruleChainManager.getRootChainActor().tell(msg, self()); - } - - -// @Override -// public void onReceive(Object msg) throws Exception { -// logger.debug("[{}] Received message: {}", tenantId, msg); -// if (msg instanceof ToDeviceActorMsg) { -// onToDeviceActorMsg((ToDeviceActorMsg) msg); -// } else if (msg instanceof ToPluginActorMsg) { -// onToPluginMsg((ToPluginActorMsg) msg); -// } else if (msg instanceof ToDeviceActorNotificationMsg) { -// onToDeviceActorMsg((ToDeviceActorNotificationMsg) msg); -// } else if (msg instanceof ClusterEventMsg) { -// broadcast(msg); -// } else if (msg instanceof ComponentLifecycleMsg) { -// onComponentLifecycleMsg((ComponentLifecycleMsg) msg); -// } else if (msg instanceof PluginTerminationMsg) { -// onPluginTerminated((PluginTerminationMsg) msg); -// } else { -// logger.warning("[{}] Unknown message: {}!", tenantId, msg); -// } -// } - - private void broadcast(Object msg) { - pluginManager.broadcast(msg); + @Override + protected void broadcast(Object msg) { + super.broadcast(msg); deviceActors.values().forEach(actorRef -> actorRef.tell(msg, ActorRef.noSender())); } - private void onToDeviceActorMsg(ToDeviceActorMsg msg) { - getOrCreateDeviceActor(msg.getDeviceId()).tell(msg, ActorRef.noSender()); + private void onServiceToRuleEngineMsg(ServiceToRuleEngineMsg msg) { + ruleChainManager.getRootChainActor().tell(msg, self()); } - private void onToDeviceActorMsg(ToDeviceActorNotificationMsg msg) { - getOrCreateDeviceActor(msg.getDeviceId()).tell(msg, ActorRef.noSender()); + private void onDeviceActorToRuleEngineMsg(DeviceActorToRuleEngineMsg msg) { + ruleChainManager.getRootChainActor().tell(msg, self()); } - private void onToPluginMsg(ToPluginActorMsg msg) { - if (msg.getPluginTenantId().equals(tenantId)) { - ActorRef pluginActor = pluginManager.getOrCreateActor(this.context(), msg.getPluginId()); - pluginActor.tell(msg, ActorRef.noSender()); - } else { - context().parent().tell(msg, ActorRef.noSender()); - } + private void onToDeviceActorMsg(DeviceAwareMsg msg) { + getOrCreateDeviceActor(msg.getDeviceId()).tell(msg, ActorRef.noSender()); } private void onComponentLifecycleMsg(ComponentLifecycleMsg msg) { @@ -132,11 +116,6 @@ public class TenantActor extends RuleChainManagerActor { } } - private void onPluginTerminated(PluginTerminationMsg msg) { - pluginManager.remove(msg.getId()); - } - - private ActorRef getOrCreateDeviceActor(DeviceId deviceId) { return deviceActors.computeIfAbsent(deviceId, k -> context().actorOf(Props.create(new DeviceActor.ActorCreator(systemContext, tenantId, deviceId)) .withDispatcher(DefaultActorService.CORE_DISPATCHER_NAME), deviceId.toString())); diff --git a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java index 1835a937e7..38e48e14de 100644 --- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java +++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java @@ -131,8 +131,8 @@ public class ThingsboardInstallService { systemDataLoaderService.createSysAdmin(); systemDataLoaderService.createAdminSettings(); systemDataLoaderService.loadSystemWidgets(); - systemDataLoaderService.loadSystemPlugins(); - systemDataLoaderService.loadSystemRules(); +// systemDataLoaderService.loadSystemPlugins(); +// systemDataLoaderService.loadSystemRules(); if (loadDemo) { log.info("Loading demo data..."); diff --git a/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterGrpcService.java b/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterGrpcService.java index f73c5ebe08..cdf8842f5a 100644 --- a/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterGrpcService.java +++ b/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterGrpcService.java @@ -30,11 +30,10 @@ import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.msg.cluster.ToAllNodesMsg; import org.thingsboard.server.common.msg.core.ToDeviceSessionActorMsg; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; -import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequestPluginMsg; import org.thingsboard.server.extensions.api.plugins.msg.ToPluginRpcResponseDeviceMsg; import org.thingsboard.server.extensions.api.plugins.rpc.PluginRpcMsg; import org.thingsboard.server.gen.cluster.ClusterAPIProtos; @@ -119,7 +118,7 @@ public class ClusterGrpcService extends ClusterRpcServiceGrpc.ClusterRpcServiceI } @Override - public void tell(ServerAddress serverAddress, ToDeviceActorMsg toForward) { + public void tell(ServerAddress serverAddress, DeviceToDeviceActorMsg toForward) { ClusterAPIProtos.ToRpcServerMessage msg = ClusterAPIProtos.ToRpcServerMessage.newBuilder() .setToDeviceActorRpcMsg(toProtoMsg(toForward)).build(); tell(serverAddress, msg); @@ -185,7 +184,7 @@ public class ClusterGrpcService extends ClusterRpcServiceGrpc.ClusterRpcServiceI } } - private static ClusterAPIProtos.ToDeviceActorRpcMessage toProtoMsg(ToDeviceActorMsg msg) { + private static ClusterAPIProtos.ToDeviceActorRpcMessage toProtoMsg(DeviceToDeviceActorMsg msg) { return ClusterAPIProtos.ToDeviceActorRpcMessage.newBuilder().setData( ByteString.copyFrom(SerializationUtils.serialize(msg)) ).build(); diff --git a/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterRpcService.java b/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterRpcService.java index b2b9e88cbc..e5a04346c3 100644 --- a/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterRpcService.java +++ b/application/src/main/java/org/thingsboard/server/service/cluster/rpc/ClusterRpcService.java @@ -19,10 +19,8 @@ import io.grpc.stub.StreamObserver; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.msg.cluster.ToAllNodesMsg; import org.thingsboard.server.common.msg.core.ToDeviceSessionActorMsg; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; -import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; -import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequestPluginMsg; import org.thingsboard.server.extensions.api.plugins.msg.ToPluginRpcResponseDeviceMsg; import org.thingsboard.server.extensions.api.plugins.rpc.PluginRpcMsg; import org.thingsboard.server.gen.cluster.ClusterAPIProtos; @@ -37,7 +35,7 @@ public interface ClusterRpcService { void init(RpcMsgListener listener); - void tell(ServerAddress serverAddress, ToDeviceActorMsg toForward); + void tell(ServerAddress serverAddress, DeviceToDeviceActorMsg toForward); void tell(ServerAddress serverAddress, ToDeviceSessionActorMsg toForward); diff --git a/application/src/main/java/org/thingsboard/server/service/cluster/rpc/RpcMsgListener.java b/application/src/main/java/org/thingsboard/server/service/cluster/rpc/RpcMsgListener.java index a5c31513be..5d26fae1c5 100644 --- a/application/src/main/java/org/thingsboard/server/service/cluster/rpc/RpcMsgListener.java +++ b/application/src/main/java/org/thingsboard/server/service/cluster/rpc/RpcMsgListener.java @@ -20,18 +20,16 @@ import org.thingsboard.server.actors.rpc.RpcSessionCreateRequestMsg; import org.thingsboard.server.actors.rpc.RpcSessionTellMsg; import org.thingsboard.server.common.msg.cluster.ToAllNodesMsg; import org.thingsboard.server.common.msg.core.ToDeviceSessionActorMsg; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; import org.thingsboard.server.extensions.api.plugins.msg.ToPluginActorMsg; -import org.thingsboard.server.extensions.api.plugins.rpc.PluginRpcMsg; -import org.thingsboard.server.gen.cluster.ClusterAPIProtos; /** * @author Andrew Shvayka */ public interface RpcMsgListener { - void onMsg(ToDeviceActorMsg msg); + void onMsg(DeviceToDeviceActorMsg msg); void onMsg(ToDeviceActorNotificationMsg msg); diff --git a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java index 908faf2315..9f7f0442a7 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java @@ -181,7 +181,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService { @Override public void loadSystemPlugins() throws Exception { - loadPlugins(Paths.get(dataDir, JSON_DIR, SYSTEM_DIR, PLUGINS_DIR), null); +// loadPlugins(Paths.get(dataDir, JSON_DIR, SYSTEM_DIR, PLUGINS_DIR), null); } @@ -227,7 +227,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService { createDevice(demoTenant.getId(), null, DEFAULT_DEVICE_TYPE, "Raspberry Pi Demo Device", "RASPBERRY_PI_DEMO_TOKEN", "Demo device that is used in " + "Raspberry Pi GPIO control sample application"); - loadPlugins(Paths.get(dataDir, JSON_DIR, DEMO_DIR, PLUGINS_DIR), demoTenant.getId()); +// loadPlugins(Paths.get(dataDir, JSON_DIR, DEMO_DIR, PLUGINS_DIR), demoTenant.getId()); // loadRules(Paths.get(dataDir, JSON_DIR, DEMO_DIR, RULES_DIR), demoTenant.getId()); loadDashboards(Paths.get(dataDir, JSON_DIR, DEMO_DIR, DASHBOARDS_DIR), demoTenant.getId(), null); } diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java index c394a57783..018f415510 100644 --- a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java +++ b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.service.rpc; +import akka.actor.ActorRef; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -104,8 +105,20 @@ public class DefaultDeviceRpcService implements DeviceRpcService { }, timeout, TimeUnit.MILLISECONDS); } + @Override + public void process(ToDeviceRpcRequest request, ServerAddress originator) { +// if (pluginServerAddress.isPresent()) { +// systemContext.getRpcService().tell(pluginServerAddress.get(), responsePluginMsg); +// logger.debug("[{}] Rpc command response sent to remote plugin actor [{}]!", deviceId, requestMd.getMsg().getMsg().getId()); +// } else { +// context.parent().tell(responsePluginMsg, ActorRef.noSender()); +// logger.debug("[{}] Rpc command response sent to local plugin actor [{}]!", deviceId, requestMd.getMsg().getMsg().getId()); +// } + } + @Override public void process(FromDeviceRpcResponse response) { + //TODO: send to another server if needed. UUID requestId = response.getId(); LocalRequestMetaData md = localRpcRequests.remove(requestId); if (md != null) { diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/DeviceRpcService.java b/application/src/main/java/org/thingsboard/server/service/rpc/DeviceRpcService.java index bf585a43a4..f58db7f7fa 100644 --- a/application/src/main/java/org/thingsboard/server/service/rpc/DeviceRpcService.java +++ b/application/src/main/java/org/thingsboard/server/service/rpc/DeviceRpcService.java @@ -17,6 +17,7 @@ package org.thingsboard.server.service.rpc; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody; +import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; import org.thingsboard.server.extensions.api.plugins.msg.RpcError; @@ -31,6 +32,8 @@ public interface DeviceRpcService { void process(ToDeviceRpcRequest request, LocalRequestMetaData metaData); + void process(ToDeviceRpcRequest request, ServerAddress originator); + void process(FromDeviceRpcResponse response); void logRpcCall(SecurityUser user, EntityId entityId, ToDeviceRpcRequestBody body, boolean oneWay, Optional rpcError, Throwable e); diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/ToDeviceRpcRequestMsg.java b/application/src/main/java/org/thingsboard/server/service/rpc/ToDeviceRpcRequestMsg.java index 4ff2a7ca70..ea77333445 100644 --- a/application/src/main/java/org/thingsboard/server/service/rpc/ToDeviceRpcRequestMsg.java +++ b/application/src/main/java/org/thingsboard/server/service/rpc/ToDeviceRpcRequestMsg.java @@ -20,6 +20,7 @@ import lombok.RequiredArgsConstructor; import lombok.ToString; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.msg.MsgType; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; @@ -54,4 +55,9 @@ public class ToDeviceRpcRequestMsg implements ToDeviceActorNotificationMsg { public TenantId getTenantId() { return msg.getTenantId(); } + + @Override + public MsgType getMsgType() { + return MsgType.DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG; + } } diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index a9e47de87e..043b8dae3e 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -207,18 +207,7 @@ actors: sync: # Default timeout for processing request using synchronous session (HTTP, CoAP) in milliseconds timeout: "${ACTORS_SESSION_SYNC_TIMEOUT:10000}" - plugin: - # Default timeout for termination of the plugin actor after it is stopped - termination.delay: "${ACTORS_PLUGIN_TERMINATION_DELAY:60000}" - # Default timeout for processing of particular message by particular plugin - processing.timeout: "${ACTORS_PLUGIN_TIMEOUT:60000}" - # Errors for particular actor are persisted once per specified amount of milliseconds - error_persist_frequency: "${ACTORS_PLUGIN_ERROR_FREQUENCY:3000}" rule: - # Default timeout for termination of the rule actor after it is stopped - termination.delay: "${ACTORS_RULE_TERMINATION_DELAY:30000}" - # Errors for particular actor are persisted once per specified amount of milliseconds - error_persist_frequency: "${ACTORS_RULE_ERROR_FREQUENCY:3000}" # Specify thread pool size for database request callbacks executor service db_callback_thread_pool_size: "${ACTORS_RULE_DB_CALLBACK_THREAD_POOL_SIZE:1}" # Specify thread pool size for javascript executor service @@ -235,6 +224,11 @@ actors: # Enable/disable actor statistics enabled: "${ACTORS_STATISTICS_ENABLED:true}" persist_frequency: "${ACTORS_STATISTICS_PERSIST_FREQUENCY:3600000}" + queue: + # Enable/disable persistence of un-processed messages to the queue + enabled: "${ACTORS_QUEUE_ENABLED:true}" + # Maximum allowed timeout for persistence into the queue + timeout: "${ACTORS_QUEUE_PERSISTENCE_TIMEOUT:30000}" cache: # caffeine or redis diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java b/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java index f8f204403a..6bde7fa332 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java @@ -18,27 +18,30 @@ package org.thingsboard.server.common.msg; /** * Created by ashvayka on 15.03.18. */ +//TODO: add all "See" references public enum MsgType { + /** + * ADDED/UPDATED/DELETED events for server nodes. + * + * See {@link org.thingsboard.server.common.msg.cluster.ClusterEventMsg} + */ + CLUSTER_EVENT_MSG, + /** * ADDED/UPDATED/DELETED events for main entities. * - * @See {@link org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg} + * See {@link org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg} */ COMPONENT_LIFE_CYCLE_MSG, /** * Misc messages from the REST API/SERVICE layer to the new rule engine. * - * @See {@link org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg} + * See {@link org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg} */ SERVICE_TO_RULE_ENGINE_MSG, - - SESSION_TO_DEVICE_ACTOR_MSG, - DEVICE_ACTOR_TO_SESSION_MSG, - - /** * Message that is sent by RuleChainActor to RuleActor with command to process TbMsg. */ @@ -59,4 +62,31 @@ public enum MsgType { */ RULE_TO_SELF_MSG, + /** + * Message that is sent by Session Actor to Device Actor. Represents messages from the device itself. + */ + DEVICE_SESSION_TO_DEVICE_ACTOR_MSG, + + DEVICE_ATTRIBUTES_UPDATE_TO_DEVICE_ACTOR_MSG, + + DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG, + + DEVICE_NAME_OR_TYPE_UPDATE_TO_DEVICE_ACTOR_MSG, + + DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG, + + DEVICE_ACTOR_RPC_TIMEOUT_MSG, + + DEVICE_ACTOR_QUEUE_TIMEOUT_MSG, + + /** + * Message that is sent from the Device Actor to Rule Engine. Requires acknowledgement + */ + DEVICE_ACTOR_TO_RULE_ENGINE_MSG, + + /** + * Message that is sent from Rule Engine to the Device Actor when message is successfully pushed to queue. + */ + RULE_ENGINE_QUEUE_PUT_ACK_MSG; + } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java index 4b7314c233..e157aaa0d4 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/TbMsgMetaData.java @@ -31,10 +31,10 @@ import java.util.concurrent.ConcurrentHashMap; @NoArgsConstructor public final class TbMsgMetaData implements Serializable { - private Map data = new ConcurrentHashMap<>(); + private final Map data = new ConcurrentHashMap<>(); public TbMsgMetaData(Map data) { - this.data = data; + this.data.putAll(data); } public String getValue(String key) { diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/cluster/ClusterEventMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/cluster/ClusterEventMsg.java index 67f4de7066..7d157f66a9 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/cluster/ClusterEventMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/cluster/ClusterEventMsg.java @@ -16,14 +16,20 @@ package org.thingsboard.server.common.msg.cluster; import lombok.Data; +import org.thingsboard.server.common.msg.MsgType; +import org.thingsboard.server.common.msg.TbActorMsg; /** * @author Andrew Shvayka */ @Data -public final class ClusterEventMsg { +public final class ClusterEventMsg implements TbActorMsg { private final ServerAddress serverAddress; private final boolean added; + @Override + public MsgType getMsgType() { + return MsgType.CLUSTER_EVENT_MSG; + } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/AttributesSubscribeMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/AttributesSubscribeMsg.java index 6894ac54eb..cadaf3ce56 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/AttributesSubscribeMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/AttributesSubscribeMsg.java @@ -16,14 +16,14 @@ package org.thingsboard.server.common.msg.core; import org.thingsboard.server.common.msg.session.FromDeviceMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; /** * @author Andrew Shvayka */ public class AttributesSubscribeMsg implements FromDeviceMsg { @Override - public MsgType getMsgType() { - return MsgType.SUBSCRIBE_ATTRIBUTES_REQUEST; + public SessionMsgType getMsgType() { + return SessionMsgType.SUBSCRIBE_ATTRIBUTES_REQUEST; } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/AttributesUnsubscribeMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/AttributesUnsubscribeMsg.java index e3fcd6fc79..c98ad2ae26 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/AttributesUnsubscribeMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/AttributesUnsubscribeMsg.java @@ -16,14 +16,15 @@ package org.thingsboard.server.common.msg.core; import org.thingsboard.server.common.msg.session.FromDeviceMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; /** * @author Andrew Shvayka */ public class AttributesUnsubscribeMsg implements FromDeviceMsg { @Override - public MsgType getMsgType() { - return MsgType.UNSUBSCRIBE_ATTRIBUTES_REQUEST; + public SessionMsgType getMsgType() { + return SessionMsgType.UNSUBSCRIBE_ATTRIBUTES_REQUEST; } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/AttributesUpdateNotification.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/AttributesUpdateNotification.java index 13294891ed..1f0f9ddc99 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/AttributesUpdateNotification.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/AttributesUpdateNotification.java @@ -17,7 +17,8 @@ package org.thingsboard.server.common.msg.core; import lombok.ToString; import org.thingsboard.server.common.msg.kv.AttributesKVMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.session.ToDeviceMsg; @ToString @@ -36,9 +37,8 @@ public class AttributesUpdateNotification implements ToDeviceMsg { return true; } - @Override - public MsgType getMsgType() { - return MsgType.ATTRIBUTES_UPDATE_NOTIFICATION; + public SessionMsgType getSessionMsgType() { + return SessionMsgType.ATTRIBUTES_UPDATE_NOTIFICATION; } public AttributesKVMsg getData() { diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicCommandAckResponse.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicCommandAckResponse.java index ef772c3f17..3ee04ba216 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicCommandAckResponse.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicCommandAckResponse.java @@ -15,26 +15,27 @@ */ package org.thingsboard.server.common.msg.core; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; public class BasicCommandAckResponse extends BasicResponseMsg implements StatusCodeResponse { private static final long serialVersionUID = 1L; - public static BasicCommandAckResponse onSuccess(MsgType requestMsgType, Integer requestId) { + public static BasicCommandAckResponse onSuccess(SessionMsgType requestMsgType, Integer requestId) { return BasicCommandAckResponse.onSuccess(requestMsgType, requestId, 200); } - public static BasicCommandAckResponse onSuccess(MsgType requestMsgType, Integer requestId, Integer code) { + public static BasicCommandAckResponse onSuccess(SessionMsgType requestMsgType, Integer requestId, Integer code) { return new BasicCommandAckResponse(requestMsgType, requestId, true, null, code); } - public static BasicCommandAckResponse onError(MsgType requestMsgType, Integer requestId, Exception error) { + public static BasicCommandAckResponse onError(SessionMsgType requestMsgType, Integer requestId, Exception error) { return new BasicCommandAckResponse(requestMsgType, requestId, false, error, null); } - private BasicCommandAckResponse(MsgType requestMsgType, Integer requestId, boolean success, Exception error, Integer code) { - super(requestMsgType, requestId, MsgType.TO_DEVICE_RPC_RESPONSE_ACK, success, error, code); + private BasicCommandAckResponse(SessionMsgType requestMsgType, Integer requestId, boolean success, Exception error, Integer code) { + super(requestMsgType, requestId, SessionMsgType.TO_DEVICE_RPC_RESPONSE_ACK, success, error, code); } @Override diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicGetAttributesRequest.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicGetAttributesRequest.java index b431c14d28..e0f6d7ecc4 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicGetAttributesRequest.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicGetAttributesRequest.java @@ -16,7 +16,8 @@ package org.thingsboard.server.common.msg.core; import lombok.ToString; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import java.util.Collections; import java.util.Optional; @@ -41,8 +42,8 @@ public class BasicGetAttributesRequest extends BasicRequest implements GetAttrib } @Override - public MsgType getMsgType() { - return MsgType.GET_ATTRIBUTES_REQUEST; + public SessionMsgType getMsgType() { + return SessionMsgType.GET_ATTRIBUTES_REQUEST; } @Override diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicGetAttributesResponse.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicGetAttributesResponse.java index 5072de25f7..e3eb15d807 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicGetAttributesResponse.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicGetAttributesResponse.java @@ -17,23 +17,24 @@ package org.thingsboard.server.common.msg.core; import lombok.ToString; import org.thingsboard.server.common.msg.kv.AttributesKVMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; @ToString public class BasicGetAttributesResponse extends BasicResponseMsg implements GetAttributesResponse { private static final long serialVersionUID = 1L; - public static BasicGetAttributesResponse onSuccess(MsgType requestMsgType, int requestId, AttributesKVMsg code) { + public static BasicGetAttributesResponse onSuccess(SessionMsgType requestMsgType, int requestId, AttributesKVMsg code) { return new BasicGetAttributesResponse(requestMsgType, requestId, true, null, code); } - public static BasicGetAttributesResponse onError(MsgType requestMsgType, int requestId, Exception error) { + public static BasicGetAttributesResponse onError(SessionMsgType requestMsgType, int requestId, Exception error) { return new BasicGetAttributesResponse(requestMsgType, requestId, false, error, null); } - private BasicGetAttributesResponse(MsgType requestMsgType, int requestId, boolean success, Exception error, AttributesKVMsg code) { - super(requestMsgType, requestId, MsgType.GET_ATTRIBUTES_RESPONSE, success, error, code); + private BasicGetAttributesResponse(SessionMsgType requestMsgType, int requestId, boolean success, Exception error, AttributesKVMsg code) { + super(requestMsgType, requestId, SessionMsgType.GET_ATTRIBUTES_RESPONSE, success, error, code); } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicResponseMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicResponseMsg.java index caaa15cb1b..c61d8e5e03 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicResponseMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicResponseMsg.java @@ -18,32 +18,33 @@ package org.thingsboard.server.common.msg.core; import java.io.Serializable; import java.util.Optional; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; public class BasicResponseMsg implements ResponseMsg { private static final long serialVersionUID = 1L; - private final MsgType requestMsgType; + private final SessionMsgType requestMsgType; private final Integer requestId; - private final MsgType msgType; + private final SessionMsgType sessionMsgType; private final boolean success; private final T data; private final Exception error; - protected BasicResponseMsg(MsgType requestMsgType, Integer requestId, MsgType msgType, boolean success, Exception error, T data) { + protected BasicResponseMsg(SessionMsgType requestMsgType, Integer requestId, SessionMsgType sessionMsgType, boolean success, Exception error, T data) { super(); this.requestMsgType = requestMsgType; this.requestId = requestId; - this.msgType = msgType; + this.sessionMsgType = sessionMsgType; this.success = success; this.error = error; this.data = data; } @Override - public MsgType getRequestMsgType() { + public SessionMsgType getRequestMsgType() { return requestMsgType; } @@ -72,8 +73,7 @@ public class BasicResponseMsg implements ResponseMsg return "BasicResponseMsg [success=" + success + ", data=" + data + ", error=" + error + "]"; } - @Override - public MsgType getMsgType() { - return msgType; + public SessionMsgType getSessionMsgType() { + return sessionMsgType; } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicStatusCodeResponse.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicStatusCodeResponse.java index 22b525bab6..f21aa857bf 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicStatusCodeResponse.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicStatusCodeResponse.java @@ -16,26 +16,27 @@ package org.thingsboard.server.common.msg.core; import lombok.ToString; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; @ToString public class BasicStatusCodeResponse extends BasicResponseMsg implements StatusCodeResponse { private static final long serialVersionUID = 1L; - public static BasicStatusCodeResponse onSuccess(MsgType requestMsgType, Integer requestId) { + public static BasicStatusCodeResponse onSuccess(SessionMsgType requestMsgType, Integer requestId) { return BasicStatusCodeResponse.onSuccess(requestMsgType, requestId, 0); } - public static BasicStatusCodeResponse onSuccess(MsgType requestMsgType, Integer requestId, Integer code) { + public static BasicStatusCodeResponse onSuccess(SessionMsgType requestMsgType, Integer requestId, Integer code) { return new BasicStatusCodeResponse(requestMsgType, requestId, true, null, code); } - public static BasicStatusCodeResponse onError(MsgType requestMsgType, Integer requestId, Exception error) { + public static BasicStatusCodeResponse onError(SessionMsgType requestMsgType, Integer requestId, Exception error) { return new BasicStatusCodeResponse(requestMsgType, requestId, false, error, null); } - private BasicStatusCodeResponse(MsgType requestMsgType, Integer requestId, boolean success, Exception error, Integer code) { - super(requestMsgType, requestId, MsgType.STATUS_CODE_RESPONSE, success, error, code); + private BasicStatusCodeResponse(SessionMsgType requestMsgType, Integer requestId, boolean success, Exception error, Integer code) { + super(requestMsgType, requestId, SessionMsgType.STATUS_CODE_RESPONSE, success, error, code); } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicTelemetryUploadRequest.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicTelemetryUploadRequest.java index 1d96a65e29..60faeb1829 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicTelemetryUploadRequest.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicTelemetryUploadRequest.java @@ -21,7 +21,8 @@ import java.util.List; import java.util.Map; import org.thingsboard.server.common.data.kv.KvEntry; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; public class BasicTelemetryUploadRequest extends BasicRequest implements TelemetryUploadRequest { @@ -48,8 +49,8 @@ public class BasicTelemetryUploadRequest extends BasicRequest implements Telemet } @Override - public MsgType getMsgType() { - return MsgType.POST_TELEMETRY_REQUEST; + public SessionMsgType getMsgType() { + return SessionMsgType.POST_TELEMETRY_REQUEST; } @Override diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicUpdateAttributesRequest.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicUpdateAttributesRequest.java index 994fe5e5d0..ee65ae4ce1 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicUpdateAttributesRequest.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicUpdateAttributesRequest.java @@ -20,7 +20,8 @@ import java.util.LinkedHashSet; import java.util.Set; import org.thingsboard.server.common.data.kv.AttributeKvEntry; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; public class BasicUpdateAttributesRequest extends BasicRequest implements UpdateAttributesRequest { @@ -46,8 +47,8 @@ public class BasicUpdateAttributesRequest extends BasicRequest implements Update } @Override - public MsgType getMsgType() { - return MsgType.POST_ATTRIBUTES_REQUEST; + public SessionMsgType getMsgType() { + return SessionMsgType.POST_ATTRIBUTES_REQUEST; } @Override diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/ResponseMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/ResponseMsg.java index 2eb0959eec..3e70460dcb 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/ResponseMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/ResponseMsg.java @@ -18,12 +18,12 @@ package org.thingsboard.server.common.msg.core; import java.io.Serializable; import java.util.Optional; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.session.ToDeviceMsg; public interface ResponseMsg extends ToDeviceMsg { - MsgType getRequestMsgType(); + SessionMsgType getRequestMsgType(); Integer getRequestId(); diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/RpcSubscribeMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/RpcSubscribeMsg.java index d4fc1d7e07..f8f24e8d20 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/RpcSubscribeMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/RpcSubscribeMsg.java @@ -16,14 +16,15 @@ package org.thingsboard.server.common.msg.core; import org.thingsboard.server.common.msg.session.FromDeviceMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; /** * @author Andrew Shvayka */ public class RpcSubscribeMsg implements FromDeviceMsg { @Override - public MsgType getMsgType() { - return MsgType.SUBSCRIBE_RPC_COMMANDS_REQUEST; + public SessionMsgType getMsgType() { + return SessionMsgType.SUBSCRIBE_RPC_COMMANDS_REQUEST; } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/RpcUnsubscribeMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/RpcUnsubscribeMsg.java index b1532d7b3b..23eb238d79 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/RpcUnsubscribeMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/RpcUnsubscribeMsg.java @@ -16,14 +16,15 @@ package org.thingsboard.server.common.msg.core; import org.thingsboard.server.common.msg.session.FromDeviceMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; /** * @author Andrew Shvayka */ public class RpcUnsubscribeMsg implements FromDeviceMsg { @Override - public MsgType getMsgType() { - return MsgType.UNSUBSCRIBE_RPC_COMMANDS_REQUEST; + public SessionMsgType getMsgType() { + return SessionMsgType.UNSUBSCRIBE_RPC_COMMANDS_REQUEST; } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineError.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineError.java index bc8ceb4dbc..978d5858e4 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineError.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineError.java @@ -21,7 +21,7 @@ package org.thingsboard.server.common.msg.core; public enum RuleEngineError { - NO_RULES, NO_ACTIVE_RULES, NO_FILTERS_MATCHED, NO_REQUEST_FROM_ACTIONS, NO_TWO_WAY_ACTIONS, NO_RESPONSE_FROM_ACTIONS, PLUGIN_TIMEOUT(true); + NO_RULES, NO_ACTIVE_RULES, NO_FILTERS_MATCHED, NO_REQUEST_FROM_ACTIONS, NO_TWO_WAY_ACTIONS, NO_RESPONSE_FROM_ACTIONS, QUEUE_PUT_TIMEOUT(true); private final boolean critical; diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineErrorMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineErrorMsg.java index 5cb3314e1d..540f629b24 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineErrorMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineErrorMsg.java @@ -16,7 +16,8 @@ package org.thingsboard.server.common.msg.core; import lombok.Data; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.session.ToDeviceMsg; /** @@ -25,7 +26,7 @@ import org.thingsboard.server.common.msg.session.ToDeviceMsg; @Data public class RuleEngineErrorMsg implements ToDeviceMsg { - private final MsgType inMsgType; + private final SessionMsgType inSessionMsgType; private final RuleEngineError error; @Override @@ -33,9 +34,8 @@ public class RuleEngineErrorMsg implements ToDeviceMsg { return false; } - @Override - public MsgType getMsgType() { - return MsgType.RULE_ENGINE_ERROR; + public SessionMsgType getSessionMsgType() { + return SessionMsgType.RULE_ENGINE_ERROR; } public String getErrorMsg() { @@ -52,7 +52,7 @@ public class RuleEngineErrorMsg implements ToDeviceMsg { return "Rule filters match, but no rule with two-way action configured!"; case NO_RESPONSE_FROM_ACTIONS: return "Rule filters match, message processed by plugin, but no response produced by rule action!"; - case PLUGIN_TIMEOUT: + case QUEUE_PUT_TIMEOUT: return "Timeout during processing of message by plugin!"; default: throw new RuntimeException("Error " + error + " is not supported!"); diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/SessionCloseMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/SessionCloseMsg.java index 738bc6e138..6d3ad5e8be 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/SessionCloseMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/SessionCloseMsg.java @@ -16,14 +16,15 @@ package org.thingsboard.server.common.msg.core; import org.thingsboard.server.common.msg.session.FromDeviceMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; /** * @author Andrew Shvayka */ public class SessionCloseMsg implements FromDeviceMsg { @Override - public MsgType getMsgType() { - return MsgType.SESSION_CLOSE; + public SessionMsgType getMsgType() { + return SessionMsgType.SESSION_CLOSE; } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/SessionCloseNotification.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/SessionCloseNotification.java index bf3c982922..bf36a9b3c3 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/SessionCloseNotification.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/SessionCloseNotification.java @@ -17,7 +17,8 @@ package org.thingsboard.server.common.msg.core; import lombok.ToString; import org.thingsboard.server.common.msg.kv.AttributesKVMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.session.ToDeviceMsg; @ToString @@ -30,9 +31,8 @@ public class SessionCloseNotification implements ToDeviceMsg { return true; } - @Override - public MsgType getMsgType() { - return MsgType.SESSION_CLOSE; + public SessionMsgType getSessionMsgType() { + return SessionMsgType.SESSION_CLOSE; } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/SessionOpenMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/SessionOpenMsg.java index f3a7bc7bae..c121a71584 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/SessionOpenMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/SessionOpenMsg.java @@ -16,14 +16,15 @@ package org.thingsboard.server.common.msg.core; import org.thingsboard.server.common.msg.session.FromDeviceMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; /** * @author Andrew Shvayka */ public class SessionOpenMsg implements FromDeviceMsg { @Override - public MsgType getMsgType() { - return MsgType.SESSION_OPEN; + public SessionMsgType getMsgType() { + return SessionMsgType.SESSION_OPEN; } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToDeviceRpcRequestMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToDeviceRpcRequestMsg.java index c9eeb4ef1a..d1a1f96451 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToDeviceRpcRequestMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToDeviceRpcRequestMsg.java @@ -16,7 +16,8 @@ package org.thingsboard.server.common.msg.core; import lombok.Data; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.session.ToDeviceMsg; /** @@ -29,9 +30,8 @@ public class ToDeviceRpcRequestMsg implements ToDeviceMsg { private final String method; private final String params; - @Override - public MsgType getMsgType() { - return MsgType.TO_DEVICE_RPC_REQUEST; + public SessionMsgType getSessionMsgType() { + return SessionMsgType.TO_DEVICE_RPC_REQUEST; } @Override diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToDeviceRpcResponseMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToDeviceRpcResponseMsg.java index ec739b379c..4fa3024947 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToDeviceRpcResponseMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToDeviceRpcResponseMsg.java @@ -17,7 +17,8 @@ package org.thingsboard.server.common.msg.core; import lombok.Data; import org.thingsboard.server.common.msg.session.FromDeviceMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; /** * @author Andrew Shvayka @@ -29,7 +30,7 @@ public class ToDeviceRpcResponseMsg implements FromDeviceMsg { private final String data; @Override - public MsgType getMsgType() { - return MsgType.TO_DEVICE_RPC_RESPONSE; + public SessionMsgType getMsgType() { + return SessionMsgType.TO_DEVICE_RPC_RESPONSE; } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToServerRpcRequestMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToServerRpcRequestMsg.java index 87708a759f..3823acac70 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToServerRpcRequestMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToServerRpcRequestMsg.java @@ -17,7 +17,7 @@ package org.thingsboard.server.common.msg.core; import lombok.Data; import org.thingsboard.server.common.msg.session.FromDeviceRequestMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; /** * @author Andrew Shvayka @@ -30,7 +30,7 @@ public class ToServerRpcRequestMsg implements FromDeviceRequestMsg { private final String params; @Override - public MsgType getMsgType() { - return MsgType.TO_SERVER_RPC_REQUEST; + public SessionMsgType getMsgType() { + return SessionMsgType.TO_SERVER_RPC_REQUEST; } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToServerRpcResponseMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToServerRpcResponseMsg.java index b9a43d13a9..82f44e9113 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToServerRpcResponseMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/ToServerRpcResponseMsg.java @@ -17,7 +17,8 @@ package org.thingsboard.server.common.msg.core; import lombok.Data; import org.thingsboard.server.common.msg.session.FromDeviceMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.session.ToDeviceMsg; /** @@ -29,9 +30,8 @@ public class ToServerRpcResponseMsg implements ToDeviceMsg { private final int requestId; private final String data; - @Override - public MsgType getMsgType() { - return MsgType.TO_SERVER_RPC_RESPONSE; + public SessionMsgType getSessionMsgType() { + return SessionMsgType.TO_SERVER_RPC_RESPONSE; } @Override diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/device/BasicToDeviceActorMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/device/BasicDeviceToDeviceActorMsg.java similarity index 76% rename from common/message/src/main/java/org/thingsboard/server/common/msg/device/BasicToDeviceActorMsg.java rename to common/message/src/main/java/org/thingsboard/server/common/msg/device/BasicDeviceToDeviceActorMsg.java index 959da7c4b3..1da19cb3cb 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/device/BasicToDeviceActorMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/device/BasicDeviceToDeviceActorMsg.java @@ -20,6 +20,7 @@ import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.SessionId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.msg.MsgType; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.msg.session.FromDeviceMsg; import org.thingsboard.server.common.msg.session.SessionType; @@ -28,7 +29,7 @@ import org.thingsboard.server.common.msg.session.ToDeviceActorSessionMsg; import java.util.Optional; @ToString -public class BasicToDeviceActorMsg implements ToDeviceActorMsg { +public class BasicDeviceToDeviceActorMsg implements DeviceToDeviceActorMsg { private static final long serialVersionUID = -1866795134993115408L; @@ -40,16 +41,16 @@ public class BasicToDeviceActorMsg implements ToDeviceActorMsg { private final ServerAddress serverAddress; private final FromDeviceMsg msg; - public BasicToDeviceActorMsg(ToDeviceActorMsg other, FromDeviceMsg msg) { + public BasicDeviceToDeviceActorMsg(DeviceToDeviceActorMsg other, FromDeviceMsg msg) { this(null, other.getTenantId(), other.getCustomerId(), other.getDeviceId(), other.getSessionId(), other.getSessionType(), msg); } - public BasicToDeviceActorMsg(ToDeviceActorSessionMsg msg, SessionType sessionType) { + public BasicDeviceToDeviceActorMsg(ToDeviceActorSessionMsg msg, SessionType sessionType) { this(null, msg.getTenantId(), msg.getCustomerId(), msg.getDeviceId(), msg.getSessionId(), sessionType, msg.getSessionMsg().getMsg()); } - private BasicToDeviceActorMsg(ServerAddress serverAddress, TenantId tenantId, CustomerId customerId, DeviceId deviceId, SessionId sessionId, SessionType sessionType, - FromDeviceMsg msg) { + private BasicDeviceToDeviceActorMsg(ServerAddress serverAddress, TenantId tenantId, CustomerId customerId, DeviceId deviceId, SessionId sessionId, SessionType sessionType, + FromDeviceMsg msg) { super(); this.serverAddress = serverAddress; this.tenantId = tenantId; @@ -95,7 +96,12 @@ public class BasicToDeviceActorMsg implements ToDeviceActorMsg { } @Override - public ToDeviceActorMsg toOtherAddress(ServerAddress otherAddress) { - return new BasicToDeviceActorMsg(otherAddress, tenantId, customerId, deviceId, sessionId, sessionType, msg); + public DeviceToDeviceActorMsg toOtherAddress(ServerAddress otherAddress) { + return new BasicDeviceToDeviceActorMsg(otherAddress, tenantId, customerId, deviceId, sessionId, sessionType, msg); + } + + @Override + public MsgType getMsgType() { + return MsgType.DEVICE_SESSION_TO_DEVICE_ACTOR_MSG; } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/device/ToDeviceActorMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/device/DeviceToDeviceActorMsg.java similarity index 84% rename from common/message/src/main/java/org/thingsboard/server/common/msg/device/ToDeviceActorMsg.java rename to common/message/src/main/java/org/thingsboard/server/common/msg/device/DeviceToDeviceActorMsg.java index 72e552d85b..fe8d9f2c21 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/device/ToDeviceActorMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/device/DeviceToDeviceActorMsg.java @@ -19,6 +19,7 @@ import java.io.Serializable; import java.util.Optional; import org.thingsboard.server.common.data.id.SessionId; +import org.thingsboard.server.common.msg.TbActorMsg; import org.thingsboard.server.common.msg.aware.CustomerAwareMsg; import org.thingsboard.server.common.msg.aware.DeviceAwareMsg; import org.thingsboard.server.common.msg.aware.TenantAwareMsg; @@ -26,7 +27,7 @@ import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.msg.session.FromDeviceMsg; import org.thingsboard.server.common.msg.session.SessionType; -public interface ToDeviceActorMsg extends DeviceAwareMsg, CustomerAwareMsg, TenantAwareMsg, Serializable { +public interface DeviceToDeviceActorMsg extends TbActorMsg, DeviceAwareMsg, CustomerAwareMsg, TenantAwareMsg, Serializable { SessionId getSessionId(); @@ -36,5 +37,5 @@ public interface ToDeviceActorMsg extends DeviceAwareMsg, CustomerAwareMsg, Tena FromDeviceMsg getPayload(); - ToDeviceActorMsg toOtherAddress(ServerAddress otherAddress); + DeviceToDeviceActorMsg toOtherAddress(ServerAddress otherAddress); } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/session/FromDeviceMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/session/FromDeviceMsg.java index 19d45a7095..71b605712f 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/session/FromDeviceMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/session/FromDeviceMsg.java @@ -19,6 +19,6 @@ import java.io.Serializable; public interface FromDeviceMsg extends Serializable { - MsgType getMsgType(); + SessionMsgType getMsgType(); } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/session/MsgType.java b/common/message/src/main/java/org/thingsboard/server/common/msg/session/SessionMsgType.java similarity index 93% rename from common/message/src/main/java/org/thingsboard/server/common/msg/session/MsgType.java rename to common/message/src/main/java/org/thingsboard/server/common/msg/session/SessionMsgType.java index ddc5149d14..c7109c9703 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/session/MsgType.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/session/SessionMsgType.java @@ -15,7 +15,7 @@ */ package org.thingsboard.server.common.msg.session; -public enum MsgType { +public enum SessionMsgType { GET_ATTRIBUTES_REQUEST(true), POST_ATTRIBUTES_REQUEST(true), GET_ATTRIBUTES_RESPONSE, SUBSCRIBE_ATTRIBUTES_REQUEST, UNSUBSCRIBE_ATTRIBUTES_REQUEST, ATTRIBUTES_UPDATE_NOTIFICATION, @@ -32,11 +32,11 @@ public enum MsgType { private final boolean requiresRulesProcessing; - MsgType() { + SessionMsgType() { this(false); } - MsgType(boolean requiresRulesProcessing) { + SessionMsgType(boolean requiresRulesProcessing) { this.requiresRulesProcessing = requiresRulesProcessing; } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/session/ToDeviceMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/session/ToDeviceMsg.java index 31ec1fa7f9..705e86420b 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/session/ToDeviceMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/session/ToDeviceMsg.java @@ -21,6 +21,6 @@ public interface ToDeviceMsg extends Serializable { boolean isSuccess(); - MsgType getMsgType(); + SessionMsgType getSessionMsgType(); } diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/TimeoutIntMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/timeout/DeviceActorQueueTimeoutMsg.java similarity index 61% rename from extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/TimeoutIntMsg.java rename to common/message/src/main/java/org/thingsboard/server/common/msg/timeout/DeviceActorQueueTimeoutMsg.java index e25d5d7dd2..0277983d8b 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/TimeoutIntMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/timeout/DeviceActorQueueTimeoutMsg.java @@ -13,15 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.extensions.api.plugins.msg; +package org.thingsboard.server.common.msg.timeout; + +import org.thingsboard.server.common.msg.MsgType; +import org.thingsboard.server.common.msg.timeout.TimeoutMsg; + +import java.util.UUID; /** * @author Andrew Shvayka */ -public final class TimeoutIntMsg extends TimeoutMsg { +public final class DeviceActorQueueTimeoutMsg extends TimeoutMsg { - public TimeoutIntMsg(Integer id, long timeout) { + public DeviceActorQueueTimeoutMsg(UUID id, long timeout) { super(id, timeout); } + @Override + public MsgType getMsgType() { + return MsgType.DEVICE_ACTOR_QUEUE_TIMEOUT_MSG; + } } diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/TimeoutUUIDMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/timeout/DeviceActorRpcTimeoutMsg.java similarity index 66% rename from extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/TimeoutUUIDMsg.java rename to common/message/src/main/java/org/thingsboard/server/common/msg/timeout/DeviceActorRpcTimeoutMsg.java index d6a697e64e..725db385c4 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/TimeoutUUIDMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/timeout/DeviceActorRpcTimeoutMsg.java @@ -13,17 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.extensions.api.plugins.msg; +package org.thingsboard.server.common.msg.timeout; -import java.util.UUID; +import org.thingsboard.server.common.msg.MsgType; /** * @author Andrew Shvayka */ -public final class TimeoutUUIDMsg extends TimeoutMsg { +public final class DeviceActorRpcTimeoutMsg extends TimeoutMsg { - public TimeoutUUIDMsg(UUID id, long timeout) { + public DeviceActorRpcTimeoutMsg(Integer id, long timeout) { super(id, timeout); } + @Override + public MsgType getMsgType() { + return MsgType.DEVICE_ACTOR_RPC_TIMEOUT_MSG; + } } diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/TimeoutMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/timeout/TimeoutMsg.java similarity index 81% rename from extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/TimeoutMsg.java rename to common/message/src/main/java/org/thingsboard/server/common/msg/timeout/TimeoutMsg.java index 03b2cd70ac..503188b006 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/TimeoutMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/timeout/TimeoutMsg.java @@ -13,15 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.extensions.api.plugins.msg; +package org.thingsboard.server.common.msg.timeout; import lombok.Data; +import org.thingsboard.server.common.msg.TbActorMsg; /** * @author Andrew Shvayka */ @Data -public class TimeoutMsg { +public abstract class TimeoutMsg implements TbActorMsg { private final T id; private final long timeout; } diff --git a/common/transport/src/main/java/org/thingsboard/server/common/transport/TransportAdaptor.java b/common/transport/src/main/java/org/thingsboard/server/common/transport/TransportAdaptor.java index 93a6e9965f..080f874efb 100644 --- a/common/transport/src/main/java/org/thingsboard/server/common/transport/TransportAdaptor.java +++ b/common/transport/src/main/java/org/thingsboard/server/common/transport/TransportAdaptor.java @@ -16,7 +16,7 @@ package org.thingsboard.server.common.transport; import org.thingsboard.server.common.msg.session.AdaptorToSessionActorMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.session.SessionActorToAdaptorMsg; import org.thingsboard.server.common.msg.session.SessionContext; import org.thingsboard.server.common.transport.adaptor.AdaptorException; @@ -25,7 +25,7 @@ import java.util.Optional; public interface TransportAdaptor { - AdaptorToSessionActorMsg convertToActorMsg(C ctx, MsgType type, T inbound) throws AdaptorException; + AdaptorToSessionActorMsg convertToActorMsg(C ctx, SessionMsgType type, T inbound) throws AdaptorException; Optional convertToAdaptorMsg(C ctx, SessionActorToAdaptorMsg msg) throws AdaptorException; diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java index 9ce1fbebbc..a7e7362a44 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java @@ -75,6 +75,8 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC log.trace("Save system rule chain with predefined id {}", SYSTEM_TENANT); ruleChain.setTenantId(SYSTEM_TENANT); } + //TODO: Temporary Hack to continue tests; + ruleChain.setRoot(true); RuleChain savedRuleChain = ruleChainDao.save(ruleChain); if (ruleChain.isRoot() && ruleChain.getTenantId() != null && ruleChain.getId() == null) { try { diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceAttributesEventNotificationMsg.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceAttributesEventNotificationMsg.java index 2fcf559852..a470784b32 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceAttributesEventNotificationMsg.java +++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceAttributesEventNotificationMsg.java @@ -22,6 +22,7 @@ import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.kv.AttributeKey; import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.msg.MsgType; import java.util.List; import java.util.Set; @@ -54,4 +55,8 @@ public class DeviceAttributesEventNotificationMsg implements ToDeviceActorNotifi return new DeviceAttributesEventNotificationMsg(tenantId, deviceId, keys, null, null, true); } + @Override + public MsgType getMsgType() { + return MsgType.DEVICE_ATTRIBUTES_UPDATE_TO_DEVICE_ACTOR_MSG; + } } diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceCredentialsUpdateNotificationMsg.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceCredentialsUpdateNotificationMsg.java index 937018e655..b634a8298f 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceCredentialsUpdateNotificationMsg.java +++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceCredentialsUpdateNotificationMsg.java @@ -21,6 +21,7 @@ import lombok.ToString; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.kv.AttributeKey; +import org.thingsboard.server.common.msg.MsgType; import java.util.Set; @@ -33,4 +34,8 @@ public class DeviceCredentialsUpdateNotificationMsg implements ToDeviceActorNoti private final TenantId tenantId; private final DeviceId deviceId; + @Override + public MsgType getMsgType() { + return MsgType.DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG; + } } diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceNameOrTypeUpdateMsg.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceNameOrTypeUpdateMsg.java index 908319082f..1823e3b335 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceNameOrTypeUpdateMsg.java +++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceNameOrTypeUpdateMsg.java @@ -19,6 +19,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.msg.MsgType; @Data @AllArgsConstructor @@ -27,4 +28,9 @@ public class DeviceNameOrTypeUpdateMsg implements ToDeviceActorNotificationMsg { private final DeviceId deviceId; private final String deviceName; private final String deviceType; + + @Override + public MsgType getMsgType() { + return MsgType.DEVICE_NAME_OR_TYPE_UPDATE_TO_DEVICE_ACTOR_MSG; + } } diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/ToDeviceActorNotificationMsg.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/ToDeviceActorNotificationMsg.java index 892d53eee9..5cd5d82946 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/ToDeviceActorNotificationMsg.java +++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/ToDeviceActorNotificationMsg.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.extensions.api.device; +import org.thingsboard.server.common.msg.TbActorMsg; import org.thingsboard.server.common.msg.aware.DeviceAwareMsg; import org.thingsboard.server.common.msg.aware.TenantAwareMsg; @@ -23,6 +24,6 @@ import java.io.Serializable; /** * @author Andrew Shvayka */ -public interface ToDeviceActorNotificationMsg extends TenantAwareMsg, DeviceAwareMsg, Serializable { +public interface ToDeviceActorNotificationMsg extends TbActorMsg, TenantAwareMsg, DeviceAwareMsg, Serializable { } diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/AbstractPlugin.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/AbstractPlugin.java index 34f4ce794a..6d54f3edb3 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/AbstractPlugin.java +++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/AbstractPlugin.java @@ -21,7 +21,7 @@ import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.extensions.api.plugins.handlers.*; import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; import org.thingsboard.server.extensions.api.plugins.msg.RuleToPluginMsg; -import org.thingsboard.server.extensions.api.plugins.msg.TimeoutMsg; +import org.thingsboard.server.common.msg.timeout.TimeoutMsg; import org.thingsboard.server.extensions.api.plugins.rest.PluginRestMsg; import org.thingsboard.server.extensions.api.plugins.rpc.RpcMsg; import org.thingsboard.server.extensions.api.plugins.ws.msg.PluginWebsocketMsg; diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/Plugin.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/Plugin.java index a41f3c14e2..20d74c3ba4 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/Plugin.java +++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/Plugin.java @@ -21,7 +21,7 @@ import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.extensions.api.component.ConfigurableComponent; import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; import org.thingsboard.server.extensions.api.plugins.msg.RuleToPluginMsg; -import org.thingsboard.server.extensions.api.plugins.msg.TimeoutMsg; +import org.thingsboard.server.common.msg.timeout.TimeoutMsg; import org.thingsboard.server.extensions.api.plugins.rest.PluginRestMsg; import org.thingsboard.server.extensions.api.plugins.rpc.RpcMsg; import org.thingsboard.server.extensions.api.plugins.ws.msg.PluginWebsocketMsg; diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginAction.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginAction.java index 3c19571560..69bee5ca97 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginAction.java +++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginAction.java @@ -15,7 +15,7 @@ */ package org.thingsboard.server.extensions.api.plugins; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.ToDeviceMsg; import org.thingsboard.server.extensions.api.component.ConfigurableComponent; import org.thingsboard.server.extensions.api.plugins.msg.PluginToRuleMsg; @@ -28,7 +28,7 @@ import java.util.Optional; public interface PluginAction extends ConfigurableComponent, RuleLifecycleComponent { - Optional convert(RuleContext ctx, ToDeviceActorMsg toDeviceActorMsg, RuleProcessingMetaData deviceMsgMd); + Optional convert(RuleContext ctx, DeviceToDeviceActorMsg deviceToDeviceActorMsg, RuleProcessingMetaData deviceMsgMd); Optional convert(PluginToRuleMsg response); diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginContext.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginContext.java index 4cd645675f..42fd747155 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginContext.java +++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/PluginContext.java @@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; +import org.thingsboard.server.common.msg.timeout.TimeoutMsg; import org.thingsboard.server.extensions.api.plugins.msg.*; import org.thingsboard.server.extensions.api.plugins.rpc.RpcMsg; import org.thingsboard.server.extensions.api.plugins.ws.PluginWebsocketSessionRef; diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/handlers/DefaultRuleMsgHandler.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/handlers/DefaultRuleMsgHandler.java index 27b476d0c0..42dbbf9052 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/handlers/DefaultRuleMsgHandler.java +++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/handlers/DefaultRuleMsgHandler.java @@ -18,7 +18,8 @@ package org.thingsboard.server.extensions.api.plugins.handlers; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.id.RuleId; import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.extensions.api.plugins.PluginContext; import org.thingsboard.server.extensions.api.plugins.msg.GetAttributesRequestRuleToPluginMsg; import org.thingsboard.server.extensions.api.plugins.msg.RuleToPluginMsg; @@ -56,8 +57,8 @@ public class DefaultRuleMsgHandler implements RuleMsgHandler { msgTypeNotSupported(msg.getPayload().getMsgType()); } - private void msgTypeNotSupported(MsgType msgType) { - throw new RuntimeException("Not supported msg type: " + msgType + "!"); + private void msgTypeNotSupported(SessionMsgType sessionMsgType) { + throw new RuntimeException("Not supported msg type: " + sessionMsgType + "!"); } } diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/ToDeviceRpcRequestPluginMsg.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/ToDeviceRpcRequestPluginMsg.java deleted file mode 100644 index b71bcb93a5..0000000000 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/ToDeviceRpcRequestPluginMsg.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * Copyright © 2016-2018 The Thingsboard Authors - * - * 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 - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.extensions.api.plugins.msg; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.ToString; -import org.thingsboard.server.common.data.id.DeviceId; -import org.thingsboard.server.common.data.id.PluginId; -import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.msg.cluster.ServerAddress; -import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; -import org.thingsboard.server.extensions.api.device.ToDeviceActorNotificationMsg; - -import java.util.Optional; - -/** - * @author Andrew Shvayka - */ -@ToString -@RequiredArgsConstructor -public class ToDeviceRpcRequestPluginMsg implements ToDeviceActorNotificationMsg { - - private final ServerAddress serverAddress; - @Getter - private final PluginId pluginId; - @Getter - private final TenantId pluginTenantId; - @Getter - private final ToDeviceRpcRequest msg; - - public ToDeviceRpcRequestPluginMsg(PluginId pluginId, TenantId pluginTenantId, ToDeviceRpcRequest msg) { - this(null, pluginId, pluginTenantId, msg); - } - - public Optional getServerAddress() { - return Optional.ofNullable(serverAddress); - } - - @Override - public DeviceId getDeviceId() { - return msg.getDeviceId(); - } - - @Override - public TenantId getTenantId() { - return msg.getTenantId(); - } -} - diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/rules/RuleFilter.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/rules/RuleFilter.java index 9489a539ca..f0e986ec13 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/rules/RuleFilter.java +++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/rules/RuleFilter.java @@ -15,7 +15,7 @@ */ package org.thingsboard.server.extensions.api.rules; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.extensions.api.component.ConfigurableComponent; /** @@ -23,6 +23,6 @@ import org.thingsboard.server.extensions.api.component.ConfigurableComponent; */ public interface RuleFilter extends ConfigurableComponent, RuleLifecycleComponent { - boolean filter(RuleContext ctx, ToDeviceActorMsg msg); + boolean filter(RuleContext ctx, DeviceToDeviceActorMsg msg); } diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/rules/RuleProcessor.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/rules/RuleProcessor.java index 3fd5e96318..5e72dbe445 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/rules/RuleProcessor.java +++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/rules/RuleProcessor.java @@ -15,15 +15,13 @@ */ package org.thingsboard.server.extensions.api.rules; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.extensions.api.component.ConfigurableComponent; -import javax.script.ScriptException; - /** * @author Andrew Shvayka */ public interface RuleProcessor extends ConfigurableComponent, RuleLifecycleComponent { - RuleProcessingMetaData process(RuleContext ctx, ToDeviceActorMsg msg) throws RuleException; + RuleProcessingMetaData process(RuleContext ctx, DeviceToDeviceActorMsg msg) throws RuleException; } diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/mail/SendMailAction.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/mail/SendMailAction.java index f765a121e1..0258cf161c 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/mail/SendMailAction.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/mail/SendMailAction.java @@ -20,7 +20,7 @@ import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.runtime.parser.ParseException; import org.springframework.util.StringUtils; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.ToDeviceMsg; import org.thingsboard.server.extensions.api.component.Action; import org.thingsboard.server.extensions.api.plugins.PluginAction; @@ -74,7 +74,7 @@ public class SendMailAction extends SimpleRuleLifecycleComponent implements Plug } @Override - public Optional convert(RuleContext ctx, ToDeviceActorMsg toDeviceActorMsg, RuleProcessingMetaData metadata) { + public Optional convert(RuleContext ctx, DeviceToDeviceActorMsg deviceToDeviceActorMsg, RuleProcessingMetaData metadata) { String sendFlag = configuration.getSendFlag(); if (StringUtils.isEmpty(sendFlag) || (Boolean) metadata.get(sendFlag).orElse(Boolean.FALSE)) { VelocityContext context = VelocityUtils.createContext(metadata); @@ -86,7 +86,7 @@ public class SendMailAction extends SimpleRuleLifecycleComponent implements Plug bccTemplate.ifPresent(t -> builder.bcc(VelocityUtils.merge(t, context))); subjectTemplate.ifPresent(t -> builder.subject(VelocityUtils.merge(t, context))); bodyTemplate.ifPresent(t -> builder.body(VelocityUtils.merge(t, context))); - return Optional.of(new SendMailRuleToPluginActionMsg(toDeviceActorMsg.getTenantId(), toDeviceActorMsg.getCustomerId(), toDeviceActorMsg.getDeviceId(), + return Optional.of(new SendMailRuleToPluginActionMsg(deviceToDeviceActorMsg.getTenantId(), deviceToDeviceActorMsg.getCustomerId(), deviceToDeviceActorMsg.getDeviceId(), builder.build())); } else { return Optional.empty(); diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/rpc/RpcPluginAction.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/rpc/RpcPluginAction.java index b1959822b5..8bd9e25e4e 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/rpc/RpcPluginAction.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/rpc/RpcPluginAction.java @@ -16,9 +16,10 @@ package org.thingsboard.server.extensions.core.action.rpc; import org.thingsboard.server.common.msg.core.ToServerRpcRequestMsg; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.session.ToDeviceMsg; import org.thingsboard.server.extensions.api.component.Action; import org.thingsboard.server.extensions.api.component.EmptyComponentConfiguration; @@ -41,12 +42,12 @@ public class RpcPluginAction extends SimpleRuleLifecycleComponent implements Plu } @Override - public Optional convert(RuleContext ctx, ToDeviceActorMsg toDeviceActorMsg, RuleProcessingMetaData deviceMsgMd) { - FromDeviceMsg msg = toDeviceActorMsg.getPayload(); - if (msg.getMsgType() == MsgType.TO_SERVER_RPC_REQUEST) { + public Optional convert(RuleContext ctx, DeviceToDeviceActorMsg deviceToDeviceActorMsg, RuleProcessingMetaData deviceMsgMd) { + FromDeviceMsg msg = deviceToDeviceActorMsg.getPayload(); + if (msg.getMsgType() == SessionMsgType.TO_SERVER_RPC_REQUEST) { ToServerRpcRequestMsg payload = (ToServerRpcRequestMsg) msg; - return Optional.of(new RpcRequestRuleToPluginMsg(toDeviceActorMsg.getTenantId(), toDeviceActorMsg.getCustomerId(), - toDeviceActorMsg.getDeviceId(), payload)); + return Optional.of(new RpcRequestRuleToPluginMsg(deviceToDeviceActorMsg.getTenantId(), deviceToDeviceActorMsg.getCustomerId(), + deviceToDeviceActorMsg.getDeviceId(), payload)); } else { return Optional.empty(); } diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/rpc/ServerSideRpcCallAction.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/rpc/ServerSideRpcCallAction.java index 80c8efba68..4e129dbf0a 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/rpc/ServerSideRpcCallAction.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/rpc/ServerSideRpcCallAction.java @@ -20,7 +20,7 @@ import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.runtime.parser.ParseException; import org.springframework.util.StringUtils; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.ToDeviceMsg; import org.thingsboard.server.extensions.api.component.Action; import org.thingsboard.server.extensions.api.plugins.PluginAction; @@ -64,7 +64,7 @@ public class ServerSideRpcCallAction extends SimpleRuleLifecycleComponent implem } @Override - public Optional convert(RuleContext ctx, ToDeviceActorMsg toDeviceActorMsg, RuleProcessingMetaData metadata) { + public Optional convert(RuleContext ctx, DeviceToDeviceActorMsg deviceToDeviceActorMsg, RuleProcessingMetaData metadata) { String sendFlag = configuration.getSendFlag(); if (StringUtils.isEmpty(sendFlag) || (Boolean) metadata.get(sendFlag).orElse(Boolean.FALSE)) { VelocityContext context = VelocityUtils.createContext(metadata); @@ -77,7 +77,7 @@ public class ServerSideRpcCallAction extends SimpleRuleLifecycleComponent implem rpcCallMethodTemplate.ifPresent(t -> builder.rpcCallMethod(VelocityUtils.merge(t, context))); rpcCallBodyTemplate.ifPresent(t -> builder.rpcCallBody(VelocityUtils.merge(t, context))); builder.rpcCallTimeoutInSec(configuration.getRpcCallTimeoutInSec()); - return Optional.of(new ServerSideRpcCallRuleToPluginActionMsg(toDeviceActorMsg.getTenantId(), toDeviceActorMsg.getCustomerId(), toDeviceActorMsg.getDeviceId(), + return Optional.of(new ServerSideRpcCallRuleToPluginActionMsg(deviceToDeviceActorMsg.getTenantId(), deviceToDeviceActorMsg.getCustomerId(), deviceToDeviceActorMsg.getDeviceId(), builder.build())); } else { return Optional.empty(); diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/telemetry/TelemetryPluginAction.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/telemetry/TelemetryPluginAction.java index b36aced45e..514eb0b38c 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/telemetry/TelemetryPluginAction.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/telemetry/TelemetryPluginAction.java @@ -19,9 +19,10 @@ import org.springframework.util.StringUtils; import org.thingsboard.server.common.msg.core.GetAttributesRequest; import org.thingsboard.server.common.msg.core.TelemetryUploadRequest; import org.thingsboard.server.common.msg.core.UpdateAttributesRequest; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.session.ToDeviceMsg; import org.thingsboard.server.extensions.api.component.Action; import org.thingsboard.server.extensions.api.plugins.PluginAction; @@ -50,20 +51,20 @@ public class TelemetryPluginAction extends SimpleRuleLifecycleComponent implemen } @Override - public Optional convert(RuleContext ctx, ToDeviceActorMsg toDeviceActorMsg, RuleProcessingMetaData deviceMsgMd) { - FromDeviceMsg msg = toDeviceActorMsg.getPayload(); - if (msg.getMsgType() == MsgType.POST_TELEMETRY_REQUEST) { + public Optional convert(RuleContext ctx, DeviceToDeviceActorMsg deviceToDeviceActorMsg, RuleProcessingMetaData deviceMsgMd) { + FromDeviceMsg msg = deviceToDeviceActorMsg.getPayload(); + if (msg.getMsgType() == SessionMsgType.POST_TELEMETRY_REQUEST) { TelemetryUploadRequest payload = (TelemetryUploadRequest) msg; - return Optional.of(new TelemetryUploadRequestRuleToPluginMsg(toDeviceActorMsg.getTenantId(), toDeviceActorMsg.getCustomerId(), - toDeviceActorMsg.getDeviceId(), payload, ttl)); - } else if (msg.getMsgType() == MsgType.POST_ATTRIBUTES_REQUEST) { + return Optional.of(new TelemetryUploadRequestRuleToPluginMsg(deviceToDeviceActorMsg.getTenantId(), deviceToDeviceActorMsg.getCustomerId(), + deviceToDeviceActorMsg.getDeviceId(), payload, ttl)); + } else if (msg.getMsgType() == SessionMsgType.POST_ATTRIBUTES_REQUEST) { UpdateAttributesRequest payload = (UpdateAttributesRequest) msg; - return Optional.of(new UpdateAttributesRequestRuleToPluginMsg(toDeviceActorMsg.getTenantId(), toDeviceActorMsg.getCustomerId(), - toDeviceActorMsg.getDeviceId(), payload)); - } else if (msg.getMsgType() == MsgType.GET_ATTRIBUTES_REQUEST) { + return Optional.of(new UpdateAttributesRequestRuleToPluginMsg(deviceToDeviceActorMsg.getTenantId(), deviceToDeviceActorMsg.getCustomerId(), + deviceToDeviceActorMsg.getDeviceId(), payload)); + } else if (msg.getMsgType() == SessionMsgType.GET_ATTRIBUTES_REQUEST) { GetAttributesRequest payload = (GetAttributesRequest) msg; - return Optional.of(new GetAttributesRequestRuleToPluginMsg(toDeviceActorMsg.getTenantId(), toDeviceActorMsg.getCustomerId(), - toDeviceActorMsg.getDeviceId(), payload)); + return Optional.of(new GetAttributesRequestRuleToPluginMsg(deviceToDeviceActorMsg.getTenantId(), deviceToDeviceActorMsg.getCustomerId(), + deviceToDeviceActorMsg.getDeviceId(), payload)); } else { return Optional.empty(); } diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/template/AbstractTemplatePluginAction.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/template/AbstractTemplatePluginAction.java index 6d7f75a031..82efdc51eb 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/template/AbstractTemplatePluginAction.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/template/AbstractTemplatePluginAction.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.runtime.parser.ParseException; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceRequestMsg; import org.thingsboard.server.common.msg.session.ToDeviceMsg; import org.thingsboard.server.extensions.api.plugins.PluginAction; @@ -52,7 +52,7 @@ public abstract class AbstractTemplatePluginAction convert(RuleContext ctx, ToDeviceActorMsg msg, RuleProcessingMetaData deviceMsgMd) { + public Optional convert(RuleContext ctx, DeviceToDeviceActorMsg msg, RuleProcessingMetaData deviceMsgMd) { FromDeviceRequestMsg payload; if (msg.getPayload() instanceof FromDeviceRequestMsg) { payload = (FromDeviceRequestMsg) msg.getPayload(); @@ -70,14 +70,14 @@ public abstract class AbstractTemplatePluginAction buildRuleToPluginMsg(RuleContext ctx, - ToDeviceActorMsg msg, + DeviceToDeviceActorMsg msg, FromDeviceRequestMsg payload); @Override diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/BasicJsFilter.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/BasicJsFilter.java index 9c092dae6e..469c76ae57 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/BasicJsFilter.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/BasicJsFilter.java @@ -16,8 +16,7 @@ package org.thingsboard.server.extensions.core.filter; import lombok.extern.slf4j.Slf4j; -import org.thingsboard.server.common.data.kv.KvEntry; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.extensions.api.rules.RuleContext; import org.thingsboard.server.extensions.api.rules.RuleFilter; @@ -39,7 +38,7 @@ public abstract class BasicJsFilter implements RuleFilter } @Override - public boolean filter(RuleContext ctx, ToDeviceActorMsg msg) { + public boolean filter(RuleContext ctx, DeviceToDeviceActorMsg msg) { try { return doFilter(ctx, msg); } catch (ScriptException e) { @@ -48,7 +47,7 @@ public abstract class BasicJsFilter implements RuleFilter } } - protected abstract boolean doFilter(RuleContext ctx, ToDeviceActorMsg msg) throws ScriptException; + protected abstract boolean doFilter(RuleContext ctx, DeviceToDeviceActorMsg msg) throws ScriptException; @Override public void resume() { diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceAttributesFilter.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceAttributesFilter.java index db7f8c25d0..468fde28f6 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceAttributesFilter.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceAttributesFilter.java @@ -17,7 +17,7 @@ package org.thingsboard.server.extensions.core.filter; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.msg.core.UpdateAttributesRequest; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceMsg; import org.thingsboard.server.extensions.api.component.Filter; import org.thingsboard.server.extensions.api.device.DeviceAttributes; @@ -34,7 +34,7 @@ import javax.script.ScriptException; public class DeviceAttributesFilter extends BasicJsFilter { @Override - protected boolean doFilter(RuleContext ctx, ToDeviceActorMsg msg) throws ScriptException { + protected boolean doFilter(RuleContext ctx, DeviceToDeviceActorMsg msg) throws ScriptException { return evaluator.execute(toBindings(ctx.getDeviceMetaData().getDeviceAttributes(), msg != null ? msg.getPayload() : null)); } diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceTelemetryFilter.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceTelemetryFilter.java index cd8f87c2b6..7c2ede54d4 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceTelemetryFilter.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceTelemetryFilter.java @@ -18,7 +18,7 @@ package org.thingsboard.server.extensions.core.filter; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.kv.KvEntry; import org.thingsboard.server.common.msg.core.TelemetryUploadRequest; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceMsg; import org.thingsboard.server.extensions.api.component.Filter; import org.thingsboard.server.extensions.api.rules.RuleContext; @@ -34,7 +34,7 @@ import java.util.List; public class DeviceTelemetryFilter extends BasicJsFilter { @Override - protected boolean doFilter(RuleContext ctx, ToDeviceActorMsg msg) throws ScriptException { + protected boolean doFilter(RuleContext ctx, DeviceToDeviceActorMsg msg) throws ScriptException { FromDeviceMsg deviceMsg = msg.getPayload(); if (deviceMsg instanceof TelemetryUploadRequest) { TelemetryUploadRequest telemetryMsg = (TelemetryUploadRequest) deviceMsg; diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceTypeFilter.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceTypeFilter.java index eb00762eec..406c9fd600 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceTypeFilter.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceTypeFilter.java @@ -16,8 +16,7 @@ package org.thingsboard.server.extensions.core.filter; import lombok.extern.slf4j.Slf4j; -import org.thingsboard.server.common.msg.core.ToServerRpcRequestMsg; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.extensions.api.component.Filter; import org.thingsboard.server.extensions.api.rules.RuleContext; import org.thingsboard.server.extensions.api.rules.RuleFilter; @@ -27,8 +26,6 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import static org.thingsboard.server.common.msg.session.MsgType.TO_SERVER_RPC_REQUEST; - /** * @author Andrew Shvayka */ @@ -46,7 +43,7 @@ public class DeviceTypeFilter extends SimpleRuleLifecycleComponent implements Ru } @Override - public boolean filter(RuleContext ctx, ToDeviceActorMsg msg) { + public boolean filter(RuleContext ctx, DeviceToDeviceActorMsg msg) { return deviceTypes.contains(ctx.getDeviceMetaData().getDeviceType()); } } diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/MethodNameFilter.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/MethodNameFilter.java index e5672b8bca..daacfec3f4 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/MethodNameFilter.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/MethodNameFilter.java @@ -17,7 +17,7 @@ package org.thingsboard.server.extensions.core.filter; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.msg.core.ToServerRpcRequestMsg; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.extensions.api.component.Filter; import org.thingsboard.server.extensions.api.rules.RuleContext; import org.thingsboard.server.extensions.api.rules.RuleFilter; @@ -27,7 +27,7 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import static org.thingsboard.server.common.msg.session.MsgType.TO_SERVER_RPC_REQUEST; +import static org.thingsboard.server.common.msg.session.SessionMsgType.TO_SERVER_RPC_REQUEST; /** * @author Andrew Shvayka @@ -46,7 +46,7 @@ public class MethodNameFilter extends SimpleRuleLifecycleComponent implements Ru } @Override - public boolean filter(RuleContext ctx, ToDeviceActorMsg msg) { + public boolean filter(RuleContext ctx, DeviceToDeviceActorMsg msg) { if (msg.getPayload().getMsgType() == TO_SERVER_RPC_REQUEST) { return methods.contains(((ToServerRpcRequestMsg) msg.getPayload()).getMethod()); } else { diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/MsgTypeFilter.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/MsgTypeFilter.java index ef0094e8a9..e40abf8bb6 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/MsgTypeFilter.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/MsgTypeFilter.java @@ -16,8 +16,9 @@ package org.thingsboard.server.extensions.core.filter; import lombok.extern.slf4j.Slf4j; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.extensions.api.component.Filter; import org.thingsboard.server.extensions.api.rules.RuleContext; import org.thingsboard.server.extensions.api.rules.RuleFilter; @@ -35,30 +36,30 @@ import java.util.stream.Collectors; @Slf4j public class MsgTypeFilter extends SimpleRuleLifecycleComponent implements RuleFilter { - private List msgTypes; + private List sessionMsgTypes; @Override public void init(MsgTypeFilterConfiguration configuration) { - msgTypes = Arrays.stream(configuration.getMessageTypes()).map(type -> { + sessionMsgTypes = Arrays.stream(configuration.getMessageTypes()).map(type -> { switch (type) { case "GET_ATTRIBUTES": - return MsgType.GET_ATTRIBUTES_REQUEST; + return SessionMsgType.GET_ATTRIBUTES_REQUEST; case "POST_ATTRIBUTES": - return MsgType.POST_ATTRIBUTES_REQUEST; + return SessionMsgType.POST_ATTRIBUTES_REQUEST; case "POST_TELEMETRY": - return MsgType.POST_TELEMETRY_REQUEST; + return SessionMsgType.POST_TELEMETRY_REQUEST; case "RPC_REQUEST": - return MsgType.TO_SERVER_RPC_REQUEST; + return SessionMsgType.TO_SERVER_RPC_REQUEST; default: - throw new InvalidParameterException("Can't map " + type + " to " + MsgType.class.getName() + "!"); + throw new InvalidParameterException("Can't map " + type + " to " + SessionMsgType.class.getName() + "!"); } }).collect(Collectors.toList()); } @Override - public boolean filter(RuleContext ctx, ToDeviceActorMsg msg) { - for (MsgType msgType : msgTypes) { - if (msgType == msg.getPayload().getMsgType()) { + public boolean filter(RuleContext ctx, DeviceToDeviceActorMsg msg) { + for (SessionMsgType sessionMsgType : sessionMsgTypes) { + if (sessionMsgType == msg.getPayload().getMsgType()) { return true; } } diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/processor/AlarmDeduplicationProcessor.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/processor/AlarmDeduplicationProcessor.java index f7ad2740c3..508ab6f889 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/processor/AlarmDeduplicationProcessor.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/processor/AlarmDeduplicationProcessor.java @@ -22,7 +22,7 @@ import org.apache.velocity.VelocityContext; import org.apache.velocity.runtime.parser.ParseException; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.Event; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.extensions.api.component.Processor; import org.thingsboard.server.extensions.api.rules.*; import org.thingsboard.server.extensions.core.utils.VelocityUtils; @@ -57,7 +57,7 @@ public class AlarmDeduplicationProcessor extends SimpleRuleLifecycleComponent } @Override - public RuleProcessingMetaData process(RuleContext ctx, ToDeviceActorMsg msg) throws RuleException { + public RuleProcessingMetaData process(RuleContext ctx, DeviceToDeviceActorMsg msg) throws RuleException { RuleProcessingMetaData md = new RuleProcessingMetaData(); VelocityContext context = VelocityUtils.createContext(ctx.getDeviceMetaData(), msg.getPayload()); String alarmId = VelocityUtils.merge(alarmIdTemplate, context); diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/processor/AlarmProcessor.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/processor/AlarmProcessor.java index b4e34402ae..711d86ae6c 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/processor/AlarmProcessor.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/processor/AlarmProcessor.java @@ -27,7 +27,7 @@ import org.thingsboard.server.common.data.alarm.AlarmStatus; import org.thingsboard.server.common.data.kv.KvEntry; import org.thingsboard.server.common.msg.core.TelemetryUploadRequest; import org.thingsboard.server.common.msg.core.UpdateAttributesRequest; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceMsg; import org.thingsboard.server.extensions.api.component.Processor; import org.thingsboard.server.extensions.api.rules.RuleContext; @@ -102,7 +102,7 @@ public class AlarmProcessor implements RuleProcessor { @Override - protected Optional buildRuleToPluginMsg(RuleContext ctx, ToDeviceActorMsg msg, FromDeviceRequestMsg payload) { + protected Optional buildRuleToPluginMsg(RuleContext ctx, DeviceToDeviceActorMsg msg, FromDeviceRequestMsg payload) { KafkaActionPayload.KafkaActionPayloadBuilder builder = KafkaActionPayload.builder(); builder.msgType(payload.getMsgType()); builder.requestId(payload.getRequestId()); diff --git a/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/action/MqttActionPayload.java b/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/action/MqttActionPayload.java index cee3ac310a..d7a0537686 100644 --- a/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/action/MqttActionPayload.java +++ b/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/action/MqttActionPayload.java @@ -17,7 +17,7 @@ package org.thingsboard.server.extensions.mqtt.action; import lombok.Builder; import lombok.Data; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import java.io.Serializable; @@ -30,5 +30,5 @@ public class MqttActionPayload implements Serializable { private final String msgBody; private final Integer requestId; - private final MsgType msgType; + private final SessionMsgType sessionMsgType; } diff --git a/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/action/MqttPluginAction.java b/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/action/MqttPluginAction.java index a33fb47186..2a0e78a536 100644 --- a/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/action/MqttPluginAction.java +++ b/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/action/MqttPluginAction.java @@ -15,7 +15,7 @@ */ package org.thingsboard.server.extensions.mqtt.action; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceRequestMsg; import org.thingsboard.server.extensions.api.component.Action; import org.thingsboard.server.extensions.api.plugins.msg.RuleToPluginMsg; @@ -28,7 +28,7 @@ import java.util.Optional; public class MqttPluginAction extends AbstractTemplatePluginAction { @Override - protected Optional buildRuleToPluginMsg(RuleContext ctx, ToDeviceActorMsg msg, FromDeviceRequestMsg payload) { + protected Optional buildRuleToPluginMsg(RuleContext ctx, DeviceToDeviceActorMsg msg, FromDeviceRequestMsg payload) { MqttActionPayload.MqttActionPayloadBuilder builder = MqttActionPayload.builder(); builder.sync(configuration.isSync()); builder.msgType(payload.getMsgType()); diff --git a/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqActionPayload.java b/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqActionPayload.java index 948467323c..68ba7093be 100644 --- a/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqActionPayload.java +++ b/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqActionPayload.java @@ -17,7 +17,7 @@ package org.thingsboard.server.extensions.rabbitmq.action; import lombok.Builder; import lombok.Data; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import java.io.Serializable; @@ -35,5 +35,5 @@ public class RabbitMqActionPayload implements Serializable { private final boolean sync; private final Integer requestId; - private final MsgType msgType; + private final SessionMsgType sessionMsgType; } diff --git a/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginAction.java b/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginAction.java index 90c6679590..97d4c63705 100644 --- a/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginAction.java +++ b/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginAction.java @@ -15,7 +15,7 @@ */ package org.thingsboard.server.extensions.rabbitmq.action; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceRequestMsg; import org.thingsboard.server.extensions.api.component.Action; import org.thingsboard.server.extensions.api.plugins.msg.RuleToPluginMsg; @@ -32,7 +32,7 @@ import java.util.Optional; public class RabbitMqPluginAction extends AbstractTemplatePluginAction { @Override - protected Optional buildRuleToPluginMsg(RuleContext ctx, ToDeviceActorMsg msg, FromDeviceRequestMsg payload) { + protected Optional buildRuleToPluginMsg(RuleContext ctx, DeviceToDeviceActorMsg msg, FromDeviceRequestMsg payload) { RabbitMqActionPayload.RabbitMqActionPayloadBuilder builder = RabbitMqActionPayload.builder(); builder.sync(configuration.isSync()); builder.exchange(configuration.getExchange()); diff --git a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallActionPayload.java b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallActionPayload.java index 996ef366ed..8a5a5b776d 100644 --- a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallActionPayload.java +++ b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallActionPayload.java @@ -19,7 +19,8 @@ import lombok.Builder; import lombok.Data; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import java.io.Serializable; @@ -33,5 +34,5 @@ public class RestApiCallActionPayload implements Serializable { private final boolean sync; private final Integer requestId; - private final MsgType msgType; + private final SessionMsgType sessionMsgType; } diff --git a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallPluginAction.java b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallPluginAction.java index eec95d1bce..e68607a6d3 100644 --- a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallPluginAction.java +++ b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallPluginAction.java @@ -18,7 +18,7 @@ package org.thingsboard.server.extensions.rest.action; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceRequestMsg; import org.thingsboard.server.extensions.api.component.Action; import org.thingsboard.server.extensions.api.plugins.msg.RuleToPluginMsg; @@ -33,7 +33,7 @@ import java.util.Optional; public class RestApiCallPluginAction extends AbstractTemplatePluginAction { @Override - protected Optional buildRuleToPluginMsg(RuleContext ctx, ToDeviceActorMsg msg, FromDeviceRequestMsg payload) { + protected Optional buildRuleToPluginMsg(RuleContext ctx, DeviceToDeviceActorMsg msg, FromDeviceRequestMsg payload) { RestApiCallActionPayload.RestApiCallActionPayloadBuilder builder = RestApiCallActionPayload.builder(); builder.msgType(payload.getMsgType()); builder.requestId(payload.getRequestId()); diff --git a/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/action/SnsTopicActionPayload.java b/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/action/SnsTopicActionPayload.java index afc0c45a7a..6b7caaf530 100644 --- a/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/action/SnsTopicActionPayload.java +++ b/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/action/SnsTopicActionPayload.java @@ -17,7 +17,7 @@ package org.thingsboard.server.extensions.sns.action; import lombok.Builder; import lombok.Data; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import java.io.Serializable; @@ -32,6 +32,6 @@ public class SnsTopicActionPayload implements Serializable { private final String msgBody; private final Integer requestId; - private final MsgType msgType; + private final SessionMsgType sessionMsgType; private final boolean sync; } diff --git a/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/action/SnsTopicPluginAction.java b/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/action/SnsTopicPluginAction.java index 13add7db90..212b279fc1 100644 --- a/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/action/SnsTopicPluginAction.java +++ b/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/action/SnsTopicPluginAction.java @@ -15,7 +15,7 @@ */ package org.thingsboard.server.extensions.sns.action; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceRequestMsg; import org.thingsboard.server.extensions.api.component.Action; import org.thingsboard.server.extensions.api.plugins.msg.RuleToPluginMsg; @@ -31,7 +31,7 @@ import java.util.Optional; public class SnsTopicPluginAction extends AbstractTemplatePluginAction { @Override - protected Optional buildRuleToPluginMsg(RuleContext ctx, ToDeviceActorMsg msg, FromDeviceRequestMsg payload) { + protected Optional buildRuleToPluginMsg(RuleContext ctx, DeviceToDeviceActorMsg msg, FromDeviceRequestMsg payload) { SnsTopicActionPayload.SnsTopicActionPayloadBuilder builder = SnsTopicActionPayload.builder(); builder.msgType(payload.getMsgType()); builder.requestId(payload.getRequestId()); diff --git a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/fifo/SqsFifoQueueActionPayload.java b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/fifo/SqsFifoQueueActionPayload.java index 6c1b40c3bf..deafcc70c7 100644 --- a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/fifo/SqsFifoQueueActionPayload.java +++ b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/fifo/SqsFifoQueueActionPayload.java @@ -17,7 +17,7 @@ package org.thingsboard.server.extensions.sqs.action.fifo; import lombok.Builder; import lombok.Data; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import java.io.Serializable; @@ -33,7 +33,7 @@ public class SqsFifoQueueActionPayload implements Serializable { private final String deviceId; private final Integer requestId; - private final MsgType msgType; + private final SessionMsgType sessionMsgType; private final boolean sync; } diff --git a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/fifo/SqsFifoQueuePluginAction.java b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/fifo/SqsFifoQueuePluginAction.java index e834c6d263..a2db8ac3b6 100644 --- a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/fifo/SqsFifoQueuePluginAction.java +++ b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/fifo/SqsFifoQueuePluginAction.java @@ -15,15 +15,12 @@ */ package org.thingsboard.server.extensions.sqs.action.fifo; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceRequestMsg; import org.thingsboard.server.extensions.api.component.Action; import org.thingsboard.server.extensions.api.plugins.msg.RuleToPluginMsg; import org.thingsboard.server.extensions.api.rules.RuleContext; import org.thingsboard.server.extensions.core.action.template.AbstractTemplatePluginAction; -import org.thingsboard.server.extensions.sqs.action.standard.SqsStandardQueueActionMsg; -import org.thingsboard.server.extensions.sqs.action.standard.SqsStandardQueueActionPayload; -import org.thingsboard.server.extensions.sqs.action.standard.SqsStandardQueuePluginActionConfiguration; import java.util.Optional; @@ -34,7 +31,7 @@ import java.util.Optional; public class SqsFifoQueuePluginAction extends AbstractTemplatePluginAction { @Override - protected Optional buildRuleToPluginMsg(RuleContext ctx, ToDeviceActorMsg msg, FromDeviceRequestMsg payload) { + protected Optional buildRuleToPluginMsg(RuleContext ctx, DeviceToDeviceActorMsg msg, FromDeviceRequestMsg payload) { SqsFifoQueueActionPayload.SqsFifoQueueActionPayloadBuilder builder = SqsFifoQueueActionPayload.builder(); builder.msgType(payload.getMsgType()); builder.requestId(payload.getRequestId()); diff --git a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/standard/SqsStandardQueueActionPayload.java b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/standard/SqsStandardQueueActionPayload.java index 3e35562de5..d6f81d37fd 100644 --- a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/standard/SqsStandardQueueActionPayload.java +++ b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/standard/SqsStandardQueueActionPayload.java @@ -17,7 +17,8 @@ package org.thingsboard.server.extensions.sqs.action.standard; import lombok.Builder; import lombok.Data; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import java.io.Serializable; @@ -33,7 +34,7 @@ public class SqsStandardQueueActionPayload implements Serializable { private final int delaySeconds; private final Integer requestId; - private final MsgType msgType; + private final SessionMsgType sessionMsgType; private final boolean sync; } diff --git a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/standard/SqsStandardQueuePluginAction.java b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/standard/SqsStandardQueuePluginAction.java index 232e26349d..ef7491026a 100644 --- a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/standard/SqsStandardQueuePluginAction.java +++ b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/standard/SqsStandardQueuePluginAction.java @@ -15,7 +15,7 @@ */ package org.thingsboard.server.extensions.sqs.action.standard; -import org.thingsboard.server.common.msg.device.ToDeviceActorMsg; +import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceRequestMsg; import org.thingsboard.server.extensions.api.component.Action; import org.thingsboard.server.extensions.api.plugins.msg.RuleToPluginMsg; @@ -31,7 +31,7 @@ import java.util.Optional; public class SqsStandardQueuePluginAction extends AbstractTemplatePluginAction { @Override - protected Optional buildRuleToPluginMsg(RuleContext ctx, ToDeviceActorMsg msg, FromDeviceRequestMsg payload) { + protected Optional buildRuleToPluginMsg(RuleContext ctx, DeviceToDeviceActorMsg msg, FromDeviceRequestMsg payload) { SqsStandardQueueActionPayload.SqsStandardQueueActionPayloadBuilder builder = SqsStandardQueueActionPayload.builder(); builder.msgType(payload.getMsgType()); builder.requestId(payload.getRequestId()); diff --git a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/plugin/SqsMessageHandler.java b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/plugin/SqsMessageHandler.java index d049b57dac..4128013534 100644 --- a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/plugin/SqsMessageHandler.java +++ b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/plugin/SqsMessageHandler.java @@ -65,7 +65,7 @@ public class SqsMessageHandler implements RuleMsgHandler { sqs.sendMessage(sendMsgRequest); if (payload.isSync()) { ctx.reply(new ResponsePluginToRuleMsg(msg.getUid(), tenantId, ruleId, - BasicStatusCodeResponse.onSuccess(payload.getMsgType(), payload.getRequestId()))); + BasicStatusCodeResponse.onSuccess(payload.getSessionMsgType(), payload.getRequestId()))); } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java index 0e6687fabf..0b9e0863d5 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java @@ -28,8 +28,10 @@ import org.thingsboard.server.common.data.kv.BasicTsKvEntry; import org.thingsboard.server.common.data.kv.KvEntry; import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.data.plugin.ComponentType; +import org.thingsboard.server.common.msg.MsgType; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.core.TelemetryUploadRequest; +import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.transport.adaptor.JsonConverter; import java.nio.charset.StandardCharsets; @@ -59,7 +61,7 @@ public class TbMsgTelemetryNode implements TbNode { @Override public void onMsg(TbContext ctx, TbMsg msg) { - if (!msg.getType().equals("POST_TELEMETRY")) { + if (!msg.getType().equals(SessionMsgType.POST_TELEMETRY_REQUEST.name())) { ctx.tellError(msg, new IllegalArgumentException("Unsupported msg type: " + msg.getType())); return; } diff --git a/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java b/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java index 7ba5e360ba..7674549ba8 100644 --- a/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java +++ b/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java @@ -90,7 +90,7 @@ public class CoapTransportResource extends CoapResource { } else if (exchange.getRequestOptions().hasObserve()) { processExchangeGetRequest(exchange, featureType.get()); } else if (featureType.get() == FeatureType.ATTRIBUTES) { - processRequest(exchange, MsgType.GET_ATTRIBUTES_REQUEST); + processRequest(exchange, SessionMsgType.GET_ATTRIBUTES_REQUEST); } else { log.trace("Invalid feature type parameter"); exchange.respond(ResponseCode.BAD_REQUEST); @@ -99,13 +99,13 @@ public class CoapTransportResource extends CoapResource { private void processExchangeGetRequest(CoapExchange exchange, FeatureType featureType) { boolean unsubscribe = exchange.getRequestOptions().getObserve() == 1; - MsgType msgType; + SessionMsgType sessionMsgType; if (featureType == FeatureType.RPC) { - msgType = unsubscribe ? MsgType.UNSUBSCRIBE_RPC_COMMANDS_REQUEST : MsgType.SUBSCRIBE_RPC_COMMANDS_REQUEST; + sessionMsgType = unsubscribe ? SessionMsgType.UNSUBSCRIBE_RPC_COMMANDS_REQUEST : SessionMsgType.SUBSCRIBE_RPC_COMMANDS_REQUEST; } else { - msgType = unsubscribe ? MsgType.UNSUBSCRIBE_ATTRIBUTES_REQUEST : MsgType.SUBSCRIBE_ATTRIBUTES_REQUEST; + sessionMsgType = unsubscribe ? SessionMsgType.UNSUBSCRIBE_ATTRIBUTES_REQUEST : SessionMsgType.SUBSCRIBE_ATTRIBUTES_REQUEST; } - Optional sessionId = processRequest(exchange, msgType); + Optional sessionId = processRequest(exchange, sessionMsgType); if (sessionId.isPresent()) { if (exchange.getRequestOptions().getObserve() == 1) { exchange.respond(ResponseCode.VALID); @@ -122,24 +122,24 @@ public class CoapTransportResource extends CoapResource { } else { switch (featureType.get()) { case ATTRIBUTES: - processRequest(exchange, MsgType.POST_ATTRIBUTES_REQUEST); + processRequest(exchange, SessionMsgType.POST_ATTRIBUTES_REQUEST); break; case TELEMETRY: - processRequest(exchange, MsgType.POST_TELEMETRY_REQUEST); + processRequest(exchange, SessionMsgType.POST_TELEMETRY_REQUEST); break; case RPC: Optional requestId = getRequestId(exchange.advanced().getRequest()); if (requestId.isPresent()) { - processRequest(exchange, MsgType.TO_DEVICE_RPC_RESPONSE); + processRequest(exchange, SessionMsgType.TO_DEVICE_RPC_RESPONSE); } else { - processRequest(exchange, MsgType.TO_SERVER_RPC_REQUEST); + processRequest(exchange, SessionMsgType.TO_SERVER_RPC_REQUEST); } break; } } } - private Optional processRequest(CoapExchange exchange, MsgType type) { + private Optional processRequest(CoapExchange exchange, SessionMsgType type) { log.trace("Processing {}", exchange.advanced().getRequest()); exchange.accept(); Exchange advanced = exchange.advanced(); diff --git a/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/JsonCoapAdaptor.java b/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/JsonCoapAdaptor.java index e3ef2ccd20..6472dfbb02 100644 --- a/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/JsonCoapAdaptor.java +++ b/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/JsonCoapAdaptor.java @@ -28,9 +28,10 @@ import org.thingsboard.server.common.msg.kv.AttributesKVMsg; import org.thingsboard.server.common.msg.session.AdaptorToSessionActorMsg; import org.thingsboard.server.common.msg.session.BasicAdaptorToSessionActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceMsg; -import org.thingsboard.server.common.msg.session.MsgType; +import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.session.SessionActorToAdaptorMsg; import org.thingsboard.server.common.msg.session.SessionContext; +import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.session.ToDeviceMsg; import org.thingsboard.server.common.msg.session.ex.ProcessingTimeoutException; import org.thingsboard.server.common.transport.adaptor.AdaptorException; @@ -48,7 +49,7 @@ import org.thingsboard.server.transport.coap.session.CoapSessionCtx; public class JsonCoapAdaptor implements CoapTransportAdaptor { @Override - public AdaptorToSessionActorMsg convertToActorMsg(CoapSessionCtx ctx, MsgType type, Request inbound) throws AdaptorException { + public AdaptorToSessionActorMsg convertToActorMsg(CoapSessionCtx ctx, SessionMsgType type, Request inbound) throws AdaptorException { FromDeviceMsg msg = null; switch (type) { case POST_TELEMETRY_REQUEST: @@ -104,7 +105,7 @@ public class JsonCoapAdaptor implements CoapTransportAdaptor { @Override public Optional convertToAdaptorMsg(CoapSessionCtx ctx, SessionActorToAdaptorMsg source) throws AdaptorException { ToDeviceMsg msg = source.getMsg(); - switch (msg.getMsgType()) { + switch (msg.getSessionMsgType()) { case STATUS_CODE_RESPONSE: case TO_DEVICE_RPC_RESPONSE_ACK: return Optional.of(convertStatusCodeResponse((StatusCodeResponse) msg)); @@ -119,19 +120,19 @@ public class JsonCoapAdaptor implements CoapTransportAdaptor { case RULE_ENGINE_ERROR: return Optional.of(convertToRuleEngineErrorResponse(ctx, (RuleEngineErrorMsg) msg)); default: - log.warn("[{}] Unsupported msg type: {}!", source.getSessionId(), msg.getMsgType()); - throw new AdaptorException(new IllegalArgumentException("Unsupported msg type: " + msg.getMsgType() + "!")); + log.warn("[{}] Unsupported msg type: {}!", source.getSessionId(), msg.getSessionMsgType()); + throw new AdaptorException(new IllegalArgumentException("Unsupported msg type: " + msg.getSessionMsgType() + "!")); } } private Response convertToRuleEngineErrorResponse(CoapSessionCtx ctx, RuleEngineErrorMsg msg) { ResponseCode status = ResponseCode.INTERNAL_SERVER_ERROR; switch (msg.getError()) { - case PLUGIN_TIMEOUT: + case QUEUE_PUT_TIMEOUT: status = ResponseCode.GATEWAY_TIMEOUT; break; default: - if (msg.getInMsgType() == MsgType.TO_SERVER_RPC_REQUEST) { + if (msg.getInSessionMsgType() == SessionMsgType.TO_SERVER_RPC_REQUEST) { status = ResponseCode.BAD_REQUEST; } break; diff --git a/transport/coap/src/test/java/org/thingsboard/server/transport/coap/CoapServerTest.java b/transport/coap/src/test/java/org/thingsboard/server/transport/coap/CoapServerTest.java index 072c7358ac..60b22206ac 100644 --- a/transport/coap/src/test/java/org/thingsboard/server/transport/coap/CoapServerTest.java +++ b/transport/coap/src/test/java/org/thingsboard/server/transport/coap/CoapServerTest.java @@ -113,9 +113,9 @@ public class CoapServerTest { try { FromDeviceMsg deviceMsg = sessionMsg.getMsg(); ToDeviceMsg toDeviceMsg = null; - if (deviceMsg.getMsgType() == MsgType.POST_TELEMETRY_REQUEST) { + if (deviceMsg.getMsgType() == SessionMsgType.POST_TELEMETRY_REQUEST) { toDeviceMsg = BasicStatusCodeResponse.onSuccess(deviceMsg.getMsgType(), BasicRequest.DEFAULT_REQUEST_ID); - } else if (deviceMsg.getMsgType() == MsgType.GET_ATTRIBUTES_REQUEST) { + } else if (deviceMsg.getMsgType() == SessionMsgType.GET_ATTRIBUTES_REQUEST) { List data = new ArrayList<>(); data.add(new BaseAttributeKvEntry(new StringDataEntry("key1", "value1"), System.currentTimeMillis())); data.add(new BaseAttributeKvEntry(new LongDataEntry("key2", 42L), System.currentTimeMillis())); diff --git a/transport/http/src/main/java/org/thingsboard/server/transport/http/session/HttpSessionCtx.java b/transport/http/src/main/java/org/thingsboard/server/transport/http/session/HttpSessionCtx.java index 743b3e777e..4732785de2 100644 --- a/transport/http/src/main/java/org/thingsboard/server/transport/http/session/HttpSessionCtx.java +++ b/transport/http/src/main/java/org/thingsboard/server/transport/http/session/HttpSessionCtx.java @@ -57,7 +57,7 @@ public class HttpSessionCtx extends DeviceAwareSessionContext { @Override public void onMsg(SessionActorToAdaptorMsg source) throws SessionException { ToDeviceMsg msg = source.getMsg(); - switch (msg.getMsgType()) { + switch (msg.getSessionMsgType()) { case GET_ATTRIBUTES_RESPONSE: reply((GetAttributesResponse) msg); return; @@ -84,11 +84,11 @@ public class HttpSessionCtx extends DeviceAwareSessionContext { private void reply(RuleEngineErrorMsg msg) { HttpStatus status = HttpStatus.INTERNAL_SERVER_ERROR; switch (msg.getError()) { - case PLUGIN_TIMEOUT: + case QUEUE_PUT_TIMEOUT: status = HttpStatus.REQUEST_TIMEOUT; break; default: - if (msg.getInMsgType() == MsgType.TO_SERVER_RPC_REQUEST) { + if (msg.getInSessionMsgType() == SessionMsgType.TO_SERVER_RPC_REQUEST) { status = HttpStatus.BAD_REQUEST; } break; diff --git a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java index 8766599eaf..5ccce350ac 100644 --- a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java +++ b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java @@ -53,7 +53,7 @@ import java.util.List; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.*; import static io.netty.handler.codec.mqtt.MqttMessageType.*; import static io.netty.handler.codec.mqtt.MqttQoS.*; -import static org.thingsboard.server.common.msg.session.MsgType.*; +import static org.thingsboard.server.common.msg.session.SessionMsgType.*; import static org.thingsboard.server.transport.mqtt.MqttTopics.*; /** diff --git a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/JsonMqttAdaptor.java b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/JsonMqttAdaptor.java index 64df6bc148..e35cfd589a 100644 --- a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/JsonMqttAdaptor.java +++ b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/JsonMqttAdaptor.java @@ -53,7 +53,7 @@ public class JsonMqttAdaptor implements MqttTransportAdaptor { private static final ByteBufAllocator ALLOCATOR = new UnpooledByteBufAllocator(false); @Override - public AdaptorToSessionActorMsg convertToActorMsg(DeviceSessionCtx ctx, MsgType type, MqttMessage inbound) throws AdaptorException { + public AdaptorToSessionActorMsg convertToActorMsg(DeviceSessionCtx ctx, SessionMsgType type, MqttMessage inbound) throws AdaptorException { FromDeviceMsg msg; switch (type) { case POST_TELEMETRY_REQUEST: @@ -94,7 +94,7 @@ public class JsonMqttAdaptor implements MqttTransportAdaptor { public Optional convertToAdaptorMsg(DeviceSessionCtx ctx, SessionActorToAdaptorMsg sessionMsg) throws AdaptorException { MqttMessage result = null; ToDeviceMsg msg = sessionMsg.getMsg(); - switch (msg.getMsgType()) { + switch (msg.getSessionMsgType()) { case STATUS_CODE_RESPONSE: case GET_ATTRIBUTES_RESPONSE: ResponseMsg responseMsg = (ResponseMsg) msg; @@ -134,12 +134,12 @@ public class JsonMqttAdaptor implements MqttTransportAdaptor { private MqttMessage convertResponseMsg(DeviceSessionCtx ctx, ToDeviceMsg msg, ResponseMsg responseMsg, Optional responseError) throws AdaptorException { MqttMessage result = null; - MsgType requestMsgType = responseMsg.getRequestMsgType(); + SessionMsgType requestMsgType = responseMsg.getRequestMsgType(); Integer requestId = responseMsg.getRequestId(); if (requestId >= 0) { - if (requestMsgType == MsgType.POST_ATTRIBUTES_REQUEST || requestMsgType == MsgType.POST_TELEMETRY_REQUEST) { + if (requestMsgType == SessionMsgType.POST_ATTRIBUTES_REQUEST || requestMsgType == SessionMsgType.POST_TELEMETRY_REQUEST) { result = MqttTransportHandler.createMqttPubAckMsg(requestId); - } else if (requestMsgType == MsgType.GET_ATTRIBUTES_REQUEST) { + } else if (requestMsgType == SessionMsgType.GET_ATTRIBUTES_REQUEST) { GetAttributesResponse response = (GetAttributesResponse) msg; Optional responseData = response.getData(); if (response.isSuccess() && responseData.isPresent()) { diff --git a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionCtx.java b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionCtx.java index 632ab28999..6377fad69d 100644 --- a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionCtx.java +++ b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionCtx.java @@ -80,13 +80,13 @@ public class GatewayDeviceSessionCtx extends DeviceAwareSessionContext { private Optional getToDeviceMsg(SessionActorToAdaptorMsg sessionMsg) { ToDeviceMsg msg = sessionMsg.getMsg(); - switch (msg.getMsgType()) { + switch (msg.getSessionMsgType()) { case STATUS_CODE_RESPONSE: ResponseMsg responseMsg = (ResponseMsg) msg; if (responseMsg.isSuccess()) { - MsgType requestMsgType = responseMsg.getRequestMsgType(); + SessionMsgType requestMsgType = responseMsg.getRequestMsgType(); Integer requestId = responseMsg.getRequestId(); - if (requestId >= 0 && requestMsgType == MsgType.POST_ATTRIBUTES_REQUEST || requestMsgType == MsgType.POST_TELEMETRY_REQUEST) { + if (requestId >= 0 && requestMsgType == SessionMsgType.POST_ATTRIBUTES_REQUEST || requestMsgType == SessionMsgType.POST_TELEMETRY_REQUEST) { return Optional.of(MqttTransportHandler.createMqttPubAckMsg(requestId)); } } From 69aac973f6292bf689a8c2f4dcc05d899efa838b Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Thu, 19 Apr 2018 11:00:00 +0300 Subject: [PATCH 4/4] Server-side RPC and Telemetry. Default Rule Chain. Fixed Tests. --- application/src/main/conf/thingsboard.conf | 2 +- .../demo_device_messaging_rpc_plugin.json | 13 - .../json/demo/plugins/demo_email_plugin.json | 28 -- .../demo/plugins/demo_time_rpc_plugin.json | 11 - .../data/json/demo/rules/demo_alarm_rule.json | 46 ---- .../demo/rules/demo_gettime_rpc_rule.json | 35 --- .../demo/rules/demo_messaging_rpc_rule.json | 38 --- .../system/plugins/system_rpc_plugin.json | 11 - .../plugins/system_telemetry_plugin.json | 9 - .../system/rules/system_telemetry_rule.json | 29 -- .../tenant/rule_chains/root_rule_chain.json | 102 ++++++++ .../server/actors/app/AppActor.java | 2 +- .../device/DeviceActorMessageProcessor.java | 81 ++++-- .../actors/ruleChain/RuleChainActor.java | 8 +- .../RuleChainActorMessageProcessor.java | 29 +- .../server/actors/tenant/TenantActor.java | 2 +- .../server/controller/RpcController.java | 9 +- .../server/controller/TenantController.java | 32 ++- .../DefaultSystemDataLoaderService.java | 147 +---------- .../service/install/InstallScripts.java | 182 +++++++++++++ .../install/SystemDataLoaderService.java | 4 - .../service/rpc/DefaultDeviceRpcService.java | 5 +- .../server/actors/ActorsTestSuite.java | 27 -- .../actors/DefaultActorServiceTest.java | 245 ----------------- .../server/actors/DummySessionID.java | 63 ----- .../AbstractRuleEngineControllerTest.java | 17 ++ ...BaseComponentDescriptorControllerTest.java | 21 +- .../controller/BasePluginControllerTest.java | 232 ---------------- .../controller/BaseRuleControllerTest.java | 247 ------------------ .../nosql/PluginControllerNoSqlTest.java | 26 -- .../nosql/RuleControllerNoSqlTest.java | 26 -- .../sql/PluginControllerSqlTest.java | 26 -- ...tractMqttServerSideRpcIntegrationTest.java | 2 + .../server/rules/RuleEngineSqlTestSuite.java | 3 +- ...AbstractRuleEngineFlowIntegrationTest.java | 13 +- ...actRuleEngineLifecycleIntegrationTest.java | 5 +- .../server/system/SystemSqlTestSuite.java | 1 - ...uest.java => AttributesUpdateRequest.java} | 2 +- ...java => BasicAttributesUpdateRequest.java} | 9 +- .../common/msg/core/RuleEngineError.java | 2 +- .../common/msg/core/RuleEngineErrorMsg.java | 16 +- .../transport/adaptor/JsonConverter.java | 6 +- .../server/dao/rule/BaseRuleChainService.java | 2 - ...pdateAttributesRequestRuleToPluginMsg.java | 6 +- .../telemetry/TelemetryPluginAction.java | 5 +- .../core/filter/DeviceAttributesFilter.java | 4 +- .../core/filter/NashornJsEvaluator.java | 4 +- .../handlers/TelemetryRuleMsgHandler.java | 4 +- .../core/processor/AlarmProcessor.java | 4 +- .../resources/MsgTypeFilterDescriptor.json | 8 +- .../kafka/action/KafkaPluginAction.java | 2 +- .../kafka/plugin/KafkaMsgHandler.java | 4 +- .../mqtt/action/MqttPluginAction.java | 2 +- .../mqtt/plugin/MqttMsgHandler.java | 4 +- .../rabbitmq/action/RabbitMqPluginAction.java | 2 +- .../rabbitmq/plugin/RabbitMqMsgHandler.java | 2 +- .../rest/action/RestApiCallPluginAction.java | 2 +- .../rest/plugin/RestApiCallMsgHandler.java | 2 +- .../sns/action/SnsTopicPluginAction.java | 2 +- .../sns/plugin/SnsMessageHandler.java | 2 +- .../action/fifo/SqsFifoQueuePluginAction.java | 2 +- .../SqsStandardQueuePluginAction.java | 2 +- .../sqs/plugin/SqsMessageHandler.java | 2 +- .../engine/telemetry/TbMsgAttributesNode.java | 76 ++++++ .../TbMsgAttributesNodeConfiguration.java | 23 +- ...etryNode.java => TbMsgTimeseriesNode.java} | 15 +- ... => TbMsgTimeseriesNodeConfiguration.java} | 8 +- .../rule/engine/action/TbAlarmNodeTest.java | 31 +++ .../coap/adaptors/JsonCoapAdaptor.java | 3 +- .../mqtt/adaptors/JsonMqttAdaptor.java | 2 +- .../mqtt/session/GatewaySessionCtx.java | 2 +- 71 files changed, 634 insertions(+), 1407 deletions(-) delete mode 100644 application/src/main/data/json/demo/plugins/demo_device_messaging_rpc_plugin.json delete mode 100644 application/src/main/data/json/demo/plugins/demo_email_plugin.json delete mode 100644 application/src/main/data/json/demo/plugins/demo_time_rpc_plugin.json delete mode 100644 application/src/main/data/json/demo/rules/demo_alarm_rule.json delete mode 100644 application/src/main/data/json/demo/rules/demo_gettime_rpc_rule.json delete mode 100644 application/src/main/data/json/demo/rules/demo_messaging_rpc_rule.json delete mode 100644 application/src/main/data/json/system/plugins/system_rpc_plugin.json delete mode 100644 application/src/main/data/json/system/plugins/system_telemetry_plugin.json delete mode 100644 application/src/main/data/json/system/rules/system_telemetry_rule.json create mode 100644 application/src/main/data/json/tenant/rule_chains/root_rule_chain.json create mode 100644 application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java delete mode 100644 application/src/test/java/org/thingsboard/server/actors/ActorsTestSuite.java delete mode 100644 application/src/test/java/org/thingsboard/server/actors/DefaultActorServiceTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/actors/DummySessionID.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/BasePluginControllerTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/BaseRuleControllerTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/nosql/PluginControllerNoSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/nosql/RuleControllerNoSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/PluginControllerSqlTest.java rename common/message/src/main/java/org/thingsboard/server/common/msg/core/{UpdateAttributesRequest.java => AttributesUpdateRequest.java} (93%) rename common/message/src/main/java/org/thingsboard/server/common/msg/core/{BasicUpdateAttributesRequest.java => BasicAttributesUpdateRequest.java} (82%) create mode 100644 rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java rename application/src/test/java/org/thingsboard/server/controller/sql/RuleControllerSqlTest.java => rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeConfiguration.java (50%) rename rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/{TbMsgTelemetryNode.java => TbMsgTimeseriesNode.java} (89%) rename rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/{TbMsgTelemetryNodeConfiguration.java => TbMsgTimeseriesNodeConfiguration.java} (74%) diff --git a/application/src/main/conf/thingsboard.conf b/application/src/main/conf/thingsboard.conf index a6e404d5ad..2baee7de41 100644 --- a/application/src/main/conf/thingsboard.conf +++ b/application/src/main/conf/thingsboard.conf @@ -14,7 +14,7 @@ # limitations under the License. # -export JAVA_OPTS="$JAVA_OPTS -Dplatform=@pkg.platform@" +export JAVA_OPTS="$JAVA_OPTS -Dplatform=@pkg.platform@ -Dinstall.data_dir=@pkg.installFolder@" export LOG_FILENAME=${pkg.name}.out export LOADER_PATH=${pkg.installFolder}/conf,${pkg.installFolder}/extensions export SQL_DATA_FOLDER=${pkg.installFolder}/data/sql diff --git a/application/src/main/data/json/demo/plugins/demo_device_messaging_rpc_plugin.json b/application/src/main/data/json/demo/plugins/demo_device_messaging_rpc_plugin.json deleted file mode 100644 index 6181f4920c..0000000000 --- a/application/src/main/data/json/demo/plugins/demo_device_messaging_rpc_plugin.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "apiToken": "messaging", - "name": "Demo Device Messaging RPC Plugin", - "clazz": "org.thingsboard.server.extensions.core.plugin.messaging.DeviceMessagingPlugin", - "publicAccess": false, - "state": "ACTIVE", - "configuration": { - "maxDeviceCountPerCustomer": 1024, - "defaultTimeout": 20000, - "maxTimeout": 60000 - }, - "additionalInfo": null -} \ No newline at end of file diff --git a/application/src/main/data/json/demo/plugins/demo_email_plugin.json b/application/src/main/data/json/demo/plugins/demo_email_plugin.json deleted file mode 100644 index 40225f8c8c..0000000000 --- a/application/src/main/data/json/demo/plugins/demo_email_plugin.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "apiToken": "mail", - "name": "Demo Email Plugin", - "clazz": "org.thingsboard.server.extensions.core.plugin.mail.MailPlugin", - "publicAccess": true, - "state": "ACTIVE", - "configuration": { - "host": "smtp.sendgrid.net", - "port": 2525, - "username": "apikey", - "password": "your_api_key", - "otherProperties": [ - { - "key": "mail.smtp.auth", - "value": "true" - }, - { - "key": "mail.smtp.timeout", - "value": "10000" - }, - { - "key": "mail.smtp.starttls.enable", - "value": "true" - } - ] - }, - "additionalInfo": null -} \ No newline at end of file diff --git a/application/src/main/data/json/demo/plugins/demo_time_rpc_plugin.json b/application/src/main/data/json/demo/plugins/demo_time_rpc_plugin.json deleted file mode 100644 index d5ac2d4469..0000000000 --- a/application/src/main/data/json/demo/plugins/demo_time_rpc_plugin.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "apiToken": "time", - "name": "Demo Time RPC Plugin", - "clazz": "org.thingsboard.server.extensions.core.plugin.time.TimePlugin", - "publicAccess": false, - "state": "ACTIVE", - "configuration": { - "timeFormat": "yyyy MM dd HH:mm:ss.SSS" - }, - "additionalInfo": null -} \ No newline at end of file diff --git a/application/src/main/data/json/demo/rules/demo_alarm_rule.json b/application/src/main/data/json/demo/rules/demo_alarm_rule.json deleted file mode 100644 index 12565d8c16..0000000000 --- a/application/src/main/data/json/demo/rules/demo_alarm_rule.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "Demo Alarm Rule", - "state": "ACTIVE", - "weight": 0, - "pluginToken": "mail", - "filters": [ - { - "clazz": "org.thingsboard.server.extensions.core.filter.MsgTypeFilter", - "name": "MsgTypeFilter", - "configuration": { - "messageTypes": [ - "POST_TELEMETRY", - "POST_ATTRIBUTES", - "GET_ATTRIBUTES" - ] - } - }, - { - "clazz": "org.thingsboard.server.extensions.core.filter.DeviceTelemetryFilter", - "name": "Temperature filter", - "configuration": { - "filter": "typeof temperature !== 'undefined' && temperature >= 100" - } - } - ], - "processor": { - "clazz": "org.thingsboard.server.extensions.core.processor.AlarmDeduplicationProcessor", - "name": "AlarmDeduplicationProcessor", - "configuration": { - "alarmIdTemplate": "[$date.get('yyyy-MM-dd HH:mm')] Device $cs.get('serialNumber')($cs.get('model')) temperature is high!", - "alarmBodyTemplate": "[$date.get('yyyy-MM-dd HH:mm:ss')] Device $cs.get('serialNumber')($cs.get('model')) temperature is $temp.valueAsString!" - } - }, - "action": { - "clazz": "org.thingsboard.server.extensions.core.action.mail.SendMailAction", - "name": "Send Mail Action", - "configuration": { - "sendFlag": "isNewAlarm", - "fromTemplate": "thingsboard@gmail.com", - "toTemplate": "thingsboard@gmail.com", - "subjectTemplate": "$alarmId", - "bodyTemplate": "$alarmBody" - } - }, - "additionalInfo": null -} \ No newline at end of file diff --git a/application/src/main/data/json/demo/rules/demo_gettime_rpc_rule.json b/application/src/main/data/json/demo/rules/demo_gettime_rpc_rule.json deleted file mode 100644 index 391c121ca2..0000000000 --- a/application/src/main/data/json/demo/rules/demo_gettime_rpc_rule.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "Demo getTime RPC Rule", - "state": "ACTIVE", - "weight": 0, - "pluginToken": "time", - "filters": [ - { - "configuration": { - "messageTypes": [ - "RPC_REQUEST" - ] - }, - "name": "RPC Request Filter", - "clazz": "org.thingsboard.server.extensions.core.filter.MsgTypeFilter" - }, - { - "configuration": { - "methodNames": [ - { - "name": "getTime" - } - ] - }, - "name": "getTime method filter", - "clazz": "org.thingsboard.server.extensions.core.filter.MethodNameFilter" - } - ], - "processor": null, - "action": { - "configuration": {}, - "clazz": "org.thingsboard.server.extensions.core.action.rpc.RpcPluginAction", - "name": "getTimeAction" - }, - "additionalInfo": null -} \ No newline at end of file diff --git a/application/src/main/data/json/demo/rules/demo_messaging_rpc_rule.json b/application/src/main/data/json/demo/rules/demo_messaging_rpc_rule.json deleted file mode 100644 index 50021e4bde..0000000000 --- a/application/src/main/data/json/demo/rules/demo_messaging_rpc_rule.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "Demo Messaging RPC Rule", - "state": "ACTIVE", - "weight": 0, - "pluginToken": "messaging", - "filters": [ - { - "configuration": { - "messageTypes": [ - "RPC_REQUEST" - ] - }, - "name": "RPC Request Filter", - "clazz": "org.thingsboard.server.extensions.core.filter.MsgTypeFilter" - }, - { - "configuration": { - "methodNames": [ - { - "name": "getDevices" - }, - { - "name": "sendMsg" - } - ] - }, - "name": "Messaging methods filter", - "clazz": "org.thingsboard.server.extensions.core.filter.MethodNameFilter" - } - ], - "processor": null, - "action": { - "configuration": {}, - "clazz": "org.thingsboard.server.extensions.core.action.rpc.RpcPluginAction", - "name": "Messaging RPC Action" - }, - "additionalInfo": null -} \ No newline at end of file diff --git a/application/src/main/data/json/system/plugins/system_rpc_plugin.json b/application/src/main/data/json/system/plugins/system_rpc_plugin.json deleted file mode 100644 index 7245faaa5e..0000000000 --- a/application/src/main/data/json/system/plugins/system_rpc_plugin.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "apiToken": "rpc", - "name": "System RPC Plugin", - "clazz": "org.thingsboard.server.extensions.core.plugin.rpc.RpcPlugin", - "publicAccess": true, - "state": "ACTIVE", - "configuration": { - "defaultTimeout": 20000 - }, - "additionalInfo": null -} \ No newline at end of file diff --git a/application/src/main/data/json/system/plugins/system_telemetry_plugin.json b/application/src/main/data/json/system/plugins/system_telemetry_plugin.json deleted file mode 100644 index 93a40e0ab3..0000000000 --- a/application/src/main/data/json/system/plugins/system_telemetry_plugin.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "apiToken": "telemetry", - "name": "System Telemetry Plugin", - "clazz": "org.thingsboard.server.extensions.core.plugin.telemetry.TelemetryStoragePlugin", - "publicAccess": true, - "state": "ACTIVE", - "configuration": {}, - "additionalInfo": null -} \ No newline at end of file diff --git a/application/src/main/data/json/system/rules/system_telemetry_rule.json b/application/src/main/data/json/system/rules/system_telemetry_rule.json deleted file mode 100644 index c8166bf710..0000000000 --- a/application/src/main/data/json/system/rules/system_telemetry_rule.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "System Telemetry Rule", - "state": "ACTIVE", - "weight": 0, - "pluginToken": "telemetry", - "filters": [ - { - "clazz": "org.thingsboard.server.extensions.core.filter.MsgTypeFilter", - "name": "TelemetryFilter", - "configuration": { - "messageTypes": [ - "POST_TELEMETRY", - "POST_ATTRIBUTES", - "GET_ATTRIBUTES" - ] - } - } - ], - "processor": null, - "action": { - "clazz": "org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction", - "name": "TelemetryMsgConverterAction", - "configuration": { - "timeUnit": "DAYS", - "ttlValue": 365 - } - }, - "additionalInfo": null -} \ No newline at end of file diff --git a/application/src/main/data/json/tenant/rule_chains/root_rule_chain.json b/application/src/main/data/json/tenant/rule_chains/root_rule_chain.json new file mode 100644 index 0000000000..a5573f8f8a --- /dev/null +++ b/application/src/main/data/json/tenant/rule_chains/root_rule_chain.json @@ -0,0 +1,102 @@ +{ + "ruleChain": { + "additionalInfo": null, + "name": "Root Rule Chain", + "firstRuleNodeId": null, + "root": true, + "debugMode": false, + "configuration": null + }, + "metadata": { + "firstNodeIndex": 2, + "nodes": [ + { + "additionalInfo": { + "layoutX": 639, + "layoutY": 113 + }, + "type": "org.thingsboard.rule.engine.filter.TbMsgTypeFilterNode", + "name": "PostAttributes", + "debugMode": true, + "configuration": { + "messageTypes": [ + "POST_ATTRIBUTES_REQUEST" + ] + } + }, + { + "additionalInfo": { + "layoutX": 638, + "layoutY": 206 + }, + "type": "org.thingsboard.rule.engine.filter.TbMsgTypeFilterNode", + "name": "PostTelemetry", + "debugMode": true, + "configuration": { + "messageTypes": [ + "POST_TELEMETRY_REQUEST" + ] + } + }, + { + "additionalInfo": { + "layoutX": 297, + "layoutY": 148 + }, + "type": "org.thingsboard.rule.engine.action.TbLogNode", + "name": "Log", + "debugMode": false, + "configuration": { + "jsScript": "return 'incoming message = ' + msg;" + } + }, + { + "additionalInfo": { + "layoutX": 905, + "layoutY": 203 + }, + "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode", + "name": "SaveTS", + "debugMode": true, + "configuration": { + "defaultTTL": 0 + } + }, + { + "additionalInfo": { + "layoutX": 904, + "layoutY": 110 + }, + "type": "org.thingsboard.rule.engine.telemetry.TbMsgAttributesNode", + "name": "save client attributes", + "debugMode": true, + "configuration": { + "scope": "CLIENT_SCOPE" + } + } + ], + "connections": [ + { + "fromIndex": 0, + "toIndex": 4, + "type": "True" + }, + { + "fromIndex": 1, + "toIndex": 3, + "type": "True" + }, + { + "fromIndex": 2, + "toIndex": 0, + "type": "Success" + }, + { + "fromIndex": 2, + "toIndex": 1, + "type": "Success" + } + ], + "ruleChainConnections": null + } +} diff --git a/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java b/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java index 07ff89e6b6..f6433e8f33 100644 --- a/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/app/AppActor.java @@ -103,7 +103,7 @@ public class AppActor extends RuleChainManagerActor { case DEVICE_CREDENTIALS_UPDATE_TO_DEVICE_ACTOR_MSG: case DEVICE_NAME_OR_TYPE_UPDATE_TO_DEVICE_ACTOR_MSG: case DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG: - onToDeviceActorMsg((DeviceToDeviceActorMsg) msg); + onToDeviceActorMsg((TenantAwareMsg) msg); break; default: return false; diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java index e289f13e4d..26c0a28068 100644 --- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java @@ -19,6 +19,9 @@ import akka.actor.ActorContext; import akka.actor.ActorRef; import akka.event.LoggingAdapter; import com.datastax.driver.core.utils.UUIDs; +import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonObject; @@ -39,14 +42,18 @@ import org.thingsboard.server.common.msg.TbMsgMetaData; import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.common.msg.core.AttributesUpdateNotification; +import org.thingsboard.server.common.msg.core.AttributesUpdateRequest; import org.thingsboard.server.common.msg.core.BasicCommandAckResponse; +import org.thingsboard.server.common.msg.core.BasicGetAttributesResponse; import org.thingsboard.server.common.msg.core.BasicStatusCodeResponse; import org.thingsboard.server.common.msg.core.BasicToDeviceSessionActorMsg; +import org.thingsboard.server.common.msg.core.GetAttributesRequest; import org.thingsboard.server.common.msg.core.RuleEngineError; import org.thingsboard.server.common.msg.core.RuleEngineErrorMsg; import org.thingsboard.server.common.msg.core.SessionCloseMsg; import org.thingsboard.server.common.msg.core.SessionCloseNotification; import org.thingsboard.server.common.msg.core.SessionOpenMsg; +import org.thingsboard.server.common.msg.core.StatusCodeResponse; import org.thingsboard.server.common.msg.core.TelemetryUploadRequest; import org.thingsboard.server.common.msg.core.ToDeviceRpcRequestMsg; import org.thingsboard.server.common.msg.core.ToDeviceRpcResponseMsg; @@ -64,10 +71,15 @@ import org.thingsboard.server.common.msg.timeout.DeviceActorQueueTimeoutMsg; import org.thingsboard.server.common.msg.timeout.DeviceActorRpcTimeoutMsg; import org.thingsboard.server.extensions.api.device.DeviceAttributesEventNotificationMsg; import org.thingsboard.server.extensions.api.device.DeviceNameOrTypeUpdateMsg; +import org.thingsboard.server.extensions.api.plugins.PluginCallback; +import org.thingsboard.server.extensions.api.plugins.PluginContext; import org.thingsboard.server.extensions.api.plugins.msg.FromDeviceRpcResponse; import org.thingsboard.server.extensions.api.plugins.msg.RpcError; +import javax.annotation.Nullable; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -114,7 +126,6 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso } private void initAttributes() { - //TODO: add invalidation of deviceType cache. Device device = systemContext.getDeviceService().findDeviceById(deviceId); this.deviceName = device.getName(); this.deviceType = device.getType(); @@ -238,6 +249,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso processSubscriptionCommands(context, msg); processRpcResponses(context, msg); processSessionStateMsgs(msg); + SessionMsgType sessionMsgType = msg.getPayload().getMsgType(); if (sessionMsgType.requiresRulesProcessing()) { switch (sessionMsgType) { @@ -245,6 +257,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso handleGetAttributesRequest(msg); break; case POST_ATTRIBUTES_REQUEST: + handlePostAttributesRequest(context, msg); break; case POST_TELEMETRY_REQUEST: handlePostTelemetryRequest(context, msg); @@ -256,14 +269,62 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso } } - private void handleGetAttributesRequest(DeviceToDeviceActorMsg msg) { + private void handleGetAttributesRequest(DeviceToDeviceActorMsg src) { + GetAttributesRequest request = (GetAttributesRequest) src.getPayload(); + ListenableFuture> clientAttributesFuture = getAttributeKvEntries(deviceId, DataConstants.CLIENT_SCOPE, request.getClientAttributeNames()); + ListenableFuture> sharedAttributesFuture = getAttributeKvEntries(deviceId, DataConstants.SHARED_SCOPE, request.getClientAttributeNames()); + + Futures.addCallback(Futures.allAsList(Arrays.asList(clientAttributesFuture, sharedAttributesFuture)), new FutureCallback>>() { + @Override + public void onSuccess(@Nullable List> result) { + BasicGetAttributesResponse response = BasicGetAttributesResponse.onSuccess(request.getMsgType(), + request.getRequestId(), BasicAttributeKVMsg.from(result.get(0), result.get(1))); + sendMsgToSessionActor(new BasicToDeviceSessionActorMsg(response, src.getSessionId()), src.getServerAddress()); + } + @Override + public void onFailure(Throwable t) { + if (t instanceof Exception) { + ToDeviceMsg toDeviceMsg = BasicStatusCodeResponse.onError(SessionMsgType.GET_ATTRIBUTES_REQUEST, request.getRequestId(), (Exception) t); + sendMsgToSessionActor(new BasicToDeviceSessionActorMsg(toDeviceMsg, src.getSessionId()), src.getServerAddress()); + } else { + logger.error("[{}] Failed to process attributes request", deviceId, t); + } + } + }); + } + + private ListenableFuture> getAttributeKvEntries(DeviceId deviceId, String scope, Optional> names) { + if (names.isPresent()) { + if (!names.get().isEmpty()) { + return systemContext.getAttributesService().find(deviceId, scope, names.get()); + } else { + return systemContext.getAttributesService().findAll(deviceId, scope); + } + } else { + return Futures.immediateFuture(Collections.emptyList()); + } + } + + private void handlePostAttributesRequest(ActorContext context, DeviceToDeviceActorMsg src) { + AttributesUpdateRequest request = (AttributesUpdateRequest) src.getPayload(); + + JsonObject json = new JsonObject(); + for (AttributeKvEntry kv : request.getAttributes()) { + kv.getBooleanValue().ifPresent(v -> json.addProperty(kv.getKey(), v)); + kv.getLongValue().ifPresent(v -> json.addProperty(kv.getKey(), v)); + kv.getDoubleValue().ifPresent(v -> json.addProperty(kv.getKey(), v)); + kv.getStrValue().ifPresent(v -> json.addProperty(kv.getKey(), v)); + } + + TbMsg tbMsg = new TbMsg(UUIDs.timeBased(), SessionMsgType.POST_ATTRIBUTES_REQUEST.name(), deviceId, defaultMetaData, TbMsgDataType.JSON, gson.toJson(json)); + pushToRuleEngineWithTimeout(context, tbMsg, src, request); } private void handlePostTelemetryRequest(ActorContext context, DeviceToDeviceActorMsg src) { - TelemetryUploadRequest telemetry = (TelemetryUploadRequest) src.getPayload(); + TelemetryUploadRequest request = (TelemetryUploadRequest) src.getPayload(); - Map> tsData = telemetry.getData(); + Map> tsData = request.getData(); JsonArray json = new JsonArray(); for (Map.Entry> entry : tsData.entrySet()) { @@ -281,7 +342,7 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso } TbMsg tbMsg = new TbMsg(UUIDs.timeBased(), SessionMsgType.POST_TELEMETRY_REQUEST.name(), deviceId, defaultMetaData, TbMsgDataType.JSON, gson.toJson(json)); - pushToRuleEngineWithTimeout(context, tbMsg, src, telemetry); + pushToRuleEngineWithTimeout(context, tbMsg, src, request); } private void pushToRuleEngineWithTimeout(ActorContext context, TbMsg tbMsg, DeviceToDeviceActorMsg src, FromDeviceRequestMsg fromDeviceRequestMsg) { @@ -403,16 +464,6 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso } } - private List fetchAttributes(String scope) { - try { - //TODO: replace this with async operation. Happens only during actor creation, but is still criticla for performance, - return systemContext.getAttributesService().findAll(this.deviceId, scope).get(); - } catch (InterruptedException | ExecutionException e) { - logger.warning("[{}] Failed to fetch attributes for scope: {}", deviceId, scope); - throw new RuntimeException(e); - } - } - void processCredentialsUpdate() { sessions.forEach((k, v) -> { sendMsgToSessionActor(new BasicToDeviceSessionActorMsg(new SessionCloseNotification(), k), v.getServer()); diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java index f60e7dd14c..55525c6e73 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 The Thingsboard Authors - *

+ * * 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * 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. diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java index e703cb7f05..f05b9a8607 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2018 The Thingsboard Authors - *

+ * * 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 - *

+ * + * http://www.apache.org/licenses/LICENSE-2.0 + * * 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. @@ -60,6 +60,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor ruleNodeList = service.getRuleChainNodes(entityId); - // Creating and starting the actors; - for (RuleNode ruleNode : ruleNodeList) { - ActorRef ruleNodeActor = createRuleNodeActor(context, ruleNode); - nodeActors.put(ruleNode.getId(), new RuleNodeCtx(tenantId, self, ruleNodeActor, ruleNode)); + if (!started) { + RuleChain ruleChain = service.findRuleChainById(entityId); + List ruleNodeList = service.getRuleChainNodes(entityId); + // Creating and starting the actors; + for (RuleNode ruleNode : ruleNodeList) { + ActorRef ruleNodeActor = createRuleNodeActor(context, ruleNode); + nodeActors.put(ruleNode.getId(), new RuleNodeCtx(tenantId, self, ruleNodeActor, ruleNode)); + } + initRoutes(ruleChain, ruleNodeList); + started = true; + } else { + onUpdate(context); } - initRoutes(ruleChain, ruleNodeList); } @Override @@ -115,6 +121,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor response = new DeferredResult<>(); long timeout = System.currentTimeMillis() + (cmd.getTimeout() != null ? cmd.getTimeout() : DEFAULT_TIMEOUT); ToDeviceRpcRequestBody body = new ToDeviceRpcRequestBody(cmd.getMethodName(), cmd.getRequestData()); - accessValidator.validate(currentUser, deviceId, new FutureCallback() { + accessValidator.validate(currentUser, deviceId, new HttpValidationCallback(response, new FutureCallback>() { @Override - public void onSuccess(@Nullable ValidationResult result) { + public void onSuccess(@Nullable DeferredResult result) { + ToDeviceRpcRequest rpcRequest = new ToDeviceRpcRequest(UUID.randomUUID(), tenantId, deviceId, @@ -124,7 +125,7 @@ public class RpcController extends BaseController { timeout, body ); - deviceRpcService.process(rpcRequest, new LocalRequestMetaData(rpcRequest, currentUser, response)); + deviceRpcService.process(rpcRequest, new LocalRequestMetaData(rpcRequest, currentUser, result)); } @Override @@ -138,7 +139,7 @@ public class RpcController extends BaseController { deviceRpcService.logRpcCall(currentUser, deviceId, body, oneWay, Optional.empty(), e); response.setResult(entity); } - }); + })); return response; } catch (IOException ioe) { throw new ThingsboardException("Invalid request body", ioe, ThingsboardErrorCode.BAD_REQUEST_PARAMS); diff --git a/application/src/main/java/org/thingsboard/server/controller/TenantController.java b/application/src/main/java/org/thingsboard/server/controller/TenantController.java index bf49074f91..1a7c116560 100644 --- a/application/src/main/java/org/thingsboard/server/controller/TenantController.java +++ b/application/src/main/java/org/thingsboard/server/controller/TenantController.java @@ -15,21 +15,34 @@ */ package org.thingsboard.server.controller; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; import org.thingsboard.server.common.data.Tenant; +import org.thingsboard.server.common.data.exception.ThingsboardException; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.tenant.TenantService; -import org.thingsboard.server.common.data.exception.ThingsboardException; +import org.thingsboard.server.service.install.InstallScripts; @RestController @RequestMapping("/api") +@Slf4j public class TenantController extends BaseController { - + + @Autowired + private InstallScripts installScripts; + @Autowired private TenantService tenantService; @@ -49,10 +62,15 @@ public class TenantController extends BaseController { @PreAuthorize("hasAuthority('SYS_ADMIN')") @RequestMapping(value = "/tenant", method = RequestMethod.POST) - @ResponseBody + @ResponseBody public Tenant saveTenant(@RequestBody Tenant tenant) throws ThingsboardException { try { - return checkNotNull(tenantService.saveTenant(tenant)); + boolean newTenant = tenant.getId() == null; + tenant = checkNotNull(tenantService.saveTenant(tenant)); + if (newTenant) { + installScripts.createDefaultRuleChains(tenant.getId()); + } + return tenant; } catch (Exception e) { throw handleException(e); } @@ -72,7 +90,7 @@ public class TenantController extends BaseController { } @PreAuthorize("hasAuthority('SYS_ADMIN')") - @RequestMapping(value = "/tenants", params = { "limit" }, method = RequestMethod.GET) + @RequestMapping(value = "/tenants", params = {"limit"}, method = RequestMethod.GET) @ResponseBody public TextPageData getTenants(@RequestParam int limit, @RequestParam(required = false) String textSearch, @@ -85,5 +103,5 @@ public class TenantController extends BaseController { throw handleException(e); } } - + } diff --git a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java index 9f7f0442a7..e33c2e3940 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java @@ -60,21 +60,12 @@ import java.nio.file.Paths; @Slf4j public class DefaultSystemDataLoaderService implements SystemDataLoaderService { - private static final String JSON_DIR = "json"; - private static final String SYSTEM_DIR = "system"; - private static final String DEMO_DIR = "demo"; - private static final String WIDGET_BUNDLES_DIR = "widget_bundles"; - private static final String PLUGINS_DIR = "plugins"; - private static final String RULES_DIR = "rules"; - private static final String DASHBOARDS_DIR = "dashboards"; - private static final ObjectMapper objectMapper = new ObjectMapper(); - public static final String JSON_EXT = ".json"; public static final String CUSTOMER_CRED = "customer"; public static final String DEFAULT_DEVICE_TYPE = "default"; - @Value("${install.data_dir}") - private String dataDir; + @Autowired + private InstallScripts installScripts; @Autowired private BCryptPasswordEncoder passwordEncoder; @@ -88,15 +79,6 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService { @Autowired private WidgetsBundleService widgetsBundleService; - @Autowired - private WidgetTypeService widgetTypeService; - - @Autowired - private PluginService pluginService; - - @Autowired - private RuleService ruleService; - @Autowired private TenantService tenantService; @@ -109,9 +91,6 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService { @Autowired private DeviceCredentialsService deviceCredentialsService; - @Autowired - private DashboardService dashboardService; - @Bean protected BCryptPasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); @@ -146,56 +125,13 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService { adminSettingsService.saveAdminSettings(mailSettings); } - @Override - public void loadSystemWidgets() throws Exception { - Path widgetBundlesDir = Paths.get(dataDir, JSON_DIR, SYSTEM_DIR, WIDGET_BUNDLES_DIR); - try (DirectoryStream dirStream = Files.newDirectoryStream(widgetBundlesDir, path -> path.toString().endsWith(JSON_EXT))) { - dirStream.forEach( - path -> { - try { - JsonNode widgetsBundleDescriptorJson = objectMapper.readTree(path.toFile()); - JsonNode widgetsBundleJson = widgetsBundleDescriptorJson.get("widgetsBundle"); - WidgetsBundle widgetsBundle = objectMapper.treeToValue(widgetsBundleJson, WidgetsBundle.class); - WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle); - JsonNode widgetTypesArrayJson = widgetsBundleDescriptorJson.get("widgetTypes"); - widgetTypesArrayJson.forEach( - widgetTypeJson -> { - try { - WidgetType widgetType = objectMapper.treeToValue(widgetTypeJson, WidgetType.class); - widgetType.setBundleAlias(savedWidgetsBundle.getAlias()); - widgetTypeService.saveWidgetType(widgetType); - } catch (Exception e) { - log.error("Unable to load widget type from json: [{}]", path.toString()); - throw new RuntimeException("Unable to load widget type from json", e); - } - } - ); - } catch (Exception e) { - log.error("Unable to load widgets bundle from json: [{}]", path.toString()); - throw new RuntimeException("Unable to load widgets bundle from json", e); - } - } - ); - } - } - - @Override - public void loadSystemPlugins() throws Exception { -// loadPlugins(Paths.get(dataDir, JSON_DIR, SYSTEM_DIR, PLUGINS_DIR), null); - } - - - @Override - public void loadSystemRules() throws Exception { -// loadRules(Paths.get(dataDir, JSON_DIR, SYSTEM_DIR, RULES_DIR), null); - } - @Override public void loadDemoData() throws Exception { Tenant demoTenant = new Tenant(); demoTenant.setRegion("Global"); demoTenant.setTitle("Tenant"); demoTenant = tenantService.saveTenant(demoTenant); + installScripts.createDefaultRuleChains(demoTenant.getId()); createUser(Authority.TENANT_ADMIN, demoTenant.getId(), null, "tenant@thingsboard.org", "tenant"); Customer customerA = new Customer(); @@ -227,9 +163,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService { createDevice(demoTenant.getId(), null, DEFAULT_DEVICE_TYPE, "Raspberry Pi Demo Device", "RASPBERRY_PI_DEMO_TOKEN", "Demo device that is used in " + "Raspberry Pi GPIO control sample application"); -// loadPlugins(Paths.get(dataDir, JSON_DIR, DEMO_DIR, PLUGINS_DIR), demoTenant.getId()); -// loadRules(Paths.get(dataDir, JSON_DIR, DEMO_DIR, RULES_DIR), demoTenant.getId()); - loadDashboards(Paths.get(dataDir, JSON_DIR, DEMO_DIR, DASHBOARDS_DIR), demoTenant.getId(), null); + installScripts.loadDashboards(demoTenant.getId(), null); } @Override @@ -240,6 +174,11 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService { } } + @Override + public void loadSystemWidgets() throws Exception { + installScripts.loadSystemWidgets(); + } + private User createUser(Authority authority, TenantId tenantId, CustomerId customerId, @@ -282,72 +221,4 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService { return device; } - private void loadPlugins(Path pluginsDir, TenantId tenantId) throws Exception{ - try (DirectoryStream dirStream = Files.newDirectoryStream(pluginsDir, path -> path.toString().endsWith(JSON_EXT))) { - dirStream.forEach( - path -> { - try { - JsonNode pluginJson = objectMapper.readTree(path.toFile()); - PluginMetaData plugin = objectMapper.treeToValue(pluginJson, PluginMetaData.class); - plugin.setTenantId(tenantId); - if (plugin.getState() == ComponentLifecycleState.ACTIVE) { - plugin.setState(ComponentLifecycleState.SUSPENDED); - PluginMetaData savedPlugin = pluginService.savePlugin(plugin); - pluginService.activatePluginById(savedPlugin.getId()); - } else { - pluginService.savePlugin(plugin); - } - } catch (Exception e) { - log.error("Unable to load plugin from json: [{}]", path.toString()); - throw new RuntimeException("Unable to load plugin from json", e); - } - } - ); - } - } - - private void loadRules(Path rulesDir, TenantId tenantId) throws Exception { - try (DirectoryStream dirStream = Files.newDirectoryStream(rulesDir, path -> path.toString().endsWith(JSON_EXT))) { - dirStream.forEach( - path -> { - try { - JsonNode ruleJson = objectMapper.readTree(path.toFile()); - RuleMetaData rule = objectMapper.treeToValue(ruleJson, RuleMetaData.class); - rule.setTenantId(tenantId); - if (rule.getState() == ComponentLifecycleState.ACTIVE) { - rule.setState(ComponentLifecycleState.SUSPENDED); - RuleMetaData savedRule = ruleService.saveRule(rule); - ruleService.activateRuleById(savedRule.getId()); - } else { - ruleService.saveRule(rule); - } - } catch (Exception e) { - log.error("Unable to load rule from json: [{}]", path.toString()); - throw new RuntimeException("Unable to load rule from json", e); - } - } - ); - } - } - - private void loadDashboards(Path dashboardsDir, TenantId tenantId, CustomerId customerId) throws Exception { - try (DirectoryStream dirStream = Files.newDirectoryStream(dashboardsDir, path -> path.toString().endsWith(JSON_EXT))) { - dirStream.forEach( - path -> { - try { - JsonNode dashboardJson = objectMapper.readTree(path.toFile()); - Dashboard dashboard = objectMapper.treeToValue(dashboardJson, Dashboard.class); - dashboard.setTenantId(tenantId); - Dashboard savedDashboard = dashboardService.saveDashboard(dashboard); - if (customerId != null && !customerId.isNullUid()) { - dashboardService.assignDashboardToCustomer(savedDashboard.getId(), customerId); - } - } catch (Exception e) { - log.error("Unable to load dashboard from json: [{}]", path.toString()); - throw new RuntimeException("Unable to load dashboard from json", e); - } - } - ); - } - } } diff --git a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java new file mode 100644 index 0000000000..5376e7643f --- /dev/null +++ b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java @@ -0,0 +1,182 @@ +/** + * Copyright © 2016-2018 The Thingsboard Authors + * + * 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 + * + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.service.install; + +import com.fasterxml.jackson.databind.JsonNode; +import lombok.Getter; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.thingsboard.server.common.data.Dashboard; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.rule.RuleChain; +import org.thingsboard.server.common.data.rule.RuleChainMetaData; +import org.thingsboard.server.common.data.widget.WidgetType; +import org.thingsboard.server.common.data.widget.WidgetsBundle; +import org.thingsboard.server.dao.dashboard.DashboardService; +import org.thingsboard.server.dao.rule.RuleChainService; +import org.thingsboard.server.dao.widget.WidgetTypeService; +import org.thingsboard.server.dao.widget.WidgetsBundleService; + +import java.io.IOException; +import java.nio.file.DirectoryStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import static org.thingsboard.server.service.install.DatabaseHelper.objectMapper; + +/** + * Created by ashvayka on 18.04.18. + */ +@Component +@Slf4j +public class InstallScripts { + + public static final String APP_DIR = "application"; + public static final String SRC_DIR = "src"; + public static final String MAIN_DIR = "main"; + public static final String DATA_DIR = "data"; + public static final String JSON_DIR = "json"; + public static final String SYSTEM_DIR = "system"; + public static final String TENANT_DIR = "tenant"; + public static final String DEMO_DIR = "demo"; + public static final String RULE_CHAINS_DIR = "rule_chains"; + public static final String WIDGET_BUNDLES_DIR = "widget_bundles"; + public static final String DASHBOARDS_DIR = "dashboards"; + + public static final String JSON_EXT = ".json"; + + @Value("${install.data_dir:}") + private String dataDir; + + @Autowired + private RuleChainService ruleChainService; + + @Autowired + private DashboardService dashboardService; + + @Autowired + private WidgetTypeService widgetTypeService; + + @Autowired + private WidgetsBundleService widgetsBundleService; + + public Path getTenantRuleChainsDir() { + return Paths.get(getDataDir(), JSON_DIR, TENANT_DIR, RULE_CHAINS_DIR); + } + + public String getDataDir() { + if (!StringUtils.isEmpty(dataDir)) { + return dataDir; + } else { + String workDir = System.getProperty("user.dir"); + if (workDir.endsWith("application")) { + return Paths.get(workDir, SRC_DIR, MAIN_DIR, DATA_DIR).toString(); + } else { + Path dataDirPath = Paths.get(workDir, APP_DIR, SRC_DIR, MAIN_DIR, DATA_DIR); + if (Files.exists(dataDirPath)) { + return dataDirPath.toString(); + } else { + throw new RuntimeException("Not valid working directory: " + workDir + ". Please use either root project directory, application module directory or specify valid \"install.data_dir\" ENV variable to avoid automatic data directory lookup!"); + } + } + } + } + + public void createDefaultRuleChains(TenantId tenantId) throws IOException { + Path tenantChainsDir = getTenantRuleChainsDir(); + try (DirectoryStream dirStream = Files.newDirectoryStream(tenantChainsDir, path -> path.toString().endsWith(InstallScripts.JSON_EXT))) { + dirStream.forEach( + path -> { + try { + JsonNode ruleChainJson = objectMapper.readTree(path.toFile()); + RuleChain ruleChain = objectMapper.treeToValue(ruleChainJson.get("ruleChain"), RuleChain.class); + RuleChainMetaData ruleChainMetaData = objectMapper.treeToValue(ruleChainJson.get("metadata"), RuleChainMetaData.class); + + ruleChain.setTenantId(tenantId); + ruleChain = ruleChainService.saveRuleChain(ruleChain); + + ruleChainMetaData.setRuleChainId(ruleChain.getId()); + ruleChainService.saveRuleChainMetaData(ruleChainMetaData); + } catch (Exception e) { + log.error("Unable to load rule chain from json: [{}]", path.toString()); + throw new RuntimeException("Unable to load rule chain from json", e); + } + } + ); + } + } + + public void loadSystemWidgets() throws Exception { + Path widgetBundlesDir = Paths.get(getDataDir(), JSON_DIR, SYSTEM_DIR, WIDGET_BUNDLES_DIR); + try (DirectoryStream dirStream = Files.newDirectoryStream(widgetBundlesDir, path -> path.toString().endsWith(JSON_EXT))) { + dirStream.forEach( + path -> { + try { + JsonNode widgetsBundleDescriptorJson = objectMapper.readTree(path.toFile()); + JsonNode widgetsBundleJson = widgetsBundleDescriptorJson.get("widgetsBundle"); + WidgetsBundle widgetsBundle = objectMapper.treeToValue(widgetsBundleJson, WidgetsBundle.class); + WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle); + JsonNode widgetTypesArrayJson = widgetsBundleDescriptorJson.get("widgetTypes"); + widgetTypesArrayJson.forEach( + widgetTypeJson -> { + try { + WidgetType widgetType = objectMapper.treeToValue(widgetTypeJson, WidgetType.class); + widgetType.setBundleAlias(savedWidgetsBundle.getAlias()); + widgetTypeService.saveWidgetType(widgetType); + } catch (Exception e) { + log.error("Unable to load widget type from json: [{}]", path.toString()); + throw new RuntimeException("Unable to load widget type from json", e); + } + } + ); + } catch (Exception e) { + log.error("Unable to load widgets bundle from json: [{}]", path.toString()); + throw new RuntimeException("Unable to load widgets bundle from json", e); + } + } + ); + } + } + + public void loadDashboards(TenantId tenantId, CustomerId customerId) throws Exception { + Path dashboardsDir = Paths.get(getDataDir(), JSON_DIR, DEMO_DIR, DASHBOARDS_DIR); + try (DirectoryStream dirStream = Files.newDirectoryStream(dashboardsDir, path -> path.toString().endsWith(JSON_EXT))) { + dirStream.forEach( + path -> { + try { + JsonNode dashboardJson = objectMapper.readTree(path.toFile()); + Dashboard dashboard = objectMapper.treeToValue(dashboardJson, Dashboard.class); + dashboard.setTenantId(tenantId); + Dashboard savedDashboard = dashboardService.saveDashboard(dashboard); + if (customerId != null && !customerId.isNullUid()) { + dashboardService.assignDashboardToCustomer(savedDashboard.getId(), customerId); + } + } catch (Exception e) { + log.error("Unable to load dashboard from json: [{}]", path.toString()); + throw new RuntimeException("Unable to load dashboard from json", e); + } + } + ); + } + } + + +} diff --git a/application/src/main/java/org/thingsboard/server/service/install/SystemDataLoaderService.java b/application/src/main/java/org/thingsboard/server/service/install/SystemDataLoaderService.java index a3dcb68573..f3a6af4880 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/SystemDataLoaderService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/SystemDataLoaderService.java @@ -23,10 +23,6 @@ public interface SystemDataLoaderService { void loadSystemWidgets() throws Exception; - void loadSystemPlugins() throws Exception; - - void loadSystemRules() throws Exception; - void loadDemoData() throws Exception; void deleteSystemWidgetBundle(String bundleAlias) throws Exception; diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java index 018f415510..4a730dbe23 100644 --- a/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java +++ b/application/src/main/java/org/thingsboard/server/service/rpc/DefaultDeviceRpcService.java @@ -96,8 +96,10 @@ public class DefaultDeviceRpcService implements DeviceRpcService { sendRpcRequest(request); UUID requestId = request.getId(); localRpcRequests.put(requestId, metaData); - long timeout = Math.max(0, System.currentTimeMillis() - request.getExpirationTime()); + long timeout = Math.max(0, request.getExpirationTime() - System.currentTimeMillis()); + log.error("[{}] processing the request: [{}]", this.hashCode(), requestId); rpcCallBackExecutor.schedule(() -> { + log.error("[{}] timeout the request: [{}]", this.hashCode(), requestId); LocalRequestMetaData localMetaData = localRpcRequests.remove(requestId); if (localMetaData != null) { reply(localMetaData, new FromDeviceRpcResponse(requestId, null, RpcError.TIMEOUT)); @@ -118,6 +120,7 @@ public class DefaultDeviceRpcService implements DeviceRpcService { @Override public void process(FromDeviceRpcResponse response) { + log.error("[{}] response the request: [{}]", this.hashCode(), response.getId()); //TODO: send to another server if needed. UUID requestId = response.getId(); LocalRequestMetaData md = localRpcRequests.remove(requestId); diff --git a/application/src/test/java/org/thingsboard/server/actors/ActorsTestSuite.java b/application/src/test/java/org/thingsboard/server/actors/ActorsTestSuite.java deleted file mode 100644 index c2b5de967a..0000000000 --- a/application/src/test/java/org/thingsboard/server/actors/ActorsTestSuite.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright © 2016-2018 The Thingsboard Authors - * - * 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 - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.actors; - -import org.junit.extensions.cpsuite.ClasspathSuite; -import org.junit.runner.RunWith; - -/** - * @author Andrew Shvayka - */ -@RunWith(ClasspathSuite.class) -@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.actors.*Test"}) -public class ActorsTestSuite { -} diff --git a/application/src/test/java/org/thingsboard/server/actors/DefaultActorServiceTest.java b/application/src/test/java/org/thingsboard/server/actors/DefaultActorServiceTest.java deleted file mode 100644 index d77341adee..0000000000 --- a/application/src/test/java/org/thingsboard/server/actors/DefaultActorServiceTest.java +++ /dev/null @@ -1,245 +0,0 @@ -/** - * Copyright © 2016-2018 The Thingsboard Authors - * - * 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 - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.actors; - -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import java.util.*; - -import com.google.common.util.concurrent.Futures; -import org.thingsboard.server.actors.service.DefaultActorService; -import org.thingsboard.server.common.data.id.*; -import org.thingsboard.server.common.data.kv.TsKvEntry; -import org.thingsboard.server.common.data.page.TextPageData; -import org.thingsboard.server.common.data.plugin.ComponentDescriptor; -import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; -import org.thingsboard.server.common.data.plugin.ComponentType; -import org.thingsboard.server.common.msg.session.*; -import org.thingsboard.server.dao.attributes.AttributesService; -import org.thingsboard.server.dao.event.EventService; -import org.thingsboard.server.gen.discovery.ServerInstanceProtos; -import org.thingsboard.server.service.cluster.discovery.DiscoveryService; -import org.thingsboard.server.service.cluster.discovery.ServerInstance; -import org.thingsboard.server.service.cluster.routing.ClusterRoutingService; -import org.thingsboard.server.service.cluster.rpc.ClusterRpcService; -import org.thingsboard.server.service.component.ComponentDiscoveryService; -import org.thingsboard.server.common.transport.auth.DeviceAuthResult; -import org.thingsboard.server.common.transport.auth.DeviceAuthService; -import org.thingsboard.server.common.data.DataConstants; -import org.thingsboard.server.common.data.Device; -import org.thingsboard.server.common.data.Tenant; -import org.thingsboard.server.common.data.kv.BasicTsKvEntry; -import org.thingsboard.server.common.data.kv.KvEntry; -import org.thingsboard.server.common.data.kv.StringDataEntry; -import org.thingsboard.server.common.data.plugin.PluginMetaData; -import org.thingsboard.server.common.data.rule.RuleMetaData; -import org.thingsboard.server.common.data.security.DeviceCredentialsFilter; -import org.thingsboard.server.common.data.security.DeviceTokenCredentials; -import org.thingsboard.server.common.msg.core.BasicTelemetryUploadRequest; -import org.thingsboard.server.dao.device.DeviceService; -import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.dao.plugin.PluginService; -import org.thingsboard.server.dao.rule.RuleService; -import org.thingsboard.server.dao.tenant.TenantService; -import org.thingsboard.server.dao.timeseries.TimeseriesService; -import org.thingsboard.server.extensions.core.plugin.telemetry.TelemetryStoragePlugin; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mockito; -import org.springframework.test.util.ReflectionTestUtils; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; - -public class DefaultActorServiceTest { - - private static final TenantId SYSTEM_TENANT = new TenantId(ModelConstants.NULL_UUID); - - private static final String PLUGIN_ID = "9fb2e951-e298-4acb-913a-db69af8a15f4"; - private static final String FILTERS_CONFIGURATION = - "[{\"clazz\":\"org.thingsboard.server.extensions.core.filter.MsgTypeFilter\", \"name\":\"TelemetryFilter\", \"configuration\": {\"messageTypes\":[\"POST_TELEMETRY\",\"POST_ATTRIBUTES\",\"GET_ATTRIBUTES\"]}}]"; - private static final String ACTION_CONFIGURATION = "{\"pluginToken\":\"telemetry\", \"clazz\":\"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction\", \"name\":\"TelemetryMsgConverterAction\", \"configuration\":{}}"; - private static final String PLUGIN_CONFIGURATION = "{}"; - private DefaultActorService actorService; - private ActorSystemContext actorContext; - - private PluginService pluginService; - private RuleService ruleService; - private DeviceAuthService deviceAuthService; - private DeviceService deviceService; - private TimeseriesService tsService; - private TenantService tenantService; - private ClusterRpcService rpcService; - private DiscoveryService discoveryService; - private ClusterRoutingService routingService; - private AttributesService attributesService; - private ComponentDiscoveryService componentService; - private EventService eventService; - private ServerInstance serverInstance; - - private RuleMetaData ruleMock; - private PluginMetaData pluginMock; - private RuleId ruleId = new RuleId(UUID.randomUUID()); - private PluginId pluginId = new PluginId(UUID.fromString(PLUGIN_ID)); - private TenantId tenantId = new TenantId(UUID.randomUUID()); - - - @Before - public void before() throws Exception { - actorService = new DefaultActorService(); - actorContext = new ActorSystemContext(); - - tenantService = mock(TenantService.class); - pluginService = mock(PluginService.class); - ruleService = mock(RuleService.class); - deviceAuthService = mock(DeviceAuthService.class); - deviceService = mock(DeviceService.class); - tsService = mock(TimeseriesService.class); - rpcService = mock(ClusterRpcService.class); - discoveryService = mock(DiscoveryService.class); - routingService = mock(ClusterRoutingService.class); - attributesService = mock(AttributesService.class); - componentService = mock(ComponentDiscoveryService.class); - eventService = mock(EventService.class); - serverInstance = new ServerInstance(ServerInstanceProtos.ServerInfo.newBuilder().setHost("localhost").setPort(8080).build()); - - ReflectionTestUtils.setField(actorService, "actorContext", actorContext); - ReflectionTestUtils.setField(actorService, "rpcService", rpcService); - ReflectionTestUtils.setField(actorService, "discoveryService", discoveryService); - - ReflectionTestUtils.setField(actorContext, "syncSessionTimeout", 10000L); - ReflectionTestUtils.setField(actorContext, "pluginActorTerminationDelay", 10000L); - ReflectionTestUtils.setField(actorContext, "pluginErrorPersistFrequency", 10000L); - ReflectionTestUtils.setField(actorContext, "ruleActorTerminationDelay", 10000L); - ReflectionTestUtils.setField(actorContext, "ruleErrorPersistFrequency", 10000L); - ReflectionTestUtils.setField(actorContext, "pluginProcessingTimeout", 60000L); - ReflectionTestUtils.setField(actorContext, "tenantService", tenantService); - ReflectionTestUtils.setField(actorContext, "pluginService", pluginService); - ReflectionTestUtils.setField(actorContext, "ruleService", ruleService); - ReflectionTestUtils.setField(actorContext, "deviceAuthService", deviceAuthService); - ReflectionTestUtils.setField(actorContext, "deviceService", deviceService); - ReflectionTestUtils.setField(actorContext, "tsService", tsService); - ReflectionTestUtils.setField(actorContext, "rpcService", rpcService); - ReflectionTestUtils.setField(actorContext, "discoveryService", discoveryService); - ReflectionTestUtils.setField(actorContext, "tsService", tsService); - ReflectionTestUtils.setField(actorContext, "routingService", routingService); - ReflectionTestUtils.setField(actorContext, "attributesService", attributesService); - ReflectionTestUtils.setField(actorContext, "componentService", componentService); - ReflectionTestUtils.setField(actorContext, "eventService", eventService); - - - when(routingService.resolveById((EntityId) any())).thenReturn(Optional.empty()); - - when(discoveryService.getCurrentServer()).thenReturn(serverInstance); - - ruleMock = mock(RuleMetaData.class); - when(ruleMock.getId()).thenReturn(ruleId); - when(ruleMock.getState()).thenReturn(ComponentLifecycleState.ACTIVE); - when(ruleMock.getPluginToken()).thenReturn("telemetry"); - TextPageData systemRules = new TextPageData<>(Collections.emptyList(), null, false); - TextPageData tenantRules = new TextPageData<>(Collections.singletonList(ruleMock), null, false); - when(ruleService.findSystemRules(any())).thenReturn(systemRules); - when(ruleService.findTenantRules(any(), any())).thenReturn(tenantRules); - when(ruleService.findRuleById(ruleId)).thenReturn(ruleMock); - - pluginMock = mock(PluginMetaData.class); - when(pluginMock.getTenantId()).thenReturn(SYSTEM_TENANT); - when(pluginMock.getId()).thenReturn(pluginId); - when(pluginMock.getState()).thenReturn(ComponentLifecycleState.ACTIVE); - TextPageData systemPlugins = new TextPageData<>(Collections.singletonList(pluginMock), null, false); - TextPageData tenantPlugins = new TextPageData<>(Collections.emptyList(), null, false); - when(pluginService.findSystemPlugins(any())).thenReturn(systemPlugins); - when(pluginService.findTenantPlugins(any(), any())).thenReturn(tenantPlugins); - when(pluginService.findPluginByApiToken("telemetry")).thenReturn(pluginMock); - when(pluginService.findPluginById(pluginId)).thenReturn(pluginMock); - - TextPageData tenants = new TextPageData<>(Collections.emptyList(), null, false); - when(tenantService.findTenants(any())).thenReturn(tenants); - } - - private void initActorSystem() { - actorService.initActorSystem(); - } - - @After - public void after() { - actorService.stopActorSystem(); - } - - @Test - public void testBasicPostWithSyncSession() throws Exception { - SessionContext ssnCtx = mock(SessionContext.class); - KvEntry entry1 = new StringDataEntry("key1", "value1"); - KvEntry entry2 = new StringDataEntry("key2", "value2"); - BasicTelemetryUploadRequest telemetry = new BasicTelemetryUploadRequest(); - long ts = 42; - telemetry.add(ts, entry1); - telemetry.add(ts, entry2); - BasicAdaptorToSessionActorMsg msg = new BasicAdaptorToSessionActorMsg(ssnCtx, telemetry); - - DeviceId deviceId = new DeviceId(UUID.randomUUID()); - - DeviceCredentialsFilter filter = new DeviceTokenCredentials("token1"); - Device device = mock(Device.class); - - when(device.getId()).thenReturn(deviceId); - when(device.getTenantId()).thenReturn(tenantId); - when(ssnCtx.getSessionId()).thenReturn(new DummySessionID("session1")); - when(ssnCtx.getSessionType()).thenReturn(SessionType.SYNC); - when(deviceAuthService.process(filter)).thenReturn(DeviceAuthResult.of(deviceId)); - when(deviceService.findDeviceById(deviceId)).thenReturn(device); - - ObjectMapper ruleMapper = new ObjectMapper(); - when(ruleMock.getFilters()).thenReturn(ruleMapper.readTree(FILTERS_CONFIGURATION)); - when(ruleMock.getAction()).thenReturn(ruleMapper.readTree(ACTION_CONFIGURATION)); - - ComponentDescriptor filterComp = new ComponentDescriptor(); - filterComp.setClazz("org.thingsboard.server.extensions.core.filter.MsgTypeFilter"); - filterComp.setType(ComponentType.FILTER); - when(componentService.getComponent("org.thingsboard.server.extensions.core.filter.MsgTypeFilter")) - .thenReturn(Optional.of(filterComp)); - - ComponentDescriptor actionComp = new ComponentDescriptor(); - actionComp.setClazz("org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction"); - actionComp.setType(ComponentType.ACTION); - when(componentService.getComponent("org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction")) - .thenReturn(Optional.of(actionComp)); - - ObjectMapper pluginMapper = new ObjectMapper(); - JsonNode pluginAdditionalInfo = pluginMapper.readTree(PLUGIN_CONFIGURATION); - when(pluginMock.getConfiguration()).thenReturn(pluginAdditionalInfo); - when(pluginMock.getClazz()).thenReturn(TelemetryStoragePlugin.class.getName()); - - when(attributesService.findAll(deviceId, DataConstants.CLIENT_SCOPE)).thenReturn(Futures.immediateFuture(Collections.emptyList())); - when(attributesService.findAll(deviceId, DataConstants.SHARED_SCOPE)).thenReturn(Futures.immediateFuture(Collections.emptyList())); - when(attributesService.findAll(deviceId, DataConstants.SERVER_SCOPE)).thenReturn(Futures.immediateFuture(Collections.emptyList())); - - initActorSystem(); - Thread.sleep(1000); - actorService.process(new BasicToDeviceActorSessionMsg(device, msg)); - - // Check that device data was saved to DB; - List expected = new ArrayList<>(); - expected.add(new BasicTsKvEntry(ts, entry1)); - expected.add(new BasicTsKvEntry(ts, entry2)); - verify(tsService, Mockito.timeout(5000)).save(deviceId, expected, 0L); - } - -} diff --git a/application/src/test/java/org/thingsboard/server/actors/DummySessionID.java b/application/src/test/java/org/thingsboard/server/actors/DummySessionID.java deleted file mode 100644 index 9324e26c3b..0000000000 --- a/application/src/test/java/org/thingsboard/server/actors/DummySessionID.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * Copyright © 2016-2018 The Thingsboard Authors - * - * 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 - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.actors; - -import org.thingsboard.server.common.data.id.SessionId; - -public class DummySessionID implements SessionId { - - @Override - public String toString() { - return id; - } - - private final String id; - - public DummySessionID(String id) { - this.id = id; - } - - @Override - public String toUidStr() { - return id; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((id == null) ? 0 : id.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - DummySessionID other = (DummySessionID) obj; - if (id == null) { - if (other.id != null) - return false; - } else if (!id.equals(other.id)) - return false; - return true; - } - -} diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java index 93fe76752e..30c7dc3570 100644 --- a/application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AbstractRuleEngineControllerTest.java @@ -16,6 +16,8 @@ package org.thingsboard.server.controller; import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonNode; +import org.springframework.beans.factory.annotation.Autowired; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.Event; import org.thingsboard.server.common.data.id.EntityId; @@ -25,12 +27,18 @@ import org.thingsboard.server.common.data.page.TimePageData; import org.thingsboard.server.common.data.page.TimePageLink; import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.rule.RuleChainMetaData; +import org.thingsboard.server.dao.rule.RuleChainService; + +import java.io.IOException; /** * Created by ashvayka on 20.03.18. */ public class AbstractRuleEngineControllerTest extends AbstractControllerTest { + @Autowired + protected RuleChainService ruleChainService; + protected RuleChain saveRuleChain(RuleChain ruleChain) throws Exception { return doPost("/api/ruleChain", ruleChain, RuleChain.class); } @@ -53,4 +61,13 @@ public class AbstractRuleEngineControllerTest extends AbstractControllerTest { new TypeReference>() { }, pageLink, entityId.getEntityType(), entityId.getId(), DataConstants.DEBUG_RULE_NODE, tenantId.getId()); } + + protected JsonNode getMetadata(Event outEvent) { + String metaDataStr = outEvent.getBody().get("metadata").asText(); + try { + return mapper.readTree(metaDataStr); + } catch (IOException e) { + throw new RuntimeException(e); + } + } } diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseComponentDescriptorControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseComponentDescriptorControllerTest.java index 4346538ad7..d04fb640f4 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseComponentDescriptorControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseComponentDescriptorControllerTest.java @@ -20,6 +20,7 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.thingsboard.rule.engine.filter.TbJsFilterNode; import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.plugin.ComponentDescriptor; @@ -35,7 +36,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. public abstract class BaseComponentDescriptorControllerTest extends AbstractControllerTest { - private static final int AMOUNT_OF_DEFAULT_PLUGINS_DESCRIPTORS = 5; + private static final int AMOUNT_OF_DEFAULT_FILTER_NODES = 3; private Tenant savedTenant; private User tenantAdmin; @@ -69,38 +70,28 @@ public abstract class BaseComponentDescriptorControllerTest extends AbstractCont @Test public void testGetByClazz() throws Exception { ComponentDescriptor descriptor = - doGet("/api/component/" + TelemetryStoragePlugin.class.getName(), ComponentDescriptor.class); + doGet("/api/component/" + TbJsFilterNode.class.getName(), ComponentDescriptor.class); Assert.assertNotNull(descriptor); Assert.assertNotNull(descriptor.getId()); Assert.assertNotNull(descriptor.getName()); Assert.assertEquals(ComponentScope.TENANT, descriptor.getScope()); - Assert.assertEquals(ComponentType.PLUGIN, descriptor.getType()); + Assert.assertEquals(ComponentType.FILTER, descriptor.getType()); Assert.assertEquals(descriptor.getClazz(), descriptor.getClazz()); } @Test public void testGetByType() throws Exception { List descriptors = readResponse( - doGet("/api/components/" + ComponentType.PLUGIN).andExpect(status().isOk()), new TypeReference>() { + doGet("/api/components/" + ComponentType.FILTER).andExpect(status().isOk()), new TypeReference>() { }); Assert.assertNotNull(descriptors); - Assert.assertEquals(AMOUNT_OF_DEFAULT_PLUGINS_DESCRIPTORS, descriptors.size()); + Assert.assertEquals(AMOUNT_OF_DEFAULT_FILTER_NODES, descriptors.size()); for (ComponentType type : ComponentType.values()) { doGet("/api/components/" + type).andExpect(status().isOk()); } } - @Test - public void testGetActionsByType() throws Exception { - List descriptors = readResponse( - doGet("/api/components/actions/" + TelemetryStoragePlugin.class.getName()).andExpect(status().isOk()), new TypeReference>() { - }); - - Assert.assertNotNull(descriptors); - Assert.assertEquals(1, descriptors.size()); - Assert.assertEquals(TelemetryPluginAction.class.getName(), descriptors.get(0).getClazz()); - } } diff --git a/application/src/test/java/org/thingsboard/server/controller/BasePluginControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BasePluginControllerTest.java deleted file mode 100644 index 915015fcd6..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/BasePluginControllerTest.java +++ /dev/null @@ -1,232 +0,0 @@ -/** - * Copyright © 2016-2018 The Thingsboard Authors - * - * 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 - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller; - -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.thingsboard.server.common.data.Tenant; -import org.thingsboard.server.common.data.User; -import org.thingsboard.server.common.data.page.TextPageData; -import org.thingsboard.server.common.data.page.TextPageLink; -import org.thingsboard.server.common.data.plugin.PluginMetaData; -import org.thingsboard.server.common.data.rule.RuleMetaData; -import org.thingsboard.server.common.data.security.Authority; -import org.thingsboard.server.extensions.core.plugin.telemetry.TelemetryStoragePlugin; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -public abstract class BasePluginControllerTest extends AbstractControllerTest { - - private IdComparator idComparator = new IdComparator<>(); - - private final ObjectMapper mapper = new ObjectMapper(); - private Tenant savedTenant; - private User tenantAdmin; - - @Before - public void beforeTest() throws Exception { - loginSysAdmin(); - - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - savedTenant = doPost("/api/tenant", tenant, Tenant.class); - Assert.assertNotNull(savedTenant); - - tenantAdmin = new User(); - tenantAdmin.setAuthority(Authority.TENANT_ADMIN); - tenantAdmin.setTenantId(savedTenant.getId()); - tenantAdmin.setEmail("tenant2@thingsboard.org"); - tenantAdmin.setFirstName("Joe"); - tenantAdmin.setLastName("Downs"); - - tenantAdmin = createUserAndLogin(tenantAdmin, "testPassword1"); - } - - @After - public void afterTest() throws Exception { - loginSysAdmin(); - - doDelete("/api/tenant/" + savedTenant.getId().getId().toString()) - .andExpect(status().isOk()); - } - - @Test - public void testSavePlugin() throws Exception { - PluginMetaData plugin = new PluginMetaData(); - doPost("/api/plugin", plugin).andExpect(status().isBadRequest()); - plugin.setName("My plugin"); - doPost("/api/plugin", plugin).andExpect(status().isBadRequest()); - plugin.setApiToken("myplugin"); - doPost("/api/plugin", plugin).andExpect(status().isBadRequest()); - plugin.setConfiguration(mapper.readTree("{}")); - doPost("/api/plugin", plugin).andExpect(status().isBadRequest()); - plugin.setClazz(TelemetryStoragePlugin.class.getName()); - PluginMetaData savedPlugin = doPost("/api/plugin", plugin, PluginMetaData.class); - - Assert.assertNotNull(savedPlugin); - Assert.assertNotNull(savedPlugin.getId()); - Assert.assertTrue(savedPlugin.getCreatedTime() > 0); - Assert.assertEquals(savedTenant.getId(), savedPlugin.getTenantId()); - } - - @Test - public void testFindPluginById() throws Exception { - PluginMetaData plugin = new PluginMetaData(); - plugin.setName("My plugin"); - plugin.setApiToken("myplugin"); - plugin.setConfiguration(mapper.readTree("{}")); - plugin.setClazz(TelemetryStoragePlugin.class.getName()); - - PluginMetaData savedPlugin = doPost("/api/plugin", plugin, PluginMetaData.class); - PluginMetaData foundPlugin = doGet("/api/plugin/" + savedPlugin.getId().getId().toString(), PluginMetaData.class); - Assert.assertNotNull(foundPlugin); - Assert.assertEquals(savedPlugin, foundPlugin); - } - - @Test - public void testActivatePlugin() throws Exception { - PluginMetaData plugin = new PluginMetaData(); - plugin.setName("My plugin"); - plugin.setApiToken("myplugin"); - plugin.setConfiguration(mapper.readTree("{}")); - plugin.setClazz(TelemetryStoragePlugin.class.getName()); - - PluginMetaData savedPlugin = doPost("/api/plugin", plugin, PluginMetaData.class); - - doPost("/api/plugin/" + savedPlugin.getId().getId().toString() + "/activate").andExpect(status().isOk()); - } - - @Test - public void testSuspendPlugin() throws Exception { - PluginMetaData plugin = new PluginMetaData(); - plugin.setName("My plugin"); - plugin.setApiToken("myplugin"); - plugin.setConfiguration(mapper.readTree("{}")); - plugin.setClazz(TelemetryStoragePlugin.class.getName()); - - PluginMetaData savedPlugin = doPost("/api/plugin", plugin, PluginMetaData.class); - - doPost("/api/plugin/" + savedPlugin.getId().getId().toString() + "/activate").andExpect(status().isOk()); - - RuleMetaData rule = BaseRuleControllerTest.createRuleMetaData(savedPlugin); - RuleMetaData savedRule = doPost("/api/rule", rule, RuleMetaData.class); - doPost("/api/rule/" + savedRule.getId().getId().toString() + "/activate").andExpect(status().isOk()); - - doPost("/api/plugin/" + savedPlugin.getId().getId().toString() + "/suspend").andExpect(status().isBadRequest()); - - doPost("/api/rule/" + savedRule.getId().getId().toString() + "/suspend").andExpect(status().isOk()); - - doPost("/api/plugin/" + savedPlugin.getId().getId().toString() + "/suspend").andExpect(status().isOk()); - } - - @Test - public void testDeletePluginById() throws Exception { - PluginMetaData plugin = new PluginMetaData(); - plugin.setName("My plugin"); - plugin.setApiToken("myplugin"); - plugin.setConfiguration(mapper.readTree("{}")); - plugin.setClazz(TelemetryStoragePlugin.class.getName()); - - PluginMetaData savedPlugin = doPost("/api/plugin", plugin, PluginMetaData.class); - - RuleMetaData rule = BaseRuleControllerTest.createRuleMetaData(savedPlugin); - RuleMetaData savedRule = doPost("/api/rule", rule, RuleMetaData.class); - - doDelete("/api/plugin/" + savedPlugin.getId().getId()).andExpect(status().isBadRequest()); - - doDelete("/api/rule/" + savedRule.getId().getId()).andExpect(status().isOk()); - - doDelete("/api/plugin/" + savedPlugin.getId().getId()).andExpect(status().isOk()); - doGet("/api/plugin/" + savedPlugin.getId().getId().toString()).andExpect(status().isNotFound()); - } - - @Test - public void testFindPluginByToken() throws Exception { - PluginMetaData plugin = new PluginMetaData(); - plugin.setName("My plugin"); - plugin.setApiToken("myplugin"); - plugin.setConfiguration(mapper.readTree("{}")); - plugin.setClazz(TelemetryStoragePlugin.class.getName()); - - PluginMetaData savedPlugin = doPost("/api/plugin", plugin, PluginMetaData.class); - PluginMetaData foundPlugin = doGet("/api/plugin/token/" + "myplugin", PluginMetaData.class); - Assert.assertNotNull(foundPlugin); - Assert.assertEquals(savedPlugin, foundPlugin); - } - - @Test - public void testFindCurrentTenantPlugins() throws Exception { - List plugins = testPluginsCreation("/api/plugin"); - for (PluginMetaData plugin : plugins) { - doDelete("/api/plugin/" + plugin.getId().getId()).andExpect(status().isOk()); - } - } - - @Test - public void testFindSystemPlugins() throws Exception { - loginSysAdmin(); - List plugins = testPluginsCreation("/api/plugin/system"); - for (PluginMetaData plugin : plugins) { - doDelete("/api/plugin/" + plugin.getId().getId()).andExpect(status().isOk()); - } - } - - private List testPluginsCreation(String url) throws Exception { - List plugins = new ArrayList<>(); - for (int i = 0; i < 111; i++) { - PluginMetaData plugin = new PluginMetaData(); - plugin.setName("My plugin"); - plugin.setApiToken("myplugin" + i); - plugin.setConfiguration(mapper.readTree("{}")); - plugin.setClazz(TelemetryStoragePlugin.class.getName()); - plugins.add(doPost("/api/plugin", plugin, PluginMetaData.class)); - } - - List loadedPlugins = new ArrayList<>(); - TextPageLink pageLink = new TextPageLink(23); - TextPageData pageData; - do { - pageData = doGetTypedWithPageLink(url + "?", - new TypeReference>() { - }, pageLink); - loadedPlugins.addAll(pageData.getData()); - if (pageData.hasNext()) { - pageLink = pageData.getNextPageLink(); - } - } while (pageData.hasNext()); - - loadedPlugins = loadedPlugins.stream() - .filter(p -> !p.getName().equals("System Telemetry Plugin")) - .filter(p -> !p.getName().equals("Mail Sender Plugin")) - .filter(p -> !p.getName().equals("System RPC Plugin")) - .collect(Collectors.toList()); - - Collections.sort(plugins, idComparator); - Collections.sort(loadedPlugins, idComparator); - - Assert.assertEquals(plugins, loadedPlugins); - return loadedPlugins; - } -} diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseRuleControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseRuleControllerTest.java deleted file mode 100644 index 9236dfec06..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/BaseRuleControllerTest.java +++ /dev/null @@ -1,247 +0,0 @@ -/** - * Copyright © 2016-2018 The Thingsboard Authors - * - * 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 - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller; - -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.thingsboard.server.common.data.Tenant; -import org.thingsboard.server.common.data.User; -import org.thingsboard.server.common.data.page.TextPageData; -import org.thingsboard.server.common.data.page.TextPageLink; -import org.thingsboard.server.common.data.plugin.PluginMetaData; -import org.thingsboard.server.common.data.rule.RuleMetaData; -import org.thingsboard.server.common.data.security.Authority; -import org.thingsboard.server.extensions.core.plugin.telemetry.TelemetryStoragePlugin; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -public abstract class BaseRuleControllerTest extends AbstractControllerTest { - - private IdComparator idComparator = new IdComparator<>(); - - private static final ObjectMapper mapper = new ObjectMapper(); - private Tenant savedTenant; - private User tenantAdmin; - private PluginMetaData sysPlugin; - private PluginMetaData tenantPlugin; - - @Before - public void beforeTest() throws Exception { - loginSysAdmin(); - - sysPlugin = new PluginMetaData(); - sysPlugin.setName("Sys plugin"); - sysPlugin.setApiToken("sysplugin"); - sysPlugin.setConfiguration(mapper.readTree("{}")); - sysPlugin.setClazz(TelemetryStoragePlugin.class.getName()); - sysPlugin = doPost("/api/plugin", sysPlugin, PluginMetaData.class); - - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - savedTenant = doPost("/api/tenant", tenant, Tenant.class); - Assert.assertNotNull(savedTenant); - - tenantAdmin = new User(); - tenantAdmin.setAuthority(Authority.TENANT_ADMIN); - tenantAdmin.setTenantId(savedTenant.getId()); - tenantAdmin.setEmail("tenant2@thingsboard.org"); - tenantAdmin.setFirstName("Joe"); - tenantAdmin.setLastName("Downs"); - - tenantAdmin = createUserAndLogin(tenantAdmin, "testPassword1"); - - tenantPlugin = new PluginMetaData(); - tenantPlugin.setName("My plugin"); - tenantPlugin.setApiToken("myplugin"); - tenantPlugin.setConfiguration(mapper.readTree("{}")); - tenantPlugin.setClazz(TelemetryStoragePlugin.class.getName()); - tenantPlugin = doPost("/api/plugin", tenantPlugin, PluginMetaData.class); - } - - @After - public void afterTest() throws Exception { - loginSysAdmin(); - - doDelete("/api/tenant/" + savedTenant.getId().getId().toString()) - .andExpect(status().isOk()); - - doDelete("/api/plugin/" + sysPlugin.getId().getId()).andExpect(status().isOk()); - } - - @Test - public void testSaveRule() throws Exception { - RuleMetaData rule = new RuleMetaData(); - doPost("/api/rule", rule).andExpect(status().isBadRequest()); - rule.setName("My Rule"); - doPost("/api/rule", rule).andExpect(status().isBadRequest()); - rule.setPluginToken(tenantPlugin.getApiToken()); - doPost("/api/rule", rule).andExpect(status().isBadRequest()); - rule.setFilters(mapper.readTree("[{\"clazz\":\"org.thingsboard.server.extensions.core.filter.MsgTypeFilter\", " + - "\"name\":\"TelemetryFilter\", " + - "\"configuration\": {\"messageTypes\":[\"POST_TELEMETRY\",\"POST_ATTRIBUTES\",\"GET_ATTRIBUTES\"]}}]")); - doPost("/api/rule", rule).andExpect(status().isBadRequest()); - rule.setAction(mapper.readTree("{\"clazz\":\"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction\", \"name\":\"TelemetryMsgConverterAction\", \"configuration\":{\"timeUnit\":\"DAYS\", \"ttlValue\":1}}")); - - RuleMetaData savedRule = doPost("/api/rule", rule, RuleMetaData.class); - Assert.assertNotNull(savedRule); - Assert.assertNotNull(savedRule.getId()); - Assert.assertTrue(savedRule.getCreatedTime() > 0); - Assert.assertEquals(savedTenant.getId(), savedRule.getTenantId()); - } - - @Test - public void testFindRuleById() throws Exception { - RuleMetaData rule = createRuleMetaData(tenantPlugin); - RuleMetaData savedRule = doPost("/api/rule", rule, RuleMetaData.class); - - RuleMetaData foundRule = doGet("/api/rule/" + savedRule.getId().getId().toString(), RuleMetaData.class); - Assert.assertNotNull(foundRule); - Assert.assertEquals(savedRule, foundRule); - } - - @Test - public void testFindRuleByPluginToken() throws Exception { - RuleMetaData rule = createRuleMetaData(tenantPlugin); - RuleMetaData savedRule = doPost("/api/rule", rule, RuleMetaData.class); - - List foundRules = doGetTyped("/api/rule/token/" + savedRule.getPluginToken(), - new TypeReference>() { - }); - Assert.assertNotNull(foundRules); - Assert.assertEquals(1, foundRules.size()); - Assert.assertEquals(savedRule, foundRules.get(0)); - } - - @Test - public void testActivateRule() throws Exception { - RuleMetaData rule = createRuleMetaData(tenantPlugin); - RuleMetaData savedRule = doPost("/api/rule", rule, RuleMetaData.class); - - doPost("/api/rule/" + savedRule.getId().getId().toString() + "/activate").andExpect(status().isBadRequest()); - - doPost("/api/plugin/" + tenantPlugin.getId().getId().toString() + "/activate").andExpect(status().isOk()); - - doPost("/api/rule/" + savedRule.getId().getId().toString() + "/activate").andExpect(status().isOk()); - } - - @Test - public void testSuspendRule() throws Exception { - RuleMetaData rule = createRuleMetaData(tenantPlugin); - RuleMetaData savedRule = doPost("/api/rule", rule, RuleMetaData.class); - - doPost("/api/plugin/" + tenantPlugin.getId().getId().toString() + "/activate").andExpect(status().isOk()); - doPost("/api/rule/" + savedRule.getId().getId().toString() + "/activate").andExpect(status().isOk()); - doPost("/api/rule/" + savedRule.getId().getId().toString() + "/suspend").andExpect(status().isOk()); - } - - @Test - public void testFindSystemRules() throws Exception { - loginSysAdmin(); - List rules = testRulesCreation("/api/rule/system", sysPlugin); - for (RuleMetaData rule : rules) { - doDelete("/api/rule/" + rule.getId().getId()).andExpect(status().isOk()); - } - loginTenantAdmin(); - } - - @Test - public void testFindCurrentTenantPlugins() throws Exception { - List rules = testRulesCreation("/api/rule", tenantPlugin); - for (RuleMetaData rule : rules) { - doDelete("/api/rule/" + rule.getId().getId()).andExpect(status().isOk()); - } - } - - @Test - public void testFindTenantPlugins() throws Exception { - List rules = testRulesCreation("/api/rule", tenantPlugin); - loginSysAdmin(); - List loadedRules = new ArrayList<>(); - TextPageLink pageLink = new TextPageLink(3); - TextPageData pageData; - do { - pageData = doGetTypedWithPageLink("/api/rule/tenant/" + savedTenant.getId().getId().toString() + "?", - new TypeReference>() { - }, pageLink); - loadedRules.addAll(pageData.getData()); - if (pageData.hasNext()) { - pageLink = pageData.getNextPageLink(); - } - } while (pageData.hasNext()); - - Collections.sort(rules, idComparator); - Collections.sort(loadedRules, idComparator); - - Assert.assertEquals(rules, loadedRules); - - for (RuleMetaData rule : rules) { - doDelete("/api/rule/" + rule.getId().getId()).andExpect(status().isOk()); - } - } - - private List testRulesCreation(String url, PluginMetaData plugin) throws Exception { - List rules = new ArrayList<>(); - for (int i = 0; i < 6; i++) { - RuleMetaData rule = createRuleMetaData(plugin); - rule.setPluginToken(plugin.getApiToken()); - rule.setName(rule.getName() + i); - rules.add(doPost("/api/rule", rule, RuleMetaData.class)); - } - - List loadedRules = new ArrayList<>(); - TextPageLink pageLink = new TextPageLink(3); - TextPageData pageData; - do { - pageData = doGetTypedWithPageLink(url + "?", - new TypeReference>() { - }, pageLink); - loadedRules.addAll(pageData.getData()); - if (pageData.hasNext()) { - pageLink = pageData.getNextPageLink(); - } - } while (pageData.hasNext()); - - loadedRules = loadedRules.stream().filter(p -> !p.getName().equals("System Telemetry Rule")).collect(Collectors.toList()); - - Collections.sort(rules, idComparator); - Collections.sort(loadedRules, idComparator); - - Assert.assertEquals(rules, loadedRules); - return loadedRules; - } - - public static RuleMetaData createRuleMetaData(PluginMetaData plugin) throws IOException { - RuleMetaData rule = new RuleMetaData(); - rule.setName("My Rule"); - rule.setPluginToken(plugin.getApiToken()); - rule.setFilters(mapper.readTree("[{\"clazz\":\"org.thingsboard.server.extensions.core.filter.MsgTypeFilter\", " + - "\"name\":\"TelemetryFilter\", " + - "\"configuration\": {\"messageTypes\":[\"POST_TELEMETRY\",\"POST_ATTRIBUTES\",\"GET_ATTRIBUTES\"]}}]")); - rule.setAction(mapper.readTree("{\"clazz\":\"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction\", \"name\":\"TelemetryMsgConverterAction\", " + - "\"configuration\":{\"timeUnit\":\"DAYS\", \"ttlValue\":1}}")); - return rule; - } -} diff --git a/application/src/test/java/org/thingsboard/server/controller/nosql/PluginControllerNoSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/nosql/PluginControllerNoSqlTest.java deleted file mode 100644 index 48815e6057..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/nosql/PluginControllerNoSqlTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright © 2016-2018 The Thingsboard Authors - * - * 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 - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.nosql; - -import org.thingsboard.server.controller.BasePluginControllerTest; -import org.thingsboard.server.dao.service.DaoNoSqlTest; - -/** - * Created by Valerii Sosliuk on 6/28/2017. - */ -@DaoNoSqlTest -public class PluginControllerNoSqlTest extends BasePluginControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/nosql/RuleControllerNoSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/nosql/RuleControllerNoSqlTest.java deleted file mode 100644 index 0557d5d3d9..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/nosql/RuleControllerNoSqlTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright © 2016-2018 The Thingsboard Authors - * - * 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 - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.nosql; - -import org.thingsboard.server.controller.BaseRuleControllerTest; -import org.thingsboard.server.dao.service.DaoNoSqlTest; - -/** - * Created by Valerii Sosliuk on 6/28/2017. - */ -@DaoNoSqlTest -public class RuleControllerNoSqlTest extends BaseRuleControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/PluginControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/PluginControllerSqlTest.java deleted file mode 100644 index fbb63385e7..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/PluginControllerSqlTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright © 2016-2018 The Thingsboard Authors - * - * 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 - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BasePluginControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -/** - * Created by Valerii Sosliuk on 6/28/2017. - */ -@DaoSqlTest -public class PluginControllerSqlTest extends BasePluginControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcIntegrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcIntegrationTest.java index b732e66f48..af477640e6 100644 --- a/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcIntegrationTest.java +++ b/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcIntegrationTest.java @@ -80,6 +80,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractC } } + @Ignore @Test public void testServerMqttOneWayRpc() throws Exception { Device device = new Device(); @@ -106,6 +107,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractC Assert.assertTrue(StringUtils.isEmpty(result)); } + @Ignore @Test public void testServerMqttOneWayRpcDeviceOffline() throws Exception { Device device = new Device(); diff --git a/application/src/test/java/org/thingsboard/server/rules/RuleEngineSqlTestSuite.java b/application/src/test/java/org/thingsboard/server/rules/RuleEngineSqlTestSuite.java index 65b4293490..c4388260e4 100644 --- a/application/src/test/java/org/thingsboard/server/rules/RuleEngineSqlTestSuite.java +++ b/application/src/test/java/org/thingsboard/server/rules/RuleEngineSqlTestSuite.java @@ -24,7 +24,8 @@ import java.util.Arrays; @RunWith(ClasspathSuite.class) @ClasspathSuite.ClassnameFilters({ - "org.thingsboard.server.rules.flow.*Test"}) + "org.thingsboard.server.rules.flow.*Test", + "org.thingsboard.server.rules.lifecycle.*Test"}) public class RuleEngineSqlTestSuite { @ClassRule diff --git a/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java b/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java index f88eb24336..f45e30335f 100644 --- a/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java +++ b/application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java @@ -16,6 +16,7 @@ package org.thingsboard.server.rules.flow; import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.junit.After; @@ -28,6 +29,7 @@ import org.thingsboard.server.actors.service.ActorService; import org.thingsboard.server.common.data.*; import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry; import org.thingsboard.server.common.data.kv.StringDataEntry; +import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.page.TimePageData; import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.rule.RuleChainMetaData; @@ -40,6 +42,7 @@ import org.thingsboard.server.controller.AbstractRuleEngineControllerTest; import org.thingsboard.server.dao.attributes.AttributesService; import org.thingsboard.server.dao.rule.RuleChainService; +import java.io.IOException; import java.util.Arrays; import java.util.Collections; @@ -60,9 +63,6 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule @Autowired protected AttributesService attributesService; - @Autowired - protected RuleChainService ruleChainService; - @Before public void beforeTest() throws Exception { loginSysAdmin(); @@ -71,6 +71,7 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule tenant.setTitle("My tenant"); savedTenant = doPost("/api/tenant", tenant, Tenant.class); Assert.assertNotNull(savedTenant); + ruleChainService.deleteRuleChainsByTenantId(savedTenant.getId()); tenantAdmin = new User(); tenantAdmin.setAuthority(Authority.TENANT_ADMIN); @@ -166,7 +167,7 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule Assert.assertEquals(ruleChain.getFirstRuleNodeId(), outEvent.getEntityId()); Assert.assertEquals(device.getId().getId().toString(), outEvent.getBody().get("entityId").asText()); - Assert.assertEquals("serverAttributeValue1", outEvent.getBody().get("metadata").get("ss.serverAttributeKey1").asText()); + Assert.assertEquals("serverAttributeValue1", getMetadata(outEvent).get("ss_serverAttributeKey1").asText()); RuleChain finalRuleChain = ruleChain; RuleNode lastRuleNode = metaData.getNodes().stream().filter(node -> !node.getId().equals(finalRuleChain.getFirstRuleNodeId())).findFirst().get(); @@ -183,8 +184,8 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule Assert.assertEquals(lastRuleNode.getId(), outEvent.getEntityId()); Assert.assertEquals(device.getId().getId().toString(), outEvent.getBody().get("entityId").asText()); - Assert.assertEquals("serverAttributeValue1", outEvent.getBody().get("metadata").get("ss.serverAttributeKey1").asText()); - Assert.assertEquals("serverAttributeValue2", outEvent.getBody().get("metadata").get("ss.serverAttributeKey2").asText()); + Assert.assertEquals("serverAttributeValue1", getMetadata(outEvent).get("ss_serverAttributeKey1").asText()); + Assert.assertEquals("serverAttributeValue2", getMetadata(outEvent).get("ss_serverAttributeKey2").asText()); } } diff --git a/application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java b/application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java index 22d79f090f..29e8b73561 100644 --- a/application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java +++ b/application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java @@ -16,6 +16,7 @@ package org.thingsboard.server.rules.lifecycle; import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.databind.JsonNode; import lombok.extern.slf4j.Slf4j; import org.junit.After; import org.junit.Assert; @@ -42,6 +43,7 @@ import org.thingsboard.server.common.msg.system.ServiceToRuleEngineMsg; import org.thingsboard.server.controller.AbstractRuleEngineControllerTest; import org.thingsboard.server.dao.attributes.AttributesService; +import java.io.IOException; import java.util.Collections; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -69,6 +71,7 @@ public abstract class AbstractRuleEngineLifecycleIntegrationTest extends Abstrac tenant.setTitle("My tenant"); savedTenant = doPost("/api/tenant", tenant, Tenant.class); Assert.assertNotNull(savedTenant); + ruleChainService.deleteRuleChainsByTenantId(savedTenant.getId()); tenantAdmin = new User(); tenantAdmin.setAuthority(Authority.TENANT_ADMIN); @@ -152,7 +155,7 @@ public abstract class AbstractRuleEngineLifecycleIntegrationTest extends Abstrac Assert.assertEquals(ruleChain.getFirstRuleNodeId(), outEvent.getEntityId()); Assert.assertEquals(device.getId().getId().toString(), outEvent.getBody().get("entityId").asText()); - Assert.assertEquals("serverAttributeValue", outEvent.getBody().get("metadata").get("ss.serverAttributeKey").asText()); + Assert.assertEquals("serverAttributeValue", getMetadata(outEvent).get("ss_serverAttributeKey").asText()); } } diff --git a/application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java b/application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java index cfa0c586a9..97c67491f1 100644 --- a/application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java +++ b/application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java @@ -35,5 +35,4 @@ public class SystemSqlTestSuite { "sql/drop-all-tables.sql", "sql-test.properties"); - } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/UpdateAttributesRequest.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/AttributesUpdateRequest.java similarity index 93% rename from common/message/src/main/java/org/thingsboard/server/common/msg/core/UpdateAttributesRequest.java rename to common/message/src/main/java/org/thingsboard/server/common/msg/core/AttributesUpdateRequest.java index a2989624dd..d4cb4b1ae6 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/UpdateAttributesRequest.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/AttributesUpdateRequest.java @@ -21,7 +21,7 @@ import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.msg.session.FromDeviceMsg; import org.thingsboard.server.common.msg.session.FromDeviceRequestMsg; -public interface UpdateAttributesRequest extends FromDeviceRequestMsg { +public interface AttributesUpdateRequest extends FromDeviceRequestMsg { Set getAttributes(); diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicUpdateAttributesRequest.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicAttributesUpdateRequest.java similarity index 82% rename from common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicUpdateAttributesRequest.java rename to common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicAttributesUpdateRequest.java index ee65ae4ce1..76efca0f07 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicUpdateAttributesRequest.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/BasicAttributesUpdateRequest.java @@ -21,19 +21,18 @@ import java.util.Set; import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.msg.session.SessionMsgType; -import org.thingsboard.server.common.msg.session.SessionMsgType; -public class BasicUpdateAttributesRequest extends BasicRequest implements UpdateAttributesRequest { +public class BasicAttributesUpdateRequest extends BasicRequest implements AttributesUpdateRequest { private static final long serialVersionUID = 1L; private final Set data; - public BasicUpdateAttributesRequest() { + public BasicAttributesUpdateRequest() { this(DEFAULT_REQUEST_ID); } - public BasicUpdateAttributesRequest(Integer requestId) { + public BasicAttributesUpdateRequest(Integer requestId) { super(requestId); this.data = new LinkedHashSet<>(); } @@ -58,7 +57,7 @@ public class BasicUpdateAttributesRequest extends BasicRequest implements Update @Override public String toString() { - return "BasicUpdateAttributesRequest [data=" + data + "]"; + return "BasicAttributesUpdateRequest [data=" + data + "]"; } } diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineError.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineError.java index 978d5858e4..f5e249c190 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineError.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineError.java @@ -21,7 +21,7 @@ package org.thingsboard.server.common.msg.core; public enum RuleEngineError { - NO_RULES, NO_ACTIVE_RULES, NO_FILTERS_MATCHED, NO_REQUEST_FROM_ACTIONS, NO_TWO_WAY_ACTIONS, NO_RESPONSE_FROM_ACTIONS, QUEUE_PUT_TIMEOUT(true); + QUEUE_PUT_TIMEOUT(true), SERVER_ERROR(true); private final boolean critical; diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineErrorMsg.java b/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineErrorMsg.java index 540f629b24..61e5cf58eb 100644 --- a/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineErrorMsg.java +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/core/RuleEngineErrorMsg.java @@ -40,20 +40,10 @@ public class RuleEngineErrorMsg implements ToDeviceMsg { public String getErrorMsg() { switch (error) { - case NO_RULES: - return "No rules configured!"; - case NO_ACTIVE_RULES: - return "No active rules!"; - case NO_FILTERS_MATCHED: - return "No rules that match current message!"; - case NO_REQUEST_FROM_ACTIONS: - return "Rule filters match, but no plugin message produced by rule action!"; - case NO_TWO_WAY_ACTIONS: - return "Rule filters match, but no rule with two-way action configured!"; - case NO_RESPONSE_FROM_ACTIONS: - return "Rule filters match, message processed by plugin, but no response produced by rule action!"; case QUEUE_PUT_TIMEOUT: - return "Timeout during processing of message by plugin!"; + return "Timeout during persistence of the message to the queue!"; + case SERVER_ERROR: + return "Error during processing of message by the server!"; default: throw new RuntimeException("Error " + error + " is not supported!"); } diff --git a/common/transport/src/main/java/org/thingsboard/server/common/transport/adaptor/JsonConverter.java b/common/transport/src/main/java/org/thingsboard/server/common/transport/adaptor/JsonConverter.java index 390266a614..b99c450326 100644 --- a/common/transport/src/main/java/org/thingsboard/server/common/transport/adaptor/JsonConverter.java +++ b/common/transport/src/main/java/org/thingsboard/server/common/transport/adaptor/JsonConverter.java @@ -118,13 +118,13 @@ public class JsonConverter { } } - public static UpdateAttributesRequest convertToAttributes(JsonElement element) { + public static AttributesUpdateRequest convertToAttributes(JsonElement element) { return convertToAttributes(element, BasicRequest.DEFAULT_REQUEST_ID); } - public static UpdateAttributesRequest convertToAttributes(JsonElement element, int requestId) { + public static AttributesUpdateRequest convertToAttributes(JsonElement element, int requestId) { if (element.isJsonObject()) { - BasicUpdateAttributesRequest request = new BasicUpdateAttributesRequest(requestId); + BasicAttributesUpdateRequest request = new BasicAttributesUpdateRequest(requestId); long ts = System.currentTimeMillis(); request.add(parseValues(element.getAsJsonObject()).stream().map(kv -> new BaseAttributeKvEntry(kv, ts)).collect(Collectors.toList())); return request; diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java index a7e7362a44..9ce1fbebbc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java @@ -75,8 +75,6 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC log.trace("Save system rule chain with predefined id {}", SYSTEM_TENANT); ruleChain.setTenantId(SYSTEM_TENANT); } - //TODO: Temporary Hack to continue tests; - ruleChain.setRoot(true); RuleChain savedRuleChain = ruleChainDao.save(ruleChain); if (ruleChain.isRoot() && ruleChain.getTenantId() != null && ruleChain.getId() == null) { try { diff --git a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/UpdateAttributesRequestRuleToPluginMsg.java b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/UpdateAttributesRequestRuleToPluginMsg.java index 991ad8d02d..a6d40ff77c 100644 --- a/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/UpdateAttributesRequestRuleToPluginMsg.java +++ b/extensions-api/src/main/java/org/thingsboard/server/extensions/api/plugins/msg/UpdateAttributesRequestRuleToPluginMsg.java @@ -18,13 +18,13 @@ package org.thingsboard.server.extensions.api.plugins.msg; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.msg.core.UpdateAttributesRequest; +import org.thingsboard.server.common.msg.core.AttributesUpdateRequest; -public class UpdateAttributesRequestRuleToPluginMsg extends AbstractRuleToPluginMsg { +public class UpdateAttributesRequestRuleToPluginMsg extends AbstractRuleToPluginMsg { private static final long serialVersionUID = 1L; - public UpdateAttributesRequestRuleToPluginMsg(TenantId tenantId, CustomerId customerId, DeviceId deviceId, UpdateAttributesRequest payload) { + public UpdateAttributesRequestRuleToPluginMsg(TenantId tenantId, CustomerId customerId, DeviceId deviceId, AttributesUpdateRequest payload) { super(tenantId, customerId, deviceId, payload); } diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/telemetry/TelemetryPluginAction.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/telemetry/TelemetryPluginAction.java index 514eb0b38c..b32137e011 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/telemetry/TelemetryPluginAction.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/action/telemetry/TelemetryPluginAction.java @@ -18,11 +18,10 @@ package org.thingsboard.server.extensions.core.action.telemetry; import org.springframework.util.StringUtils; import org.thingsboard.server.common.msg.core.GetAttributesRequest; import org.thingsboard.server.common.msg.core.TelemetryUploadRequest; -import org.thingsboard.server.common.msg.core.UpdateAttributesRequest; +import org.thingsboard.server.common.msg.core.AttributesUpdateRequest; import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceMsg; import org.thingsboard.server.common.msg.session.SessionMsgType; -import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.session.ToDeviceMsg; import org.thingsboard.server.extensions.api.component.Action; import org.thingsboard.server.extensions.api.plugins.PluginAction; @@ -58,7 +57,7 @@ public class TelemetryPluginAction extends SimpleRuleLifecycleComponent implemen return Optional.of(new TelemetryUploadRequestRuleToPluginMsg(deviceToDeviceActorMsg.getTenantId(), deviceToDeviceActorMsg.getCustomerId(), deviceToDeviceActorMsg.getDeviceId(), payload, ttl)); } else if (msg.getMsgType() == SessionMsgType.POST_ATTRIBUTES_REQUEST) { - UpdateAttributesRequest payload = (UpdateAttributesRequest) msg; + AttributesUpdateRequest payload = (AttributesUpdateRequest) msg; return Optional.of(new UpdateAttributesRequestRuleToPluginMsg(deviceToDeviceActorMsg.getTenantId(), deviceToDeviceActorMsg.getCustomerId(), deviceToDeviceActorMsg.getDeviceId(), payload)); } else if (msg.getMsgType() == SessionMsgType.GET_ATTRIBUTES_REQUEST) { diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceAttributesFilter.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceAttributesFilter.java index 468fde28f6..5865c1d219 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceAttributesFilter.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/DeviceAttributesFilter.java @@ -16,7 +16,7 @@ package org.thingsboard.server.extensions.core.filter; import lombok.extern.slf4j.Slf4j; -import org.thingsboard.server.common.msg.core.UpdateAttributesRequest; +import org.thingsboard.server.common.msg.core.AttributesUpdateRequest; import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceMsg; import org.thingsboard.server.extensions.api.component.Filter; @@ -44,7 +44,7 @@ public class DeviceAttributesFilter extends BasicJsFilter { if (msg != null) { switch (msg.getMsgType()) { case POST_ATTRIBUTES_REQUEST: - bindings = NashornJsEvaluator.updateBindings(bindings, (UpdateAttributesRequest) msg); + bindings = NashornJsEvaluator.updateBindings(bindings, (AttributesUpdateRequest) msg); break; default: break; diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/NashornJsEvaluator.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/NashornJsEvaluator.java index 20cb39763c..6e9fe3f1e7 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/NashornJsEvaluator.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/filter/NashornJsEvaluator.java @@ -19,7 +19,7 @@ import jdk.nashorn.api.scripting.NashornScriptEngineFactory; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.data.kv.KvEntry; -import org.thingsboard.server.common.msg.core.UpdateAttributesRequest; +import org.thingsboard.server.common.msg.core.AttributesUpdateRequest; import org.thingsboard.server.extensions.api.device.DeviceAttributes; import javax.script.*; @@ -69,7 +69,7 @@ public class NashornJsEvaluator { return bindings; } - public static Bindings updateBindings(Bindings bindings, UpdateAttributesRequest msg) { + public static Bindings updateBindings(Bindings bindings, AttributesUpdateRequest msg) { Map attrMap = (Map) bindings.get(CLIENT_SIDE); for (AttributeKvEntry attr : msg.getAttributes()) { if (!CLIENT_SIDE.equalsIgnoreCase(attr.getKey()) && !SERVER_SIDE.equalsIgnoreCase(attr.getKey()) diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRuleMsgHandler.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRuleMsgHandler.java index 9cb67fdffa..014d149d7a 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRuleMsgHandler.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRuleMsgHandler.java @@ -28,7 +28,7 @@ import org.thingsboard.server.common.msg.core.BasicGetAttributesResponse; import org.thingsboard.server.common.msg.core.BasicStatusCodeResponse; import org.thingsboard.server.common.msg.core.GetAttributesRequest; import org.thingsboard.server.common.msg.core.TelemetryUploadRequest; -import org.thingsboard.server.common.msg.core.UpdateAttributesRequest; +import org.thingsboard.server.common.msg.core.AttributesUpdateRequest; import org.thingsboard.server.common.msg.kv.BasicAttributeKVMsg; import org.thingsboard.server.extensions.api.plugins.PluginCallback; import org.thingsboard.server.extensions.api.plugins.PluginContext; @@ -132,7 +132,7 @@ public class TelemetryRuleMsgHandler extends DefaultRuleMsgHandler { @Override public void handleUpdateAttributesRequest(PluginContext ctx, TenantId tenantId, RuleId ruleId, UpdateAttributesRequestRuleToPluginMsg msg) { - UpdateAttributesRequest request = msg.getPayload(); + AttributesUpdateRequest request = msg.getPayload(); ctx.saveAttributes(msg.getTenantId(), msg.getDeviceId(), DataConstants.CLIENT_SCOPE, request.getAttributes().stream().collect(Collectors.toList()), new PluginCallback() { @Override diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/processor/AlarmProcessor.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/processor/AlarmProcessor.java index 711d86ae6c..df6e45acd3 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/processor/AlarmProcessor.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/processor/AlarmProcessor.java @@ -26,7 +26,7 @@ import org.thingsboard.server.common.data.alarm.AlarmSeverity; import org.thingsboard.server.common.data.alarm.AlarmStatus; import org.thingsboard.server.common.data.kv.KvEntry; import org.thingsboard.server.common.msg.core.TelemetryUploadRequest; -import org.thingsboard.server.common.msg.core.UpdateAttributesRequest; +import org.thingsboard.server.common.msg.core.AttributesUpdateRequest; import org.thingsboard.server.common.msg.device.DeviceToDeviceActorMsg; import org.thingsboard.server.common.msg.session.FromDeviceMsg; import org.thingsboard.server.extensions.api.component.Processor; @@ -219,7 +219,7 @@ public class AlarmProcessor implements RuleProcessor buildRuleToPluginMsg(RuleContext ctx, DeviceToDeviceActorMsg msg, FromDeviceRequestMsg payload) { KafkaActionPayload.KafkaActionPayloadBuilder builder = KafkaActionPayload.builder(); - builder.msgType(payload.getMsgType()); + builder.sessionMsgType(payload.getMsgType()); builder.requestId(payload.getRequestId()); builder.sync(configuration.isSync()); builder.topic(configuration.getTopic()); diff --git a/extensions/extension-kafka/src/main/java/org/thingsboard/server/extensions/kafka/plugin/KafkaMsgHandler.java b/extensions/extension-kafka/src/main/java/org/thingsboard/server/extensions/kafka/plugin/KafkaMsgHandler.java index 3e87507150..4000c2286a 100644 --- a/extensions/extension-kafka/src/main/java/org/thingsboard/server/extensions/kafka/plugin/KafkaMsgHandler.java +++ b/extensions/extension-kafka/src/main/java/org/thingsboard/server/extensions/kafka/plugin/KafkaMsgHandler.java @@ -49,10 +49,10 @@ public class KafkaMsgHandler implements RuleMsgHandler { if (payload.isSync()) { if (metadata != null) { ctx.reply(new ResponsePluginToRuleMsg(msg.getUid(), tenantId, ruleId, - BasicStatusCodeResponse.onSuccess(payload.getMsgType(), payload.getRequestId()))); + BasicStatusCodeResponse.onSuccess(payload.getSessionMsgType(), payload.getRequestId()))); } else { ctx.reply(new ResponsePluginToRuleMsg(msg.getUid(), tenantId, ruleId, - BasicStatusCodeResponse.onError(payload.getMsgType(), payload.getRequestId(), e))); + BasicStatusCodeResponse.onError(payload.getSessionMsgType(), payload.getRequestId(), e))); } } }); diff --git a/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/action/MqttPluginAction.java b/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/action/MqttPluginAction.java index 2a0e78a536..694fa9fccf 100644 --- a/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/action/MqttPluginAction.java +++ b/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/action/MqttPluginAction.java @@ -31,7 +31,7 @@ public class MqttPluginAction extends AbstractTemplatePluginAction buildRuleToPluginMsg(RuleContext ctx, DeviceToDeviceActorMsg msg, FromDeviceRequestMsg payload) { MqttActionPayload.MqttActionPayloadBuilder builder = MqttActionPayload.builder(); builder.sync(configuration.isSync()); - builder.msgType(payload.getMsgType()); + builder.sessionMsgType(payload.getMsgType()); builder.requestId(payload.getRequestId()); builder.topic(configuration.getTopic()); builder.msgBody(getMsgBody(ctx, msg)); diff --git a/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/plugin/MqttMsgHandler.java b/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/plugin/MqttMsgHandler.java index e6ac32a505..408372918f 100644 --- a/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/plugin/MqttMsgHandler.java +++ b/extensions/extension-mqtt/src/main/java/org/thingsboard/server/extensions/mqtt/plugin/MqttMsgHandler.java @@ -51,7 +51,7 @@ public class MqttMsgHandler implements RuleMsgHandler { log.debug("Message [{}] was successfully delivered to topic [{}]!", msg.toString(), payload.getTopic()); if (payload.isSync()) { ctx.reply(new ResponsePluginToRuleMsg(msg.getUid(), tenantId, ruleId, - BasicStatusCodeResponse.onSuccess(payload.getMsgType(), payload.getRequestId()))); + BasicStatusCodeResponse.onSuccess(payload.getSessionMsgType(), payload.getRequestId()))); } } @Override @@ -59,7 +59,7 @@ public class MqttMsgHandler implements RuleMsgHandler { log.warn("Failed to deliver message [{}] to topic [{}]!", msg.toString(), payload.getTopic()); if (payload.isSync()) { ctx.reply(new ResponsePluginToRuleMsg(msg.getUid(), tenantId, ruleId, - BasicStatusCodeResponse.onError(payload.getMsgType(), payload.getRequestId(), new Exception(e)))); + BasicStatusCodeResponse.onError(payload.getSessionMsgType(), payload.getRequestId(), new Exception(e)))); } } }); diff --git a/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginAction.java b/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginAction.java index 97d4c63705..0ae65b7f41 100644 --- a/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginAction.java +++ b/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginAction.java @@ -38,7 +38,7 @@ public class RabbitMqPluginAction extends AbstractTemplatePluginAction buildRuleToPluginMsg(RuleContext ctx, DeviceToDeviceActorMsg msg, FromDeviceRequestMsg payload) { RestApiCallActionPayload.RestApiCallActionPayloadBuilder builder = RestApiCallActionPayload.builder(); - builder.msgType(payload.getMsgType()); + builder.sessionMsgType(payload.getMsgType()); builder.requestId(payload.getRequestId()); builder.sync(configuration.isSync()); builder.actionPath(configuration.getActionPath()); diff --git a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallMsgHandler.java b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallMsgHandler.java index bc7cc719fd..7c04a43859 100644 --- a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallMsgHandler.java +++ b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallMsgHandler.java @@ -52,7 +52,7 @@ public class RestApiCallMsgHandler implements RuleMsgHandler { String.class); if (exchangeResponse.getStatusCode().equals(payload.getExpectedResultCode()) && payload.isSync()) { ctx.reply(new ResponsePluginToRuleMsg(msg.getUid(), tenantId, ruleId, - BasicStatusCodeResponse.onSuccess(payload.getMsgType(), payload.getRequestId()))); + BasicStatusCodeResponse.onSuccess(payload.getSessionMsgType(), payload.getRequestId()))); } else if(!exchangeResponse.getStatusCode().equals(payload.getExpectedResultCode())) { throw new RuntimeException("Response Status Code '" + exchangeResponse.getStatusCode() diff --git a/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/action/SnsTopicPluginAction.java b/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/action/SnsTopicPluginAction.java index 212b279fc1..c65ed990b9 100644 --- a/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/action/SnsTopicPluginAction.java +++ b/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/action/SnsTopicPluginAction.java @@ -33,7 +33,7 @@ public class SnsTopicPluginAction extends AbstractTemplatePluginAction buildRuleToPluginMsg(RuleContext ctx, DeviceToDeviceActorMsg msg, FromDeviceRequestMsg payload) { SnsTopicActionPayload.SnsTopicActionPayloadBuilder builder = SnsTopicActionPayload.builder(); - builder.msgType(payload.getMsgType()); + builder.sessionMsgType(payload.getMsgType()); builder.requestId(payload.getRequestId()); builder.topicArn(configuration.getTopicArn()); builder.msgBody(getMsgBody(ctx, msg)); diff --git a/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/plugin/SnsMessageHandler.java b/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/plugin/SnsMessageHandler.java index d84208a8c2..b90bb7802f 100644 --- a/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/plugin/SnsMessageHandler.java +++ b/extensions/extension-sns/src/main/java/org/thingsboard/server/extensions/sns/plugin/SnsMessageHandler.java @@ -52,7 +52,7 @@ public class SnsMessageHandler implements RuleMsgHandler { sns.publish(publishRequest); if (payload.isSync()) { ctx.reply(new ResponsePluginToRuleMsg(msg.getUid(), tenantId, ruleId, - BasicStatusCodeResponse.onSuccess(payload.getMsgType(), payload.getRequestId()))); + BasicStatusCodeResponse.onSuccess(payload.getSessionMsgType(), payload.getRequestId()))); } return; } diff --git a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/fifo/SqsFifoQueuePluginAction.java b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/fifo/SqsFifoQueuePluginAction.java index a2db8ac3b6..29c14e1262 100644 --- a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/fifo/SqsFifoQueuePluginAction.java +++ b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/fifo/SqsFifoQueuePluginAction.java @@ -33,7 +33,7 @@ public class SqsFifoQueuePluginAction extends AbstractTemplatePluginAction buildRuleToPluginMsg(RuleContext ctx, DeviceToDeviceActorMsg msg, FromDeviceRequestMsg payload) { SqsFifoQueueActionPayload.SqsFifoQueueActionPayloadBuilder builder = SqsFifoQueueActionPayload.builder(); - builder.msgType(payload.getMsgType()); + builder.sessionMsgType(payload.getMsgType()); builder.requestId(payload.getRequestId()); builder.queue(configuration.getQueue()); builder.deviceId(msg.getDeviceId().toString()); diff --git a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/standard/SqsStandardQueuePluginAction.java b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/standard/SqsStandardQueuePluginAction.java index ef7491026a..4ebf7bb743 100644 --- a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/standard/SqsStandardQueuePluginAction.java +++ b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/action/standard/SqsStandardQueuePluginAction.java @@ -33,7 +33,7 @@ public class SqsStandardQueuePluginAction extends AbstractTemplatePluginAction buildRuleToPluginMsg(RuleContext ctx, DeviceToDeviceActorMsg msg, FromDeviceRequestMsg payload) { SqsStandardQueueActionPayload.SqsStandardQueueActionPayloadBuilder builder = SqsStandardQueueActionPayload.builder(); - builder.msgType(payload.getMsgType()); + builder.sessionMsgType(payload.getMsgType()); builder.requestId(payload.getRequestId()); builder.queue(configuration.getQueue()); builder.delaySeconds(configuration.getDelaySeconds()); diff --git a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/plugin/SqsMessageHandler.java b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/plugin/SqsMessageHandler.java index 4128013534..248996aba9 100644 --- a/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/plugin/SqsMessageHandler.java +++ b/extensions/extension-sqs/src/main/java/org/thingsboard/server/extensions/sqs/plugin/SqsMessageHandler.java @@ -78,7 +78,7 @@ public class SqsMessageHandler implements RuleMsgHandler { sqs.sendMessage(sendMsgRequest); if (payload.isSync()) { ctx.reply(new ResponsePluginToRuleMsg(msg.getUid(), tenantId, ruleId, - BasicStatusCodeResponse.onSuccess(payload.getMsgType(), payload.getRequestId()))); + BasicStatusCodeResponse.onSuccess(payload.getSessionMsgType(), payload.getRequestId()))); } } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java new file mode 100644 index 0000000000..6db4a5e16d --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java @@ -0,0 +1,76 @@ +/** + * Copyright © 2016-2018 The Thingsboard Authors + * + * 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 + * + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.rule.engine.telemetry; + +import com.google.gson.JsonParser; +import lombok.extern.slf4j.Slf4j; +import org.springframework.util.StringUtils; +import org.thingsboard.rule.engine.TbNodeUtils; +import org.thingsboard.rule.engine.api.RuleNode; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNode; +import org.thingsboard.rule.engine.api.TbNodeConfiguration; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.BasicTsKvEntry; +import org.thingsboard.server.common.data.kv.KvEntry; +import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.common.data.plugin.ComponentType; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.core.AttributesUpdateRequest; +import org.thingsboard.server.common.msg.core.TelemetryUploadRequest; +import org.thingsboard.server.common.msg.session.SessionMsgType; +import org.thingsboard.server.common.transport.adaptor.JsonConverter; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +@Slf4j +@RuleNode( + type = ComponentType.ACTION, + name = "save attributes", + configClazz = TbMsgAttributesNodeConfiguration.class, + nodeDescription = "Saves attributes data", + nodeDetails = "Saves entity attributes based on configurable scope parameter. Expects messages with 'POST_ATTRIBUTES_REQUEST' message type" +) +public class TbMsgAttributesNode implements TbNode { + + private TbMsgAttributesNodeConfiguration config; + + @Override + public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { + this.config = TbNodeUtils.convert(configuration, TbMsgAttributesNodeConfiguration.class); + } + + @Override + public void onMsg(TbContext ctx, TbMsg msg) { + if (!msg.getType().equals(SessionMsgType.POST_ATTRIBUTES_REQUEST.name())) { + ctx.tellError(msg, new IllegalArgumentException("Unsupported msg type: " + msg.getType())); + return; + } + + String src = msg.getData(); + Set attributes = JsonConverter.convertToAttributes(new JsonParser().parse(src)).getAttributes(); + ctx.getTelemetryService().saveAndNotify(msg.getOriginator(), config.getScope(), new ArrayList<>(attributes), new TelemetryNodeCallback(ctx, msg)); + } + + @Override + public void destroy() { + } + +} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/RuleControllerSqlTest.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeConfiguration.java similarity index 50% rename from application/src/test/java/org/thingsboard/server/controller/sql/RuleControllerSqlTest.java rename to rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeConfiguration.java index cf651dac02..c6339176cb 100644 --- a/application/src/test/java/org/thingsboard/server/controller/sql/RuleControllerSqlTest.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeConfiguration.java @@ -13,14 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.controller.sql; +package org.thingsboard.rule.engine.telemetry; -import org.thingsboard.server.controller.BaseRuleControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; +import lombok.Data; +import org.thingsboard.rule.engine.api.NodeConfiguration; +import org.thingsboard.server.common.data.DataConstants; -/** - * Created by Valerii Sosliuk on 6/28/2017. - */ -@DaoSqlTest -public class RuleControllerSqlTest extends BaseRuleControllerTest { +@Data +public class TbMsgAttributesNodeConfiguration implements NodeConfiguration { + + private String scope; + + @Override + public TbMsgAttributesNodeConfiguration defaultConfiguration() { + TbMsgAttributesNodeConfiguration configuration = new TbMsgAttributesNodeConfiguration(); + configuration.setScope(DataConstants.SERVER_SCOPE); + return configuration; + } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNode.java similarity index 89% rename from rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java rename to rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNode.java index 0b9e0863d5..6f89d98ced 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNode.java @@ -28,13 +28,11 @@ import org.thingsboard.server.common.data.kv.BasicTsKvEntry; import org.thingsboard.server.common.data.kv.KvEntry; import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.data.plugin.ComponentType; -import org.thingsboard.server.common.msg.MsgType; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.core.TelemetryUploadRequest; import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.transport.adaptor.JsonConverter; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -42,21 +40,20 @@ import java.util.Map; @Slf4j @RuleNode( type = ComponentType.ACTION, - name = "save timeseries data", - configClazz = TbMsgTelemetryNodeConfiguration.class, + name = "save timeseries", + configClazz = TbMsgTimeseriesNodeConfiguration.class, nodeDescription = "Saves timeseries data", - nodeDetails = "Saves timeseries telemetry data based on configurable TTL parameter. Expects messages with 'POST_TELEMETRY' message type", + nodeDetails = "Saves timeseries telemetry data based on configurable TTL parameter. Expects messages with 'POST_TELEMETRY_REQUEST' message type", uiResources = {"static/rulenode/rulenode-core-config.js", "static/rulenode/rulenode-core-config.css"}, configDirective = "tbActionNodeTelemetryConfig" ) +public class TbMsgTimeseriesNode implements TbNode { -public class TbMsgTelemetryNode implements TbNode { - - private TbMsgTelemetryNodeConfiguration config; + private TbMsgTimeseriesNodeConfiguration config; @Override public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { - this.config = TbNodeUtils.convert(configuration, TbMsgTelemetryNodeConfiguration.class); + this.config = TbNodeUtils.convert(configuration, TbMsgTimeseriesNodeConfiguration.class); } @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeConfiguration.java similarity index 74% rename from rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNodeConfiguration.java rename to rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeConfiguration.java index 5523926f76..d405bdcd17 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTelemetryNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeConfiguration.java @@ -18,16 +18,14 @@ package org.thingsboard.rule.engine.telemetry; import lombok.Data; import org.thingsboard.rule.engine.api.NodeConfiguration; -import java.util.Map; - @Data -public class TbMsgTelemetryNodeConfiguration implements NodeConfiguration { +public class TbMsgTimeseriesNodeConfiguration implements NodeConfiguration { private long defaultTTL; @Override - public TbMsgTelemetryNodeConfiguration defaultConfiguration() { - TbMsgTelemetryNodeConfiguration configuration = new TbMsgTelemetryNodeConfiguration(); + public TbMsgTimeseriesNodeConfiguration defaultConfiguration() { + TbMsgTimeseriesNodeConfiguration configuration = new TbMsgTimeseriesNodeConfiguration(); configuration.setDefaultTTL(0L); return configuration; } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java index 69c3aca2d2..c0aec73693 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAlarmNodeTest.java @@ -17,9 +17,14 @@ package org.thingsboard.rule.engine.action; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.util.concurrent.AbstractListeningExecutorService; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; import org.apache.commons.lang3.NotImplementedException; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -38,6 +43,8 @@ import org.thingsboard.server.dao.alarm.AlarmService; import javax.script.ScriptException; import java.io.IOException; import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import static org.junit.Assert.*; import static org.mockito.Matchers.any; @@ -66,11 +73,32 @@ public class TbAlarmNodeTest { @Mock private ScriptEngine detailsJs; + private ListeningExecutor dbExecutor; + private EntityId originator = new DeviceId(UUIDs.timeBased()); private TenantId tenantId = new TenantId(UUIDs.timeBased()); private TbMsgMetaData metaData = new TbMsgMetaData(); private String rawJson = "{\"name\": \"Vit\", \"passed\": 5}"; + @Before + public void before() { + dbExecutor = new ListeningExecutor() { + @Override + public ListenableFuture executeAsync(Callable task) { + try { + return Futures.immediateFuture(task.call()); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public void execute(Runnable command) { + command.run(); + } + }; + } + @Test public void newAlarmCanBeCreated() throws ScriptException, IOException { initWithScript(); @@ -128,6 +156,7 @@ public class TbAlarmNodeTest { verify(ctx).createJsScriptEngine("CLEAR", "isCleared"); verify(ctx).createJsScriptEngine("DETAILS", "Details"); verify(ctx).getJsExecutor(); + verify(ctx).getDbCallbackExecutor(); verifyNoMoreInteractions(ctx, alarmService, clearJs, detailsJs); } @@ -151,6 +180,7 @@ public class TbAlarmNodeTest { verify(ctx).createJsScriptEngine("DETAILS", "Details"); verify(ctx, times(2)).getJsExecutor(); verify(ctx).getAlarmService(); + verify(ctx, times(3)).getDbCallbackExecutor(); verify(ctx).getTenantId(); verify(alarmService).findLatestByOriginatorAndType(tenantId, originator, "SomeType"); @@ -307,6 +337,7 @@ public class TbAlarmNodeTest { when(ctx.getTenantId()).thenReturn(tenantId); when(ctx.getJsExecutor()).thenReturn(executor); when(ctx.getAlarmService()).thenReturn(alarmService); + when(ctx.getDbCallbackExecutor()).thenReturn(dbExecutor); mockJsExecutor(); diff --git a/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/JsonCoapAdaptor.java b/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/JsonCoapAdaptor.java index 6472dfbb02..1c9631129f 100644 --- a/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/JsonCoapAdaptor.java +++ b/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/JsonCoapAdaptor.java @@ -31,7 +31,6 @@ import org.thingsboard.server.common.msg.session.FromDeviceMsg; import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.session.SessionActorToAdaptorMsg; import org.thingsboard.server.common.msg.session.SessionContext; -import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.session.ToDeviceMsg; import org.thingsboard.server.common.msg.session.ex.ProcessingTimeoutException; import org.thingsboard.server.common.transport.adaptor.AdaptorException; @@ -157,7 +156,7 @@ public class JsonCoapAdaptor implements CoapTransportAdaptor { return response; } - private UpdateAttributesRequest convertToUpdateAttributesRequest(SessionContext ctx, Request inbound) throws AdaptorException { + private AttributesUpdateRequest convertToUpdateAttributesRequest(SessionContext ctx, Request inbound) throws AdaptorException { String payload = validatePayload(ctx, inbound); try { return JsonConverter.convertToAttributes(new JsonParser().parse(payload)); diff --git a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/JsonMqttAdaptor.java b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/JsonMqttAdaptor.java index e35cfd589a..f0b29cbd17 100644 --- a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/JsonMqttAdaptor.java +++ b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/JsonMqttAdaptor.java @@ -219,7 +219,7 @@ public class JsonMqttAdaptor implements MqttTransportAdaptor { } } - private UpdateAttributesRequest convertToUpdateAttributesRequest(SessionContext ctx, MqttPublishMessage inbound) throws AdaptorException { + private AttributesUpdateRequest convertToUpdateAttributesRequest(SessionContext ctx, MqttPublishMessage inbound) throws AdaptorException { String payload = validatePayload(ctx.getSessionId(), inbound.payload()); try { return JsonConverter.convertToAttributes(new JsonParser().parse(payload), inbound.variableHeader().messageId()); diff --git a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionCtx.java b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionCtx.java index b4dd8db9c1..f35434aaaa 100644 --- a/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionCtx.java +++ b/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionCtx.java @@ -179,7 +179,7 @@ public class GatewaySessionCtx { throw new JsonSyntaxException(CAN_T_PARSE_VALUE + json); } long ts = System.currentTimeMillis(); - BasicUpdateAttributesRequest request = new BasicUpdateAttributesRequest(requestId); + BasicAttributesUpdateRequest request = new BasicAttributesUpdateRequest(requestId); JsonObject deviceData = deviceEntry.getValue().getAsJsonObject(); request.add(JsonConverter.parseValues(deviceData).stream().map(kv -> new BaseAttributeKvEntry(kv, ts)).collect(Collectors.toList())); GatewayDeviceSessionCtx deviceSessionCtx = devices.get(deviceName);