Merge pull request #7157 from volodymyr-babak/bug/edge-snmp-device-profile

[Bug][3.4.2] SNMP/CoAP/LWM2M device profile transport configuration missing Serialization

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceMsgConstructor.java

@@ -16,7 +16,8 @@
 package org.thingsboard.server.service.edge.rpc.constructor;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.protobuf.ByteString;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Device;
@@ -28,6 +29,7 @@ import org.thingsboard.server.gen.edge.v1.DeviceRpcCallMsg;
 import org.thingsboard.server.gen.edge.v1.DeviceUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.RpcRequestMsg;
 import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
+import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.util.UUID;
@@ -36,7 +38,8 @@ import java.util.UUID;
 @TbCoreComponent
 public class DeviceMsgConstructor {
 
-    protected static final ObjectMapper mapper = new ObjectMapper();
+    @Autowired
+    private DataDecodingEncodingService dataDecodingEncodingService;
 
     public DeviceUpdateMsg constructDeviceUpdatedMsg(UpdateMsgType msgType, Device device, CustomerId customerId, String conflictName) {
         DeviceUpdateMsg.Builder builder = DeviceUpdateMsg.newBuilder()
@@ -66,6 +69,9 @@ public class DeviceMsgConstructor {
         if (conflictName != null) {
             builder.setConflictName(conflictName);
         }
+        if (device.getDeviceData() != null) {
+            builder.setDeviceDataBytes(ByteString.copyFrom(dataDecodingEncodingService.encode(device.getDeviceData())));
+        }
         return builder.build();
     }
 

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceEdgeProcessor.java

@@ -22,6 +22,7 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Customer;
@@ -29,6 +30,7 @@ import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EdgeUtils;
 import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.device.data.DeviceData;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.edge.EdgeEvent;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
@@ -59,9 +61,11 @@ import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
 import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
 import org.thingsboard.server.queue.TbQueueCallback;
 import org.thingsboard.server.queue.TbQueueMsgMetadata;
+import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.rpc.FromDeviceRpcResponseActorMsg;
 
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -70,6 +74,9 @@ import java.util.concurrent.locks.ReentrantLock;
 @TbCoreComponent
 public class DeviceEdgeProcessor extends BaseEdgeProcessor {
 
+    @Autowired
+    private DataDecodingEncodingService dataDecodingEncodingService;
+
     private static final ReentrantLock deviceCreationLock = new ReentrantLock();
 
     public ListenableFuture<Void> processDeviceFromEdge(TenantId tenantId, Edge edge, DeviceUpdateMsg deviceUpdateMsg) {
@@ -191,6 +198,11 @@ public class DeviceEdgeProcessor extends BaseEdgeProcessor {
                                 deviceUpdateMsg.getDeviceProfileIdLSB()));
                 device.setDeviceProfileId(deviceProfileId);
             }
+            Optional<DeviceData> deviceDataOpt =
+                    dataDecodingEncodingService.decode(deviceUpdateMsg.getDeviceDataBytes().toByteArray());
+            if (deviceDataOpt.isPresent()) {
+                device.setDeviceData(deviceDataOpt.get());
+            }
             Device savedDevice = deviceService.saveDevice(device);
             tbClusterService.onDeviceUpdated(savedDevice, device);
             return saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.DEVICE, EdgeEventActionType.CREDENTIALS_REQUEST, deviceId, null);
@@ -231,6 +243,11 @@ public class DeviceEdgeProcessor extends BaseEdgeProcessor {
                                 deviceUpdateMsg.getDeviceProfileIdLSB()));
                 device.setDeviceProfileId(deviceProfileId);
             }
