From 60e15ece5a6ca8e2840e39c6edb70d4d07470bff Mon Sep 17 00:00:00 2001 From: ShvaykaD Date: Thu, 5 Aug 2021 16:53:09 +0300 Subject: [PATCH] replaced protobuf-wrappers usage to optional keyword --- .../service/edge/rpc/EdgeProtoUtils.java | 52 ----------- .../rpc/constructor/AssetMsgConstructor.java | 13 +-- .../constructor/CustomerMsgConstructor.java | 22 ++--- .../constructor/DashboardMsgConstructor.java | 8 +- .../rpc/constructor/DeviceMsgConstructor.java | 19 ++-- .../DeviceProfileMsgConstructor.java | 13 +-- .../constructor/EntityViewMsgConstructor.java | 11 +-- .../constructor/RelationMsgConstructor.java | 6 +- .../constructor/RuleChainMsgConstructor.java | 8 +- .../rpc/constructor/UserMsgConstructor.java | 13 +-- .../constructor/WidgetTypeMsgConstructor.java | 10 +- .../WidgetsBundleMsgConstructor.java | 7 +- .../rpc/processor/DeviceEdgeProcessor.java | 18 ++-- .../rpc/processor/RelationEdgeProcessor.java | 2 +- .../thingsboard/server/edge/BaseEdgeTest.java | 19 ++-- common/edge-api/src/main/proto/edge.proto | 91 +++++++++---------- 16 files changed, 114 insertions(+), 198 deletions(-) delete mode 100644 application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeProtoUtils.java diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeProtoUtils.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeProtoUtils.java deleted file mode 100644 index a9dfac4df7..0000000000 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeProtoUtils.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * Copyright © 2016-2021 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.edge.rpc; - -import com.google.protobuf.BoolValue; -import com.google.protobuf.ByteString; -import com.google.protobuf.BytesValue; -import com.google.protobuf.Int64Value; -import com.google.protobuf.StringValue; - -public class EdgeProtoUtils { - - private EdgeProtoUtils() { - } - - public static BoolValue getBoolValue(Boolean value) { - BoolValue.Builder builder = BoolValue.newBuilder(); - builder.setValue(value); - return builder.build(); - } - - public static StringValue getStringValue(String value) { - StringValue.Builder builder = StringValue.newBuilder(); - builder.setValue(value); - return builder.build(); - } - - public static Int64Value getInt64Value(Long value) { - Int64Value.Builder builder = Int64Value.newBuilder(); - builder.setValue(value); - return builder.build(); - } - - public static BytesValue getBytesValue(ByteString value) { - BytesValue.Builder builder = BytesValue.newBuilder(); - builder.setValue(value); - return builder.build(); - } -} diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/AssetMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/AssetMsgConstructor.java index c5438f9445..6f8bc520dd 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/AssetMsgConstructor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/AssetMsgConstructor.java @@ -16,17 +16,14 @@ package org.thingsboard.server.service.edge.rpc.constructor; import org.springframework.stereotype.Component; +import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.server.common.data.asset.Asset; import org.thingsboard.server.common.data.id.AssetId; import org.thingsboard.server.common.data.id.CustomerId; -import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.server.gen.edge.v1.AssetUpdateMsg; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; import org.thingsboard.server.queue.util.TbCoreComponent; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getInt64Value; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getStringValue; - @Component @TbCoreComponent public class AssetMsgConstructor { @@ -39,14 +36,14 @@ public class AssetMsgConstructor { .setName(asset.getName()) .setType(asset.getType()); if (asset.getLabel() != null) { - builder.setLabel(getStringValue(asset.getLabel())); + builder.setLabel(asset.getLabel()); } if (customerId != null) { - builder.setCustomerIdMSB(getInt64Value(customerId.getId().getMostSignificantBits())); - builder.setCustomerIdLSB(getInt64Value(customerId.getId().getLeastSignificantBits())); + builder.setCustomerIdMSB(customerId.getId().getMostSignificantBits()); + builder.setCustomerIdLSB(customerId.getId().getLeastSignificantBits()); } if (asset.getAdditionalInfo() != null) { - builder.setAdditionalInfo(getStringValue(JacksonUtil.toString(asset.getAdditionalInfo()))); + builder.setAdditionalInfo(JacksonUtil.toString(asset.getAdditionalInfo())); } return builder.build(); } diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/CustomerMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/CustomerMsgConstructor.java index 5e9a861995..0b2e32a333 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/CustomerMsgConstructor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/CustomerMsgConstructor.java @@ -16,15 +16,13 @@ package org.thingsboard.server.service.edge.rpc.constructor; import org.springframework.stereotype.Component; +import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.id.CustomerId; -import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.server.gen.edge.v1.CustomerUpdateMsg; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; import org.thingsboard.server.queue.util.TbCoreComponent; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getStringValue; - @Component @TbCoreComponent public class CustomerMsgConstructor { @@ -36,31 +34,31 @@ public class CustomerMsgConstructor { .setIdLSB(customer.getId().getId().getLeastSignificantBits()) .setTitle(customer.getTitle()); if (customer.getCountry() != null) { - builder.setCountry(getStringValue(customer.getCountry())); + builder.setCountry(customer.getCountry()); } if (customer.getState() != null) { - builder.setState(getStringValue(customer.getState())); + builder.setState(customer.getState()); } if (customer.getCity() != null) { - builder.setCity(getStringValue(customer.getCity())); + builder.setCity(customer.getCity()); } if (customer.getAddress() != null) { - builder.setAddress(getStringValue(customer.getAddress())); + builder.setAddress(customer.getAddress()); } if (customer.getAddress2() != null) { - builder.setAddress2(getStringValue(customer.getAddress2())); + builder.setAddress2(customer.getAddress2()); } if (customer.getZip() != null) { - builder.setZip(getStringValue(customer.getZip())); + builder.setZip(customer.getZip()); } if (customer.getPhone() != null) { - builder.setPhone(getStringValue(customer.getPhone())); + builder.setPhone(customer.getPhone()); } if (customer.getEmail() != null) { - builder.setEmail(getStringValue(customer.getEmail())); + builder.setEmail(customer.getEmail()); } if (customer.getAdditionalInfo() != null) { - builder.setAdditionalInfo(getStringValue(JacksonUtil.toString(customer.getAdditionalInfo()))); + builder.setAdditionalInfo(JacksonUtil.toString(customer.getAdditionalInfo())); } return builder.build(); } diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DashboardMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DashboardMsgConstructor.java index b916d10aa8..29c0f9b38b 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DashboardMsgConstructor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DashboardMsgConstructor.java @@ -16,16 +16,14 @@ package org.thingsboard.server.service.edge.rpc.constructor; import org.springframework.stereotype.Component; +import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.server.common.data.Dashboard; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DashboardId; -import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.server.gen.edge.v1.DashboardUpdateMsg; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; import org.thingsboard.server.queue.util.TbCoreComponent; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getInt64Value; - @Component @TbCoreComponent public class DashboardMsgConstructor { @@ -38,8 +36,8 @@ public class DashboardMsgConstructor { .setTitle(dashboard.getTitle()) .setConfiguration(JacksonUtil.toString(dashboard.getConfiguration())); if (customerId != null) { - builder.setCustomerIdMSB(getInt64Value(customerId.getId().getMostSignificantBits())); - builder.setCustomerIdLSB(getInt64Value(customerId.getId().getLeastSignificantBits())); + builder.setCustomerIdMSB(customerId.getId().getMostSignificantBits()); + builder.setCustomerIdLSB(customerId.getId().getLeastSignificantBits()); } return builder.build(); } diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceMsgConstructor.java index 1506e2f4e8..a28e80d80a 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceMsgConstructor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceMsgConstructor.java @@ -32,9 +32,6 @@ import org.thingsboard.server.queue.util.TbCoreComponent; import java.util.UUID; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getInt64Value; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getStringValue; - @Component @TbCoreComponent public class DeviceMsgConstructor { @@ -49,21 +46,21 @@ public class DeviceMsgConstructor { .setName(device.getName()) .setType(device.getType()); if (device.getLabel() != null) { - builder.setLabel(getStringValue(device.getLabel())); + builder.setLabel(device.getLabel()); } if (customerId != null) { - builder.setCustomerIdMSB(getInt64Value(customerId.getId().getMostSignificantBits())); - builder.setCustomerIdLSB(getInt64Value(customerId.getId().getLeastSignificantBits())); + builder.setCustomerIdMSB(customerId.getId().getMostSignificantBits()); + builder.setCustomerIdLSB(customerId.getId().getLeastSignificantBits()); } if (device.getDeviceProfileId() != null) { - builder.setDeviceProfileIdMSB(getInt64Value(device.getDeviceProfileId().getId().getMostSignificantBits())); - builder.setDeviceProfileIdLSB(getInt64Value(device.getDeviceProfileId().getId().getLeastSignificantBits())); + builder.setDeviceProfileIdMSB(device.getDeviceProfileId().getId().getMostSignificantBits()); + builder.setDeviceProfileIdLSB(device.getDeviceProfileId().getId().getLeastSignificantBits()); } if (device.getAdditionalInfo() != null) { - builder.setAdditionalInfo(getStringValue(JacksonUtil.toString(device.getAdditionalInfo()))); + builder.setAdditionalInfo(JacksonUtil.toString(device.getAdditionalInfo())); } if (conflictName != null) { - builder.setConflictName(getStringValue(conflictName)); + builder.setConflictName(conflictName); } return builder.build(); } @@ -77,7 +74,7 @@ public class DeviceMsgConstructor { .setCredentialsId(deviceCredentials.getCredentialsId()); } if (deviceCredentials.getCredentialsValue() != null) { - builder.setCredentialsValue(getStringValue(deviceCredentials.getCredentialsValue())); + builder.setCredentialsValue(deviceCredentials.getCredentialsValue()); } return builder.build(); } diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceProfileMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceProfileMsgConstructor.java index 8646fc3756..965b7c9e67 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceProfileMsgConstructor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceProfileMsgConstructor.java @@ -27,9 +27,6 @@ import org.thingsboard.server.queue.util.TbCoreComponent; import java.nio.charset.StandardCharsets; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getBytesValue; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getStringValue; - @Component @TbCoreComponent public class DeviceProfileMsgConstructor { @@ -55,19 +52,19 @@ public class DeviceProfileMsgConstructor { // builder.setDefaultQueueName(deviceProfile.getDefaultQueueName()); // } if (deviceProfile.getDescription() != null) { - builder.setDescription(getStringValue(deviceProfile.getDescription())); + builder.setDescription(deviceProfile.getDescription()); } if (deviceProfile.getTransportType() != null) { - builder.setTransportType(getStringValue(deviceProfile.getTransportType().name())); + builder.setTransportType(deviceProfile.getTransportType().name()); } if (deviceProfile.getProvisionType() != null) { - builder.setProvisionType(getStringValue(deviceProfile.getProvisionType().name())); + builder.setProvisionType(deviceProfile.getProvisionType().name()); } if (deviceProfile.getProvisionDeviceKey() != null) { - builder.setProvisionDeviceKey(getStringValue(deviceProfile.getProvisionDeviceKey())); + builder.setProvisionDeviceKey(deviceProfile.getProvisionDeviceKey()); } if (deviceProfile.getImage() != null) { - builder.setImage(getBytesValue(ByteString.copyFrom(deviceProfile.getImage().getBytes(StandardCharsets.UTF_8)))); + builder.setImage(ByteString.copyFrom(deviceProfile.getImage().getBytes(StandardCharsets.UTF_8))); } return builder.build(); } diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/EntityViewMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/EntityViewMsgConstructor.java index 4f9d580ecb..21205349b5 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/EntityViewMsgConstructor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/EntityViewMsgConstructor.java @@ -16,18 +16,15 @@ package org.thingsboard.server.service.edge.rpc.constructor; import org.springframework.stereotype.Component; +import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.server.common.data.EntityView; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.EntityViewId; -import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.server.gen.edge.v1.EdgeEntityType; import org.thingsboard.server.gen.edge.v1.EntityViewUpdateMsg; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; import org.thingsboard.server.queue.util.TbCoreComponent; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getInt64Value; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getStringValue; - @Component @TbCoreComponent public class EntityViewMsgConstructor { @@ -54,11 +51,11 @@ public class EntityViewMsgConstructor { .setEntityIdLSB(entityView.getEntityId().getId().getLeastSignificantBits()) .setEntityType(entityType); if (customerId != null) { - builder.setCustomerIdMSB(getInt64Value(customerId.getId().getMostSignificantBits())); - builder.setCustomerIdLSB(getInt64Value(customerId.getId().getLeastSignificantBits())); + builder.setCustomerIdMSB(customerId.getId().getMostSignificantBits()); + builder.setCustomerIdLSB(customerId.getId().getLeastSignificantBits()); } if (entityView.getAdditionalInfo() != null) { - builder.setAdditionalInfo(getStringValue(JacksonUtil.toString(entityView.getAdditionalInfo()))); + builder.setAdditionalInfo(JacksonUtil.toString(entityView.getAdditionalInfo())); } return builder.build(); } diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/RelationMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/RelationMsgConstructor.java index 839f19dad5..adf918eec6 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/RelationMsgConstructor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/RelationMsgConstructor.java @@ -16,14 +16,12 @@ package org.thingsboard.server.service.edge.rpc.constructor; import org.springframework.stereotype.Component; -import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.common.util.JacksonUtil; +import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.gen.edge.v1.RelationUpdateMsg; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; import org.thingsboard.server.queue.util.TbCoreComponent; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getStringValue; - @Component @TbCoreComponent public class RelationMsgConstructor { @@ -42,7 +40,7 @@ public class RelationMsgConstructor { builder.setAdditionalInfo(JacksonUtil.toString(entityRelation.getAdditionalInfo())); } if (entityRelation.getTypeGroup() != null) { - builder.setTypeGroup(getStringValue(entityRelation.getTypeGroup().name())); + builder.setTypeGroup(entityRelation.getTypeGroup().name()); } return builder.build(); } diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/RuleChainMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/RuleChainMsgConstructor.java index f137fda04e..11b14a78dc 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/RuleChainMsgConstructor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/RuleChainMsgConstructor.java @@ -19,13 +19,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.server.common.data.id.RuleChainId; import org.thingsboard.server.common.data.rule.NodeConnectionInfo; import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.rule.RuleChainConnectionInfo; import org.thingsboard.server.common.data.rule.RuleChainMetaData; import org.thingsboard.server.common.data.rule.RuleNode; -import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.server.gen.edge.v1.NodeConnectionInfoProto; import org.thingsboard.server.gen.edge.v1.RuleChainConnectionInfoProto; import org.thingsboard.server.gen.edge.v1.RuleChainMetadataUpdateMsg; @@ -37,8 +37,6 @@ import org.thingsboard.server.queue.util.TbCoreComponent; import java.util.ArrayList; import java.util.List; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getInt64Value; - @Component @Slf4j @TbCoreComponent @@ -56,8 +54,8 @@ public class RuleChainMsgConstructor { .setDebugMode(ruleChain.isDebugMode()) .setConfiguration(JacksonUtil.toString(ruleChain.getConfiguration())); if (ruleChain.getFirstRuleNodeId() != null) { - builder.setFirstRuleNodeIdMSB(getInt64Value(ruleChain.getFirstRuleNodeId().getId().getMostSignificantBits())) - .setFirstRuleNodeIdLSB(getInt64Value(ruleChain.getFirstRuleNodeId().getId().getLeastSignificantBits())); + builder.setFirstRuleNodeIdMSB(ruleChain.getFirstRuleNodeId().getId().getMostSignificantBits()) + .setFirstRuleNodeIdLSB(ruleChain.getFirstRuleNodeId().getId().getLeastSignificantBits()); } return builder.build(); } diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/UserMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/UserMsgConstructor.java index 118bd4e6dd..16de535f47 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/UserMsgConstructor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/UserMsgConstructor.java @@ -26,9 +26,6 @@ import org.thingsboard.server.gen.edge.v1.UserCredentialsUpdateMsg; import org.thingsboard.server.gen.edge.v1.UserUpdateMsg; import org.thingsboard.server.queue.util.TbCoreComponent; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getInt64Value; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getStringValue; - @Component @TbCoreComponent public class UserMsgConstructor { @@ -41,17 +38,17 @@ public class UserMsgConstructor { .setEmail(user.getEmail()) .setAuthority(user.getAuthority().name()); if (customerId != null) { - builder.setCustomerIdMSB(getInt64Value(customerId.getId().getMostSignificantBits())); - builder.setCustomerIdLSB(getInt64Value(customerId.getId().getLeastSignificantBits())); + builder.setCustomerIdMSB(customerId.getId().getMostSignificantBits()); + builder.setCustomerIdLSB(customerId.getId().getLeastSignificantBits()); } if (user.getFirstName() != null) { - builder.setFirstName(getStringValue(user.getFirstName())); + builder.setFirstName(user.getFirstName()); } if (user.getLastName() != null) { - builder.setLastName(getStringValue(user.getLastName())); + builder.setLastName(user.getLastName()); } if (user.getAdditionalInfo() != null) { - builder.setAdditionalInfo(getStringValue(JacksonUtil.toString(user.getAdditionalInfo()))); + builder.setAdditionalInfo(JacksonUtil.toString(user.getAdditionalInfo())); } return builder.build(); } diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/WidgetTypeMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/WidgetTypeMsgConstructor.java index 8cf5c2e792..ed911297f7 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/WidgetTypeMsgConstructor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/WidgetTypeMsgConstructor.java @@ -24,8 +24,6 @@ import org.thingsboard.server.gen.edge.v1.UpdateMsgType; import org.thingsboard.server.gen.edge.v1.WidgetTypeUpdateMsg; import org.thingsboard.server.queue.util.TbCoreComponent; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getStringValue; - @Component @TbCoreComponent public class WidgetTypeMsgConstructor { @@ -36,16 +34,16 @@ public class WidgetTypeMsgConstructor { .setIdMSB(widgetType.getId().getId().getMostSignificantBits()) .setIdLSB(widgetType.getId().getId().getLeastSignificantBits()); if (widgetType.getBundleAlias() != null) { - builder.setBundleAlias(getStringValue(widgetType.getBundleAlias())); + builder.setBundleAlias(widgetType.getBundleAlias()); } if (widgetType.getAlias() != null) { - builder.setAlias(getStringValue(widgetType.getAlias())); + builder.setAlias(widgetType.getAlias()); } if (widgetType.getName() != null) { - builder.setName(getStringValue(widgetType.getName())); + builder.setName(widgetType.getName()); } if (widgetType.getDescriptor() != null) { - builder.setDescriptorJson(getStringValue(JacksonUtil.toString(widgetType.getDescriptor()))); + builder.setDescriptorJson(JacksonUtil.toString(widgetType.getDescriptor())); } if (widgetType.getTenantId().equals(TenantId.SYS_TENANT_ID)) { builder.setIsSystem(true); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/WidgetsBundleMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/WidgetsBundleMsgConstructor.java index 56464ad8a5..7a2a9d00cd 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/WidgetsBundleMsgConstructor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/WidgetsBundleMsgConstructor.java @@ -26,9 +26,6 @@ import org.thingsboard.server.queue.util.TbCoreComponent; import java.nio.charset.StandardCharsets; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getBytesValue; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getStringValue; - @Component @TbCoreComponent public class WidgetsBundleMsgConstructor { @@ -41,10 +38,10 @@ public class WidgetsBundleMsgConstructor { .setTitle(widgetsBundle.getTitle()) .setAlias(widgetsBundle.getAlias()); if (widgetsBundle.getImage() != null) { - builder.setImage(getBytesValue(ByteString.copyFrom(widgetsBundle.getImage().getBytes(StandardCharsets.UTF_8)))); + builder.setImage(ByteString.copyFrom(widgetsBundle.getImage().getBytes(StandardCharsets.UTF_8))); } if (widgetsBundle.getDescription() != null) { - builder.setDescription(getStringValue(widgetsBundle.getDescription())); + builder.setDescription(widgetsBundle.getDescription()); } if (widgetsBundle.getTenantId().equals(TenantId.SYS_TENANT_ID)) { builder.setIsSystem(true); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceEdgeProcessor.java index c036eebc16..6475ed530d 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceEdgeProcessor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceEdgeProcessor.java @@ -145,7 +145,7 @@ public class DeviceEdgeProcessor extends BaseEdgeProcessor { deviceCredentials.setCredentialsType(DeviceCredentialsType.valueOf(deviceCredentialsUpdateMsg.getCredentialsType())); deviceCredentials.setCredentialsId(deviceCredentialsUpdateMsg.getCredentialsId()); if (deviceCredentialsUpdateMsg.hasCredentialsValue()) { - deviceCredentials.setCredentialsValue(deviceCredentialsUpdateMsg.getCredentialsValue().getValue()); + deviceCredentials.setCredentialsValue(deviceCredentialsUpdateMsg.getCredentialsValue()); } deviceCredentialsService.updateDeviceCredentials(tenantId, deviceCredentials); } catch (Exception e) { @@ -165,15 +165,15 @@ public class DeviceEdgeProcessor extends BaseEdgeProcessor { device.setName(deviceUpdateMsg.getName()); device.setType(deviceUpdateMsg.getType()); if (deviceUpdateMsg.hasLabel()) { - device.setLabel(deviceUpdateMsg.getLabel().getValue()); + device.setLabel(deviceUpdateMsg.getLabel()); } if (deviceUpdateMsg.hasAdditionalInfo()) { - device.setAdditionalInfo(JacksonUtil.toJsonNode(deviceUpdateMsg.getAdditionalInfo().getValue())); + device.setAdditionalInfo(JacksonUtil.toJsonNode(deviceUpdateMsg.getAdditionalInfo())); } if (deviceUpdateMsg.hasDeviceProfileIdMSB() && deviceUpdateMsg.hasDeviceProfileIdLSB()) { DeviceProfileId deviceProfileId = new DeviceProfileId( - new UUID(deviceUpdateMsg.getDeviceProfileIdMSB().getValue(), - deviceUpdateMsg.getDeviceProfileIdLSB().getValue())); + new UUID(deviceUpdateMsg.getDeviceProfileIdMSB(), + deviceUpdateMsg.getDeviceProfileIdLSB())); device.setDeviceProfileId(deviceProfileId); } deviceService.saveDevice(device); @@ -203,15 +203,15 @@ public class DeviceEdgeProcessor extends BaseEdgeProcessor { device.setName(deviceName); device.setType(deviceUpdateMsg.getType()); if (deviceUpdateMsg.hasLabel()) { - device.setLabel(deviceUpdateMsg.getLabel().getValue()); + device.setLabel(deviceUpdateMsg.getLabel()); } if (deviceUpdateMsg.hasAdditionalInfo()) { - device.setAdditionalInfo(JacksonUtil.toJsonNode(deviceUpdateMsg.getAdditionalInfo().getValue())); + device.setAdditionalInfo(JacksonUtil.toJsonNode(deviceUpdateMsg.getAdditionalInfo())); } if (deviceUpdateMsg.hasDeviceProfileIdMSB() && deviceUpdateMsg.hasDeviceProfileIdLSB()) { DeviceProfileId deviceProfileId = new DeviceProfileId( - new UUID(deviceUpdateMsg.getDeviceProfileIdMSB().getValue(), - deviceUpdateMsg.getDeviceProfileIdLSB().getValue())); + new UUID(deviceUpdateMsg.getDeviceProfileIdMSB(), + deviceUpdateMsg.getDeviceProfileIdLSB())); device.setDeviceProfileId(deviceProfileId); } Device savedDevice = deviceService.saveDevice(device, false); diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RelationEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RelationEdgeProcessor.java index d23edc0f60..979996208f 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RelationEdgeProcessor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/RelationEdgeProcessor.java @@ -73,7 +73,7 @@ public class RelationEdgeProcessor extends BaseEdgeProcessor { entityRelation.setType(relationUpdateMsg.getType()); if (relationUpdateMsg.hasTypeGroup()) { - entityRelation.setTypeGroup(RelationTypeGroup.valueOf(relationUpdateMsg.getTypeGroup().getValue())); + entityRelation.setTypeGroup(RelationTypeGroup.valueOf(relationUpdateMsg.getTypeGroup())); } entityRelation.setAdditionalInfo(mapper.readTree(relationUpdateMsg.getAdditionalInfo())); switch (relationUpdateMsg.getMsgType()) { diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java index d2267facfb..473cac859b 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java @@ -28,7 +28,6 @@ import com.google.protobuf.MessageLite; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.RandomStringUtils; import org.awaitility.Awaitility; -import org.hamcrest.Matchers; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -116,7 +115,6 @@ import org.thingsboard.server.gen.edge.v1.UserUpdateMsg; import org.thingsboard.server.gen.edge.v1.WidgetTypeUpdateMsg; import org.thingsboard.server.gen.edge.v1.WidgetsBundleUpdateMsg; import org.thingsboard.server.gen.transport.TransportProtos; -import org.thingsboard.server.service.edge.rpc.EdgeProtoUtils; import org.thingsboard.server.service.queue.TbClusterService; import java.util.ArrayList; @@ -129,7 +127,6 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static org.thingsboard.server.service.edge.rpc.EdgeProtoUtils.getStringValue; @Slf4j abstract public class BaseEdgeTest extends AbstractControllerTest { @@ -652,7 +649,7 @@ abstract public class BaseEdgeTest extends AbstractControllerTest { Assert.assertEquals(relationUpdateMsg.getFromIdMSB(), relation.getFrom().getId().getMostSignificantBits()); Assert.assertEquals(relationUpdateMsg.getToIdLSB(), relation.getTo().getId().getLeastSignificantBits()); Assert.assertEquals(relationUpdateMsg.getToEntityType(), relation.getTo().getEntityType().name()); - Assert.assertEquals(relationUpdateMsg.getTypeGroup().getValue(), relation.getTypeGroup().name()); + Assert.assertEquals(relationUpdateMsg.getTypeGroup(), relation.getTypeGroup().name()); // 2 edgeImitator.expectMessageAmount(1); @@ -676,7 +673,7 @@ abstract public class BaseEdgeTest extends AbstractControllerTest { Assert.assertEquals(relationUpdateMsg.getFromIdMSB(), relation.getFrom().getId().getMostSignificantBits()); Assert.assertEquals(relationUpdateMsg.getToIdLSB(), relation.getTo().getId().getLeastSignificantBits()); Assert.assertEquals(relationUpdateMsg.getToEntityType(), relation.getTo().getEntityType().name()); - Assert.assertEquals(relationUpdateMsg.getTypeGroup().getValue(), relation.getTypeGroup().name()); + Assert.assertEquals(relationUpdateMsg.getTypeGroup(), relation.getTypeGroup().name()); log.info("Relations tested successfully"); } @@ -912,9 +909,9 @@ abstract public class BaseEdgeTest extends AbstractControllerTest { Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, widgetTypeUpdateMsg.getMsgType()); Assert.assertEquals(widgetTypeUpdateMsg.getIdMSB(), savedWidgetType.getUuidId().getMostSignificantBits()); Assert.assertEquals(widgetTypeUpdateMsg.getIdLSB(), savedWidgetType.getUuidId().getLeastSignificantBits()); - Assert.assertEquals(widgetTypeUpdateMsg.getAlias().getValue(), savedWidgetType.getAlias()); - Assert.assertEquals(widgetTypeUpdateMsg.getName().getValue(), savedWidgetType.getName()); - Assert.assertEquals(JacksonUtil.toJsonNode(widgetTypeUpdateMsg.getDescriptorJson().getValue()), savedWidgetType.getDescriptor()); + Assert.assertEquals(widgetTypeUpdateMsg.getAlias(), savedWidgetType.getAlias()); + Assert.assertEquals(widgetTypeUpdateMsg.getName(), savedWidgetType.getName()); + Assert.assertEquals(JacksonUtil.toJsonNode(widgetTypeUpdateMsg.getDescriptorJson()), savedWidgetType.getDescriptor()); // 3 edgeImitator.expectMessageAmount(1); @@ -1214,7 +1211,7 @@ abstract public class BaseEdgeTest extends AbstractControllerTest { Assert.assertTrue(latestMessage instanceof DeviceUpdateMsg); DeviceUpdateMsg latestDeviceUpdateMsg = (DeviceUpdateMsg) latestMessage; Assert.assertNotEquals(deviceOnCloudName, latestDeviceUpdateMsg.getName()); - Assert.assertEquals(deviceOnCloudName, latestDeviceUpdateMsg.getConflictName().getValue()); + Assert.assertEquals(deviceOnCloudName, latestDeviceUpdateMsg.getConflictName()); UUID newDeviceId = new UUID(latestDeviceUpdateMsg.getIdMSB(), latestDeviceUpdateMsg.getIdLSB()); @@ -1281,7 +1278,7 @@ abstract public class BaseEdgeTest extends AbstractControllerTest { EntityId toEntityId = EntityIdFactory.getByTypeAndUuid(relationUpdateMsg.getToEntityType(), toUUID); Assert.assertEquals(relation.getTo(), toEntityId); - Assert.assertEquals(relation.getTypeGroup().name(), relationUpdateMsg.getTypeGroup().getValue()); + Assert.assertEquals(relation.getTypeGroup().name(), relationUpdateMsg.getTypeGroup()); } private void sendAlarm() throws Exception { @@ -1393,7 +1390,7 @@ abstract public class BaseEdgeTest extends AbstractControllerTest { UplinkMsg.Builder uplinkMsgBuilder = UplinkMsg.newBuilder(); RelationUpdateMsg.Builder relationUpdateMsgBuilder = RelationUpdateMsg.newBuilder(); relationUpdateMsgBuilder.setType("test"); - relationUpdateMsgBuilder.setTypeGroup(getStringValue(RelationTypeGroup.COMMON.name())); + relationUpdateMsgBuilder.setTypeGroup(RelationTypeGroup.COMMON.name()); relationUpdateMsgBuilder.setToIdMSB(device1.getId().getId().getMostSignificantBits()); relationUpdateMsgBuilder.setToIdLSB(device1.getId().getId().getLeastSignificantBits()); relationUpdateMsgBuilder.setToEntityType(device1.getId().getEntityType().name()); diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto index 06eec3c2ce..8586d9b920 100644 --- a/common/edge-api/src/main/proto/edge.proto +++ b/common/edge-api/src/main/proto/edge.proto @@ -20,7 +20,6 @@ option java_multiple_files = true; option java_outer_classname = "EdgeProtos"; import "queue.proto"; -import "google/protobuf/wrappers.proto"; package edge; @@ -130,8 +129,8 @@ message RuleChainUpdateMsg { int64 idMSB = 2; int64 idLSB = 3; string name = 4; - google.protobuf.Int64Value firstRuleNodeIdMSB = 5; - google.protobuf.Int64Value firstRuleNodeIdLSB = 6; + optional int64 firstRuleNodeIdMSB = 5; + optional int64 firstRuleNodeIdLSB = 6; bool root = 7; bool debugMode = 8; string configuration = 9; @@ -175,8 +174,8 @@ message DashboardUpdateMsg { UpdateMsgType msgType = 1; int64 idMSB = 2; int64 idLSB = 3; - google.protobuf.Int64Value customerIdMSB = 4; - google.protobuf.Int64Value customerIdLSB = 5; + optional int64 customerIdMSB = 4; + optional int64 customerIdLSB = 5; string title = 6; string configuration = 7; } @@ -185,15 +184,15 @@ message DeviceUpdateMsg { UpdateMsgType msgType = 1; int64 idMSB = 2; int64 idLSB = 3; - google.protobuf.Int64Value customerIdMSB = 4; - google.protobuf.Int64Value customerIdLSB = 5; - google.protobuf.Int64Value deviceProfileIdMSB = 6; - google.protobuf.Int64Value deviceProfileIdLSB = 7; + optional int64 customerIdMSB = 4; + optional int64 customerIdLSB = 5; + optional int64 deviceProfileIdMSB = 6; + optional int64 deviceProfileIdLSB = 7; string name = 8; string type = 9; - google.protobuf.StringValue label = 10; - google.protobuf.StringValue additionalInfo = 11; - google.protobuf.StringValue conflictName = 12; + optional string label = 10; + optional string additionalInfo = 11; + optional string conflictName = 12; } message DeviceProfileUpdateMsg { @@ -201,17 +200,17 @@ message DeviceProfileUpdateMsg { int64 idMSB = 2; int64 idLSB = 3; string name = 4; - google.protobuf.StringValue description = 5; + optional string description = 5; bool default = 6; string type = 7; - google.protobuf.StringValue transportType = 8; - google.protobuf.StringValue provisionType = 9; + optional string transportType = 8; + optional string provisionType = 9; int64 defaultRuleChainIdMSB = 10; int64 defaultRuleChainIdLSB = 11; string defaultQueueName = 12; bytes profileDataBytes = 13; - google.protobuf.StringValue provisionDeviceKey = 14; - google.protobuf.BytesValue image = 15; + optional string provisionDeviceKey = 14; + optional bytes image = 15; } message DeviceCredentialsUpdateMsg { @@ -219,33 +218,33 @@ message DeviceCredentialsUpdateMsg { int64 deviceIdLSB = 2; string credentialsType = 3; string credentialsId = 4; - google.protobuf.StringValue credentialsValue = 5; + optional string credentialsValue = 5; } message AssetUpdateMsg { UpdateMsgType msgType = 1; int64 idMSB = 2; int64 idLSB = 3; - google.protobuf.Int64Value customerIdMSB = 4; - google.protobuf.Int64Value customerIdLSB = 5; + optional int64 customerIdMSB = 4; + optional int64 customerIdLSB = 5; string name = 6; string type = 7; - google.protobuf.StringValue label = 8; - google.protobuf.StringValue additionalInfo = 9; + optional string label = 8; + optional string additionalInfo = 9; } message EntityViewUpdateMsg { UpdateMsgType msgType = 1; int64 idMSB = 2; int64 idLSB = 3; - google.protobuf.Int64Value customerIdMSB = 4; - google.protobuf.Int64Value customerIdLSB = 5; + optional int64 customerIdMSB = 4; + optional int64 customerIdLSB = 5; string name = 6; string type = 7; int64 entityIdMSB = 8; int64 entityIdLSB = 9; EdgeEntityType entityType = 10; - google.protobuf.StringValue additionalInfo = 11; + optional string additionalInfo = 11; } message AlarmUpdateMsg { @@ -271,15 +270,15 @@ message CustomerUpdateMsg { int64 idMSB = 2; int64 idLSB = 3; string title = 4; - google.protobuf.StringValue country = 5; - google.protobuf.StringValue state = 6; - google.protobuf.StringValue city = 7; - google.protobuf.StringValue address = 8; - google.protobuf.StringValue address2 = 9; - google.protobuf.StringValue zip = 10; - google.protobuf.StringValue phone = 11; - google.protobuf.StringValue email = 12; - google.protobuf.StringValue additionalInfo = 13; + optional string country = 5; + optional string state = 6; + optional string city = 7; + optional string address = 8; + optional string address2 = 9; + optional string zip = 10; + optional string phone = 11; + optional string email = 12; + optional string additionalInfo = 13; } message RelationUpdateMsg { @@ -291,7 +290,7 @@ message RelationUpdateMsg { int64 toIdLSB = 6; string toEntityType = 7; string type = 8; - google.protobuf.StringValue typeGroup = 9; + optional string typeGroup = 9; string additionalInfo = 10; } @@ -299,13 +298,13 @@ message UserUpdateMsg { UpdateMsgType msgType = 1; int64 idMSB = 2; int64 idLSB = 3; - google.protobuf.Int64Value customerIdMSB = 4; - google.protobuf.Int64Value customerIdLSB = 5; + optional int64 customerIdMSB = 4; + optional int64 customerIdLSB = 5; string email = 6; string authority = 7; - google.protobuf.StringValue firstName = 8; - google.protobuf.StringValue lastName = 9; - google.protobuf.StringValue additionalInfo = 10; + optional string firstName = 8; + optional string lastName = 9; + optional string additionalInfo = 10; } message WidgetsBundleUpdateMsg { @@ -314,19 +313,19 @@ message WidgetsBundleUpdateMsg { int64 idLSB = 3; string title = 4; string alias = 5; - google.protobuf.BytesValue image = 6; + optional bytes image = 6; bool isSystem = 7; - google.protobuf.StringValue description = 8; + optional string description = 8; } message WidgetTypeUpdateMsg { UpdateMsgType msgType = 1; int64 idMSB = 2; int64 idLSB = 3; - google.protobuf.StringValue bundleAlias = 4; - google.protobuf.StringValue alias = 5; - google.protobuf.StringValue name = 6; - google.protobuf.StringValue descriptorJson = 7; + optional string bundleAlias = 4; + optional string alias = 5; + optional string name = 6; + optional string descriptorJson = 7; bool isSystem = 8; }