+            Optional<DeviceData> deviceDataOpt =
+                    dataDecodingEncodingService.decode(deviceUpdateMsg.getDeviceDataBytes().toByteArray());
+            if (deviceDataOpt.isPresent()) {
+                device.setDeviceData(deviceDataOpt.get());
+            }
             if (created) {
                 deviceValidator.validate(device, Device::getTenantId);
                 device.setId(deviceId);

application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java

@@ -43,6 +43,7 @@ import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.OtaPackageInfo;
@@ -56,17 +57,32 @@ import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.asset.Asset;
+import org.thingsboard.server.common.data.device.data.DefaultDeviceConfiguration;
+import org.thingsboard.server.common.data.device.data.DeviceData;
+import org.thingsboard.server.common.data.device.data.MqttDeviceTransportConfiguration;
+import org.thingsboard.server.common.data.device.data.PowerMode;
+import org.thingsboard.server.common.data.device.data.PowerSavingConfiguration;
 import org.thingsboard.server.common.data.device.profile.AlarmCondition;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionFilter;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionFilterKey;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionKeyType;
 import org.thingsboard.server.common.data.device.profile.AlarmRule;
 import org.thingsboard.server.common.data.device.profile.AllowCreateNewDevicesDeviceProfileProvisionConfiguration;
+import org.thingsboard.server.common.data.device.profile.CoapDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.DefaultCoapDeviceTypeConfiguration;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileAlarm;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.device.profile.JsonTransportPayloadConfiguration;
-import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.ProtoTransportPayloadConfiguration;
 import org.thingsboard.server.common.data.device.profile.SimpleAlarmConditionSpec;
+import org.thingsboard.server.common.data.device.profile.SnmpDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.lwm2m.OtherConfiguration;
+import org.thingsboard.server.common.data.device.profile.lwm2m.TelemetryMappingConfiguration;
+import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.AbstractLwM2MBootstrapServerCredential;
+import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.LwM2MBootstrapServerCredential;
+import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.NoSecLwM2MBootstrapServerCredential;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.edge.EdgeEvent;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
@@ -77,6 +93,7 @@ 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.TenantId;
+import org.thingsboard.server.common.data.kv.DataType;
 import org.thingsboard.server.common.data.ota.ChecksumAlgorithm;
 import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.page.PageData;
@@ -99,6 +116,9 @@ import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentialsType;
 import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
+import org.thingsboard.server.common.data.transport.snmp.SnmpMapping;
+import org.thingsboard.server.common.data.transport.snmp.config.SnmpCommunicationConfig;
+import org.thingsboard.server.common.data.transport.snmp.config.impl.TelemetryQueryingSnmpCommunicationConfig;
 import org.thingsboard.server.common.data.widget.WidgetType;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.common.msg.queue.ServiceType;
@@ -139,9 +159,13 @@ 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.queue.util.DataDecodingEncodingService;
+import org.thingsboard.server.transport.AbstractTransportIntegrationTest;
+import org.thingsboard.server.transport.lwm2m.AbstractLwM2MIntegrationTest;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -172,6 +196,9 @@ abstract public class BaseEdgeTest extends AbstractControllerTest {
     @Autowired
     private EdgeEventService edgeEventService;
 
+    @Autowired
+    private DataDecodingEncodingService dataDecodingEncodingService;
+
     @Autowired
     private TbClusterService clusterService;
 
@@ -246,10 +273,8 @@ abstract public class BaseEdgeTest extends AbstractControllerTest {
     private void installation() throws Exception {
         edge = doPost("/api/edge", constructEdge("Test Edge", "test"), Edge.class);
 
-        MqttDeviceProfileTransportConfiguration transportConfiguration = new MqttDeviceProfileTransportConfiguration();
-        transportConfiguration.setTransportPayloadTypeConfiguration(new JsonTransportPayloadConfiguration());
-
-        thermostatDeviceProfile = this.createDeviceProfile(THERMOSTAT_DEVICE_PROFILE_NAME, transportConfiguration);
+        thermostatDeviceProfile = this.createDeviceProfile(THERMOSTAT_DEVICE_PROFILE_NAME,
+                createMqttDeviceProfileTransportConfiguration(new JsonTransportPayloadConfiguration(), false));
 
         extendDeviceProfileData(thermostatDeviceProfile);
         thermostatDeviceProfile = doPost("/api/deviceProfile", thermostatDeviceProfile, DeviceProfile.class);
@@ -439,6 +464,226 @@ abstract public class BaseEdgeTest extends AbstractControllerTest {
         Assert.assertEquals(deviceProfileUpdateMsg.getIdLSB(), deviceProfile.getUuidId().getLeastSignificantBits());
     }
 
+    @Test
+    public void testDeviceProfiles_snmp() throws Exception {
+        DeviceProfile deviceProfile = createDeviceProfileAndDoBasicAssert("SNMP", createSnmpDeviceProfileTransportConfiguration());
+
+        AbstractMessage latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof DeviceProfileUpdateMsg);
+        DeviceProfileUpdateMsg deviceProfileUpdateMsg = (DeviceProfileUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, deviceProfileUpdateMsg.getMsgType());
+        Assert.assertEquals(deviceProfileUpdateMsg.getIdMSB(), deviceProfile.getUuidId().getMostSignificantBits());
+        Assert.assertEquals(deviceProfileUpdateMsg.getIdLSB(), deviceProfile.getUuidId().getLeastSignificantBits());
+        Assert.assertEquals(DeviceTransportType.SNMP.name(), deviceProfileUpdateMsg.getTransportType());
+
+        Optional<DeviceProfileData> deviceProfileDataOpt =
+                dataDecodingEncodingService.decode(deviceProfileUpdateMsg.getProfileDataBytes().toByteArray());
+
+        Assert.assertTrue(deviceProfileDataOpt.isPresent());
+        DeviceProfileData deviceProfileData = deviceProfileDataOpt.get();
+
+        Assert.assertTrue(deviceProfileData.getTransportConfiguration() instanceof SnmpDeviceProfileTransportConfiguration);
+        SnmpDeviceProfileTransportConfiguration transportConfiguration =
+                (SnmpDeviceProfileTransportConfiguration) deviceProfileData.getTransportConfiguration();
+        Assert.assertEquals(Integer.valueOf(1000), transportConfiguration.getTimeoutMs());
+        Assert.assertEquals(Integer.valueOf(3), transportConfiguration.getRetries());
+
+        Assert.assertFalse(transportConfiguration.getCommunicationConfigs().isEmpty());
+        SnmpCommunicationConfig communicationConfig = transportConfiguration.getCommunicationConfigs().get(0);
+        Assert.assertTrue(communicationConfig instanceof TelemetryQueryingSnmpCommunicationConfig);
+        TelemetryQueryingSnmpCommunicationConfig snmpCommunicationConfig =
+                (TelemetryQueryingSnmpCommunicationConfig) communicationConfig;
+
+        Assert.assertEquals(Long.valueOf(500L), snmpCommunicationConfig.getQueryingFrequencyMs());
+        Assert.assertFalse(snmpCommunicationConfig.getMappings().isEmpty());
+
+        SnmpMapping snmpMapping = snmpCommunicationConfig.getMappings().get(0);
+        Assert.assertEquals("temperature", snmpMapping.getKey());
+        Assert.assertEquals("1.3.3.5.6.7.8.9.1", snmpMapping.getOid());
+        Assert.assertEquals(DataType.DOUBLE, snmpMapping.getDataType());
+
+        removeDeviceProfileAndDoBasicAssert(deviceProfile);
+    }
+
+    @Test
+    public void testDeviceProfiles_lwm2m() throws Exception {
+        DeviceProfile deviceProfile = createDeviceProfileAndDoBasicAssert("LWM2M", createLwm2mDeviceProfileTransportConfiguration());
+
+        AbstractMessage latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof DeviceProfileUpdateMsg);
+        DeviceProfileUpdateMsg deviceProfileUpdateMsg = (DeviceProfileUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, deviceProfileUpdateMsg.getMsgType());
+        Assert.assertEquals(deviceProfileUpdateMsg.getIdMSB(), deviceProfile.getUuidId().getMostSignificantBits());
+        Assert.assertEquals(deviceProfileUpdateMsg.getIdLSB(), deviceProfile.getUuidId().getLeastSignificantBits());
+        Assert.assertEquals(DeviceTransportType.LWM2M.name(), deviceProfileUpdateMsg.getTransportType());
+
+        Optional<DeviceProfileData> deviceProfileDataOpt =
+                dataDecodingEncodingService.decode(deviceProfileUpdateMsg.getProfileDataBytes().toByteArray());
+
+        Assert.assertTrue(deviceProfileDataOpt.isPresent());
+        DeviceProfileData deviceProfileData = deviceProfileDataOpt.get();
+
+        Assert.assertTrue(deviceProfileData.getTransportConfiguration() instanceof Lwm2mDeviceProfileTransportConfiguration);
+        Lwm2mDeviceProfileTransportConfiguration transportConfiguration =
+                (Lwm2mDeviceProfileTransportConfiguration) deviceProfileData.getTransportConfiguration();
+
+        OtherConfiguration clientLwM2mSettings = transportConfiguration.getClientLwM2mSettings();
+        Assert.assertEquals(PowerMode.DRX, clientLwM2mSettings.getPowerMode());
+        Assert.assertEquals(Integer.valueOf(1), clientLwM2mSettings.getFwUpdateStrategy());
+        Assert.assertEquals(Integer.valueOf(1), clientLwM2mSettings.getSwUpdateStrategy());
+        Assert.assertEquals(Integer.valueOf(1), clientLwM2mSettings.getClientOnlyObserveAfterConnect());
+
+        Assert.assertTrue(transportConfiguration.isBootstrapServerUpdateEnable());
+
+        Assert.assertFalse(transportConfiguration.getBootstrap().isEmpty());
+        LwM2MBootstrapServerCredential lwM2MBootstrapServerCredential = transportConfiguration.getBootstrap().get(0);
+        Assert.assertTrue(lwM2MBootstrapServerCredential instanceof NoSecLwM2MBootstrapServerCredential);
+        NoSecLwM2MBootstrapServerCredential noSecLwM2MBootstrapServerCredential = (NoSecLwM2MBootstrapServerCredential) lwM2MBootstrapServerCredential;
+
+        Assert.assertEquals("PUBLIC_KEY", noSecLwM2MBootstrapServerCredential.getServerPublicKey());
+        Assert.assertEquals(Integer.valueOf(123), noSecLwM2MBootstrapServerCredential.getShortServerId());
+        Assert.assertTrue(noSecLwM2MBootstrapServerCredential.isBootstrapServerIs());
+        Assert.assertEquals("localhost", noSecLwM2MBootstrapServerCredential.getHost());
+        Assert.assertEquals(Integer.valueOf(5687), noSecLwM2MBootstrapServerCredential.getPort());
+
+        TelemetryMappingConfiguration observeAttr = transportConfiguration.getObserveAttr();
+        Assert.assertEquals("batteryLevel", observeAttr.getKeyName().get("/3_1.0/0/9"));
+        Assert.assertTrue(observeAttr.getObserve().isEmpty());
+        Assert.assertTrue(observeAttr.getAttribute().isEmpty());
+        Assert.assertFalse(observeAttr.getTelemetry().isEmpty());
+        Assert.assertTrue(observeAttr.getTelemetry().contains("/3_1.0/0/9"));
+        Assert.assertTrue(observeAttr.getAttributeLwm2m().isEmpty());
+
+        removeDeviceProfileAndDoBasicAssert(deviceProfile);
+    }
+
+    @Test
+    public void testDeviceProfiles_coap() throws Exception {
+        DeviceProfile deviceProfile = createDeviceProfileAndDoBasicAssert("COAP", createCoapDeviceProfileTransportConfiguration());
+
+        AbstractMessage latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof DeviceProfileUpdateMsg);
+        DeviceProfileUpdateMsg deviceProfileUpdateMsg = (DeviceProfileUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, deviceProfileUpdateMsg.getMsgType());
+        Assert.assertEquals(deviceProfileUpdateMsg.getIdMSB(), deviceProfile.getUuidId().getMostSignificantBits());
+        Assert.assertEquals(deviceProfileUpdateMsg.getIdLSB(), deviceProfile.getUuidId().getLeastSignificantBits());
+        Assert.assertEquals(DeviceTransportType.COAP.name(), deviceProfileUpdateMsg.getTransportType());
+
+        Optional<DeviceProfileData> deviceProfileDataOpt =
+                dataDecodingEncodingService.decode(deviceProfileUpdateMsg.getProfileDataBytes().toByteArray());
+
+        Assert.assertTrue(deviceProfileDataOpt.isPresent());
+        DeviceProfileData deviceProfileData = deviceProfileDataOpt.get();
+
+        Assert.assertTrue(deviceProfileData.getTransportConfiguration() instanceof CoapDeviceProfileTransportConfiguration);
+        CoapDeviceProfileTransportConfiguration transportConfiguration =
+                (CoapDeviceProfileTransportConfiguration) deviceProfileData.getTransportConfiguration();
+
+        PowerSavingConfiguration clientSettings = transportConfiguration.getClientSettings();
+
+        Assert.assertEquals(PowerMode.DRX, clientSettings.getPowerMode());
+        Assert.assertEquals(Long.valueOf(1L), clientSettings.getEdrxCycle());
+        Assert.assertEquals(Long.valueOf(1L), clientSettings.getPsmActivityTimer());
+        Assert.assertEquals(Long.valueOf(1L), clientSettings.getPagingTransmissionWindow());
+
+        Assert.assertTrue(transportConfiguration.getCoapDeviceTypeConfiguration() instanceof DefaultCoapDeviceTypeConfiguration);
+        DefaultCoapDeviceTypeConfiguration coapDeviceTypeConfiguration =
+                (DefaultCoapDeviceTypeConfiguration) transportConfiguration.getCoapDeviceTypeConfiguration();
+
+        Assert.assertTrue(coapDeviceTypeConfiguration.getTransportPayloadTypeConfiguration() instanceof ProtoTransportPayloadConfiguration);
+
+        ProtoTransportPayloadConfiguration protoTransportPayloadConfiguration =
+                (ProtoTransportPayloadConfiguration) coapDeviceTypeConfiguration.getTransportPayloadTypeConfiguration();
+
+        Assert.assertEquals(AbstractTransportIntegrationTest.DEVICE_TELEMETRY_PROTO_SCHEMA, protoTransportPayloadConfiguration.getDeviceTelemetryProtoSchema());
+        Assert.assertEquals(AbstractTransportIntegrationTest.DEVICE_ATTRIBUTES_PROTO_SCHEMA, protoTransportPayloadConfiguration.getDeviceAttributesProtoSchema());
+        Assert.assertEquals(AbstractTransportIntegrationTest.DEVICE_RPC_RESPONSE_PROTO_SCHEMA, protoTransportPayloadConfiguration.getDeviceRpcResponseProtoSchema());
+        Assert.assertEquals(AbstractTransportIntegrationTest.DEVICE_RPC_REQUEST_PROTO_SCHEMA, protoTransportPayloadConfiguration.getDeviceRpcRequestProtoSchema());
+
+        removeDeviceProfileAndDoBasicAssert(deviceProfile);
+    }
+
+    private DeviceProfile createDeviceProfileAndDoBasicAssert(String deviceProfileName, DeviceProfileTransportConfiguration deviceProfileTransportConfiguration) throws Exception {
+        DeviceProfile deviceProfile = this.createDeviceProfile(deviceProfileName, deviceProfileTransportConfiguration);
+        extendDeviceProfileData(deviceProfile);
+        edgeImitator.expectMessageAmount(1);
+        deviceProfile = doPost("/api/deviceProfile", deviceProfile, DeviceProfile.class);
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        return deviceProfile;
+    }
+
+    private void removeDeviceProfileAndDoBasicAssert(DeviceProfile deviceProfile) throws Exception {
+        edgeImitator.expectMessageAmount(1);
+        doDelete("/api/deviceProfile/" + deviceProfile.getUuidId())
+                .andExpect(status().isOk());
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        AbstractMessage latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof DeviceProfileUpdateMsg);
+        DeviceProfileUpdateMsg deviceProfileUpdateMsg = (DeviceProfileUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE, deviceProfileUpdateMsg.getMsgType());
+        Assert.assertEquals(deviceProfileUpdateMsg.getIdMSB(), deviceProfile.getUuidId().getMostSignificantBits());
+        Assert.assertEquals(deviceProfileUpdateMsg.getIdLSB(), deviceProfile.getUuidId().getLeastSignificantBits());
+    }
+
+    private SnmpDeviceProfileTransportConfiguration createSnmpDeviceProfileTransportConfiguration() {
+        SnmpDeviceProfileTransportConfiguration transportConfiguration = new SnmpDeviceProfileTransportConfiguration();
+        List<SnmpCommunicationConfig> communicationConfigs = new ArrayList<>();
+        TelemetryQueryingSnmpCommunicationConfig communicationConfig = new TelemetryQueryingSnmpCommunicationConfig();
+        communicationConfig.setQueryingFrequencyMs(500L);
+        List<SnmpMapping> mappings = new ArrayList<>();
+        mappings.add(new SnmpMapping("1.3.3.5.6.7.8.9.1", "temperature", DataType.DOUBLE));
+        communicationConfig.setMappings(mappings);
+        communicationConfigs.add(communicationConfig);
+        transportConfiguration.setCommunicationConfigs(communicationConfigs);
+        transportConfiguration.setTimeoutMs(1000);
+        transportConfiguration.setRetries(3);
+        return transportConfiguration;
+    }
+
+    private Lwm2mDeviceProfileTransportConfiguration createLwm2mDeviceProfileTransportConfiguration() {
+        Lwm2mDeviceProfileTransportConfiguration transportConfiguration = new Lwm2mDeviceProfileTransportConfiguration();
+
+        OtherConfiguration clientLwM2mSettings = JacksonUtil.fromString(AbstractLwM2MIntegrationTest.CLIENT_LWM2M_SETTINGS, OtherConfiguration.class);
+        transportConfiguration.setClientLwM2mSettings(clientLwM2mSettings);
+
+        transportConfiguration.setBootstrapServerUpdateEnable(true);
+
+        TelemetryMappingConfiguration observeAttrConfiguration =
+                JacksonUtil.fromString(AbstractLwM2MIntegrationTest.OBSERVE_ATTRIBUTES_WITH_PARAMS, TelemetryMappingConfiguration.class);
+        transportConfiguration.setObserveAttr(observeAttrConfiguration);
+
+        List<LwM2MBootstrapServerCredential> bootstrap = new ArrayList<>();
+        AbstractLwM2MBootstrapServerCredential bootstrapServerCredential = new NoSecLwM2MBootstrapServerCredential();
+        bootstrapServerCredential.setServerPublicKey("PUBLIC_KEY");
+        bootstrapServerCredential.setShortServerId(123);
+        bootstrapServerCredential.setBootstrapServerIs(true);
+        bootstrapServerCredential.setHost("localhost");
+        bootstrapServerCredential.setPort(5687);
+        bootstrap.add(bootstrapServerCredential);
+        transportConfiguration.setBootstrap(bootstrap);
+
+        return transportConfiguration;
+    }
+
+    private CoapDeviceProfileTransportConfiguration createCoapDeviceProfileTransportConfiguration() {
+        CoapDeviceProfileTransportConfiguration transportConfiguration = new CoapDeviceProfileTransportConfiguration();
+        PowerSavingConfiguration clientSettings = new PowerSavingConfiguration();
+        clientSettings.setPowerMode(PowerMode.DRX);
+        clientSettings.setEdrxCycle(1L);
+        clientSettings.setPsmActivityTimer(1L);
+        clientSettings.setPagingTransmissionWindow(1L);
+        transportConfiguration.setClientSettings(clientSettings);
+        DefaultCoapDeviceTypeConfiguration coapDeviceTypeConfiguration = new DefaultCoapDeviceTypeConfiguration();
+        ProtoTransportPayloadConfiguration transportPayloadTypeConfiguration = new ProtoTransportPayloadConfiguration();
+        transportPayloadTypeConfiguration.setDeviceTelemetryProtoSchema(AbstractTransportIntegrationTest.DEVICE_TELEMETRY_PROTO_SCHEMA);
+        transportPayloadTypeConfiguration.setDeviceAttributesProtoSchema(AbstractTransportIntegrationTest.DEVICE_ATTRIBUTES_PROTO_SCHEMA);
+        transportPayloadTypeConfiguration.setDeviceRpcResponseProtoSchema(AbstractTransportIntegrationTest.DEVICE_RPC_RESPONSE_PROTO_SCHEMA);
+        transportPayloadTypeConfiguration.setDeviceRpcRequestProtoSchema(AbstractTransportIntegrationTest.DEVICE_RPC_REQUEST_PROTO_SCHEMA);
+        coapDeviceTypeConfiguration.setTransportPayloadTypeConfiguration(transportPayloadTypeConfiguration);
+        transportConfiguration.setCoapDeviceTypeConfiguration(coapDeviceTypeConfiguration);
+        return transportConfiguration;
+    }
+
     @Test
     public void testDevices() throws Exception {
         // 1
@@ -1911,6 +2156,14 @@ abstract public class BaseEdgeTest extends AbstractControllerTest {
 
         Device savedDevice = saveDevice(StringUtils.randomAlphanumeric(15), thermostatDeviceProfile.getName());
         savedDevice.setFirmwareId(firmwareOtaPackageInfo.getId());
+
+        DeviceData deviceData = new DeviceData();
+        deviceData.setConfiguration(new DefaultDeviceConfiguration());
+        MqttDeviceTransportConfiguration transportConfiguration = new MqttDeviceTransportConfiguration();
+        transportConfiguration.getProperties().put("topic", "tb_rule_engine.thermostat");
+        deviceData.setTransportConfiguration(transportConfiguration);
+        savedDevice.setDeviceData(deviceData);
+
         savedDevice = doPost("/api/device", savedDevice, Device.class);
 
         // wait until device UPDATED event is sent to edge notification service
@@ -1930,6 +2183,14 @@ abstract public class BaseEdgeTest extends AbstractControllerTest {
         Assert.assertEquals(deviceUpdateMsg.getType(), savedDevice.getType());
         Assert.assertEquals(firmwareOtaPackageInfo.getUuidId().getMostSignificantBits(), deviceUpdateMsg.getFirmwareIdMSB());
         Assert.assertEquals(firmwareOtaPackageInfo.getUuidId().getLeastSignificantBits(), deviceUpdateMsg.getFirmwareIdLSB());
+        Optional<DeviceData> deviceDataOpt =
+                dataDecodingEncodingService.decode(deviceUpdateMsg.getDeviceDataBytes().toByteArray());
+        Assert.assertTrue(deviceDataOpt.isPresent());
+        deviceData = deviceDataOpt.get();
+        Assert.assertTrue(deviceData.getTransportConfiguration() instanceof MqttDeviceTransportConfiguration);
+        MqttDeviceTransportConfiguration mqttDeviceTransportConfiguration =
+                (MqttDeviceTransportConfiguration) deviceData.getTransportConfiguration();
+        Assert.assertEquals("tb_rule_engine.thermostat", mqttDeviceTransportConfiguration.getProperties().get("topic"));
         return savedDevice;
     }
 

application/src/test/java/org/thingsboard/server/transport/AbstractTransportIntegrationTest.java

@@ -33,7 +33,7 @@ public abstract class AbstractTransportIntegrationTest extends AbstractControlle
 
     protected static final AtomicInteger atomicInteger = new AtomicInteger(2);
 
-    protected static final String DEVICE_TELEMETRY_PROTO_SCHEMA = "syntax =\"proto3\";\n" +
+    public static final String DEVICE_TELEMETRY_PROTO_SCHEMA = "syntax =\"proto3\";\n" +
             "\n" +
             "package test;\n" +
             "\n" +
@@ -54,7 +54,7 @@ public abstract class AbstractTransportIntegrationTest extends AbstractControlle
             "  }\n" +
             "}";
 
-    protected static final String DEVICE_ATTRIBUTES_PROTO_SCHEMA = "syntax =\"proto3\";\n" +
+    public static final String DEVICE_ATTRIBUTES_PROTO_SCHEMA = "syntax =\"proto3\";\n" +
             "\n" +
             "package test;\n" +
             "\n" +
@@ -75,14 +75,14 @@ public abstract class AbstractTransportIntegrationTest extends AbstractControlle
             "  }\n" +
             "}";
 
-    protected static final String DEVICE_RPC_RESPONSE_PROTO_SCHEMA = "syntax =\"proto3\";\n" +
+    public static final String DEVICE_RPC_RESPONSE_PROTO_SCHEMA = "syntax =\"proto3\";\n" +
             "package rpc;\n" +
             "\n" +
             "message RpcResponseMsg {\n" +
             "  optional string payload = 1;\n" +
             "}";
 
-    protected static final String DEVICE_RPC_REQUEST_PROTO_SCHEMA = "syntax =\"proto3\";\n" +
+    public static final String DEVICE_RPC_REQUEST_PROTO_SCHEMA = "syntax =\"proto3\";\n" +
             "package rpc;\n" +
             "\n" +
             "message RpcRequestMsg {\n" +

application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java

@@ -144,7 +144,7 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractControllerTes
                     "    \"attributeLwm2m\": {}\n" +
                     "  }";
 
-    protected final String OBSERVE_ATTRIBUTES_WITH_PARAMS =
+    public static final String OBSERVE_ATTRIBUTES_WITH_PARAMS =
 
             "    {\n" +
                     "    \"keyName\": {\n" +
@@ -159,7 +159,7 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractControllerTes
                     "    \"attributeLwm2m\": {}\n" +
                     "  }";
 
-    protected final String CLIENT_LWM2M_SETTINGS =
+    public static final String CLIENT_LWM2M_SETTINGS =
             "     {\n" +
                     "    \"edrxCycle\": null,\n" +
                     "    \"powerMode\": \"DRX\",\n" +

common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java

@@ -27,6 +27,8 @@ import java.util.Map;
 @Data
 public class CoapDeviceTransportConfiguration extends PowerSavingConfiguration implements DeviceTransportConfiguration {
 
+    private static final long serialVersionUID = 6061442236008925609L;
+
     @JsonIgnore
     private Map<String, Object> properties = new HashMap<>();
 

common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceConfiguration.java

@@ -23,6 +23,8 @@ import org.thingsboard.server.common.data.DeviceProfileType;
 @Data
 public class DefaultDeviceConfiguration implements DeviceConfiguration {
 
+    private static final long serialVersionUID = -2225378639573611325L;
+
     @Override
     public DeviceProfileType getType() {
         return DeviceProfileType.DEFAULT;

common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceConfiguration.java

@@ -22,6 +22,8 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import org.thingsboard.server.common.data.DeviceProfileType;
 
+import java.io.Serializable;
+
 @ApiModel
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonTypeInfo(
@@ -30,7 +32,7 @@ import org.thingsboard.server.common.data.DeviceProfileType;
         property = "type")
 @JsonSubTypes({
         @JsonSubTypes.Type(value = DefaultDeviceConfiguration.class, name = "DEFAULT")})
-public interface DeviceConfiguration {
+public interface DeviceConfiguration extends Serializable {
 
     @JsonIgnore
     DeviceProfileType getType();

common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceData.java

@@ -19,9 +19,13 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @ApiModel
 @Data
-public class DeviceData {
+public class DeviceData implements Serializable {
+
+    private static final long serialVersionUID = -3771567735290681274L;
 
     @ApiModelProperty(position = 1, value = "Device configuration for device profile type. DEFAULT is only supported value for now")
     private DeviceConfiguration configuration;

common/data/src/main/java/org/thingsboard/server/common/data/device/data/PowerSavingConfiguration.java

@@ -17,8 +17,13 @@ package org.thingsboard.server.common.data.device.data;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class PowerSavingConfiguration {
+public class PowerSavingConfiguration implements Serializable {
+
+    private static final long serialVersionUID = 2905389805488525362L;
+
     private PowerMode powerMode;
     private Long psmActivityTimer;
     private Long edrxCycle;

common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceTypeConfiguration.java

@@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.thingsboard.server.common.data.CoapDeviceType;
 
+import java.io.Serializable;
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
@@ -29,7 +31,7 @@ import org.thingsboard.server.common.data.CoapDeviceType;
 @JsonSubTypes({
         @JsonSubTypes.Type(value = DefaultCoapDeviceTypeConfiguration.class, name = "DEFAULT"),
         @JsonSubTypes.Type(value = EfentoCoapDeviceTypeConfiguration.class, name = "EFENTO")})
-public interface CoapDeviceTypeConfiguration {
+public interface CoapDeviceTypeConfiguration extends Serializable {
 
     @JsonIgnore
     CoapDeviceType getCoapDeviceType();

common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultCoapDeviceTypeConfiguration.java

@@ -21,6 +21,8 @@ import org.thingsboard.server.common.data.CoapDeviceType;
 @Data
 public class DefaultCoapDeviceTypeConfiguration implements CoapDeviceTypeConfiguration {
 
+    private static final long serialVersionUID = -4287100699186773773L;
+
     private TransportPayloadTypeConfiguration transportPayloadTypeConfiguration;
 
     @Override

common/data/src/main/java/org/thingsboard/server/common/data/device/profile/EfentoCoapDeviceTypeConfiguration.java

@@ -21,6 +21,8 @@ import org.thingsboard.server.common.data.CoapDeviceType;
 @Data
 public class EfentoCoapDeviceTypeConfiguration implements CoapDeviceTypeConfiguration {
 
+    private static final long serialVersionUID = -8523081152598707064L;
+
     @Override
     public CoapDeviceType getCoapDeviceType() {
         return CoapDeviceType.EFENTO;

common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/ObjectAttributes.java

@@ -18,9 +18,13 @@ package org.thingsboard.server.common.data.device.profile.lwm2m;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class ObjectAttributes {
+public class ObjectAttributes implements Serializable {
+
+    private static final long serialVersionUID = 4765123984733721312L;
 
     private Long dim;
     private String ver;

common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/OtherConfiguration.java

@@ -18,10 +18,12 @@ package org.thingsboard.server.common.data.device.profile.lwm2m;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.device.data.PowerMode;
 import org.thingsboard.server.common.data.device.data.PowerSavingConfiguration;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/TelemetryMappingConfiguration.java

@@ -19,13 +19,16 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class TelemetryMappingConfiguration {
+public class TelemetryMappingConfiguration implements Serializable {
+
+    private static final long serialVersionUID = -7594999741305410419L;
 
     private Map<String, String> keyName;
     private Set<String> observe;

common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MBootstrapServerCredential.java

@@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode;
 
+import java.io.Serializable;
+
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
         property = "securityMode")
@@ -31,7 +33,7 @@ import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurity
         @JsonSubTypes.Type(value = X509LwM2MBootstrapServerCredential.class, name = "X509")
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
-public interface LwM2MBootstrapServerCredential {
+public interface LwM2MBootstrapServerCredential extends Serializable {
     @JsonIgnore
     LwM2MSecurityMode getSecurityMode();
 }

common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MBootstrapServersConfiguration.java

@@ -1,27 +0,0 @@
-/**
- * Copyright © 2016-2022 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.common.data.device.profile.lwm2m.bootstrap;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class LwM2MBootstrapServersConfiguration {
-
-    List<LwM2MBootstrapServerCredential> bootstrap;
-
-}

common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/NoSecLwM2MBootstrapServerCredential.java

@@ -18,6 +18,9 @@ package org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode;
 
 public class NoSecLwM2MBootstrapServerCredential extends AbstractLwM2MBootstrapServerCredential {
+
+    private static final long serialVersionUID = 5540417758424747066L;
+
     @Override
     public LwM2MSecurityMode getSecurityMode() {
         return LwM2MSecurityMode.NO_SEC;

common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/PSKLwM2MBootstrapServerCredential.java

@@ -18,6 +18,9 @@ package org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode;
 
 public class PSKLwM2MBootstrapServerCredential extends AbstractLwM2MBootstrapServerCredential {
+
+    private static final long serialVersionUID = -1639587501559199887L;
+
     @Override
     public LwM2MSecurityMode getSecurityMode() {
         return LwM2MSecurityMode.PSK;

common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/RPKLwM2MBootstrapServerCredential.java

@@ -18,6 +18,9 @@ package org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode;
 
 public class RPKLwM2MBootstrapServerCredential extends AbstractLwM2MBootstrapServerCredential {
+
+    private static final long serialVersionUID = 6692464656059120166L;
+
     @Override
     public LwM2MSecurityMode getSecurityMode() {
         return LwM2MSecurityMode.RPK;

common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/X509LwM2MBootstrapServerCredential.java

@@ -18,6 +18,9 @@ package org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode;
 
 public class X509LwM2MBootstrapServerCredential extends AbstractLwM2MBootstrapServerCredential {
+
+    private static final long serialVersionUID = -3740860424558547405L;
+
     @Override
     public LwM2MSecurityMode getSecurityMode() {
         return LwM2MSecurityMode.X509;

common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/SnmpMapping.java

@@ -22,12 +22,16 @@ import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.kv.DataType;
 
+import java.io.Serializable;
 import java.util.regex.Pattern;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class SnmpMapping {
+public class SnmpMapping implements Serializable {
+
+    private static final long serialVersionUID = 2042438869374145944L;
+
     private String oid;
     private String key;
     private DataType dataType;

common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/config/SnmpCommunicationConfig.java

@@ -28,6 +28,7 @@ import org.thingsboard.server.common.data.transport.snmp.config.impl.SharedAttri
 import org.thingsboard.server.common.data.transport.snmp.config.impl.TelemetryQueryingSnmpCommunicationConfig;
 import org.thingsboard.server.common.data.transport.snmp.config.impl.ToDeviceRpcRequestSnmpCommunicationConfig;
 
+import java.io.Serializable;
 import java.util.List;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -38,7 +39,7 @@ import java.util.List;
         @Type(value = SharedAttributesSettingSnmpCommunicationConfig.class, name = "SHARED_ATTRIBUTES_SETTING"),
         @Type(value = ToDeviceRpcRequestSnmpCommunicationConfig.class, name = "TO_DEVICE_RPC_REQUEST")
 })
-public interface SnmpCommunicationConfig {
+public interface SnmpCommunicationConfig extends Serializable {
 
     SnmpCommunicationSpec getSpec();
 

common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/config/impl/ClientAttributesQueryingSnmpCommunicationConfig.java

@@ -20,6 +20,8 @@ import org.thingsboard.server.common.data.transport.snmp.config.RepeatingQueryin
 
 public class ClientAttributesQueryingSnmpCommunicationConfig extends RepeatingQueryingSnmpCommunicationConfig {
 
+    private static final long serialVersionUID = 536740834893462914L;
+
     @Override
     public SnmpCommunicationSpec getSpec() {
         return SnmpCommunicationSpec.CLIENT_ATTRIBUTES_QUERYING;

common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/config/impl/SharedAttributesSettingSnmpCommunicationConfig.java

@@ -21,6 +21,8 @@ import org.thingsboard.server.common.data.transport.snmp.config.MultipleMappings
 
 public class SharedAttributesSettingSnmpCommunicationConfig extends MultipleMappingsSnmpCommunicationConfig {
 
+    private static final long serialVersionUID = 8981224974190924703L;
+
     @Override
     public SnmpCommunicationSpec getSpec() {
         return SnmpCommunicationSpec.SHARED_ATTRIBUTES_SETTING;

common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/config/impl/TelemetryQueryingSnmpCommunicationConfig.java

@@ -24,6 +24,8 @@ import org.thingsboard.server.common.data.transport.snmp.config.RepeatingQueryin
 @Data
 public class TelemetryQueryingSnmpCommunicationConfig extends RepeatingQueryingSnmpCommunicationConfig {
 
+    private static final long serialVersionUID = -1367743866881596885L;
+
     @Override
     public SnmpCommunicationSpec getSpec() {
         return SnmpCommunicationSpec.TELEMETRY_QUERYING;

common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/config/impl/ToDeviceRpcRequestSnmpCommunicationConfig.java

@@ -19,6 +19,9 @@ import org.thingsboard.server.common.data.transport.snmp.SnmpCommunicationSpec;
 import org.thingsboard.server.common.data.transport.snmp.config.MultipleMappingsSnmpCommunicationConfig;
 
 public class ToDeviceRpcRequestSnmpCommunicationConfig extends MultipleMappingsSnmpCommunicationConfig {
+
+    private static final long serialVersionUID = -8607312598073845460L;
+
     @Override
     public SnmpCommunicationSpec getSpec() {
         return SnmpCommunicationSpec.TO_DEVICE_RPC_REQUEST;

common/edge-api/src/main/proto/edge.proto

@@ -200,6 +200,7 @@ message DeviceUpdateMsg {
   optional string conflictName = 12;
   optional int64 firmwareIdMSB = 13;
   optional int64 firmwareIdLSB = 14;
+  optional bytes deviceDataBytes = 15;
 }
 
 message DeviceProfileUpdateMsg {

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/secure/LwM2MBootstrapConfig.java

@@ -37,6 +37,8 @@ import java.util.List;
 @Data
 public class LwM2MBootstrapConfig implements Serializable {
 
+    private static final long serialVersionUID = -4729088085817468640L;
+
     List<LwM2MBootstrapServerCredential> serverConfiguration;
 
     /** -bootstrapServer, lwm2mServer