Merge branch 'master' of github.com:thingsboard/thingsboard

ShvaykaD
2 parents 22c91039 08de78a8
Showing 79 changed files with 2655 additions and 514 deletions
.gitignore
application/pom.xml
application/src/main/data/json/demo/dashboards/thermostats.json
application/src/main/data/json/demo/rule_chains/thermostat_alarms.json
application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
application/src/main/java/org/thingsboard/server/controller/AdminController.java
application/src/main/java/org/thingsboard/server/controller/DeviceController.java
application/src/main/java/org/thingsboard/server/service/apiusage/DefaultTbApiUsageStateService.java
application/src/main/java/org/thingsboard/server/service/apiusage/TenantApiUsageState.java
application/src/main/java/org/thingsboard/server/service/device/DeviceProvisionServiceImpl.java
application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
application/src/main/java/org/thingsboard/server/service/queue/TbClusterService.java
application/src/main/java/org/thingsboard/server/service/sms/AbstractSmsSender.java
application/src/main/java/org/thingsboard/server/service/sms/DefaultSmsSenderFactory.java
application/src/main/java/org/thingsboard/server/service/sms/DefaultSmsService.java
--- a/.gitignore
View file @6b3448d
+++ b/.gitignore
View file @6b3448d
@@ -33,3 +33,5 @@ pom.xml.versionsBackup
 **/.env
 .instance_id
 rebuild-docker.sh
+.run/**
+.run
--- a/application/pom.xml
View file @6b3448d
+++ b/application/pom.xml
View file @6b3448d
@@ -194,6 +194,14 @@
             <artifactId>javax.mail</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.twilio.sdk</groupId>
+            <artifactId>twilio</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-sns</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
         </dependency>
--- a/application/src/main/data/json/demo/dashboards/thermostats.json
View file @6b3448d
+++ b/application/src/main/data/json/demo/dashboards/thermostats.json
View file @6b3448d
@@ -219,8 +219,8 @@
             "defaultPageSize": 10,
             "defaultSortOrder": "-createdTime",
             "enableSelectColumnDisplay": false,
-            "enableStatusFilter": true,
-            "alarmsTitle": "Alarms"
+            "alarmsTitle": "Alarms",
+            "enableFilter": true
           },
           "title": "New Alarms table",
           "dropShadow": true,
@@ -234,6 +234,9 @@
           "showLegend": false,
           "alarmSource": {
             "type": "entity",
+            "name": "alarms",
+            "entityAliasId": "68a058e1-fdda-8482-715b-3ae4a488568e",
+            "filterId": null,
             "dataKeys": [
               {
                 "name": "createdTime",
@@ -275,9 +278,7 @@
                 "settings": {},
                 "_hash": 0.7977920750136249
               }
-            ],
-            "entityAliasId": "ce27a9d0-93bf-b7a4-054d-d0369a8cf813",
-            "name": "alarms"
+            ]
           },
           "alarmSearchStatus": "ANY",
           "alarmsPollingInterval": 5,
@@ -1031,7 +1032,8 @@
             "markerImageFunction": "var res;\nif(dsData[dsIndex].active !== \"true\"){\n\tvar res = {\n\t    url: images[0],\n\t    size: 48\n\t}\n} else {\n    var res = {\n\t    url: images[1],\n\t    size: 48\n\t}\n}\nreturn res;",
             "useLabelFunction": true,
             "provider": "openstreet-map",
-            "draggableMarker": true
+            "draggableMarker": true,
+            "editablePolygon": true
           },
           "title": "New Markers Placement - OpenStreetMap",
           "dropShadow": true,
@@ -1062,61 +1064,6 @@
           "displayTimewindow": true
         },
         "id": "0a430429-9078-9ae6-2b67-e4a15a2bf8bf"
-      },
-      "f4bb2f2d-0164-60bc-f3e8-9b1e7b5a59b3": {
-        "isSystemType": true,
-        "bundleAlias": "input_widgets",
-        "typeAlias": "update_double_timeseries",
-        "type": "latest",
-        "title": "New widget",
-        "sizeX": 7.5,
-        "sizeY": 3,
-        "config": {
-          "datasources": [
-            {
-              "type": "entity",
-              "name": null,
-              "entityAliasId": "12ae98c7-1ea2-52cf-64d5-763e9d993547",
-              "dataKeys": [
-                {
-                  "name": "temperature",
-                  "type": "timeseries",
-                  "label": "temperature",
-                  "color": "#2196f3",
-                  "settings": {},
-                  "_hash": 0.4164505192982848
-                }
-              ]
-            }
-          ],
-          "timewindow": {
-            "realtime": {
-              "timewindowMs": 60000
-            }
-          },
-          "showTitle": true,
-          "backgroundColor": "#fff",
-          "color": "rgba(0, 0, 0, 0.87)",
-          "padding": "8px",
-          "settings": {
-            "showResultMessage": true,
-            "showLabel": true
-          },
-          "title": "New Update double timeseries",
-          "dropShadow": true,
-          "enableFullscreen": false,
-          "widgetStyle": {},
-          "titleStyle": {
-            "fontSize": "16px",
-            "fontWeight": 400
-          },
-          "useDashboardTimewindow": true,
-          "showLegend": false,
-          "actions": {}
-        },
-        "row": 0,
-        "col": 0,
-        "id": "f4bb2f2d-0164-60bc-f3e8-9b1e7b5a59b3"
       }
     },
     "states": {
@@ -1215,12 +1162,6 @@
                 "sizeY": 6,
                 "row": 6,
                 "col": 0
-              },
-              "f4bb2f2d-0164-60bc-f3e8-9b1e7b5a59b3": {
-                "sizeX": 7.5,
-                "sizeY": 3,
-                "row": 12,
-                "col": 0
               }
             },
             "gridSettings": {
@@ -1257,16 +1198,6 @@
           "stateEntityParamName": null,
           "defaultStateEntity": null
         }
-      },
-      "ce27a9d0-93bf-b7a4-054d-d0369a8cf813": {
-        "id": "ce27a9d0-93bf-b7a4-054d-d0369a8cf813",
-        "alias": "Thermostat-alarm",
-        "filter": {
-          "type": "entityName",
-          "resolveMultiple": false,
-          "entityType": "ASSET",
-          "entityNameFilter": "Thermostat Alarms"
-        }
       }
     },
     "timewindow": {
@@ -1301,7 +1232,8 @@
       "showDashboardTimewindow": true,
       "showDashboardExport": true,
       "toolbarAlwaysOpen": true
-    }
+    },
+    "filters": {}
   },
   "name": "Thermostats"
 }
--- a/application/src/main/data/json/demo/rule_chains/thermostat_alarms.json
View file @6b3448d
+++ b/application/src/main/data/json/demo/rule_chains/thermostat_alarms.json
View file @6b3448d
 {
   "ruleChain": {
-    "additionalInfo": null,
+    "additionalInfo": {
+      "description": ""
+    },
     "name": "Thermostat Alarms",
     "firstRuleNodeId": null,
     "root": false,
@@ -8,131 +10,126 @@
     "configuration": null
   },
   "metadata": {
-    "firstNodeIndex": 5,
+    "firstNodeIndex": 6,
     "nodes": [
       {
         "additionalInfo": {
-          "layoutX": 929,
-          "layoutY": 67
+          "layoutX": 822,
+          "layoutY": 294
         },
-        "type": "org.thingsboard.rule.engine.action.TbCreateAlarmNode",
-        "name": "Create Temp Alarm",
+        "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
+        "name": "Save Timeseries",
         "debugMode": false,
         "configuration": {
-          "alarmType": "High Temperature",
-          "alarmDetailsBuildJs": "var details = {};\nif (metadata.prevAlarmDetails) {\n    details = JSON.parse(metadata.prevAlarmDetails);\n}\ndetails.triggerValue = msg.temperature;\nreturn details;",
-          "severity": "MAJOR",
-          "propagate": true,
-          "useMessageAlarmData": false,
-          "relationTypes": [
-            "ToAlarmPropagationAsset"
-          ]
+          "defaultTTL": 0
         }
       },
       {
         "additionalInfo": {
-          "layoutX": 930,
-          "layoutY": 201
+          "description": null,
+          "layoutX": 824,
+          "layoutY": 221
         },
-        "type": "org.thingsboard.rule.engine.action.TbClearAlarmNode",
-        "name": "Clear Temp Alarm",
+        "type": "org.thingsboard.rule.engine.telemetry.TbMsgAttributesNode",
+        "name": "Save Client Attributes",
         "debugMode": false,
         "configuration": {
-          "alarmType": "High Temperature",
-          "alarmDetailsBuildJs": "var details = {};\nif (metadata.prevAlarmDetails) {\n    details = JSON.parse(metadata.prevAlarmDetails);\n}\nreturn details;"
+          "scope": "SERVER_SCOPE",
+          "notifyDevice": null
         }
       },
       {
         "additionalInfo": {
-          "layoutX": 930,
-          "layoutY": 131
+          "layoutX": 494,
+          "layoutY": 309
         },
-        "type": "org.thingsboard.rule.engine.action.TbCreateAlarmNode",
-        "name": "Create Humidity Alarm",
+        "type": "org.thingsboard.rule.engine.filter.TbMsgTypeSwitchNode",
+        "name": "Message Type Switch",
         "debugMode": false,
         "configuration": {
-          "alarmType": "Low Humidity",
-          "alarmDetailsBuildJs": "var details = {};\nif (metadata.prevAlarmDetails) {\n    details = JSON.parse(metadata.prevAlarmDetails);\n}\ndetails.triggerValue = msg.humidity;\nreturn details;",
-          "severity": "MINOR",
-          "propagate": true,
-          "useMessageAlarmData": false,
-          "relationTypes": [
-            "ToAlarmPropagationAsset"
-          ]
+          "version": 0
         }
       },
       {
         "additionalInfo": {
-          "layoutX": 929,
-          "layoutY": 275
+          "layoutX": 824,
+          "layoutY": 383
         },
-        "type": "org.thingsboard.rule.engine.action.TbClearAlarmNode",
-        "name": "Clear Humidity Alarm",
+        "type": "org.thingsboard.rule.engine.action.TbLogNode",
+        "name": "Log RPC from Device",
         "debugMode": false,
         "configuration": {
-          "alarmType": "Low Humidity",
-          "alarmDetailsBuildJs": "var details = {};\nif (metadata.prevAlarmDetails) {\n    details = JSON.parse(metadata.prevAlarmDetails);\n}\nreturn details;"
+          "jsScript": "return '\\nIncoming message:\\n' + JSON.stringify(msg) + '\\nIncoming metadata:\\n' + JSON.stringify(metadata);"
         }
       },
       {
         "additionalInfo": {
-          "layoutX": 586,
-          "layoutY": 148
+          "layoutX": 823,
+          "layoutY": 444
         },
-        "type": "org.thingsboard.rule.engine.filter.TbJsSwitchNode",
-        "name": "Check Alarms",
+        "type": "org.thingsboard.rule.engine.action.TbLogNode",
+        "name": "Log Other",
         "debugMode": false,
         "configuration": {
-          "jsScript": "var relations = [];\nif(metadata[\"ss_alarmTemperature\"] === \"true\"){\n    if(msg.temperature > metadata[\"ss_thresholdTemperature\"]){\n        relations.push(\"NewTempAlarm\");\n    } else {\n        relations.push(\"ClearTempAlarm\");\n    }\n}\nif(metadata[\"ss_alarmHumidity\"] === \"true\"){\n    if(msg.humidity < metadata[\"ss_thresholdHumidity\"]){\n        relations.push(\"NewHumidityAlarm\");\n    } else {\n        relations.push(\"ClearHumidityAlarm\");\n    }\n}\n\nreturn relations;"
+          "jsScript": "return '\\nIncoming message:\\n' + JSON.stringify(msg) + '\\nIncoming metadata:\\n' + JSON.stringify(metadata);"
         }
       },
       {
         "additionalInfo": {
-          "layoutX": 321,
-          "layoutY": 149
+          "layoutX": 822,
+          "layoutY": 507
         },
-        "type": "org.thingsboard.rule.engine.metadata.TbGetAttributesNode",
-        "name": "Fetch Configuration",
+        "type": "org.thingsboard.rule.engine.rpc.TbSendRPCRequestNode",
+        "name": "RPC Call Request",
         "debugMode": false,
         "configuration": {
-          "clientAttributeNames": [],
-          "sharedAttributeNames": [],
-          "serverAttributeNames": [
-            "alarmTemperature",
-            "thresholdTemperature",
-            "alarmHumidity",
-            "thresholdHumidity"
-          ],
-          "latestTsKeyNames": [],
-          "tellFailureIfAbsent": false,
-          "getLatestValueWithTs": false
+          "timeoutInSeconds": 60
+        }
+      },
+      {
+        "additionalInfo": {
+          "description": "",
+          "layoutX": 209,
+          "layoutY": 307
+        },
+        "type": "org.thingsboard.rule.engine.profile.TbDeviceProfileNode",
+        "name": "Device Profile Node",
+        "debugMode": false,
+        "configuration": {
+          "persistAlarmRulesState": false,
+          "fetchAlarmRulesStateOnStart": false
         }
       }
     ],
     "connections": [
       {
-        "fromIndex": 4,
-        "toIndex": 0,
-        "type": "NewTempAlarm"
+        "fromIndex": 2,
+        "toIndex": 4,
+        "type": "Other"
       },
       {
-        "fromIndex": 4,
+        "fromIndex": 2,
         "toIndex": 1,
-        "type": "ClearTempAlarm"
+        "type": "Post attributes"
       },
       {
-        "fromIndex": 4,
-        "toIndex": 2,
-        "type": "NewHumidityAlarm"
+        "fromIndex": 2,
+        "toIndex": 0,
+        "type": "Post telemetry"
       },
       {
-        "fromIndex": 4,
+        "fromIndex": 2,
         "toIndex": 3,
-        "type": "ClearHumidityAlarm"
+        "type": "RPC Request from Device"
       },
       {
-        "fromIndex": 5,
-        "toIndex": 4,
+        "fromIndex": 2,
+        "toIndex": 5,
+        "type": "RPC Request to Device"
+      },
+      {
+        "fromIndex": 6,
+        "toIndex": 2,
         "type": "Success"
       }
     ],
--- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
View file @6b3448d
@@ -32,6 +32,8 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.thingsboard.rule.engine.api.MailService;
+import org.thingsboard.rule.engine.api.SmsService;
+import org.thingsboard.rule.engine.api.sms.SmsSenderFactory;
 import org.thingsboard.server.actors.service.ActorService;
 import org.thingsboard.server.actors.tenant.DebugTbRateLimits;
 import org.thingsboard.server.common.data.DataConstants;
@@ -80,6 +82,7 @@ import org.thingsboard.server.service.rpc.TbRuleEngineDeviceRpcService;
 import org.thingsboard.server.service.script.JsExecutorService;
 import org.thingsboard.server.service.script.JsInvokeService;
 import org.thingsboard.server.service.session.DeviceSessionCacheService;
+import org.thingsboard.server.service.sms.SmsExecutorService;
 import org.thingsboard.server.service.state.DeviceStateService;
 import org.thingsboard.server.service.telemetry.AlarmSubscriptionService;
 import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
@@ -230,6 +233,10 @@ public class ActorSystemContext {
     @Autowired
     @Getter
+    private SmsExecutorService smsExecutor;
+
+    @Autowired
+    @Getter
     private DbCallbackExecutorService dbCallbackExecutor;
     @Autowired
@@ -246,6 +253,14 @@ public class ActorSystemContext {
     @Autowired
     @Getter
+    private SmsService smsService;
+
+    @Autowired
+    @Getter
+    private SmsSenderFactory smsSenderFactory;
+
+    @Autowired
+    @Getter
     private ClaimDevicesService claimDevicesService;
     @Autowired
@@ -325,6 +340,10 @@ public class ActorSystemContext {
     @Getter
     private boolean allowSystemMailService;
+    @Value("${actors.rule.allow_system_sms_service}")
+    @Getter
+    private boolean allowSystemSmsService;
+
     @Value("${transport.sessions.inactivity_timeout}")
     @Getter
     private long sessionInactivityTimeout;
--- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
View file @6b3448d
@@ -28,10 +28,13 @@ import org.thingsboard.rule.engine.api.RuleEngineDeviceProfileCache;
 import org.thingsboard.rule.engine.api.RuleEngineRpcService;
 import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
 import org.thingsboard.rule.engine.api.ScriptEngine;
+import org.thingsboard.rule.engine.api.SmsService;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbRelationTypes;
+import org.thingsboard.rule.engine.api.sms.SmsSenderFactory;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.actors.TbActorRef;
+import org.thingsboard.server.common.data.ApiUsageRecordKey;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
@@ -303,6 +306,11 @@ class DefaultTbContext implements TbContext {
     }
     @Override
+    public ListeningExecutor getSmsExecutor() {
+        return mainCtx.getSmsExecutor();
+    }
+
+    @Override
     public ListeningExecutor getDbCallbackExecutor() {
         return mainCtx.getDbCallbackExecutor();
     }
@@ -428,6 +436,20 @@ class DefaultTbContext implements TbContext {
     }
     @Override
+    public SmsService getSmsService() {
+        if (mainCtx.isAllowSystemSmsService()) {
+            return mainCtx.getSmsService();
+        } else {
+            throw new RuntimeException("Access to System SMS Service is forbidden!");
+        }
+    }
+
+    @Override
+    public SmsSenderFactory getSmsSenderFactory() {
+        return mainCtx.getSmsSenderFactory();
+    }
+
+    @Override
     public RuleEngineRpcService getRpcService() {
         return mainCtx.getTbRuleEngineDeviceRpcService();
     }
--- a/application/src/main/java/org/thingsboard/server/controller/AdminController.java
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/controller/AdminController.java
View file @6b3448d
@@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.rule.engine.api.MailService;
+import org.thingsboard.rule.engine.api.SmsService;
+import org.thingsboard.rule.engine.api.sms.config.TestSmsRequest;
 import org.thingsboard.server.common.data.AdminSettings;
 import org.thingsboard.server.common.data.UpdateMessage;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
@@ -46,6 +48,9 @@ public class AdminController extends BaseController {
     private MailService mailService;
     @Autowired
+    private SmsService smsService;
+
+    @Autowired
     private AdminSettingsService adminSettingsService;
     @Autowired
@@ -80,6 +85,8 @@ public class AdminController extends BaseController {
             if (adminSettings.getKey().equals("mail")) {
                 mailService.updateMailConfiguration();
                 ((ObjectNode) adminSettings.getJsonValue()).put("password", "");
+            } else if (adminSettings.getKey().equals("sms")) {
+                smsService.updateSmsConfiguration();
             }
             return adminSettings;
         } catch (Exception e) {
@@ -128,6 +135,17 @@ public class AdminController extends BaseController {
     }
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/settings/testSms", method = RequestMethod.POST)
+    public void sendTestSms(@RequestBody TestSmsRequest testSmsRequest) throws ThingsboardException {
+        try {
+            accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
+            smsService.sendTestSms(testSmsRequest);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/updates", method = RequestMethod.GET)
     @ResponseBody
     public UpdateMessage checkUpdates() throws ThingsboardException {
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
View file @6b3448d
@@ -118,6 +118,7 @@ public class DeviceController extends BaseController {
             Device savedDevice = checkNotNull(deviceService.saveDeviceWithAccessToken(device, accessToken));
+            tbClusterService.onDeviceChange(savedDevice, null);
             tbClusterService.pushMsgToCore(new DeviceNameOrTypeUpdateMsg(savedDevice.getTenantId(),
                     savedDevice.getId(), savedDevice.getName(), savedDevice.getType()), null);
             tbClusterService.onEntityStateChange(savedDevice.getTenantId(), savedDevice.getId(),
@@ -150,6 +151,9 @@ public class DeviceController extends BaseController {
             Device device = checkDeviceId(deviceId, Operation.DELETE);
             deviceService.deleteDevice(getCurrentUser().getTenantId(), deviceId);
+            tbClusterService.onDeviceDeleted(device, null);
+            tbClusterService.onEntityStateChange(device.getTenantId(), deviceId, ComponentLifecycleEvent.DELETED);
+
             logEntityAction(deviceId, device,
                     device.getCustomerId(),
                     ActionType.DELETED, null, strDeviceId);
--- a/application/src/main/java/org/thingsboard/server/service/apiusage/DefaultTbApiUsageStateService.java
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/apiusage/DefaultTbApiUsageStateService.java
View file @6b3448d
@@ -17,21 +17,21 @@ package org.thingsboard.server.service.apiusage;
 import com.google.common.util.concurrent.FutureCallback;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.context.event.EventListener;
-import org.springframework.core.annotation.Order;
-import org.springframework.data.util.Pair;
 import org.springframework.stereotype.Service;
+import org.thingsboard.rule.engine.api.MailService;
 import org.thingsboard.server.common.data.ApiFeature;
 import org.thingsboard.server.common.data.ApiUsageRecordKey;
 import org.thingsboard.server.common.data.ApiUsageState;
+import org.thingsboard.server.common.data.ApiUsageStateMailMessage;
 import org.thingsboard.server.common.data.ApiUsageStateValue;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.ApiUsageStateId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantProfileId;
@@ -45,6 +45,7 @@ import org.thingsboard.server.common.data.tenant.profile.TenantProfileData;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.msg.tools.SchedulerUtils;
+import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
@@ -54,14 +55,12 @@ import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.queue.discovery.PartitionChangeEvent;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.scheduler.SchedulerComponent;
-import org.thingsboard.server.queue.util.TbCoreComponent;
-import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.service.queue.TbClusterService;
 import org.thingsboard.server.service.telemetry.InternalTelemetryService;
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -69,6 +68,8 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -94,6 +95,7 @@ public class DefaultTbApiUsageStateService implements TbApiUsageStateService {
     private final ApiUsageStateService apiUsageStateService;
     private final SchedulerComponent scheduler;
     private final TbTenantProfileCache tenantProfileCache;
+    private final MailService mailService;
     @Lazy
     @Autowired
@@ -112,13 +114,15 @@ public class DefaultTbApiUsageStateService implements TbApiUsageStateService {
     private final Lock updateLock = new ReentrantLock();
+    private final ExecutorService mailExecutor;
+
     public DefaultTbApiUsageStateService(TbClusterService clusterService,
                                          PartitionService partitionService,
                                          TenantService tenantService,
                                          TimeseriesService tsService,
                                          ApiUsageStateService apiUsageStateService,
                                          SchedulerComponent scheduler,
-                                         TbTenantProfileCache tenantProfileCache) {
+                                         TbTenantProfileCache tenantProfileCache, MailService mailService) {
         this.clusterService = clusterService;
         this.partitionService = partitionService;
         this.tenantService = tenantService;
@@ -126,6 +130,8 @@ public class DefaultTbApiUsageStateService implements TbApiUsageStateService {
         this.apiUsageStateService = apiUsageStateService;
         this.scheduler = scheduler;
         this.tenantProfileCache = tenantProfileCache;
+        this.mailService = mailService;
+        this.mailExecutor = Executors.newSingleThreadExecutor();
     }
     @PostConstruct
@@ -286,7 +292,49 @@ public class DefaultTbApiUsageStateService implements TbApiUsageStateService {
         List<TsKvEntry> stateTelemetry = new ArrayList<>();
         result.forEach(((apiFeature, aState) -> stateTelemetry.add(new BasicTsKvEntry(ts, new StringDataEntry(apiFeature.getApiStateKey(), aState.name())))));
         tsWsService.saveAndNotifyInternal(state.getTenantId(), state.getApiUsageState().getId(), stateTelemetry, VOID_CALLBACK);
-        //TODO: notify tenant admin via email!
+
+        String email = tenantService.findTenantById(state.getTenantId()).getEmail();
+
+        if (StringUtils.isNotEmpty(email)) {
+            result.forEach((apiFeature, stateValue) -> {
+                mailExecutor.submit(() -> {
+                    try {
+                        mailService.sendApiFeatureStateEmail(apiFeature, stateValue, email, createStateMailMessage(state, apiFeature, stateValue));
+                    } catch (ThingsboardException e) {
+                        log.warn("[{}] Can't send update of the API state to tenant with provided email [{}]", state.getTenantId(), email, e);
+                    }
+                });
+            });
+        } else {
+            log.warn("[{}] Can't send update of the API state to tenant with empty email!", state.getTenantId());
+        }
+    }
+
+    private ApiUsageStateMailMessage createStateMailMessage(TenantApiUsageState state, ApiFeature apiFeature, ApiUsageStateValue stateValue) {
+        StateChecker checker = getStateChecker(stateValue);
+        for (ApiUsageRecordKey apiUsageRecordKey : ApiUsageRecordKey.getKeys(apiFeature)) {
+            long threshold = state.getProfileThreshold(apiUsageRecordKey);
+            long warnThreshold = state.getProfileWarnThreshold(apiUsageRecordKey);
+            long value = state.get(apiUsageRecordKey);
+            if (checker.check(threshold, warnThreshold, value)) {
+                return new ApiUsageStateMailMessage(apiUsageRecordKey, threshold, value);
+            }
+        }
+        return null;
+    }
+
+    private StateChecker getStateChecker(ApiUsageStateValue stateValue) {
+        if (ApiUsageStateValue.ENABLED.equals(stateValue)) {
+            return (t, wt, v) -> true;
+        } else if (ApiUsageStateValue.WARNING.equals(stateValue)) {
+            return (t, wt, v) -> v < t && v >= wt;
+        } else {
+            return (t, wt, v) -> v >= t;
+        }
+    }
+
+    private interface StateChecker {
+        boolean check(long threshold, long warnThreshold, long value);
     }
     private void checkStartOfNextCycle() {
@@ -367,4 +415,10 @@ public class DefaultTbApiUsageStateService implements TbApiUsageStateService {
         }
     }
+    @PreDestroy
+    private void destroy() {
+        if (mailExecutor != null) {
+            mailExecutor.shutdownNow();
+        }
+    }
 }
--- a/application/src/main/java/org/thingsboard/server/service/apiusage/TenantApiUsageState.java
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/apiusage/TenantApiUsageState.java
View file @6b3448d
@@ -125,6 +125,10 @@ public class TenantApiUsageState {
                 return apiUsageState.getDbStorageState();
             case JS:
                 return apiUsageState.getJsExecState();
+            case EMAIL:
+                return apiUsageState.getEmailExecState();
+            case SMS:
+                return apiUsageState.getSmsExecState();
             default:
                 return ApiUsageStateValue.ENABLED;
         }
@@ -145,6 +149,12 @@ public class TenantApiUsageState {
             case JS:
                 apiUsageState.setJsExecState(value);
                 break;
+            case EMAIL:
+                apiUsageState.setEmailExecState(value);
+                break;
+            case SMS:
+                apiUsageState.setSmsExecState(value);
+                break;
         }
         return !currentValue.equals(value);
     }
--- a/application/src/main/java/org/thingsboard/server/service/device/DeviceProvisionServiceImpl.java
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/device/DeviceProvisionServiceImpl.java
View file @6b3448d
@@ -22,6 +22,7 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -188,6 +189,11 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
         Device device = deviceService.findDeviceByTenantIdAndName(profile.getTenantId(), provisionRequest.getDeviceName());
         try {
             if (device == null) {
+                if (StringUtils.isEmpty(provisionRequest.getDeviceName())) {
+                    String newDeviceName = RandomStringUtils.randomAlphanumeric(20);
+                    log.info("Device name not found in provision request. Generated name is: {}", newDeviceName);
+                    provisionRequest.setDeviceName(newDeviceName);
+                }
                 Device savedDevice = deviceService.saveDevice(provisionRequest, profile);
                 deviceStateService.onDeviceAdded(savedDevice);
--- a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
View file @6b3448d
@@ -28,12 +28,21 @@ import org.thingsboard.server.common.data.Customer;
 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.DeviceProfileProvisionType;
+import org.thingsboard.server.common.data.DeviceProfileType;
+import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
-import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
-import org.thingsboard.server.common.data.tenant.profile.TenantProfileData;
 import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.asset.Asset;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.device.profile.AlarmCondition;
+import org.thingsboard.server.common.data.device.profile.AlarmRule;
+import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileConfiguration;
+import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileTransportConfiguration;
+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.DisabledDeviceProfileProvisionConfiguration;
+import org.thingsboard.server.common.data.device.profile.SimpleAlarmConditionSpec;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
@@ -42,19 +51,29 @@ import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BooleanDataEntry;
 import org.thingsboard.server.common.data.kv.DoubleDataEntry;
 import org.thingsboard.server.common.data.kv.LongDataEntry;
-import org.thingsboard.server.common.data.relation.EntityRelation;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.query.BooleanFilterPredicate;
+import org.thingsboard.server.common.data.query.DynamicValue;
+import org.thingsboard.server.common.data.query.DynamicValueSourceType;
+import org.thingsboard.server.common.data.query.EntityKey;
+import org.thingsboard.server.common.data.query.EntityKeyType;
+import org.thingsboard.server.common.data.query.EntityKeyValueType;
+import org.thingsboard.server.common.data.query.FilterPredicateValue;
+import org.thingsboard.server.common.data.query.KeyFilter;
+import org.thingsboard.server.common.data.query.NumericFilterPredicate;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
+import org.thingsboard.server.common.data.tenant.profile.TenantProfileData;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
-import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.dao.device.DeviceCredentialsService;
 import org.thingsboard.server.dao.device.DeviceProfileService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.exception.DataValidationException;
-import org.thingsboard.server.dao.relation.RelationService;
+import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.settings.AdminSettingsService;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -62,6 +81,8 @@ import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.widget.WidgetsBundleService;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
 @Service
 @Profile("install")
@@ -97,12 +118,6 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
     private CustomerService customerService;
     @Autowired
-    private RelationService relationService;
-
-    @Autowired
-    private AssetService assetService;
-
-    @Autowired
     private DeviceService deviceService;
     @Autowired
@@ -114,6 +129,9 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
     @Autowired
     private DeviceCredentialsService deviceCredentialsService;
+    @Autowired
+    private RuleChainService ruleChainService;
+
     @Bean
     protected BCryptPasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
@@ -245,19 +263,133 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
         createDevice(demoTenant.getId(), null, defaultDeviceProfile.getId(), "Raspberry Pi Demo Device", "RASPBERRY_PI_DEMO_TOKEN", "Demo device that is used in " +
                 "Raspberry Pi GPIO control sample application");
-        Asset thermostatAlarms = new Asset();
-        thermostatAlarms.setTenantId(demoTenant.getId());
-        thermostatAlarms.setName("Thermostat Alarms");
-        thermostatAlarms.setType("AlarmPropagationAsset");
-        thermostatAlarms = assetService.saveAsset(thermostatAlarms);
-
-        DeviceProfile thermostatDeviceProfile = this.deviceProfileService.findOrCreateDeviceProfile(demoTenant.getId(), "thermostat");
-
-        DeviceId t1Id = createDevice(demoTenant.getId(), null, thermostatDeviceProfile.getId(), "Thermostat T1", "T1_TEST_TOKEN", "Demo device for Thermostats dashboard").getId();
-        DeviceId t2Id = createDevice(demoTenant.getId(), null, thermostatDeviceProfile.getId(), "Thermostat T2", "T2_TEST_TOKEN", "Demo device for Thermostats dashboard").getId();
-
-        relationService.saveRelation(thermostatAlarms.getTenantId(), new EntityRelation(thermostatAlarms.getId(), t1Id, "ToAlarmPropagationAsset"));
-        relationService.saveRelation(thermostatAlarms.getTenantId(), new EntityRelation(thermostatAlarms.getId(), t2Id, "ToAlarmPropagationAsset"));
+        DeviceProfile thermostatDeviceProfile = new DeviceProfile();
+        thermostatDeviceProfile.setTenantId(demoTenant.getId());
+        thermostatDeviceProfile.setDefault(false);
+        thermostatDeviceProfile.setName("thermostat");
+        thermostatDeviceProfile.setType(DeviceProfileType.DEFAULT);
+        thermostatDeviceProfile.setTransportType(DeviceTransportType.DEFAULT);
+        thermostatDeviceProfile.setProvisionType(DeviceProfileProvisionType.DISABLED);
+        thermostatDeviceProfile.setDescription("Thermostat device profile");
+        thermostatDeviceProfile.setDefaultRuleChainId(ruleChainService.findTenantRuleChains(
+                demoTenant.getId(), new PageLink(1, 0, "Thermostat Alarms")).getData().get(0).getId());
+
+        DeviceProfileData deviceProfileData = new DeviceProfileData();
+        DefaultDeviceProfileConfiguration configuration = new DefaultDeviceProfileConfiguration();
+        DefaultDeviceProfileTransportConfiguration transportConfiguration = new DefaultDeviceProfileTransportConfiguration();
+        DisabledDeviceProfileProvisionConfiguration provisionConfiguration = new DisabledDeviceProfileProvisionConfiguration(null);
+        deviceProfileData.setConfiguration(configuration);
+        deviceProfileData.setTransportConfiguration(transportConfiguration);
+        deviceProfileData.setProvisionConfiguration(provisionConfiguration);
+        thermostatDeviceProfile.setProfileData(deviceProfileData);
+
+        DeviceProfileAlarm highTemperature = new DeviceProfileAlarm();
+        highTemperature.setId("highTemperatureAlarmID");
+        highTemperature.setAlarmType("High Temperature");
+        AlarmRule temperatureRule = new AlarmRule();
+        AlarmCondition temperatureCondition = new AlarmCondition();
+        temperatureCondition.setSpec(new SimpleAlarmConditionSpec());
+
+        KeyFilter alarmTemperatureAttributeFilter = new KeyFilter();
+        alarmTemperatureAttributeFilter.setKey(new EntityKey(EntityKeyType.ATTRIBUTE, "alarmTemperature"));
+        alarmTemperatureAttributeFilter.setValueType(EntityKeyValueType.BOOLEAN);
+        BooleanFilterPredicate alarmTemperatureAttributePredicate = new BooleanFilterPredicate();
+        alarmTemperatureAttributePredicate.setOperation(BooleanFilterPredicate.BooleanOperation.EQUAL);
+        alarmTemperatureAttributePredicate.setValue(new FilterPredicateValue<>(Boolean.TRUE));
+        alarmTemperatureAttributeFilter.setPredicate(alarmTemperatureAttributePredicate);
+
+        KeyFilter temperatureTimeseriesFilter = new KeyFilter();
+        temperatureTimeseriesFilter.setKey(new EntityKey(EntityKeyType.TIME_SERIES, "temperature"));
+        temperatureTimeseriesFilter.setValueType(EntityKeyValueType.NUMERIC);
+        NumericFilterPredicate temperatureTimeseriesFilterPredicate = new NumericFilterPredicate();
+        temperatureTimeseriesFilterPredicate.setOperation(NumericFilterPredicate.NumericOperation.GREATER);
+        FilterPredicateValue<Double> temperatureTimeseriesPredicateValue =
+                new FilterPredicateValue<>(25.0, null,
+                        new DynamicValue<>(DynamicValueSourceType.CURRENT_DEVICE, "thresholdTemperature"));
+        temperatureTimeseriesFilterPredicate.setValue(temperatureTimeseriesPredicateValue);
+        temperatureTimeseriesFilter.setPredicate(temperatureTimeseriesFilterPredicate);
+        temperatureCondition.setCondition(Arrays.asList(alarmTemperatureAttributeFilter, temperatureTimeseriesFilter));
+        temperatureRule.setAlarmDetails("Current temperature = ${temperature}");
+        temperatureRule.setCondition(temperatureCondition);
+        highTemperature.setCreateRules(new LinkedHashMap<>(Collections.singletonMap(AlarmSeverity.MAJOR, temperatureRule)));
+
+        AlarmRule clearTemperatureRule = new AlarmRule();
+        AlarmCondition clearTemperatureCondition = new AlarmCondition();
+        clearTemperatureCondition.setSpec(new SimpleAlarmConditionSpec());
+
+        KeyFilter clearTemperatureTimeseriesFilter = new KeyFilter();
+        clearTemperatureTimeseriesFilter.setKey(new EntityKey(EntityKeyType.TIME_SERIES, "temperature"));
+        clearTemperatureTimeseriesFilter.setValueType(EntityKeyValueType.NUMERIC);
+        NumericFilterPredicate clearTemperatureTimeseriesFilterPredicate = new NumericFilterPredicate();
+        clearTemperatureTimeseriesFilterPredicate.setOperation(NumericFilterPredicate.NumericOperation.LESS_OR_EQUAL);
+        FilterPredicateValue<Double> clearTemperatureTimeseriesPredicateValue =
+                new FilterPredicateValue<>(25.0, null,
+                        new DynamicValue<>(DynamicValueSourceType.CURRENT_DEVICE, "thresholdTemperature"));
+
+        clearTemperatureTimeseriesFilterPredicate.setValue(clearTemperatureTimeseriesPredicateValue);
+        clearTemperatureTimeseriesFilter.setPredicate(clearTemperatureTimeseriesFilterPredicate);
+        clearTemperatureCondition.setCondition(Collections.singletonList(clearTemperatureTimeseriesFilter));
+        clearTemperatureRule.setCondition(clearTemperatureCondition);
+        clearTemperatureRule.setAlarmDetails("Current temperature = ${temperature}");
+        highTemperature.setClearRule(clearTemperatureRule);
+
+        DeviceProfileAlarm lowHumidity = new DeviceProfileAlarm();
+        lowHumidity.setId("lowHumidityAlarmID");
+        lowHumidity.setAlarmType("Low Humidity");
+        AlarmRule humidityRule = new AlarmRule();
+        AlarmCondition humidityCondition = new AlarmCondition();
+        humidityCondition.setSpec(new SimpleAlarmConditionSpec());
+
+        KeyFilter alarmHumidityAttributeFilter = new KeyFilter();
+        alarmHumidityAttributeFilter.setKey(new EntityKey(EntityKeyType.ATTRIBUTE, "alarmHumidity"));
+        alarmHumidityAttributeFilter.setValueType(EntityKeyValueType.BOOLEAN);
+        BooleanFilterPredicate alarmHumidityAttributePredicate = new BooleanFilterPredicate();
+        alarmHumidityAttributePredicate.setOperation(BooleanFilterPredicate.BooleanOperation.EQUAL);
+        alarmHumidityAttributePredicate.setValue(new FilterPredicateValue<>(Boolean.TRUE));
+        alarmHumidityAttributeFilter.setPredicate(alarmHumidityAttributePredicate);
+
+        KeyFilter humidityTimeseriesFilter = new KeyFilter();
+        humidityTimeseriesFilter.setKey(new EntityKey(EntityKeyType.TIME_SERIES, "humidity"));
+        humidityTimeseriesFilter.setValueType(EntityKeyValueType.NUMERIC);
+        NumericFilterPredicate humidityTimeseriesFilterPredicate = new NumericFilterPredicate();
+        humidityTimeseriesFilterPredicate.setOperation(NumericFilterPredicate.NumericOperation.LESS);
+        FilterPredicateValue<Double> humidityTimeseriesPredicateValue =
+                new FilterPredicateValue<>(60.0, null,
+                        new DynamicValue<>(DynamicValueSourceType.CURRENT_DEVICE, "thresholdHumidity"));
+        humidityTimeseriesFilterPredicate.setValue(humidityTimeseriesPredicateValue);
+        humidityTimeseriesFilter.setPredicate(humidityTimeseriesFilterPredicate);
+        humidityCondition.setCondition(Arrays.asList(alarmHumidityAttributeFilter, humidityTimeseriesFilter));
+
+        humidityRule.setCondition(humidityCondition);
+        humidityRule.setAlarmDetails("Current humidity = ${humidity}");
+        lowHumidity.setCreateRules(new LinkedHashMap<>(Collections.singletonMap(AlarmSeverity.MINOR, humidityRule)));
+
+        AlarmRule clearHumidityRule = new AlarmRule();
+        AlarmCondition clearHumidityCondition = new AlarmCondition();
+        clearHumidityCondition.setSpec(new SimpleAlarmConditionSpec());
+
+        KeyFilter clearHumidityTimeseriesFilter = new KeyFilter();
+        clearHumidityTimeseriesFilter.setKey(new EntityKey(EntityKeyType.TIME_SERIES, "humidity"));
+        clearHumidityTimeseriesFilter.setValueType(EntityKeyValueType.NUMERIC);
+        NumericFilterPredicate clearHumidityTimeseriesFilterPredicate = new NumericFilterPredicate();
+        clearHumidityTimeseriesFilterPredicate.setOperation(NumericFilterPredicate.NumericOperation.GREATER_OR_EQUAL);
+        FilterPredicateValue<Double> clearHumidityTimeseriesPredicateValue =
+                new FilterPredicateValue<>(60.0, null,
+                        new DynamicValue<>(DynamicValueSourceType.CURRENT_DEVICE, "thresholdHumidity"));
+
+        clearHumidityTimeseriesFilterPredicate.setValue(clearHumidityTimeseriesPredicateValue);
+        clearHumidityTimeseriesFilter.setPredicate(clearHumidityTimeseriesFilterPredicate);
+        clearHumidityCondition.setCondition(Collections.singletonList(clearHumidityTimeseriesFilter));
+        clearHumidityRule.setCondition(clearHumidityCondition);
+        clearHumidityRule.setAlarmDetails("Current humidity = ${humidity}");
+        lowHumidity.setClearRule(clearHumidityRule);
+
+        deviceProfileData.setAlarms(Arrays.asList(highTemperature, lowHumidity));
+
+        DeviceProfile savedThermostatDeviceProfile = deviceProfileService.saveDeviceProfile(thermostatDeviceProfile);
+
+        DeviceId t1Id = createDevice(demoTenant.getId(), null, savedThermostatDeviceProfile.getId(), "Thermostat T1", "T1_TEST_TOKEN", "Demo device for Thermostats dashboard").getId();
+        DeviceId t2Id = createDevice(demoTenant.getId(), null, savedThermostatDeviceProfile.getId(), "Thermostat T2", "T2_TEST_TOKEN", "Demo device for Thermostats dashboard").getId();
         attributesService.save(demoTenant.getId(), t1Id, DataConstants.SERVER_SCOPE,
                 Arrays.asList(new BaseAttributeKvEntry(System.currentTimeMillis(), new DoubleDataEntry("latitude", 37.3948)),
--- a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
View file @6b3448d
@@ -367,6 +367,8 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                                     " db_storage varchar(32)," +
                                     " re_exec varchar(32)," +
                                     " js_exec varchar(32)," +
+                                    " email_exec varchar(32)," +
+                                    " sms_exec varchar(32)," +
                                     " CONSTRAINT api_usage_state_unq_key UNIQUE (tenant_id, entity_id)\n" +
                                     ");");
                         } catch (Exception e) {
--- a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
View file @6b3448d
@@ -20,8 +20,10 @@ import freemarker.template.Configuration;
 import freemarker.template.Template;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.NestedRuntimeException;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.mail.javamail.MimeMessageHelper;
@@ -29,12 +31,18 @@ import org.springframework.stereotype.Service;
 import org.springframework.ui.freemarker.FreeMarkerTemplateUtils;
 import org.thingsboard.rule.engine.api.MailService;
 import org.thingsboard.server.common.data.AdminSettings;
+import org.thingsboard.server.common.data.ApiFeature;
+import org.thingsboard.server.common.data.ApiUsageRecordKey;
+import org.thingsboard.server.common.data.ApiUsageStateMailMessage;
+import org.thingsboard.server.common.data.ApiUsageStateValue;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.settings.AdminSettingsService;
+import org.thingsboard.server.queue.usagestats.TbApiUsageClient;
+import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import javax.annotation.PostConstruct;
 import javax.mail.MessagingException;
@@ -51,18 +59,28 @@ public class DefaultMailService implements MailService {
     public static final String MAIL_PROP = "mail.";
     public static final String TARGET_EMAIL = "targetEmail";
     public static final String UTF_8 = "UTF-8";
-    @Autowired
-    private MessageSource messages;
+    public static final int _10K = 10000;
+    public static final int _1M = 1000000;
+
+    private final MessageSource messages;
+    private final Configuration freemarkerConfig;
+    private final AdminSettingsService adminSettingsService;
+    private final TbApiUsageClient apiUsageClient;
+    @Lazy
     @Autowired
-    private Configuration freemarkerConfig;
+    private TbApiUsageStateService apiUsageStateService;
     private JavaMailSenderImpl mailSender;
     private String mailFrom;
-    @Autowired
-    private AdminSettingsService adminSettingsService;
+    public DefaultMailService(MessageSource messages, Configuration freemarkerConfig, AdminSettingsService adminSettingsService, TbApiUsageClient apiUsageClient) {
+        this.messages = messages;
+        this.freemarkerConfig = freemarkerConfig;
+        this.adminSettingsService = adminSettingsService;
+        this.apiUsageClient = apiUsageClient;
+    }
     @PostConstruct
     private void init() {
@@ -141,7 +159,7 @@ public class DefaultMailService implements MailService {
     }
     @Override
-    public void sendEmail(String email, String subject, String message) throws ThingsboardException {
+    public void sendEmail(TenantId tenantId, String email, String subject, String message) throws ThingsboardException {
         sendMail(mailSender, mailFrom, email, subject, message);
     }
@@ -216,20 +234,23 @@ public class DefaultMailService implements MailService {
     }
     @Override
-    public void send(String from, String to, String cc, String bcc, String subject, String body) throws MessagingException {
-        MimeMessage mailMsg = mailSender.createMimeMessage();
-        MimeMessageHelper helper = new MimeMessageHelper(mailMsg, "UTF-8");
-        helper.setFrom(StringUtils.isBlank(from) ? mailFrom : from);
-        helper.setTo(to.split("\\s*,\\s*"));
-        if (!StringUtils.isBlank(cc)) {
-            helper.setCc(cc.split("\\s*,\\s*"));
-        }
-        if (!StringUtils.isBlank(bcc)) {
-            helper.setBcc(bcc.split("\\s*,\\s*"));
+    public void send(TenantId tenantId, String from, String to, String cc, String bcc, String subject, String body) throws MessagingException {
+        if (apiUsageStateService.getApiUsageState(tenantId).isEmailSendEnabled()) {
+            MimeMessage mailMsg = mailSender.createMimeMessage();
+            MimeMessageHelper helper = new MimeMessageHelper(mailMsg, "UTF-8");
+            helper.setFrom(StringUtils.isBlank(from) ? mailFrom : from);
+            helper.setTo(to.split("\\s*,\\s*"));
+            if (!StringUtils.isBlank(cc)) {
+                helper.setCc(cc.split("\\s*,\\s*"));
+            }
+            if (!StringUtils.isBlank(bcc)) {
+                helper.setBcc(bcc.split("\\s*,\\s*"));
+            }
+            helper.setSubject(subject);
+            helper.setText(body);
+            mailSender.send(helper.getMimeMessage());
+            apiUsageClient.report(tenantId, ApiUsageRecordKey.EMAIL_EXEC_COUNT, 1);
         }
-        helper.setSubject(subject);
-        helper.setText(body);
-        mailSender.send(helper.getMimeMessage());
     }
     @Override
@@ -246,6 +267,122 @@ public class DefaultMailService implements MailService {
         sendMail(mailSender, mailFrom, email, subject, message);
     }
+    @Override
+    public void sendApiFeatureStateEmail(ApiFeature apiFeature, ApiUsageStateValue stateValue, String email, ApiUsageStateMailMessage msg) throws ThingsboardException {
+        String subject = messages.getMessage("api.usage.state", null, Locale.US);
+
+        Map<String, Object> model = new HashMap<>();
+        model.put("apiFeature", apiFeature.getLabel());
+        model.put(TARGET_EMAIL, email);
+
+        String message = null;
+
+        switch (stateValue) {
+            case ENABLED:
+                model.put("apiLabel", toEnabledValueLabel(apiFeature));
+                message = mergeTemplateIntoString("state.enabled.ftl", model);
+                break;
+            case WARNING:
+                model.put("apiValueLabel", toDisabledValueLabel(apiFeature) + " " + toWarningValueLabel(msg.getKey(), msg.getValue(), msg.getThreshold()));
+                message = mergeTemplateIntoString("state.warning.ftl", model);
+                break;
+            case DISABLED:
+                model.put("apiLimitValueLabel", toDisabledValueLabel(apiFeature) + " " + toDisabledValueLabel(msg.getKey(), msg.getThreshold()));
+                message = mergeTemplateIntoString("state.disabled.ftl", model);
+                break;
+        }
+        sendMail(mailSender, mailFrom, email, subject, message);
+    }
+
+    private String toEnabledValueLabel(ApiFeature apiFeature) {
+        switch (apiFeature) {
+            case DB:
+                return "save";
+            case TRANSPORT:
+                return "receive";
+            case JS:
+                return "invoke";
+            case RE:
+                return "process";
+            case EMAIL:
+            case SMS:
+                return "send";
+            default:
+                throw new RuntimeException("Not implemented!");
+        }
+    }
+
+    private String toDisabledValueLabel(ApiFeature apiFeature) {
+        switch (apiFeature) {
+            case DB:
+                return "saved";
+            case TRANSPORT:
+                return "received";
+            case JS:
+                return "invoked";
+            case RE:
+                return "processed";
+            case EMAIL:
+            case SMS:
+                return "sent";
+            default:
+                throw new RuntimeException("Not implemented!");
+        }
+    }
+
+    private String toWarningValueLabel(ApiUsageRecordKey key, long value, long threshold) {
+        String valueInM = getValueAsString(value);
+        String thresholdInM = getValueAsString(threshold);
+        switch (key) {
+            case STORAGE_DP_COUNT:
+            case TRANSPORT_DP_COUNT:
+                return valueInM + " out of " + thresholdInM + " allowed data points";
+            case TRANSPORT_MSG_COUNT:
+                return valueInM + " out of " + thresholdInM + " allowed messages";
+            case JS_EXEC_COUNT:
+                return valueInM + " out of " + thresholdInM + " allowed JavaScript functions";
+            case RE_EXEC_COUNT:
+                return valueInM + " out of " + thresholdInM + " allowed Rule Engine messages";
+            case EMAIL_EXEC_COUNT:
+                return valueInM + " out of " + thresholdInM + " allowed Email messages";
+            case SMS_EXEC_COUNT:
+                return valueInM + " out of " + thresholdInM + " allowed SMS messages";
+            default:
+                throw new RuntimeException("Not implemented!");
+        }
+    }
+
+    private String toDisabledValueLabel(ApiUsageRecordKey key, long value) {
+        switch (key) {
+            case STORAGE_DP_COUNT:
+            case TRANSPORT_DP_COUNT:
+                return getValueAsString(value) + " data points";
+            case TRANSPORT_MSG_COUNT:
+                return getValueAsString(value) + " messages";
+            case JS_EXEC_COUNT:
+                return "JavaScript functions " + getValueAsString(value) + " times";
+            case RE_EXEC_COUNT:
+                return getValueAsString(value) + " Rule Engine messages";
+            case EMAIL_EXEC_COUNT:
+                return getValueAsString(value) + " Email messages";
+            case SMS_EXEC_COUNT:
+                return getValueAsString(value) + " SMS messages";
+            default:
+                throw new RuntimeException("Not implemented!");
+        }
+    }
+
+    @NotNull
+    private String getValueAsString(long value) {
+        if (value > _1M && value % _1M < _10K) {
+            return value / _1M + "M";
+        } else if (value > _10K) {
+            return String.format("%.2fM", ((double) value) / 1000000);
+        } else {
+            return value + "";
+        }
+    }
+
     private void sendMail(JavaMailSenderImpl mailSender,
                           String mailFrom, String email,
                           String subject, String message) throws ThingsboardException {
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
View file @6b3448d
@@ -22,6 +22,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.thingsboard.rule.engine.api.msg.ToDeviceActorNotificationMsg;
 import org.thingsboard.server.common.data.ApiUsageState;
+import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.HasName;
@@ -32,7 +33,6 @@ import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
@@ -237,6 +237,16 @@ public class DefaultTbClusterService implements TbClusterService {
         onEntityDelete(TenantId.SYS_TENANT_ID, entity.getId(), entity.getName(), callback);
     }
+    @Override
+    public void onDeviceChange(Device entity, TbQueueCallback callback) {
+        onEntityChange(entity.getTenantId(), entity.getId(), entity, callback);
+    }
+
+    @Override
+    public void onDeviceDeleted(Device entity, TbQueueCallback callback) {
+        onEntityDelete(entity.getTenantId(), entity.getId(), entity.getName(), callback);
+    }
+
     public <T> void onEntityChange(TenantId tenantId, EntityId entityid, T entity, TbQueueCallback callback) {
         String entityName = (entity instanceof HasName) ? ((HasName) entity).getName() : entity.getClass().getName();
         log.trace("[{}][{}][{}] Processing [{}] change event", tenantId, entityid.getEntityType(), entityid.getId(), entityName);
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
View file @6b3448d
@@ -15,6 +15,8 @@
  */
 package org.thingsboard.server.service.queue;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
@@ -76,6 +78,7 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -175,39 +178,48 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
                     CountDownLatch processingTimeoutLatch = new CountDownLatch(1);
                     TbPackProcessingContext<TbProtoQueueMsg<ToCoreMsg>> ctx = new TbPackProcessingContext<>(
                             processingTimeoutLatch, pendingMap, new ConcurrentHashMap<>());
-                    pendingMap.forEach((id, msg) -> {
-                        log.trace("[{}] Creating main callback for message: {}", id, msg.getValue());
-                        TbCallback callback = new TbPackCallback<>(id, ctx);
-                        try {
-                            ToCoreMsg toCoreMsg = msg.getValue();
-                            if (toCoreMsg.hasToSubscriptionMgrMsg()) {
-                                log.trace("[{}] Forwarding message to subscription manager service {}", id, toCoreMsg.getToSubscriptionMgrMsg());
-                                forwardToSubMgrService(toCoreMsg.getToSubscriptionMgrMsg(), callback);
-                            } else if (toCoreMsg.hasToDeviceActorMsg()) {
-                                log.trace("[{}] Forwarding message to device actor {}", id, toCoreMsg.getToDeviceActorMsg());
-                                forwardToDeviceActor(toCoreMsg.getToDeviceActorMsg(), callback);
-                            } else if (toCoreMsg.hasDeviceStateServiceMsg()) {
-                                log.trace("[{}] Forwarding message to state service {}", id, toCoreMsg.getDeviceStateServiceMsg());
-                                forwardToStateService(toCoreMsg.getDeviceStateServiceMsg(), callback);
-                            } else if (toCoreMsg.getToDeviceActorNotificationMsg() != null && !toCoreMsg.getToDeviceActorNotificationMsg().isEmpty()) {
-                                Optional<TbActorMsg> actorMsg = encodingService.decode(toCoreMsg.getToDeviceActorNotificationMsg().toByteArray());
-                                if (actorMsg.isPresent()) {
-                                    TbActorMsg tbActorMsg = actorMsg.get();
-                                    if (tbActorMsg.getMsgType().equals(MsgType.DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG)) {
-                                        tbCoreDeviceRpcService.forwardRpcRequestToDeviceActor((ToDeviceRpcRequestActorMsg) tbActorMsg);
-                                    } else {
-                                        log.trace("[{}] Forwarding message to App Actor {}", id, actorMsg.get());
-                                        actorContext.tell(actorMsg.get());
+                    PendingMsgHolder pendingMsgHolder = new PendingMsgHolder();
+                    Future<?> packSubmitFuture = consumersExecutor.submit(() -> {
+                        pendingMap.forEach((id, msg) -> {
+                            log.trace("[{}] Creating main callback for message: {}", id, msg.getValue());
+                            TbCallback callback = new TbPackCallback<>(id, ctx);
+                            try {
+                                ToCoreMsg toCoreMsg = msg.getValue();
+                                pendingMsgHolder.setToCoreMsg(toCoreMsg);
+                                if (toCoreMsg.hasToSubscriptionMgrMsg()) {
+                                    log.trace("[{}] Forwarding message to subscription manager service {}", id, toCoreMsg.getToSubscriptionMgrMsg());
+                                    forwardToSubMgrService(toCoreMsg.getToSubscriptionMgrMsg(), callback);
+                                } else if (toCoreMsg.hasToDeviceActorMsg()) {
+                                    log.trace("[{}] Forwarding message to device actor {}", id, toCoreMsg.getToDeviceActorMsg());
+                                    forwardToDeviceActor(toCoreMsg.getToDeviceActorMsg(), callback);
+                                } else if (toCoreMsg.hasDeviceStateServiceMsg()) {
+                                    log.trace("[{}] Forwarding message to state service {}", id, toCoreMsg.getDeviceStateServiceMsg());
+                                    forwardToStateService(toCoreMsg.getDeviceStateServiceMsg(), callback);
+                                } else if (toCoreMsg.getToDeviceActorNotificationMsg() != null && !toCoreMsg.getToDeviceActorNotificationMsg().isEmpty()) {
+                                    Optional<TbActorMsg> actorMsg = encodingService.decode(toCoreMsg.getToDeviceActorNotificationMsg().toByteArray());
+                                    if (actorMsg.isPresent()) {
+                                        TbActorMsg tbActorMsg = actorMsg.get();
+                                        if (tbActorMsg.getMsgType().equals(MsgType.DEVICE_RPC_REQUEST_TO_DEVICE_ACTOR_MSG)) {
+                                            tbCoreDeviceRpcService.forwardRpcRequestToDeviceActor((ToDeviceRpcRequestActorMsg) tbActorMsg);
+                                        } else {
+                                            log.trace("[{}] Forwarding message to App Actor {}", id, actorMsg.get());
+                                            actorContext.tell(actorMsg.get());
+                                        }
                                     }
+                                    callback.onSuccess();
                                 }
-                                callback.onSuccess();
+                            } catch (Throwable e) {
+                                log.warn("[{}] Failed to process message: {}", id, msg, e);
+                                callback.onFailure(e);
                             }
-                        } catch (Throwable e) {
-                            log.warn("[{}] Failed to process message: {}", id, msg, e);
-                            callback.onFailure(e);
-                        }
+                        });
                     });
                     if (!processingTimeoutLatch.await(packProcessingTimeout, TimeUnit.MILLISECONDS)) {
+                        if (!packSubmitFuture.isDone()) {
+                            packSubmitFuture.cancel(true);
+                            ToCoreMsg lastSubmitMsg = pendingMsgHolder.getToCoreMsg();
+                            log.info("Timeout to process message: {}", lastSubmitMsg);
+                        }
                         ctx.getAckMap().forEach((id, msg) -> log.debug("[{}] Timeout to process message: {}", id, msg.getValue()));
                         ctx.getFailedMap().forEach((id, msg) -> log.warn("[{}] Failed to process message: {}", id, msg.getValue()));
                     }
@@ -227,6 +239,12 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
         });
     }
+    private static class PendingMsgHolder {
+        @Getter
+        @Setter
+        private volatile ToCoreMsg toCoreMsg;
+    }
+
     @Override
     protected ServiceType getServiceType() {
         return ServiceType.TB_CORE;
--- a/application/src/main/java/org/thingsboard/server/service/queue/TbClusterService.java
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/queue/TbClusterService.java
View file @6b3448d
@@ -17,6 +17,7 @@ package org.thingsboard.server.service.queue;
 import org.thingsboard.rule.engine.api.msg.ToDeviceActorNotificationMsg;
 import org.thingsboard.server.common.data.ApiUsageState;
+import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
@@ -66,4 +67,8 @@ public interface TbClusterService {
     void onTenantDelete(Tenant tenant, TbQueueCallback callback);
     void onApiStateChange(ApiUsageState apiUsageState, TbQueueCallback callback);
+
+    void onDeviceChange(Device device, TbQueueCallback callback);
+
+    void onDeviceDeleted(Device device, TbQueueCallback callback);
 }
--- a/application/src/main/java/org/thingsboard/server/service/sms/AbstractSmsSender.java 0 → 100644
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/sms/AbstractSmsSender.java 0 → 100644
View file @6b3448d
+/**
+ * Copyright © 2016-2020 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.sms;
+
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.rule.engine.api.sms.SmsSender;
+import org.thingsboard.rule.engine.api.sms.exception.SmsParseException;
+
+import java.util.regex.Pattern;
+
+@Slf4j
+public abstract class AbstractSmsSender implements SmsSender {
+
+    private static final Pattern E_164_PHONE_NUMBER_PATTERN = Pattern.compile("^\\+[1-9]\\d{1,14}$");
+
+    private static final int MAX_SMS_MESSAGE_LENGTH = 1600;
+    private static final int MAX_SMS_SEGMENT_LENGTH = 70;
+
+    protected String validatePhoneNumber(String phoneNumber) throws SmsParseException {
+        phoneNumber = phoneNumber.trim();
+        if (!E_164_PHONE_NUMBER_PATTERN.matcher(phoneNumber).matches()) {
+            throw new SmsParseException("Invalid phone number format. Phone number must be in E.164 format.");
+        }
+        return phoneNumber;
+    }
+
+    protected String prepareMessage(String message) {
+        message = message.replaceAll("^\"|\"$", "").replaceAll("\\\\n", "\n");
+        if (message.length() > MAX_SMS_MESSAGE_LENGTH) {
+            log.warn("SMS message exceeds maximum symbols length and will be truncated");
+            message = message.substring(0, MAX_SMS_MESSAGE_LENGTH);
+        }
+        return message;
+    }
+
+    protected int countMessageSegments(String message) {
+        return (int)Math.ceil((double) message.length() / (double) MAX_SMS_SEGMENT_LENGTH);
+    }
+
+}
--- a/application/src/main/java/org/thingsboard/server/service/sms/DefaultSmsSenderFactory.java 0 → 100644
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/sms/DefaultSmsSenderFactory.java 0 → 100644
View file @6b3448d
+/**
+ * Copyright © 2016-2020 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.sms;
+
+import org.springframework.stereotype.Component;
+import org.thingsboard.rule.engine.api.sms.SmsSender;
+import org.thingsboard.rule.engine.api.sms.SmsSenderFactory;
+import org.thingsboard.rule.engine.api.sms.config.AwsSnsSmsProviderConfiguration;
+import org.thingsboard.rule.engine.api.sms.config.SmsProviderConfiguration;
+import org.thingsboard.rule.engine.api.sms.config.TwilioSmsProviderConfiguration;
+import org.thingsboard.server.service.sms.aws.AwsSmsSender;
+import org.thingsboard.server.service.sms.twilio.TwilioSmsSender;
+
+@Component
+public class DefaultSmsSenderFactory implements SmsSenderFactory {
+
+    @Override
+    public SmsSender createSmsSender(SmsProviderConfiguration config) {
+        switch (config.getType()) {
+            case AWS_SNS:
+                return new AwsSmsSender((AwsSnsSmsProviderConfiguration)config);
+            case TWILIO:
+                return new TwilioSmsSender((TwilioSmsProviderConfiguration)config);
+            default:
+                throw new RuntimeException("Unknown SMS provider type " + config.getType());
+        }
+    }
+
+}
--- a/application/src/main/java/org/thingsboard/server/service/sms/DefaultSmsService.java 0 → 100644
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/sms/DefaultSmsService.java 0 → 100644
View file @6b3448d
+/**
+ * Copyright © 2016-2020 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.sms;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.NestedRuntimeException;
+import org.springframework.stereotype.Service;
+import org.thingsboard.rule.engine.api.SmsService;
+import org.thingsboard.rule.engine.api.sms.SmsSender;
+import org.thingsboard.rule.engine.api.sms.SmsSenderFactory;
+import org.thingsboard.rule.engine.api.sms.config.SmsProviderConfiguration;
+import org.thingsboard.rule.engine.api.sms.config.TestSmsRequest;
+import org.thingsboard.server.common.data.AdminSettings;
+import org.thingsboard.server.common.data.ApiUsageRecordKey;
+import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.settings.AdminSettingsService;
+import org.thingsboard.server.dao.util.mapping.JacksonUtil;
+import org.thingsboard.server.queue.usagestats.TbApiUsageClient;
+import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+@Service
+@Slf4j
+public class DefaultSmsService implements SmsService {
+
+    private final SmsSenderFactory smsSenderFactory;
+    private final AdminSettingsService adminSettingsService;
+    private final TbApiUsageStateService apiUsageStateService;
+    private final TbApiUsageClient apiUsageClient;
+
+    private SmsSender smsSender;
+
+    public DefaultSmsService(SmsSenderFactory smsSenderFactory, AdminSettingsService adminSettingsService, TbApiUsageStateService apiUsageStateService, TbApiUsageClient apiUsageClient) {
+        this.smsSenderFactory = smsSenderFactory;
+        this.adminSettingsService = adminSettingsService;
+        this.apiUsageStateService = apiUsageStateService;
+        this.apiUsageClient = apiUsageClient;
+    }
+
+    @PostConstruct
+    private void init() {
+        updateSmsConfiguration();
+    }
+
+    @PreDestroy
+    private void destroy() {
+        if (this.smsSender != null) {
+            this.smsSender.destroy();
+        }
+    }
+
+    @Override
+    public void updateSmsConfiguration() {
+        AdminSettings settings = adminSettingsService.findAdminSettingsByKey(new TenantId(EntityId.NULL_UUID), "sms");
+        if (settings != null) {
+            try {
+                JsonNode jsonConfig = settings.getJsonValue();
+                SmsProviderConfiguration configuration = JacksonUtil.convertValue(jsonConfig, SmsProviderConfiguration.class);
+                SmsSender newSmsSender = this.smsSenderFactory.createSmsSender(configuration);
+                if (this.smsSender != null) {
+                    this.smsSender.destroy();
+                }
+                this.smsSender = newSmsSender;
+            } catch (Exception e) {
+                log.error("Failed to create SMS sender", e);
+            }
+        }
+    }
+
+    private int sendSms(String numberTo, String message) throws ThingsboardException {
+        if (this.smsSender == null) {
+            throw new ThingsboardException("Unable to send SMS: no SMS provider configured!", ThingsboardErrorCode.GENERAL);
+        }
+        return this.sendSms(this.smsSender, numberTo, message);
+    }
+
+    @Override
+    public void sendSms(TenantId tenantId, String[] numbersTo, String message) throws ThingsboardException {
+        if (apiUsageStateService.getApiUsageState(tenantId).isSmsSendEnabled()) {
+            int smsCount = 0;
+            try {
+                for (String numberTo : numbersTo) {
+                    smsCount += this.sendSms(numberTo, message);
+                }
+            } finally {
+                if (smsCount > 0) {
+                    apiUsageClient.report(tenantId, ApiUsageRecordKey.SMS_EXEC_COUNT, smsCount);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void sendTestSms(TestSmsRequest testSmsRequest) throws ThingsboardException {
+        SmsSender testSmsSender;
+        try {
+            testSmsSender = this.smsSenderFactory.createSmsSender(testSmsRequest.getProviderConfiguration());
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+        this.sendSms(testSmsSender, testSmsRequest.getNumberTo(), testSmsRequest.getMessage());
+        testSmsSender.destroy();
+    }
+
+    private int sendSms(SmsSender smsSender, String numberTo, String message) throws ThingsboardException {
+        try {
+            return smsSender.sendSms(numberTo, message);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    private ThingsboardException handleException(Exception exception) {
+        String message;
+        if (exception instanceof NestedRuntimeException) {
+            message = ((NestedRuntimeException) exception).getMostSpecificCause().getMessage();
+        } else {
+            message = exception.getMessage();
+        }
+        log.warn("Unable to send SMS: {}", message);
+        return new ThingsboardException(String.format("Unable to send SMS: %s", message),
+                ThingsboardErrorCode.GENERAL);
+    }
+}
--- a/application/src/main/java/org/thingsboard/server/service/sms/SmsExecutorService.java 0 → 100644
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/sms/SmsExecutorService.java 0 → 100644
View file @6b3448d
+/**
+ * Copyright © 2016-2020 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.sms;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.thingsboard.common.util.AbstractListeningExecutor;
+
+@Component
+public class SmsExecutorService extends AbstractListeningExecutor {
+
+    @Value("${actors.rule.sms_thread_pool_size}")
+    private int smsExecutorThreadPoolSize;
+
+    @Override
+    protected int getThreadPollSize() {
+        return smsExecutorThreadPoolSize;
+    }
+
+}
--- a/application/src/main/java/org/thingsboard/server/service/sms/aws/AwsSmsSender.java 0 → 100644
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/sms/aws/AwsSmsSender.java 0 → 100644
View file @6b3448d
+/**
+ * Copyright © 2016-2020 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.sms.aws;
+
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.sns.AmazonSNS;
+import com.amazonaws.services.sns.AmazonSNSClient;
+import com.amazonaws.services.sns.model.PublishRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.thingsboard.rule.engine.api.sms.config.AwsSnsSmsProviderConfiguration;
+import org.thingsboard.rule.engine.api.sms.exception.SmsException;
+import org.thingsboard.rule.engine.api.sms.exception.SmsSendException;
+import org.thingsboard.server.service.sms.AbstractSmsSender;
+
+@Slf4j
+public class AwsSmsSender extends AbstractSmsSender {
+
+    private AmazonSNS snsClient;
+
+    public AwsSmsSender(AwsSnsSmsProviderConfiguration config) {
+        if (StringUtils.isEmpty(config.getAccessKeyId()) || StringUtils.isEmpty(config.getSecretAccessKey()) || StringUtils.isEmpty(config.getRegion())) {
+            throw new IllegalArgumentException("Invalid AWS sms provider configuration: aws accessKeyId, aws secretAccessKey and aws region should be specified!");
+        }
+        AWSCredentials awsCredentials = new BasicAWSCredentials(config.getAccessKeyId(), config.getSecretAccessKey());
+        AWSStaticCredentialsProvider credProvider = new AWSStaticCredentialsProvider(awsCredentials);
+        this.snsClient = AmazonSNSClient.builder()
+                .withCredentials(credProvider)
+                .withRegion(config.getRegion())
+                .build();
+    }
+
+    @Override
+    public int sendSms(String numberTo, String message) throws SmsException {
+        numberTo = this.validatePhoneNumber(numberTo);
+        message = this.prepareMessage(message);
+        try {
+            PublishRequest publishRequest = new PublishRequest()
+                    .withPhoneNumber(numberTo)
+                    .withMessage(message);
+            this.snsClient.publish(publishRequest);
+            return this.countMessageSegments(message);
+        } catch (Exception e) {
+            throw new SmsSendException("Failed to send SMS message - " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public void destroy() {
+        if (this.snsClient != null) {
+            try {
+                this.snsClient.shutdown();
+            } catch (Exception e) {
+                log.error("Failed to shutdown SNS client during destroy()", e);
+            }
+        }
+    }
+}
--- a/application/src/main/java/org/thingsboard/server/service/sms/twilio/TwilioSmsSender.java 0 → 100644
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/sms/twilio/TwilioSmsSender.java 0 → 100644
View file @6b3448d
+/**
+ * Copyright © 2016-2020 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.sms.twilio;
+
+import com.twilio.http.TwilioRestClient;
+import com.twilio.rest.api.v2010.account.Message;
+import com.twilio.type.PhoneNumber;
+import org.apache.commons.lang3.StringUtils;
+import org.thingsboard.rule.engine.api.sms.config.TwilioSmsProviderConfiguration;
+import org.thingsboard.rule.engine.api.sms.exception.SmsException;
+import org.thingsboard.rule.engine.api.sms.exception.SmsSendException;
+import org.thingsboard.server.service.sms.AbstractSmsSender;
+
+public class TwilioSmsSender extends AbstractSmsSender {
+
+    private TwilioRestClient twilioRestClient;
+    private String numberFrom;
+
+    public TwilioSmsSender(TwilioSmsProviderConfiguration config) {
+        if (StringUtils.isEmpty(config.getAccountSid()) || StringUtils.isEmpty(config.getAccountToken()) || StringUtils.isEmpty(config.getNumberFrom())) {
+            throw new IllegalArgumentException("Invalid twilio sms provider configuration: accountSid, accountToken and numberFrom should be specified!");
+        }
+        this.numberFrom = this.validatePhoneNumber(config.getNumberFrom());
+        this.twilioRestClient = new TwilioRestClient.Builder(config.getAccountSid(), config.getAccountToken()).build();
+    }
+
+    @Override
+    public int sendSms(String numberTo, String message) throws SmsException {
+        numberTo = this.validatePhoneNumber(numberTo);
+        message = this.prepareMessage(message);
+        try {
+            String numSegments = Message.creator(new PhoneNumber(numberTo), new PhoneNumber(this.numberFrom), message).create(this.twilioRestClient).getNumSegments();
+            return Integer.valueOf(numSegments);
+        } catch (Exception e) {
+            throw new SmsSendException("Failed to send SMS message - " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+}
--- a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionService.java
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionService.java
View file @6b3448d
@@ -21,12 +21,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
-import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.EntityView;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.EntityViewId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.discovery.ClusterTopologyChangeEvent;
 import org.thingsboard.server.queue.discovery.PartitionChangeEvent;
@@ -36,7 +30,6 @@ import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
 import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.queue.TbClusterService;
-import org.thingsboard.server.service.telemetry.DefaultTelemetryWebSocketService;
 import org.thingsboard.server.service.telemetry.sub.AlarmSubscriptionUpdate;
 import org.thingsboard.server.service.telemetry.sub.TelemetrySubscriptionUpdate;
@@ -49,7 +42,6 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
 @Slf4j
 @TbCoreComponent
@@ -60,9 +52,6 @@ public class DefaultTbLocalSubscriptionService implements TbLocalSubscriptionSer
     private final Map<String, Map<Integer, TbSubscription>> subscriptionsBySessionId = new ConcurrentHashMap<>();
     @Autowired
-    private EntityViewService entityViewService;
-
-    @Autowired
     private PartitionService partitionService;
     @Autowired
@@ -72,17 +61,17 @@ public class DefaultTbLocalSubscriptionService implements TbLocalSubscriptionSer
     @Lazy
     private SubscriptionManagerService subscriptionManagerService;
-    private ExecutorService wsCallBackExecutor;
+    private ExecutorService subscriptionUpdateExecutor;
     @PostConstruct
     public void initExecutor() {
-        wsCallBackExecutor = Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("ws-sub-callback"));
+        subscriptionUpdateExecutor = Executors.newWorkStealingPool(20);
     }
     @PreDestroy
     public void shutdownExecutor() {
-        if (wsCallBackExecutor != null) {
-            wsCallBackExecutor.shutdownNow();
+        if (subscriptionUpdateExecutor != null) {
+            subscriptionUpdateExecutor.shutdownNow();
         }
     }
@@ -148,7 +137,7 @@ public class DefaultTbLocalSubscriptionService implements TbLocalSubscriptionSer
                     update.getLatestValues().forEach((key, value) -> attrSub.getKeyStates().put(key, value));
                     break;
             }
-            subscription.getUpdateConsumer().accept(sessionId, update);
+            subscriptionUpdateExecutor.submit(() -> subscription.getUpdateConsumer().accept(sessionId, update));
         }
         callback.onSuccess();
     }
@@ -158,7 +147,7 @@ public class DefaultTbLocalSubscriptionService implements TbLocalSubscriptionSer
         TbSubscription subscription = subscriptionsBySessionId
                 .getOrDefault(sessionId, Collections.emptyMap()).get(update.getSubscriptionId());
         if (subscription != null && subscription.getType() == TbSubscriptionType.ALARMS) {
-            subscription.getUpdateConsumer().accept(sessionId, update);
+            subscriptionUpdateExecutor.submit(() -> subscription.getUpdateConsumer().accept(sessionId, update));
         }
         callback.onSuccess();
     }
--- a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @6b3448d
+++ b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @6b3448d
@@ -54,12 +54,16 @@ import org.thingsboard.server.dao.device.provision.ProvisionResponse;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.util.mapping.JacksonUtil;
 import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.gen.transport.TransportProtos.DeviceCredentialsProto;
 import org.thingsboard.server.gen.transport.TransportProtos.DeviceInfoProto;
 import org.thingsboard.server.gen.transport.TransportProtos.GetOrCreateDeviceFromGatewayRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.GetOrCreateDeviceFromGatewayResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.GetEntityProfileRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.GetEntityProfileResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceRequestMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceResponseMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceResponseMsgOrBuilder;
+import org.thingsboard.server.gen.transport.TransportProtos.ProvisionResponseStatus;
 import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceCredentialsResponseMsg;
@@ -174,6 +178,8 @@ public class DefaultTransportApiService implements TransportApiService {
                     if (!checkMqttCredentials(mqtt, credentials)) {
                         credentials = null;
                     }
+                } else {
+                    return getEmptyTransportApiResponseFuture();
                 }
             }
             if (credentials == null) {
@@ -292,30 +298,32 @@ public class DefaultTransportApiService implements TransportApiService {
                                     requestMsg.getProvisionDeviceCredentialsMsg().getProvisionDeviceSecret()))));
         } catch (ProvisionFailedException e) {
             return Futures.immediateFuture(getTransportApiResponseMsg(
-                    TransportProtos.DeviceCredentialsProto.getDefaultInstance(),
+                    new DeviceCredentials(),
                     TransportProtos.ProvisionResponseStatus.valueOf(e.getMessage())));
         }
-        return Futures.transform(provisionResponseFuture, provisionResponse -> getTransportApiResponseMsg(
-                getDeviceCredentials(provisionResponse.getDeviceCredentials()), TransportProtos.ProvisionResponseStatus.SUCCESS),
+        return Futures.transform(provisionResponseFuture, provisionResponse -> getTransportApiResponseMsg(provisionResponse.getDeviceCredentials(), TransportProtos.ProvisionResponseStatus.SUCCESS),
                 dbCallbackExecutorService);
     }
-    private TransportApiResponseMsg getTransportApiResponseMsg(TransportProtos.DeviceCredentialsProto deviceCredentials, TransportProtos.ProvisionResponseStatus status) {
-        return TransportApiResponseMsg.newBuilder()
-                .setProvisionDeviceResponseMsg(TransportProtos.ProvisionDeviceResponseMsg.newBuilder()
-                        .setDeviceCredentials(deviceCredentials)
-                        .setProvisionResponseStatus(status)
-                        .build())
-                .build();
-    }
+    private TransportApiResponseMsg getTransportApiResponseMsg(DeviceCredentials deviceCredentials, TransportProtos.ProvisionResponseStatus status) {
+        if (!status.equals(ProvisionResponseStatus.SUCCESS)) {
+            return TransportApiResponseMsg.newBuilder().setProvisionDeviceResponseMsg(TransportProtos.ProvisionDeviceResponseMsg.newBuilder().setStatus(status).build()).build();
+        }
+        TransportProtos.ProvisionDeviceResponseMsg.Builder provisionResponse = TransportProtos.ProvisionDeviceResponseMsg.newBuilder()
+                                                                                .setCredentialsType(TransportProtos.CredentialsType.valueOf(deviceCredentials.getCredentialsType().name()))
+                                                                                .setStatus(status);
+        switch (deviceCredentials.getCredentialsType()){
+            case ACCESS_TOKEN:
+                provisionResponse.setCredentialsValue(deviceCredentials.getCredentialsId());
+                break;
+            case MQTT_BASIC:
+            case X509_CERTIFICATE:
+                provisionResponse.setCredentialsValue(deviceCredentials.getCredentialsValue());
+                break;
+        }
-    private TransportProtos.DeviceCredentialsProto getDeviceCredentials(DeviceCredentials deviceCredentials) {
-        return TransportProtos.DeviceCredentialsProto.newBuilder()
-                .setDeviceIdMSB(deviceCredentials.getDeviceId().getId().getMostSignificantBits())
-                .setDeviceIdLSB(deviceCredentials.getDeviceId().getId().getLeastSignificantBits())
-                .setCredentialsType(TransportProtos.CredentialsType.valueOf(deviceCredentials.getCredentialsType().name()))
-                .setCredentialsId(deviceCredentials.getCredentialsId())
-                .setCredentialsValue(deviceCredentials.getCredentialsValue() != null ? deviceCredentials.getCredentialsValue() : "")
+        return TransportApiResponseMsg.newBuilder()
+                .setProvisionDeviceResponseMsg(provisionResponse.build())
                 .build();
     }
--- a/application/src/main/resources/i18n/messages.properties
View file @6b3448d
+++ b/application/src/main/resources/i18n/messages.properties
View file @6b3448d
@@ -3,4 +3,5 @@ activation.subject=Your account activation on Thingsboard
 account.activated.subject=Thingsboard - your account has been activated
 reset.password.subject=Thingsboard - Password reset has been requested
 password.was.reset.subject=Thingsboard - your account password has been reset
-account.lockout.subject=Thingsboard - User account has been lockout
+account.lockout.subject=Thingsboard - User account has been lockout
+api.usage.state=Thingsboard - Api Usage State for tenant has been updated
--- a/application/src/main/resources/templates/state.disabled.ftl 0 → 100644
View file @6b3448d
+++ b/application/src/main/resources/templates/state.disabled.ftl 0 → 100644
View file @6b3448d
+<#--
+
+    Copyright © 2016-2020 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.
+
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+<head>
+    <meta name="viewport" content="width=device-width"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <title>Thingsboard - Api Usage State</title>
+
+
+    <style type="text/css">
+        img {
+            max-width: 100%;
+        }
+
+        body {
+            -webkit-font-smoothing: antialiased;
+            -webkit-text-size-adjust: none;
+            width: 100% !important;
+            height: 100%;
+            line-height: 1.6em;
+        }
+
+        body {
+            background-color: #f6f6f6;
+        }
+
+        @media only screen and (max-width: 640px) {
+            body {
+                padding: 0 !important;
+            }
+
+            h1 {
+                font-weight: 800 !important;
+                margin: 20px 0 5px !important;
+            }
+
+            h2 {
+                font-weight: 800 !important;
+                margin: 20px 0 5px !important;
+            }
+
+            h3 {
+                font-weight: 800 !important;
+                margin: 20px 0 5px !important;
+            }
+
+            h4 {
+                font-weight: 800 !important;
+                margin: 20px 0 5px !important;
+            }
+
+            h1 {
+                font-size: 22px !important;
+            }
+
+            h2 {
+                font-size: 18px !important;
+            }
+
+            h3 {
+                font-size: 16px !important;
+            }
+
+            .container {
+                padding: 0 !important;
+                width: 100% !important;
+            }
+
+            .content {
+                padding: 0 !important;
+            }
+
+            .content-wrap {
+                padding: 10px !important;
+            }
+
+            .invoice {
+                width: 100% !important;
+            }
+        }
+    </style>
+</head>
+
+<body itemscope itemtype="http://schema.org/EmailMessage"
+      style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;"
+      bgcolor="#f6f6f6">
+
+<table class="main"
+       style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px; box-sizing: border-box; border-radius: 3px; width: 100%; background-color: #f6f6f6; margin: 0px auto;"
+       cellspacing="0" cellpadding="0" bgcolor="#f6f6f6">
+    <tbody>
+    <tr style="box-sizing: border-box; margin: 0px;">
+        <td class="content-wrap" style="box-sizing: border-box; vertical-align: top; margin: 0px; padding: 20px;"
+            align="center" valign="top">
+            <table style="box-sizing: border-box; border: 1px solid #e9e9e9; border-radius: 3px; margin: 0px; height: 223px; padding: 20px; background-color: #ffffff; width: 600px; max-width: 600px !important;"
+                   width="600" cellspacing="0" cellpadding="0">
+                <tbody>
+                <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                    <td class="content-block"
+                        style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #348eda; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0px; padding: 0px 0px 20px; height: 84px;"
+                        valign="top">
+                        <h2>Your ThingsBoard account feature was disabled</h2>
+                    </td>
+                </tr>
+                <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                    <td class="content-block"
+                        style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0px; padding: 0px 0px 20px; height: 40px;"
+                        valign="top">We have disabled the ${apiFeature} for your account because ThingsBoard has already ${apiLimitValueLabel}.
+                    </td>
+                </tr>
+                <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                    <td class="content-block"
+                        style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0px; padding: 0px 0px 20px; height: 59px;"
+                        valign="top">Please contact your system administrator to resolve the issue.
+                    </td>
+                </tr>
+                <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+                    <td class="content-block"
+                        style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0px; padding: 0px 0px 20px; height: 40px;"
+                        valign="top">&mdash; The ThingsBoard
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </td>
+    </tr>
+    </tbody>
+</table>
+<table style="color: #999999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px; box-sizing: border-box; margin: 0px auto; height: 64px; background-color: #f6f6f6; width: 100%;"
+       cellpadding="0px 0px 20px">
+    <tbody>
+    <tr style="box-sizing: border-box; margin: 0px;">
+        <td class="aligncenter content-block"
+            style="box-sizing: border-box; font-size: 12px; margin: 0px; padding: 0px 0px 20px; width: 600px; text-align: center; vertical-align: middle;"
+            align="center" valign="top">This email was sent to&nbsp;<a
+                    style="box-sizing: border-box; color: #999999; margin: 0px;"
+                    href="mailto:${targetEmail}">${targetEmail}</a>&nbsp;by ThingsBoard.
+        </td>
+    </tr>
+    </tbody>
+</table>
+</body>
+</html>
--- a/application/src/main/resources/templates/state.enabled.ftl 0 → 100644
View file @6b3448d
+++ b/application/src/main/resources/templates/state.enabled.ftl 0 → 100644
View file @6b3448d
+<#--
+
+    Copyright © 2016-2020 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.
+
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	  style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+<head>
+	<meta name="viewport" content="width=device-width"/>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+	<title>Thingsboard - Api Usage State</title>
+
+
+	<style type="text/css">
+		img {
+			max-width: 100%;
+		}
+
+		body {
+			-webkit-font-smoothing: antialiased;
+			-webkit-text-size-adjust: none;
+			width: 100% !important;
+			height: 100%;
+			line-height: 1.6em;
+		}
+
+		body {
+			background-color: #f6f6f6;
+		}
+
+		@media only screen and (max-width: 640px) {
+			body {
+				padding: 0 !important;
+			}
+
+			h1 {
+				font-weight: 800 !important;
+				margin: 20px 0 5px !important;
+			}
+
+			h2 {
+				font-weight: 800 !important;
+				margin: 20px 0 5px !important;
+			}
+
+			h3 {
+				font-weight: 800 !important;
+				margin: 20px 0 5px !important;
+			}
+
+			h4 {
+				font-weight: 800 !important;
+				margin: 20px 0 5px !important;
+			}
+
+			h1 {
+				font-size: 22px !important;
+			}
+
+			h2 {
+				font-size: 18px !important;
+			}
+
+			h3 {
+				font-size: 16px !important;
+			}
+
+			.container {
+				padding: 0 !important;
+				width: 100% !important;
+			}
+
+			.content {
+				padding: 0 !important;
+			}
+
+			.content-wrap {
+				padding: 10px !important;
+			}
+
+			.invoice {
+				width: 100% !important;
+			}
+		}
+	</style>
+</head>
+
+<body itemscope itemtype="http://schema.org/EmailMessage"
+	  style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;"
+	  bgcolor="#f6f6f6">
+
+<table class="main"
+	   style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px; box-sizing: border-box; border-radius: 3px; width: 100%; background-color: #f6f6f6; margin: 0px auto;"
+	   cellspacing="0" cellpadding="0" bgcolor="#f6f6f6">
+	<tbody>
+	<tr style="box-sizing: border-box; margin: 0px;">
+		<td class="content-wrap" style="box-sizing: border-box; vertical-align: top; margin: 0px; padding: 20px;"
+			align="center" valign="top">
+			<table style="box-sizing: border-box; border: 1px solid #e9e9e9; border-radius: 3px; margin: 0px; height: 223px; padding: 20px; background-color: #ffffff; width: 600px; max-width: 600px !important;"
+				   width="600" cellspacing="0" cellpadding="0">
+				<tbody>
+				<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+					<td class="content-block"
+						style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #348eda; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0px; padding: 0px 0px 20px; height: 84px;"
+						valign="top">
+						<h2>Your ThingsBoard account feature was enabled</h2>
+					</td>
+				</tr>
+				<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+					<td class="content-block"
+						style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0px; padding: 0px 0px 20px; height: 40px;"
+						valign="top">We have enabled the ${apiFeature} for your account and ThingsBoard is already able to ${apiLabel} messages.
+					</td>
+				</tr>
+				<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+					<td class="content-block"
+						style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0px; padding: 0px 0px 20px; height: 40px;"
+						valign="top">&mdash; The ThingsBoard
+					</td>
+				</tr>
+				</tbody>
+			</table>
+		</td>
+	</tr>
+	</tbody>
+</table>
+<table style="color: #999999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px; box-sizing: border-box; margin: 0px auto; height: 64px; background-color: #f6f6f6; width: 100%;"
+	   cellpadding="0px 0px 20px">
+	<tbody>
+	<tr style="box-sizing: border-box; margin: 0px;">
+		<td class="aligncenter content-block"
+			style="box-sizing: border-box; font-size: 12px; margin: 0px; padding: 0px 0px 20px; width: 600px; text-align: center; vertical-align: middle;"
+			align="center" valign="top">This email was sent to&nbsp;<a
+					style="box-sizing: border-box; color: #999999; margin: 0px;"
+					href="mailto:${targetEmail}">${targetEmail}</a>&nbsp;by ThingsBoard.
+		</td>
+	</tr>
+	</tbody>
+</table>
+</body>
+</html>
--- a/application/src/main/resources/templates/state.warning.ftl 0 → 100644
View file @6b3448d
+++ b/application/src/main/resources/templates/state.warning.ftl 0 → 100644
View file @6b3448d
+<#--
+
+    Copyright © 2016-2020 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.
+
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+		"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	  style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+<head>
+	<meta name="viewport" content="width=device-width"/>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+	<title>Thingsboard - Api Usage State</title>
+
+
+	<style type="text/css">
+		img {
+			max-width: 100%;
+		}
+
+		body {
+			-webkit-font-smoothing: antialiased;
+			-webkit-text-size-adjust: none;
+			width: 100% !important;
+			height: 100%;
+			line-height: 1.6em;
+		}
+
+		body {
+			background-color: #f6f6f6;
+		}
+
+		@media only screen and (max-width: 640px) {
+			body {
+				padding: 0 !important;
+			}
+
+			h1 {
+				font-weight: 800 !important;
+				margin: 20px 0 5px !important;
+			}
+
+			h2 {
+				font-weight: 800 !important;
+				margin: 20px 0 5px !important;
+			}
+
+			h3 {
+				font-weight: 800 !important;
+				margin: 20px 0 5px !important;
+			}
+
+			h4 {
+				font-weight: 800 !important;
+				margin: 20px 0 5px !important;
+			}
+
+			h1 {
+				font-size: 22px !important;
+			}
+
+			h2 {
+				font-size: 18px !important;
+			}
+
+			h3 {
+				font-size: 16px !important;
+			}
+
+			.container {
+				padding: 0 !important;
+				width: 100% !important;
+			}
+
+			.content {
+				padding: 0 !important;
+			}
+
+			.content-wrap {
+				padding: 10px !important;
+			}
+
+			.invoice {
+				width: 100% !important;
+			}
+		}
+	</style>
+</head>
+
+<body itemscope itemtype="http://schema.org/EmailMessage"
+	  style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;"
+	  bgcolor="#f6f6f6">
+
+<table class="main"
+	   style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px; box-sizing: border-box; border-radius: 3px; width: 100%; background-color: #f6f6f6; margin: 0px auto;"
+	   cellspacing="0" cellpadding="0" bgcolor="#f6f6f6">
+	<tbody>
+	<tr style="box-sizing: border-box; margin: 0px;">
+		<td class="content-wrap" style="box-sizing: border-box; vertical-align: top; margin: 0px; padding: 20px;"
+			align="center" valign="top">
+			<table style="box-sizing: border-box; border: 1px solid #e9e9e9; border-radius: 3px; margin: 0px; height: 223px; padding: 20px; background-color: #ffffff; width: 600px; max-width: 600px !important;"
+				   width="600" cellspacing="0" cellpadding="0">
+				<tbody>
+				<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+					<td class="content-block"
+						style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #348eda; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0px; padding: 0px 0px 20px; height: 84px;"
+						valign="top">
+						<h2>Your ThingsBoard account feature may be disabled soon</h2>
+					</td>
+				</tr>
+				<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+					<td class="content-block"
+						style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0px; padding: 0px 0px 20px; height: 40px;"
+						valign="top">
+						ThingsBoard has already&nbsp;${apiValueLabel}.<br> ${apiFeature} will be disabled for your account once the limit will be reached.
+					</td>
+				</tr>
+				<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+					<td class="content-block"
+						style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0px; padding: 0px 0px 20px; height: 59px;"
+						valign="top">Please contact your system administrator to resolve the issue.
+					</td>
+				</tr>
+				<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
+					<td class="content-block"
+						style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0px; padding: 0px 0px 20px; height: 40px;"
+						valign="top">&mdash; The ThingsBoard
+					</td>
+				</tr>
+				</tbody>
+			</table>
+		</td>
+	</tr>
+	</tbody>
+</table>
+<table style="color: #999999; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px; box-sizing: border-box; margin: 0px auto; height: 64px; background-color: #f6f6f6; width: 100%;"
+	   cellpadding="0px 0px 20px">
+	<tbody>
+	<tr style="box-sizing: border-box; margin: 0px;">
+		<td class="aligncenter content-block"
+			style="box-sizing: border-box; font-size: 12px; margin: 0px; padding: 0px 0px 20px; width: 600px; text-align: center; vertical-align: middle;"
+			align="center" valign="top">This email was sent to&nbsp;<a
+					style="box-sizing: border-box; color: #999999; margin: 0px;"
+					href="mailto:${targetEmail}">${targetEmail}</a>&nbsp;by ThingsBoard.
+		</td>
+	</tr>
+	</tbody>
+</table>
+</body>
+</html>
--- a/application/src/main/resources/thingsboard.yml
View file @6b3448d
+++ b/application/src/main/resources/thingsboard.yml
View file @6b3448d
@@ -281,8 +281,12 @@ actors:
     js_thread_pool_size: "${ACTORS_RULE_JS_THREAD_POOL_SIZE:50}"
     # Specify thread pool size for mail sender executor service
     mail_thread_pool_size: "${ACTORS_RULE_MAIL_THREAD_POOL_SIZE:50}"
+    # Specify thread pool size for sms sender executor service
+    sms_thread_pool_size: "${ACTORS_RULE_SMS_THREAD_POOL_SIZE:50}"
     # Whether to allow usage of system mail service for rules
     allow_system_mail_service: "${ACTORS_RULE_ALLOW_SYSTEM_MAIL_SERVICE:true}"
+    # Whether to allow usage of system sms service for rules
+    allow_system_sms_service: "${ACTORS_RULE_ALLOW_SYSTEM_SMS_SERVICE:true}"
     # Specify thread pool size for external call service
     external_call_thread_pool_size: "${ACTORS_RULE_EXTERNAL_CALL_THREAD_POOL_SIZE:50}"
     chain:
@@ -591,6 +595,7 @@ queue:
     linger.ms: "${TB_KAFKA_LINGER_MS:1}"
     buffer.memory: "${TB_BUFFER_MEMORY:33554432}"
     replication_factor: "${TB_QUEUE_KAFKA_REPLICATION_FACTOR:1}"
+    max_poll_interval_ms: "${TB_QUEUE_KAFKA_MAX_POLL_INTERVAL_MS:0}"
     max_poll_records: "${TB_QUEUE_KAFKA_MAX_POLL_RECORDS:8192}"
     max_partition_fetch_bytes: "${TB_QUEUE_KAFKA_MAX_PARTITION_FETCH_BYTES:16777216}"
     fetch_max_bytes: "${TB_QUEUE_KAFKA_FETCH_MAX_BYTES:134217728}"
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
View file @6b3448d
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.controller;
-import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -33,12 +32,7 @@ import org.junit.Rule;
 import org.junit.rules.TestRule;
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
-import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootContextLoader;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
@@ -46,10 +40,6 @@ import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.mock.http.MockHttpInputMessage;
 import org.springframework.mock.http.MockHttpOutputMessage;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultActions;
@@ -58,7 +48,6 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.context.WebApplicationContext;
-import org.thingsboard.server.common.data.BaseData;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfileType;
@@ -68,11 +57,13 @@ import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileConfiguration;
 import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
-import org.thingsboard.server.common.data.device.profile.ProvisionDeviceProfileCredentials;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.MqttTopics;
+import org.thingsboard.server.common.data.device.profile.ProtoTransportPayloadConfiguration;
+import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeConfiguration;
 import org.thingsboard.server.common.data.id.HasId;
-import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.id.UUIDBased;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.security.Authority;
@@ -330,7 +321,7 @@ public abstract class AbstractWebTest {
         }
     }
-    protected DeviceProfile createDeviceProfile(String name) {
+    protected DeviceProfile createDeviceProfile(String name, DeviceProfileTransportConfiguration deviceProfileTransportConfiguration) {
         DeviceProfile deviceProfile = new DeviceProfile();
         deviceProfile.setName(name);
         deviceProfile.setType(DeviceProfileType.DEFAULT);
@@ -338,15 +329,34 @@ public abstract class AbstractWebTest {
         deviceProfile.setDescription(name + " Test");
         DeviceProfileData deviceProfileData = new DeviceProfileData();
         DefaultDeviceProfileConfiguration configuration = new DefaultDeviceProfileConfiguration();
-        DefaultDeviceProfileTransportConfiguration transportConfiguration = new DefaultDeviceProfileTransportConfiguration();
         deviceProfileData.setConfiguration(configuration);
-        deviceProfileData.setTransportConfiguration(transportConfiguration);
+        if (deviceProfileTransportConfiguration != null) {
+            deviceProfileData.setTransportConfiguration(deviceProfileTransportConfiguration);
+        } else {
+            deviceProfileData.setTransportConfiguration(new DefaultDeviceProfileTransportConfiguration());
+        }
         deviceProfile.setProfileData(deviceProfileData);
         deviceProfile.setDefault(false);
         deviceProfile.setDefaultRuleChainId(null);
         return deviceProfile;
     }
+    protected MqttDeviceProfileTransportConfiguration createMqttDeviceProfileTransportConfiguration(TransportPayloadTypeConfiguration transportPayloadTypeConfiguration) {
+        MqttDeviceProfileTransportConfiguration mqttDeviceProfileTransportConfiguration = new MqttDeviceProfileTransportConfiguration();
+        mqttDeviceProfileTransportConfiguration.setDeviceTelemetryTopic(MqttTopics.DEVICE_TELEMETRY_TOPIC);
+        mqttDeviceProfileTransportConfiguration.setDeviceTelemetryTopic(MqttTopics.DEVICE_ATTRIBUTES_TOPIC);
+        mqttDeviceProfileTransportConfiguration.setTransportPayloadTypeConfiguration(transportPayloadTypeConfiguration);
+        return mqttDeviceProfileTransportConfiguration;
+    }
+
+    protected ProtoTransportPayloadConfiguration createProtoTransportPayloadConfiguration(String deviceAttributesProtoSchema, String deviceTelemetryProtoSchema) {
+        ProtoTransportPayloadConfiguration protoTransportPayloadConfiguration = new ProtoTransportPayloadConfiguration();
+        protoTransportPayloadConfiguration.setDeviceAttributesProtoSchema(deviceAttributesProtoSchema);
+        protoTransportPayloadConfiguration.setDeviceTelemetryProtoSchema(deviceTelemetryProtoSchema);
+        return protoTransportPayloadConfiguration;
+    }
+
+
     protected ResultActions doGet(String urlTemplate, Object... urlVariables) throws Exception {
         MockHttpServletRequestBuilder getRequest = get(urlTemplate, urlVariables);
         setJwtToken(getRequest);
--- a/application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java
View file @6b3448d
@@ -16,6 +16,12 @@
 package org.thingsboard.server.controller;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.os72.protobuf.dynamic.DynamicSchema;
+import com.google.protobuf.Descriptors;
+import com.google.protobuf.DynamicMessage;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.util.JsonFormat;
+import com.squareup.wire.schema.internal.parser.ProtoFileElement;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -28,7 +34,10 @@ import org.thingsboard.server.common.data.DeviceProfileType;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.device.profile.ProvisionDeviceProfileCredentials;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.ProtoTransportPayloadConfiguration;
+import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeConfiguration;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.security.Authority;
@@ -36,9 +45,13 @@ import org.thingsboard.server.common.data.security.Authority;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 public abstract class BaseDeviceProfileControllerTest extends AbstractControllerTest {
@@ -78,7 +91,7 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
     @Test
     public void testSaveDeviceProfile() throws Exception {
-        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile");
+        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile", null);
         DeviceProfile savedDeviceProfile = doPost("/api/deviceProfile", deviceProfile, DeviceProfile.class);
         Assert.assertNotNull(savedDeviceProfile);
         Assert.assertNotNull(savedDeviceProfile.getId());
@@ -96,7 +109,7 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
     @Test
     public void testFindDeviceProfileById() throws Exception {
-        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile");
+        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile", null);
         DeviceProfile savedDeviceProfile = doPost("/api/deviceProfile", deviceProfile, DeviceProfile.class);
         DeviceProfile foundDeviceProfile = doGet("/api/deviceProfile/"+savedDeviceProfile.getId().getId().toString(), DeviceProfile.class);
         Assert.assertNotNull(foundDeviceProfile);
@@ -105,7 +118,7 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
     @Test
     public void testFindDeviceProfileInfoById() throws Exception {
-        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile");
+        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile", null);
         DeviceProfile savedDeviceProfile = doPost("/api/deviceProfile", deviceProfile, DeviceProfile.class);
         DeviceProfileInfo foundDeviceProfileInfo = doGet("/api/deviceProfileInfo/"+savedDeviceProfile.getId().getId().toString(), DeviceProfileInfo.class);
         Assert.assertNotNull(foundDeviceProfileInfo);
@@ -127,7 +140,7 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
     @Test
     public void testSetDefaultDeviceProfile() throws Exception {
-        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile 1");
+        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile 1", null);
         DeviceProfile savedDeviceProfile = doPost("/api/deviceProfile", deviceProfile, DeviceProfile.class);
         DeviceProfile defaultDeviceProfile = doPost("/api/deviceProfile/"+savedDeviceProfile.getId().getId().toString()+"/default", null, DeviceProfile.class);
         Assert.assertNotNull(defaultDeviceProfile);
@@ -147,19 +160,19 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
     @Test
     public void testSaveDeviceProfileWithSameName() throws Exception {
-        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile");
+        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile", null);
         doPost("/api/deviceProfile", deviceProfile).andExpect(status().isOk());
-        DeviceProfile deviceProfile2 = this.createDeviceProfile("Device Profile");
+        DeviceProfile deviceProfile2 = this.createDeviceProfile("Device Profile", null);
         doPost("/api/deviceProfile", deviceProfile2).andExpect(status().isBadRequest())
                 .andExpect(statusReason(containsString("Device profile with such name already exists")));
     }
     @Test
     public void testSaveDeviceProfileWithSameProvisionDeviceKey() throws Exception {
-        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile");
+        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile", null);
         deviceProfile.setProvisionDeviceKey("testProvisionDeviceKey");
         doPost("/api/deviceProfile", deviceProfile).andExpect(status().isOk());
-        DeviceProfile deviceProfile2 = this.createDeviceProfile("Device Profile 2");
+        DeviceProfile deviceProfile2 = this.createDeviceProfile("Device Profile 2", null);
         deviceProfile2.setProvisionDeviceKey("testProvisionDeviceKey");
         doPost("/api/deviceProfile", deviceProfile2).andExpect(status().isBadRequest())
                 .andExpect(statusReason(containsString("Device profile with such provision device key already exists")));
@@ -168,7 +181,7 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
     @Ignore
     @Test
     public void testChangeDeviceProfileTypeWithExistingDevices() throws Exception {
-        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile");
+        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile", null);
         DeviceProfile savedDeviceProfile = doPost("/api/deviceProfile", deviceProfile, DeviceProfile.class);
         Device device = new Device();
         device.setName("Test device");
@@ -183,7 +196,7 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
     @Test
     public void testChangeDeviceProfileTransportTypeWithExistingDevices() throws Exception {
-        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile");
+        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile", null);
         DeviceProfile savedDeviceProfile = doPost("/api/deviceProfile", deviceProfile, DeviceProfile.class);
         Device device = new Device();
         device.setName("Test device");
@@ -197,7 +210,7 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
     @Test
     public void testDeleteDeviceProfileWithExistingDevice() throws Exception {
-        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile");
+        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile", null);
         DeviceProfile savedDeviceProfile = doPost("/api/deviceProfile", deviceProfile, DeviceProfile.class);
         Device device = new Device();
@@ -214,7 +227,7 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
     @Test
     public void testDeleteDeviceProfile() throws Exception {
-        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile");
+        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile", null);
         DeviceProfile savedDeviceProfile = doPost("/api/deviceProfile", deviceProfile, DeviceProfile.class);
         doDelete("/api/deviceProfile/" + savedDeviceProfile.getId().getId().toString())
@@ -235,7 +248,7 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
         deviceProfiles.addAll(pageData.getData());
         for (int i=0;i<28;i++) {
-            DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile"+i);
+            DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile"+i, null);
             deviceProfiles.add(doPost("/api/deviceProfile", deviceProfile, DeviceProfile.class));
         }
@@ -280,7 +293,7 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
         deviceProfiles.addAll(deviceProfilePageData.getData());
         for (int i=0;i<28;i++) {
-            DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile"+i);
+            DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile"+i, null);
             deviceProfiles.add(doPost("/api/deviceProfile", deviceProfile, DeviceProfile.class));
         }
@@ -318,4 +331,341 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
         Assert.assertEquals(1, pageData.getTotalElements());
     }
+    @Test
+    public void testSaveProtoDeviceProfileWithInvalidProtoFile() throws Exception {
+        testSaveDeviceProfileWithInvalidProtoSchema("syntax = \"proto3\";\n" +
+                "\n" +
+                "package schemavalidation;\n" +
+                "\n" +
+                "message SchemaValidationTest {\n" +
+                "   required int32 parameter = 1;\n" +
+                "}", "[Transport Configuration] failed to parse attributes proto schema due to: Syntax error in :6:4: 'required' label forbidden in proto3 field declarations");
+    }
+
+    @Test
+    public void testSaveProtoDeviceProfileWithInvalidProtoSyntax() throws Exception {
+        testSaveDeviceProfileWithInvalidProtoSchema("syntax = \"proto2\";\n" +
+                "\n" +
+                "package schemavalidation;\n" +
+                "\n" +
+                "message SchemaValidationTest {\n" +
+                "   required int32 parameter = 1;\n" +
+                "}", "[Transport Configuration] invalid schema syntax: proto2 for attributes proto schema provided! Only proto3 allowed!");
+    }
+
+    @Test
+    public void testSaveProtoDeviceProfileOptionsNotSupported() throws Exception {
+        testSaveDeviceProfileWithInvalidProtoSchema("syntax = \"proto3\";\n" +
+                "\n" +
+                "option java_package = \"com.test.schemavalidation\";\n" +
+                "option java_multiple_files = true;\n" +
+                "\n" +
+                "package schemavalidation;\n" +
+                "\n" +
+                "message SchemaValidationTest {\n" +
+                "   int32 parameter = 1;\n" +
+                "}", "[Transport Configuration] invalid attributes proto schema provided! Schema options don't support!");
+    }
+
+    @Test
+    public void testSaveProtoDeviceProfilePublicImportsNotSupported() throws Exception {
+        testSaveDeviceProfileWithInvalidProtoSchema("syntax = \"proto3\";\n" +
+                "\n" +
+                "import public \"oldschema.proto\";\n" +
+                "\n" +
+                "package schemavalidation;\n" +
+                "\n" +
+                "message SchemaValidationTest {\n" +
+                "   int32 parameter = 1;\n" +
+                "}", "[Transport Configuration] invalid attributes proto schema provided! Schema public imports don't support!");
+    }
+
+    @Test
+    public void testSaveProtoDeviceProfileImportsNotSupported() throws Exception {
+        testSaveDeviceProfileWithInvalidProtoSchema("syntax = \"proto3\";\n" +
+                "\n" +
+                "import \"oldschema.proto\";\n" +
+                "\n" +
+                "package schemavalidation;\n" +
+                "\n" +
+                "message SchemaValidationTest {\n" +
+                "   int32 parameter = 1;\n" +
+                "}", "[Transport Configuration] invalid attributes proto schema provided! Schema imports don't support!");
+    }
+
+    @Test
+    public void testSaveProtoDeviceProfileExtendDeclarationsNotSupported() throws Exception {
+        testSaveDeviceProfileWithInvalidProtoSchema("syntax = \"proto3\";\n" +
+                "\n" +
+                "package schemavalidation;\n" +
+                "\n" +
+                "extend google.protobuf.MethodOptions {\n" +
+                "  MyMessage my_method_option = 50007;\n" +
+                "}", "[Transport Configuration] invalid attributes proto schema provided! Schema extend declarations don't support!");
+    }
+
+    @Test
+    public void testSaveProtoDeviceProfileEnumOptionsNotSupported() throws Exception {
+        testSaveDeviceProfileWithInvalidProtoSchema("syntax = \"proto3\";\n" +
+                "\n" +
+                "package schemavalidation;\n" +
+                "\n" +
+                "enum testEnum {\n" +
+                "   option allow_alias = true;\n" +
+                "   DEFAULT = 0;\n" +
+                "   STARTED = 1;\n" +
+                "   RUNNING = 2;\n" +
+                "}\n" +
+                "\n" +
+                "message testMessage {\n" +
+                "   int32 parameter = 1;\n" +
+                "}", "[Transport Configuration] invalid attributes proto schema provided! Enum definitions options are not supported!");
+    }
+
+    @Test
+    public void testSaveProtoDeviceProfileNoOneMessageTypeExists() throws Exception {
+        testSaveDeviceProfileWithInvalidProtoSchema("syntax = \"proto3\";\n" +
+                "\n" +
+                "package schemavalidation;\n" +
+                "\n" +
+                "enum testEnum {\n" +
+                "   DEFAULT = 0;\n" +
+                "   STARTED = 1;\n" +
+                "   RUNNING = 2;\n" +
+                "}", "[Transport Configuration] invalid attributes proto schema provided! At least one Message definition should exists!");
+    }
+
+    @Test
+    public void testSaveProtoDeviceProfileMessageTypeOptionsNotSupported() throws Exception {
+        testSaveDeviceProfileWithInvalidProtoSchema("syntax = \"proto3\";\n" +
+                "\n" +
+                "package schemavalidation;\n" +
+                "\n" +
+                "message testMessage {\n" +
+                "   option allow_alias = true;\n" +
+                "   int32 parameter = 1;\n" +
+                "}", "[Transport Configuration] invalid attributes proto schema provided! Message definition options don't support!");
+    }
+
+    @Test
+    public void testSaveProtoDeviceProfileMessageTypeExtensionsNotSupported() throws Exception {
+        testSaveDeviceProfileWithInvalidProtoSchema("syntax = \"proto3\";\n" +
+                "\n" +
+                "package schemavalidation;\n" +
+                "\n" +
+                "message TestMessage {\n" +
+                "   extensions 100 to 199;\n" +
+                "}", "[Transport Configuration] invalid attributes proto schema provided! Message definition extensions don't support!");
+    }
+
+    @Test
+    public void testSaveProtoDeviceProfileMessageTypeReservedElementsNotSupported() throws Exception {
+        testSaveDeviceProfileWithInvalidProtoSchema("syntax = \"proto3\";\n" +
+                "\n" +
+                "package schemavalidation;\n" +
+                "\n" +
+                "message Foo {\n" +
+                "  reserved 2, 15, 9 to 11;\n" +
+                "  reserved \"foo\", \"bar\";\n" +
+                "}", "[Transport Configuration] invalid attributes proto schema provided! Message definition reserved elements don't support!");
+    }
+
+    @Test
+    public void testSaveProtoDeviceProfileMessageTypeGroupsElementsNotSupported() throws Exception {
+        testSaveDeviceProfileWithInvalidProtoSchema("syntax = \"proto3\";\n" +
+                "\n" +
+                "package schemavalidation;\n" +
+                "\n" +
+                "message TestMessage {\n" +
+                "  repeated group Result = 1 {\n" +
+                "    string url = 2;\n" +
+                "    string title = 3;\n" +
+                "    repeated string snippets = 4;\n" +
+                "  }\n" +
+                "}", "[Transport Configuration] invalid attributes proto schema provided! Message definition groups don't support!");
+    }
+
+    @Test
+    public void testSaveProtoDeviceProfileOneOfsGroupsElementsNotSupported() throws Exception {
+        testSaveDeviceProfileWithInvalidProtoSchema("syntax = \"proto3\";\n" +
+                "\n" +
+                "package schemavalidation;\n" +
+                "\n" +
+                "message SampleMessage {\n" +
+                "  oneof test_oneof {\n" +
+                "     string name = 1;\n" +
+                "     group Result = 2 {\n" +
+                "    \tstring url = 3;\n" +
+                "    \tstring title = 4;\n" +
+                "    \trepeated string snippets = 5;\n" +
+                "     }\n" +
+                "  }" +
+                "}", "[Transport Configuration] invalid attributes proto schema provided! OneOf definition groups don't support!");
+    }
+
+    @Test
+    public void testSaveProtoDeviceProfileWithMessageNestedTypes() throws Exception {
+        String schema = "syntax = \"proto3\";\n" +
+                "\n" +
+                "package testnested;\n" +
+                "\n" +
+                "message Outer {\n" +
+                "  message MiddleAA {\n" +
+                "    message Inner {\n" +
+                "      int64 ival = 1;\n" +
+                "      bool  booly = 2;\n" +
+                "    }\n" +
+                "    Inner inner = 1;\n" +
+                "  }\n" +
+                "  message MiddleBB {\n" +
+                "    message Inner {\n" +
+                "      int32 ival = 1;\n" +
+                "      bool  booly = 2;\n" +
+                "    }\n" +
+                "    Inner inner = 1;\n" +
+                "  }\n" +
+                "  MiddleAA middleAA = 1;\n" +
+                "  MiddleBB middleBB = 2;\n" +
+                "}";
+        DynamicSchema dynamicSchema = getDynamicSchema(schema);
+        assertNotNull(dynamicSchema);
+        Set<String> messageTypes = dynamicSchema.getMessageTypes();
+        assertEquals(5, messageTypes.size());
+        assertTrue(messageTypes.contains("testnested.Outer"));
+        assertTrue(messageTypes.contains("testnested.Outer.MiddleAA"));
+        assertTrue(messageTypes.contains("testnested.Outer.MiddleAA.Inner"));
+        assertTrue(messageTypes.contains("testnested.Outer.MiddleBB"));
+        assertTrue(messageTypes.contains("testnested.Outer.MiddleBB.Inner"));
+
+        DynamicMessage.Builder middleAAInnerMsgBuilder = dynamicSchema.newMessageBuilder("testnested.Outer.MiddleAA.Inner");
+        Descriptors.Descriptor middleAAInnerMsgDescriptor = middleAAInnerMsgBuilder.getDescriptorForType();
+        DynamicMessage middleAAInnerMsg = middleAAInnerMsgBuilder
+                .setField(middleAAInnerMsgDescriptor.findFieldByName("ival"), 1L)
+                .setField(middleAAInnerMsgDescriptor.findFieldByName("booly"), true)
+                .build();
+
+        DynamicMessage.Builder middleAAMsgBuilder = dynamicSchema.newMessageBuilder("testnested.Outer.MiddleAA");
+        Descriptors.Descriptor middleAAMsgDescriptor = middleAAMsgBuilder.getDescriptorForType();
+        DynamicMessage middleAAMsg = middleAAMsgBuilder
+                .setField(middleAAMsgDescriptor.findFieldByName("inner"), middleAAInnerMsg)
+                .build();
+
+        DynamicMessage.Builder middleBBInnerMsgBuilder = dynamicSchema.newMessageBuilder("testnested.Outer.MiddleAA.Inner");
+        Descriptors.Descriptor middleBBInnerMsgDescriptor = middleBBInnerMsgBuilder.getDescriptorForType();
+        DynamicMessage middleBBInnerMsg = middleBBInnerMsgBuilder
+                .setField(middleBBInnerMsgDescriptor.findFieldByName("ival"), 0L)
+                .setField(middleBBInnerMsgDescriptor.findFieldByName("booly"), false)
+                .build();
+
+        DynamicMessage.Builder middleBBMsgBuilder = dynamicSchema.newMessageBuilder("testnested.Outer.MiddleBB");
+        Descriptors.Descriptor middleBBMsgDescriptor = middleBBMsgBuilder.getDescriptorForType();
+        DynamicMessage middleBBMsg = middleBBMsgBuilder
+                .setField(middleBBMsgDescriptor.findFieldByName("inner"), middleBBInnerMsg)
+                .build();
+
+
+        DynamicMessage.Builder outerMsgBuilder = dynamicSchema.newMessageBuilder("testnested.Outer");
+        Descriptors.Descriptor outerMsgBuilderDescriptor = outerMsgBuilder.getDescriptorForType();
+        DynamicMessage outerMsg = outerMsgBuilder
+                .setField(outerMsgBuilderDescriptor.findFieldByName("middleAA"), middleAAMsg)
+                .setField(outerMsgBuilderDescriptor.findFieldByName("middleBB"), middleBBMsg)
+                .build();
+
+        assertEquals("{\n" +
+                "  \"middleAA\": {\n" +
+                "    \"inner\": {\n" +
+                "      \"ival\": \"1\",\n" +
+                "      \"booly\": true\n" +
+                "    }\n" +
+                "  },\n" +
+                "  \"middleBB\": {\n" +
+                "    \"inner\": {\n" +
+                "      \"ival\": 0,\n" +
+                "      \"booly\": false\n" +
+                "    }\n" +
+                "  }\n" +
+                "}", dynamicMsgToJson(outerMsgBuilderDescriptor, outerMsg.toByteArray()));
+    }
+
+    @Test
+    public void testSaveProtoDeviceProfileWithMessageOneOfs() throws Exception {
+        String schema = "syntax = \"proto3\";\n" +
+                "\n" +
+                "package testoneofs;\n" +
+                "\n" +
+                "message SubMessage {\n" +
+                "   repeated string name = 1;\n" +
+                "}\n" +
+                "\n" +
+                "message SampleMessage {\n" +
+                "  oneof testOneOf {\n" +
+                "     string name = 4;\n" +
+                "     SubMessage subMessage = 9;\n" +
+                "  }\n" +
+                "}";
+        DynamicSchema dynamicSchema = getDynamicSchema(schema);
+        assertNotNull(dynamicSchema);
+        Set<String> messageTypes = dynamicSchema.getMessageTypes();
+        assertEquals(2, messageTypes.size());
+        assertTrue(messageTypes.contains("testoneofs.SubMessage"));
+        assertTrue(messageTypes.contains("testoneofs.SampleMessage"));
+
+        DynamicMessage.Builder sampleMsgBuilder = dynamicSchema.newMessageBuilder("testoneofs.SampleMessage");
+        Descriptors.Descriptor sampleMsgDescriptor = sampleMsgBuilder.getDescriptorForType();
+        assertNotNull(sampleMsgDescriptor);
+
+        List<Descriptors.FieldDescriptor> fields = sampleMsgDescriptor.getFields();
+        assertEquals(2, fields.size());
+        DynamicMessage sampleMsg = sampleMsgBuilder
+                .setField(sampleMsgDescriptor.findFieldByName("name"), "Bob")
+                .build();
+        assertEquals("{\n" + "  \"name\": \"Bob\"\n" + "}", dynamicMsgToJson(sampleMsgDescriptor, sampleMsg.toByteArray()));
+
+        DynamicMessage.Builder subMsgBuilder = dynamicSchema.newMessageBuilder("testoneofs.SubMessage");
+        Descriptors.Descriptor subMsgDescriptor = subMsgBuilder.getDescriptorForType();
+        DynamicMessage subMsg = subMsgBuilder
+                .addRepeatedField(subMsgDescriptor.findFieldByName("name"), "Alice")
+                .addRepeatedField(subMsgDescriptor.findFieldByName("name"), "John")
+                .build();
+
+        DynamicMessage sampleMsgWithOneOfSubMessage = sampleMsgBuilder.setField(sampleMsgDescriptor.findFieldByName("subMessage"), subMsg).build();
+        assertEquals("{\n" + "  \"subMessage\": {\n" + "    \"name\": [\"Alice\", \"John\"]\n" + "  }\n" + "}",
+                dynamicMsgToJson(sampleMsgDescriptor, sampleMsgWithOneOfSubMessage.toByteArray()));
+    }
+
+    private DeviceProfile testSaveDeviceProfileWithProtoPayloadType(String schema) throws Exception {
+        ProtoTransportPayloadConfiguration protoTransportPayloadConfiguration = this.createProtoTransportPayloadConfiguration(schema, schema);
+        MqttDeviceProfileTransportConfiguration mqttDeviceProfileTransportConfiguration = this.createMqttDeviceProfileTransportConfiguration(protoTransportPayloadConfiguration);
+        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile", mqttDeviceProfileTransportConfiguration);
+        DeviceProfile savedDeviceProfile = doPost("/api/deviceProfile", deviceProfile, DeviceProfile.class);
+        DeviceProfile foundDeviceProfile = doGet("/api/deviceProfile/"+savedDeviceProfile.getId().getId().toString(), DeviceProfile.class);
+        Assert.assertEquals(savedDeviceProfile.getName(), foundDeviceProfile.getName());
+        return savedDeviceProfile;
+    }
+
+    private void testSaveDeviceProfileWithInvalidProtoSchema(String schema, String errorMsg) throws Exception {
+        ProtoTransportPayloadConfiguration protoTransportPayloadConfiguration = this.createProtoTransportPayloadConfiguration(schema, schema);
+        MqttDeviceProfileTransportConfiguration mqttDeviceProfileTransportConfiguration = this.createMqttDeviceProfileTransportConfiguration(protoTransportPayloadConfiguration);
+        DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile", mqttDeviceProfileTransportConfiguration);
+        doPost("/api/deviceProfile", deviceProfile).andExpect(status().isBadRequest())
+                .andExpect(statusReason(containsString(errorMsg)));
+    }
+
+    private DynamicSchema getDynamicSchema(String schema) throws Exception {
+        DeviceProfile deviceProfile = testSaveDeviceProfileWithProtoPayloadType(schema);
+        DeviceProfileTransportConfiguration transportConfiguration = deviceProfile.getProfileData().getTransportConfiguration();
+        assertTrue(transportConfiguration instanceof MqttDeviceProfileTransportConfiguration);
+        MqttDeviceProfileTransportConfiguration mqttDeviceProfileTransportConfiguration = (MqttDeviceProfileTransportConfiguration) transportConfiguration;
+        TransportPayloadTypeConfiguration transportPayloadTypeConfiguration = mqttDeviceProfileTransportConfiguration.getTransportPayloadTypeConfiguration();
+        assertTrue(transportPayloadTypeConfiguration instanceof ProtoTransportPayloadConfiguration);
+        ProtoTransportPayloadConfiguration protoTransportPayloadConfiguration = (ProtoTransportPayloadConfiguration) transportPayloadTypeConfiguration;
+        ProtoFileElement protoFile = protoTransportPayloadConfiguration.getTransportProtoSchema(schema);
+        return protoTransportPayloadConfiguration.getDynamicSchema(protoFile, ProtoTransportPayloadConfiguration.ATTRIBUTES_PROTO_SCHEMA);
+    }
+
+    private String dynamicMsgToJson(Descriptors.Descriptor descriptor, byte[] payload) throws InvalidProtocolBufferException {
+        DynamicMessage dynamicMessage = DynamicMessage.parseFrom(descriptor, payload);
+        return JsonFormat.printer().includingDefaultValueFields().print(dynamicMessage);
+    }
+
 }
--- a/application/src/test/java/org/thingsboard/server/mqtt/AbstractMqttIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/AbstractMqttIntegrationTest.java
View file @6b3448d
@@ -38,7 +38,10 @@ import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileCon
 import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileProvisionConfiguration;
 import org.thingsboard.server.common.data.device.profile.DisabledDeviceProfileProvisionConfiguration;
+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.ProtoTransportPayloadConfiguration;
+import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeConfiguration;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.controller.AbstractControllerTest;
@@ -47,7 +50,6 @@ import org.thingsboard.server.gen.transport.TransportProtos;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Supplier;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -60,6 +62,48 @@ public abstract class AbstractMqttIntegrationTest extends AbstractControllerTest
     private static final AtomicInteger atomicInteger = new AtomicInteger(2);
+    public static final String DEVICE_TELEMETRY_PROTO_SCHEMA = "syntax =\"proto3\";\n" +
+            "\n" +
+            "package test;\n" +
+            "\n" +
+            "message PostTelemetry {\n" +
+            "  string key1 = 1;\n" +
+            "  bool key2 = 2;\n" +
+            "  double key3 = 3;\n" +
+            "  int32 key4 = 4;\n" +
+            "  JsonObject key5 = 5;\n" +
+            "\n" +
+            "  message JsonObject {\n" +
+            "    int32 someNumber = 6;\n" +
+            "    repeated int32 someArray = 7;\n" +
+            "    NestedJsonObject someNestedObject = 8;\n" +
+            "    message NestedJsonObject {\n" +
+            "       string key = 9;\n" +
+            "    }\n" +
+            "  }\n" +
+            "}";
+
+    public static final String DEVICE_ATTRIBUTES_PROTO_SCHEMA = "syntax =\"proto3\";\n" +
+            "\n" +
+            "package test;\n" +
+            "\n" +
+            "message PostAttributes {\n" +
+            "  string key1 = 1;\n" +
+            "  bool key2 = 2;\n" +
+            "  double key3 = 3;\n" +
+            "  int32 key4 = 4;\n" +
+            "  JsonObject key5 = 5;\n" +
+            "\n" +
+            "  message JsonObject {\n" +
+            "    int32 someNumber = 6;\n" +
+            "    repeated int32 someArray = 7;\n" +
+            "    NestedJsonObject someNestedObject = 8;\n" +
+            "    message NestedJsonObject {\n" +
+            "       string key = 9;\n" +
+            "    }\n" +
+            "  }\n" +
+            "}";
+
     protected Tenant savedTenant;
     protected User tenantAdmin;
@@ -69,8 +113,10 @@ public abstract class AbstractMqttIntegrationTest extends AbstractControllerTest
     protected Device savedGateway;
     protected String gatewayAccessToken;
+    protected DeviceProfile deviceProfile;
+
     protected void processBeforeTest (String deviceName, String gatewayName, TransportPayloadType payloadType, String telemetryTopic, String attributesTopic) throws Exception {
-        this.processBeforeTest(deviceName, gatewayName, payloadType, telemetryTopic, attributesTopic, DeviceProfileProvisionType.DISABLED, null, null);
+        this.processBeforeTest(deviceName, gatewayName, payloadType, telemetryTopic, attributesTopic, null, null, DeviceProfileProvisionType.DISABLED, null, null);
     }
     protected void processBeforeTest(String deviceName,
@@ -78,6 +124,8 @@ public abstract class AbstractMqttIntegrationTest extends AbstractControllerTest
                                      TransportPayloadType payloadType,
                                      String telemetryTopic,
                                      String attributesTopic,
+                                     String telemetryProtoSchema,
+                                     String attributesProtoSchema,
                                      DeviceProfileProvisionType provisionType,
                                      String provisionKey, String provisionSecret
                                      ) throws Exception {
@@ -109,12 +157,12 @@ public abstract class AbstractMqttIntegrationTest extends AbstractControllerTest
         gateway.setAdditionalInfo(additionalInfo);
         if (payloadType != null) {
-            DeviceProfile mqttDeviceProfile = createMqttDeviceProfile(payloadType, telemetryTopic, attributesTopic, provisionType, provisionKey, provisionSecret);
-            DeviceProfile savedDeviceProfile = doPost("/api/deviceProfile", mqttDeviceProfile, DeviceProfile.class);
-            device.setType(savedDeviceProfile.getName());
-            device.setDeviceProfileId(savedDeviceProfile.getId());
-            gateway.setType(savedDeviceProfile.getName());
-            gateway.setDeviceProfileId(savedDeviceProfile.getId());
+            DeviceProfile mqttDeviceProfile = createMqttDeviceProfile(payloadType, telemetryTopic, attributesTopic, telemetryProtoSchema, attributesProtoSchema, provisionType, provisionKey, provisionSecret);
+            deviceProfile = doPost("/api/deviceProfile", mqttDeviceProfile, DeviceProfile.class);
+            device.setType(deviceProfile.getName());
+            device.setDeviceProfileId(deviceProfile.getId());
+            gateway.setType(deviceProfile.getName());
+            gateway.setDeviceProfileId(deviceProfile.getId());
         }
         savedDevice = doPost("/api/device", device, Device.class);
@@ -201,9 +249,9 @@ public abstract class AbstractMqttIntegrationTest extends AbstractControllerTest
     protected DeviceProfile createMqttDeviceProfile(TransportPayloadType transportPayloadType,
                                                     String telemetryTopic, String attributesTopic,
+                                                    String telemetryProtoSchema, String attributesProtoSchema,
                                                     DeviceProfileProvisionType provisionType,
-                                                    String provisionKey, String provisionSecret
-    ) {
+                                                    String provisionKey, String provisionSecret) {
         DeviceProfile deviceProfile = new DeviceProfile();
         deviceProfile.setName(transportPayloadType.name());
         deviceProfile.setType(DeviceProfileType.DEFAULT);
@@ -213,15 +261,30 @@ public abstract class AbstractMqttIntegrationTest extends AbstractControllerTest
         deviceProfile.setDescription(transportPayloadType.name() + " Test");
         DeviceProfileData deviceProfileData = new DeviceProfileData();
         DefaultDeviceProfileConfiguration configuration = new DefaultDeviceProfileConfiguration();
-        MqttDeviceProfileTransportConfiguration transportConfiguration = new MqttDeviceProfileTransportConfiguration();
-        transportConfiguration.setTransportPayloadType(transportPayloadType);
+        MqttDeviceProfileTransportConfiguration mqttDeviceProfileTransportConfiguration = new MqttDeviceProfileTransportConfiguration();
         if (!StringUtils.isEmpty(telemetryTopic)) {
-            transportConfiguration.setDeviceTelemetryTopic(telemetryTopic);
+            mqttDeviceProfileTransportConfiguration.setDeviceTelemetryTopic(telemetryTopic);
         }
         if (!StringUtils.isEmpty(attributesTopic)) {
-            transportConfiguration.setDeviceAttributesTopic(attributesTopic);
+            mqttDeviceProfileTransportConfiguration.setDeviceAttributesTopic(attributesTopic);
         }
-        deviceProfileData.setTransportConfiguration(transportConfiguration);
+        TransportPayloadTypeConfiguration transportPayloadTypeConfiguration;
+        if (TransportPayloadType.JSON.equals(transportPayloadType)) {
+            transportPayloadTypeConfiguration = new JsonTransportPayloadConfiguration();
+        } else {
+            ProtoTransportPayloadConfiguration protoTransportPayloadConfiguration = new ProtoTransportPayloadConfiguration();
+            if (StringUtils.isEmpty(telemetryProtoSchema)) {
+                telemetryProtoSchema = DEVICE_TELEMETRY_PROTO_SCHEMA;
+            }
+            if (StringUtils.isEmpty(attributesProtoSchema)) {
+                attributesProtoSchema = DEVICE_ATTRIBUTES_PROTO_SCHEMA;
+            }
+            protoTransportPayloadConfiguration.setDeviceTelemetryProtoSchema(telemetryProtoSchema);
+            protoTransportPayloadConfiguration.setDeviceAttributesProtoSchema(attributesProtoSchema);
+            transportPayloadTypeConfiguration = protoTransportPayloadConfiguration;
+        }
+        mqttDeviceProfileTransportConfiguration.setTransportPayloadTypeConfiguration(transportPayloadTypeConfiguration);
+        deviceProfileData.setTransportConfiguration(mqttDeviceProfileTransportConfiguration);
         DeviceProfileProvisionConfiguration provisionConfiguration;
         switch (provisionType) {
             case ALLOW_CREATE_NEW_DEVICES:
@@ -233,6 +296,7 @@ public abstract class AbstractMqttIntegrationTest extends AbstractControllerTest
             case DISABLED:
             default:
                 provisionConfiguration = new DisabledDeviceProfileProvisionConfiguration(provisionSecret);
+                break;
         }
         deviceProfileData.setProvisionConfiguration(provisionConfiguration);
         deviceProfileData.setConfiguration(configuration);
--- a/application/src/test/java/org/thingsboard/server/mqtt/attributes/AbstractMqttAttributesIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/attributes/AbstractMqttAttributesIntegrationTest.java
View file @6b3448d
@@ -56,7 +56,6 @@ public abstract class AbstractMqttAttributesIntegrationTest extends AbstractMqtt
         return tsKvProtoList;
     }
-
     protected TransportProtos.TsKvProto getTsKvProto(String key, String value, TransportProtos.KeyValueType keyValueType) {
         TransportProtos.TsKvProto.Builder tsKvProtoBuilder = TransportProtos.TsKvProto.newBuilder();
         TransportProtos.KeyValueProto keyValueProto = getKeyValueProto(key, value, keyValueType);
--- a/application/src/test/java/org/thingsboard/server/mqtt/attributes/request/AbstractMqttAttributesRequestIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/attributes/request/AbstractMqttAttributesRequestIntegrationTest.java
View file @6b3448d
@@ -18,9 +18,7 @@ package org.thingsboard.server.mqtt.attributes.request;
 import com.google.protobuf.InvalidProtocolBufferException;
 import io.netty.handler.codec.mqtt.MqttQoS;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
-import org.eclipse.paho.client.mqttv3.MqttCallback;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.junit.After;
@@ -36,9 +34,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 @Slf4j
--- a/application/src/test/java/org/thingsboard/server/mqtt/attributes/request/AbstractMqttAttributesRequestJsonIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/attributes/request/AbstractMqttAttributesRequestJsonIntegrationTest.java
View file @6b3448d
@@ -18,14 +18,9 @@ package org.thingsboard.server.mqtt.attributes.request;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.thingsboard.server.common.data.TransportPayloadType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 @Slf4j
 public abstract class AbstractMqttAttributesRequestJsonIntegrationTest extends AbstractMqttAttributesRequestIntegrationTest {
--- a/application/src/test/java/org/thingsboard/server/mqtt/attributes/request/AbstractMqttAttributesRequestProtoIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/attributes/request/AbstractMqttAttributesRequestProtoIntegrationTest.java
View file @6b3448d
@@ -15,18 +15,26 @@
  */
 package org.thingsboard.server.mqtt.attributes.request;
+import com.github.os72.protobuf.dynamic.DynamicSchema;
+import com.google.protobuf.Descriptors;
+import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.InvalidProtocolBufferException;
+import com.squareup.wire.schema.internal.parser.ProtoFileElement;
 import io.netty.handler.codec.mqtt.MqttQoS;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.DeviceProfileProvisionType;
 import org.thingsboard.server.common.data.TransportPayloadType;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.ProtoTransportPayloadConfiguration;
 import org.thingsboard.server.common.data.device.profile.MqttTopics;
+import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeConfiguration;
 import org.thingsboard.server.gen.transport.TransportApiProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
@@ -38,16 +46,33 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 @Slf4j
 public abstract class AbstractMqttAttributesRequestProtoIntegrationTest extends AbstractMqttAttributesRequestIntegrationTest {
-    @Before
-    public void beforeTest() throws Exception {
-        processBeforeTest("Test Request attribute values from the server proto", "Gateway Test Request attribute values from the server proto", TransportPayloadType.PROTOBUF, null, null);
-    }
+    public static final String ATTRIBUTES_SCHEMA_STR = "syntax =\"proto3\";\n" +
+            "\n" +
+            "package test;\n" +
+            "\n" +
+            "message PostAttributes {\n" +
+            "  string attribute1 = 1;\n" +
+            "  bool attribute2 = 2;\n" +
+            "  double attribute3 = 3;\n" +
+            "  int32 attribute4 = 4;\n" +
+            "  JsonObject attribute5 = 5;\n" +
+            "\n" +
+            "  message JsonObject {\n" +
+            "    int32 someNumber = 6;\n" +
+            "    repeated int32 someArray = 7;\n" +
+            "    NestedJsonObject someNestedObject = 8;\n" +
+            "    message NestedJsonObject {\n" +
+            "       string key = 9;\n" +
+            "    }\n" +
+            "  }\n" +
+            "}";
     @After
     public void afterTest() throws Exception {
@@ -56,21 +81,55 @@ public abstract class AbstractMqttAttributesRequestProtoIntegrationTest extends 
     @Test
     public void testRequestAttributesValuesFromTheServer() throws Exception {
+        super.processBeforeTest("Test Request attribute values from the server proto", "Gateway Test Request attribute values from the server proto",
+                TransportPayloadType.PROTOBUF, null, null, null, ATTRIBUTES_SCHEMA_STR, DeviceProfileProvisionType.DISABLED, null, null);
         processTestRequestAttributesValuesFromTheServer();
     }
-
     @Test
     public void testRequestAttributesValuesFromTheServerGateway() throws Exception {
+        super.processBeforeTest("Test Request attribute values from the server proto", "Gateway Test Request attribute values from the server proto", TransportPayloadType.PROTOBUF, null, null);
         processTestGatewayRequestAttributesValuesFromTheServer();
     }
     protected void postAttributesAndSubscribeToTopic(Device savedDevice, MqttAsyncClient client) throws Exception {
         doPostAsync("/api/plugins/telemetry/DEVICE/" + savedDevice.getId().getId() + "/attributes/SHARED_SCOPE", POST_ATTRIBUTES_PAYLOAD, String.class, status().isOk());
-        String keys = "attribute1,attribute2,attribute3,attribute4,attribute5";
-        List<String> expectedKeys = Arrays.asList(keys.split(","));
-        TransportProtos.PostAttributeMsg postAttributeMsg = getPostAttributeMsg(expectedKeys);
-        byte[] payload = postAttributeMsg.toByteArray();
+        DeviceProfileTransportConfiguration transportConfiguration = deviceProfile.getProfileData().getTransportConfiguration();
+        assertTrue(transportConfiguration instanceof MqttDeviceProfileTransportConfiguration);
+        MqttDeviceProfileTransportConfiguration mqttTransportConfiguration = (MqttDeviceProfileTransportConfiguration) transportConfiguration;
+        TransportPayloadTypeConfiguration transportPayloadTypeConfiguration = mqttTransportConfiguration.getTransportPayloadTypeConfiguration();
+        assertTrue(transportPayloadTypeConfiguration instanceof ProtoTransportPayloadConfiguration);
+        ProtoTransportPayloadConfiguration protoTransportPayloadConfiguration = (ProtoTransportPayloadConfiguration) transportPayloadTypeConfiguration;
+        ProtoFileElement transportProtoSchema = protoTransportPayloadConfiguration.getTransportProtoSchema(ATTRIBUTES_SCHEMA_STR);
+        DynamicSchema attributesSchema = protoTransportPayloadConfiguration.getDynamicSchema(transportProtoSchema, ProtoTransportPayloadConfiguration.ATTRIBUTES_PROTO_SCHEMA);
+
+        DynamicMessage.Builder nestedJsonObjectBuilder = attributesSchema.newMessageBuilder("PostAttributes.JsonObject.NestedJsonObject");
+        Descriptors.Descriptor nestedJsonObjectBuilderDescriptor = nestedJsonObjectBuilder.getDescriptorForType();
+        assertNotNull(nestedJsonObjectBuilderDescriptor);
+        DynamicMessage nestedJsonObject = nestedJsonObjectBuilder.setField(nestedJsonObjectBuilderDescriptor.findFieldByName("key"), "value").build();
+
+        DynamicMessage.Builder jsonObjectBuilder = attributesSchema.newMessageBuilder("PostAttributes.JsonObject");
+        Descriptors.Descriptor jsonObjectBuilderDescriptor = jsonObjectBuilder.getDescriptorForType();
+        assertNotNull(jsonObjectBuilderDescriptor);
+        DynamicMessage jsonObject = jsonObjectBuilder
+                .setField(jsonObjectBuilderDescriptor.findFieldByName("someNumber"), 42)
+                .addRepeatedField(jsonObjectBuilderDescriptor.findFieldByName("someArray"), 1)
+                .addRepeatedField(jsonObjectBuilderDescriptor.findFieldByName("someArray"), 2)
+                .addRepeatedField(jsonObjectBuilderDescriptor.findFieldByName("someArray"), 3)
+                .setField(jsonObjectBuilderDescriptor.findFieldByName("someNestedObject"), nestedJsonObject)
+                .build();
+
+        DynamicMessage.Builder postAttributesBuilder = attributesSchema.newMessageBuilder("PostAttributes");
+        Descriptors.Descriptor postAttributesMsgDescriptor = postAttributesBuilder.getDescriptorForType();
+        assertNotNull(postAttributesMsgDescriptor);
+        DynamicMessage postAttributesMsg = postAttributesBuilder
+                .setField(postAttributesMsgDescriptor.findFieldByName("attribute1"), "value1")
+                .setField(postAttributesMsgDescriptor.findFieldByName("attribute2"), true)
+                .setField(postAttributesMsgDescriptor.findFieldByName("attribute3"), 42.0)
+                .setField(postAttributesMsgDescriptor.findFieldByName("attribute4"), 73)
+                .setField(postAttributesMsgDescriptor.findFieldByName("attribute5"), jsonObject)
+                .build();
+        byte[] payload = postAttributesMsg.toByteArray();
         client.publish(MqttTopics.DEVICE_ATTRIBUTES_TOPIC, new MqttMessage(payload));
         client.subscribe(MqttTopics.DEVICE_ATTRIBUTES_RESPONSES_TOPIC, MqttQoS.AT_MOST_ONCE.value());
     }
--- a/application/src/test/java/org/thingsboard/server/mqtt/attributes/request/sql/MqttAttributesRequestJsonSqlIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/attributes/request/sql/MqttAttributesRequestJsonSqlIntegrationTest.java
View file @6b3448d
@@ -16,7 +16,6 @@
 package org.thingsboard.server.mqtt.attributes.request.sql;
 import org.thingsboard.server.dao.service.DaoSqlTest;
-import org.thingsboard.server.mqtt.attributes.request.AbstractMqttAttributesRequestIntegrationTest;
 import org.thingsboard.server.mqtt.attributes.request.AbstractMqttAttributesRequestJsonIntegrationTest;
 @DaoSqlTest
--- a/application/src/test/java/org/thingsboard/server/mqtt/attributes/request/sql/MqttAttributesRequestProtoSqlIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/attributes/request/sql/MqttAttributesRequestProtoSqlIntegrationTest.java
View file @6b3448d
@@ -16,7 +16,6 @@
 package org.thingsboard.server.mqtt.attributes.request.sql;
 import org.thingsboard.server.dao.service.DaoSqlTest;
-import org.thingsboard.server.mqtt.attributes.request.AbstractMqttAttributesRequestJsonIntegrationTest;
 import org.thingsboard.server.mqtt.attributes.request.AbstractMqttAttributesRequestProtoIntegrationTest;
 @DaoSqlTest
--- a/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesIntegrationTest.java
View file @6b3448d
@@ -18,11 +18,7 @@ package org.thingsboard.server.mqtt.attributes.updates;
 import com.google.protobuf.InvalidProtocolBufferException;
 import io.netty.handler.codec.mqtt.MqttQoS;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
-import org.eclipse.paho.client.mqttv3.MqttCallback;
-import org.eclipse.paho.client.mqttv3.MqttException;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -33,12 +29,10 @@ import org.thingsboard.server.dao.util.mapping.JacksonUtil;
 import org.thingsboard.server.mqtt.attributes.AbstractMqttAttributesIntegrationTest;
 import java.nio.charset.StandardCharsets;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 @Slf4j
--- a/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesJsonIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesJsonIntegrationTest.java
View file @6b3448d
@@ -21,11 +21,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.thingsboard.server.common.data.TransportPayloadType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 @Slf4j
 public abstract class AbstractMqttAttributesUpdatesJsonIntegrationTest extends AbstractMqttAttributesUpdatesIntegrationTest {
--- a/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesProtoIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/AbstractMqttAttributesUpdatesProtoIntegrationTest.java
View file @6b3448d
@@ -21,11 +21,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.thingsboard.server.common.data.TransportPayloadType;
-import org.thingsboard.server.common.data.device.profile.MqttTopics;
 import org.thingsboard.server.gen.transport.TransportApiProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.stream.Collectors;
--- a/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/sql/MqttAttributesUpdatesSqlJsonIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/sql/MqttAttributesUpdatesSqlJsonIntegrationTest.java
View file @6b3448d
@@ -16,7 +16,6 @@
 package org.thingsboard.server.mqtt.attributes.updates.sql;
 import org.thingsboard.server.dao.service.DaoSqlTest;
-import org.thingsboard.server.mqtt.attributes.updates.AbstractMqttAttributesUpdatesIntegrationTest;
 import org.thingsboard.server.mqtt.attributes.updates.AbstractMqttAttributesUpdatesJsonIntegrationTest;
 @DaoSqlTest
--- a/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/sql/MqttAttributesUpdatesSqlProtoIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/attributes/updates/sql/MqttAttributesUpdatesSqlProtoIntegrationTest.java
View file @6b3448d
@@ -16,7 +16,6 @@
 package org.thingsboard.server.mqtt.attributes.updates.sql;
 import org.thingsboard.server.dao.service.DaoSqlTest;
-import org.thingsboard.server.mqtt.attributes.updates.AbstractMqttAttributesUpdatesJsonIntegrationTest;
 import org.thingsboard.server.mqtt.attributes.updates.AbstractMqttAttributesUpdatesProtoIntegrationTest;
 @DaoSqlTest
--- a/application/src/test/java/org/thingsboard/server/mqtt/claim/AbstractMqttClaimDeviceTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/claim/AbstractMqttClaimDeviceTest.java
View file @6b3448d
@@ -20,7 +20,6 @@ import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.thingsboard.server.common.data.ClaimRequest;
 import org.thingsboard.server.common.data.Customer;
--- a/application/src/test/java/org/thingsboard/server/mqtt/claim/AbstractMqttClaimJsonDeviceTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/claim/AbstractMqttClaimJsonDeviceTest.java
View file @6b3448d
@@ -18,7 +18,6 @@ package org.thingsboard.server.mqtt.claim;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.thingsboard.server.common.data.TransportPayloadType;
--- a/application/src/test/java/org/thingsboard/server/mqtt/claim/AbstractMqttClaimProtoDeviceTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/claim/AbstractMqttClaimProtoDeviceTest.java
View file @6b3448d
@@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.thingsboard.server.common.data.TransportPayloadType;
 import org.thingsboard.server.gen.transport.TransportApiProtos;
--- a/application/src/test/java/org/thingsboard/server/mqtt/claim/sql/MqttClaimDeviceJsonSqlTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/claim/sql/MqttClaimDeviceJsonSqlTest.java
View file @6b3448d
@@ -16,7 +16,6 @@
 package org.thingsboard.server.mqtt.claim.sql;
 import org.thingsboard.server.dao.service.DaoSqlTest;
-import org.thingsboard.server.mqtt.claim.AbstractMqttClaimDeviceTest;
 import org.thingsboard.server.mqtt.claim.AbstractMqttClaimJsonDeviceTest;
 @DaoSqlTest
--- a/application/src/test/java/org/thingsboard/server/mqtt/claim/sql/MqttClaimDeviceProtoSqlTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/claim/sql/MqttClaimDeviceProtoSqlTest.java
View file @6b3448d
@@ -16,7 +16,6 @@
 package org.thingsboard.server.mqtt.claim.sql;
 import org.thingsboard.server.dao.service.DaoSqlTest;
-import org.thingsboard.server.mqtt.claim.AbstractMqttClaimJsonDeviceTest;
 import org.thingsboard.server.mqtt.claim.AbstractMqttClaimProtoDeviceTest;
 @DaoSqlTest
--- a/application/src/test/java/org/thingsboard/server/mqtt/provision/AbstractMqttProvisionJsonDeviceTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/provision/AbstractMqttProvisionJsonDeviceTest.java
View file @6b3448d
@@ -94,34 +94,32 @@ public abstract class AbstractMqttProvisionJsonDeviceTest extends AbstractMqttIn
     protected void processTestProvisioningDisabledDevice() throws Exception {
-        super.processBeforeTest("Test Provision device", "Test Provision gateway", TransportPayloadType.JSON, null, null, DeviceProfileProvisionType.DISABLED, null, null);
+        super.processBeforeTest("Test Provision device", "Test Provision gateway", TransportPayloadType.JSON, null, null, null, null, DeviceProfileProvisionType.DISABLED, null, null);
         byte[] result = createMqttClientAndPublish().getPayloadBytes();
         JsonObject response = JsonUtils.parse(new String(result)).getAsJsonObject();
         Assert.assertEquals("Provision data was not found!", response.get("errorMsg").getAsString());
-        Assert.assertEquals(ProvisionResponseStatus.NOT_FOUND.name(), response.get("provisionDeviceStatus").getAsString());
+        Assert.assertEquals(ProvisionResponseStatus.NOT_FOUND.name(), response.get("status").getAsString());
     }
     protected void processTestProvisioningCreateNewDeviceWithoutCredentials() throws Exception {
-        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.JSON, null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
+        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.JSON, null, null, null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
         byte[] result = createMqttClientAndPublish().getPayloadBytes();
         JsonObject response = JsonUtils.parse(new String(result)).getAsJsonObject();
         Device createdDevice = deviceService.findDeviceByTenantIdAndName(savedTenant.getTenantId(), "Test Provision device");
         Assert.assertNotNull(createdDevice);
-        Assert.assertEquals(createdDevice.getId().toString(), response.get("deviceId").getAsString());
         DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedTenant.getTenantId(), createdDevice.getId());
         Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.get("credentialsType").getAsString());
-        Assert.assertEquals(deviceCredentials.getCredentialsId(), response.get("credentialsId").getAsString());
-        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.get("provisionDeviceStatus").getAsString());
+        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.get("status").getAsString());
     }
     protected void processTestProvisioningCreateNewDeviceWithAccessToken() throws Exception {
-        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.JSON, null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
+        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.JSON, null, null, null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
         String requestCredentials = ",\"credentialsType\": \"ACCESS_TOKEN\",\"token\": \"test_token\"";
         byte[] result = createMqttClientAndPublish(requestCredentials).getPayloadBytes();
         JsonObject response = JsonUtils.parse(new String(result)).getAsJsonObject();
@@ -129,20 +127,18 @@ public abstract class AbstractMqttProvisionJsonDeviceTest extends AbstractMqttIn
         Device createdDevice = deviceService.findDeviceByTenantIdAndName(savedTenant.getTenantId(), "Test Provision device");
         Assert.assertNotNull(createdDevice);
-        Assert.assertEquals(createdDevice.getId().toString(), response.get("deviceId").getAsString());
         DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedTenant.getTenantId(), createdDevice.getId());
         Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.get("credentialsType").getAsString());
-        Assert.assertEquals(deviceCredentials.getCredentialsId(), response.get("credentialsId").getAsString());
         Assert.assertEquals(deviceCredentials.getCredentialsType().name(), "ACCESS_TOKEN");
         Assert.assertEquals(deviceCredentials.getCredentialsId(), "test_token");
-        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.get("provisionDeviceStatus").getAsString());
+        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.get("status").getAsString());
     }
     protected void processTestProvisioningCreateNewDeviceWithCert() throws Exception {
-        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.JSON, null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
+        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.JSON, null, null, null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
         String requestCredentials = ",\"credentialsType\": \"X509_CERTIFICATE\",\"hash\": \"testHash\"";
         byte[] result = createMqttClientAndPublish(requestCredentials).getPayloadBytes();
         JsonObject response = JsonUtils.parse(new String(result)).getAsJsonObject();
@@ -150,12 +146,10 @@ public abstract class AbstractMqttProvisionJsonDeviceTest extends AbstractMqttIn
         Device createdDevice = deviceService.findDeviceByTenantIdAndName(savedTenant.getTenantId(), "Test Provision device");
         Assert.assertNotNull(createdDevice);
-        Assert.assertEquals(createdDevice.getId().toString(), response.get("deviceId").getAsString());
         DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedTenant.getTenantId(), createdDevice.getId());
         Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.get("credentialsType").getAsString());
-        Assert.assertEquals(deviceCredentials.getCredentialsId(), response.get("credentialsId").getAsString());
         Assert.assertEquals(deviceCredentials.getCredentialsType().name(), "X509_CERTIFICATE");
         String cert = EncryptionUtil.trimNewLines(deviceCredentials.getCredentialsValue());
@@ -164,12 +158,12 @@ public abstract class AbstractMqttProvisionJsonDeviceTest extends AbstractMqttIn
         Assert.assertEquals(deviceCredentials.getCredentialsId(), sha3Hash);
         Assert.assertEquals(deviceCredentials.getCredentialsValue(), "testHash");
-        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.get("provisionDeviceStatus").getAsString());
+        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.get("status").getAsString());
     }
     protected void processTestProvisioningCreateNewDeviceWithMqttBasic() throws Exception {
-        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.JSON, null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
+        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.JSON, null, null, null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
         String requestCredentials = ",\"credentialsType\": \"MQTT_BASIC\",\"clientId\": \"test_clientId\",\"username\": \"test_username\",\"password\": \"test_password\"";
         byte[] result = createMqttClientAndPublish(requestCredentials).getPayloadBytes();
         JsonObject response = JsonUtils.parse(new String(result)).getAsJsonObject();
@@ -177,12 +171,10 @@ public abstract class AbstractMqttProvisionJsonDeviceTest extends AbstractMqttIn
         Device createdDevice = deviceService.findDeviceByTenantIdAndName(savedTenant.getTenantId(), "Test Provision device");
         Assert.assertNotNull(createdDevice);
-        Assert.assertEquals(createdDevice.getId().toString(), response.get("deviceId").getAsString());
         DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedTenant.getTenantId(), createdDevice.getId());
         Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.get("credentialsType").getAsString());
-        Assert.assertEquals(deviceCredentials.getCredentialsId(), response.get("credentialsId").getAsString());
         Assert.assertEquals(deviceCredentials.getCredentialsType().name(), "MQTT_BASIC");
         Assert.assertEquals(deviceCredentials.getCredentialsId(), EncryptionUtil.getSha3Hash("|", "test_clientId", "test_username"));
@@ -192,29 +184,26 @@ public abstract class AbstractMqttProvisionJsonDeviceTest extends AbstractMqttIn
         mqttCredentials.setPassword("test_password");
         Assert.assertEquals(deviceCredentials.getCredentialsValue(), JacksonUtil.toString(mqttCredentials));
-        Assert.assertEquals(deviceCredentials.getCredentialsId(), response.get("credentialsId").getAsString());
-        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.get("provisionDeviceStatus").getAsString());
+        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.get("status").getAsString());
     }
     protected void processTestProvisioningCheckPreProvisionedDevice() throws Exception {
-        super.processBeforeTest("Test Provision device", "Test Provision gateway", TransportPayloadType.JSON, null, null, DeviceProfileProvisionType.CHECK_PRE_PROVISIONED_DEVICES, "testProvisionKey", "testProvisionSecret");
+        super.processBeforeTest("Test Provision device", "Test Provision gateway", TransportPayloadType.JSON, null, null, null, null, DeviceProfileProvisionType.CHECK_PRE_PROVISIONED_DEVICES, "testProvisionKey", "testProvisionSecret");
         byte[] result = createMqttClientAndPublish().getPayloadBytes();
         JsonObject response = JsonUtils.parse(new String(result)).getAsJsonObject();
-        Assert.assertEquals(savedDevice.getId().toString(), response.get("deviceId").getAsString());
         DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedTenant.getTenantId(), savedDevice.getId());
         Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.get("credentialsType").getAsString());
-        Assert.assertEquals(deviceCredentials.getCredentialsId(), response.get("credentialsId").getAsString());
-        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.get("provisionDeviceStatus").getAsString());
+        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.get("status").getAsString());
     }
     protected void processTestProvisioningWithBadKeyDevice() throws Exception {
-        super.processBeforeTest("Test Provision device", "Test Provision gateway", TransportPayloadType.JSON, null, null, DeviceProfileProvisionType.CHECK_PRE_PROVISIONED_DEVICES, "testProvisionKeyOrig", "testProvisionSecret");
+        super.processBeforeTest("Test Provision device", "Test Provision gateway", TransportPayloadType.JSON, null, null, null, null, DeviceProfileProvisionType.CHECK_PRE_PROVISIONED_DEVICES, "testProvisionKeyOrig", "testProvisionSecret");
         byte[] result = createMqttClientAndPublish().getPayloadBytes();
         JsonObject response = JsonUtils.parse(new String(result)).getAsJsonObject();
         Assert.assertEquals("Provision data was not found!", response.get("errorMsg").getAsString());
-        Assert.assertEquals(ProvisionResponseStatus.NOT_FOUND.name(), response.get("provisionDeviceStatus").getAsString());
+        Assert.assertEquals(ProvisionResponseStatus.NOT_FOUND.name(), response.get("status").getAsString());
     }
     protected TestMqttCallback createMqttClientAndPublish() throws Exception {
--- a/application/src/test/java/org/thingsboard/server/mqtt/provision/AbstractMqttProvisionProtoDeviceTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/provision/AbstractMqttProvisionProtoDeviceTest.java
View file @6b3448d
@@ -102,30 +102,28 @@ public abstract class AbstractMqttProvisionProtoDeviceTest extends AbstractMqttI
     protected void processTestProvisioningDisabledDevice() throws Exception {
-        super.processBeforeTest("Test Provision device", "Test Provision gateway", TransportPayloadType.PROTOBUF, null, null, DeviceProfileProvisionType.DISABLED, null, null);
+        super.processBeforeTest("Test Provision device", "Test Provision gateway", TransportPayloadType.PROTOBUF, null, null, null, null, DeviceProfileProvisionType.DISABLED, null, null);
         ProvisionDeviceResponseMsg result = ProvisionDeviceResponseMsg.parseFrom(createMqttClientAndPublish().getPayloadBytes());
         Assert.assertNotNull(result);
-        Assert.assertEquals(ProvisionResponseStatus.NOT_FOUND.name(), result.getProvisionResponseStatus().toString());
+        Assert.assertEquals(ProvisionResponseStatus.NOT_FOUND.name(), result.getStatus().toString());
     }
     protected void processTestProvisioningCreateNewDeviceWithoutCredentials() throws Exception {
-        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.PROTOBUF, null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
+        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.PROTOBUF, null, null, null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
         ProvisionDeviceResponseMsg response = ProvisionDeviceResponseMsg.parseFrom(createMqttClientAndPublish().getPayloadBytes());
         Device createdDevice = deviceService.findDeviceByTenantIdAndName(savedTenant.getTenantId(), "Test Provision device");
         Assert.assertNotNull(createdDevice);
-        Assert.assertEquals(createdDevice.getId().getId(), new UUID(response.getDeviceCredentials().getDeviceIdMSB(), response.getDeviceCredentials().getDeviceIdLSB()));
         DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedTenant.getTenantId(), createdDevice.getId());
-        Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.getDeviceCredentials().getCredentialsType().toString());
-        Assert.assertEquals(deviceCredentials.getCredentialsId(), response.getDeviceCredentials().getCredentialsId());
-        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.getProvisionResponseStatus().toString());
+        Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.getCredentialsType().toString());
+        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.getStatus().toString());
     }
     protected void processTestProvisioningCreateNewDeviceWithAccessToken() throws Exception {
-        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.PROTOBUF, null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
+        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.PROTOBUF, null, null,null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
         CredentialsDataProto requestCredentials = CredentialsDataProto.newBuilder().setValidateDeviceTokenRequestMsg(ValidateDeviceTokenRequestMsg.newBuilder().setToken("test_token").build()).build();
         ProvisionDeviceResponseMsg response = ProvisionDeviceResponseMsg.parseFrom(createMqttClientAndPublish(createTestsProvisionMessage(CredentialsType.ACCESS_TOKEN, requestCredentials)).getPayloadBytes());
@@ -133,19 +131,17 @@ public abstract class AbstractMqttProvisionProtoDeviceTest extends AbstractMqttI
         Device createdDevice = deviceService.findDeviceByTenantIdAndName(savedTenant.getTenantId(), "Test Provision device");
         Assert.assertNotNull(createdDevice);
-        Assert.assertEquals(createdDevice.getId().getId(), new UUID(response.getDeviceCredentials().getDeviceIdMSB(), response.getDeviceCredentials().getDeviceIdLSB()));
         DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedTenant.getTenantId(), createdDevice.getId());
-        Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.getDeviceCredentials().getCredentialsType().toString());
-        Assert.assertEquals(deviceCredentials.getCredentialsId(), response.getDeviceCredentials().getCredentialsId());
+        Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.getCredentialsType().toString());
         Assert.assertEquals(deviceCredentials.getCredentialsType(), DeviceCredentialsType.ACCESS_TOKEN);
         Assert.assertEquals(deviceCredentials.getCredentialsId(), "test_token");
-        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.getProvisionResponseStatus().toString());
+        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.getStatus().toString());
     }
     protected void processTestProvisioningCreateNewDeviceWithCert() throws Exception {
-        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.PROTOBUF, null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
+        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.PROTOBUF, null, null, null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
         CredentialsDataProto requestCredentials = CredentialsDataProto.newBuilder().setValidateDeviceX509CertRequestMsg(ValidateDeviceX509CertRequestMsg.newBuilder().setHash("testHash").build()).build();
         ProvisionDeviceResponseMsg response = ProvisionDeviceResponseMsg.parseFrom(createMqttClientAndPublish(createTestsProvisionMessage(CredentialsType.X509_CERTIFICATE, requestCredentials)).getPayloadBytes());
@@ -153,12 +149,10 @@ public abstract class AbstractMqttProvisionProtoDeviceTest extends AbstractMqttI
         Device createdDevice = deviceService.findDeviceByTenantIdAndName(savedTenant.getTenantId(), "Test Provision device");
         Assert.assertNotNull(createdDevice);
-        Assert.assertEquals(createdDevice.getId().getId(), new UUID(response.getDeviceCredentials().getDeviceIdMSB(), response.getDeviceCredentials().getDeviceIdLSB()));
         DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedTenant.getTenantId(), createdDevice.getId());
-        Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.getDeviceCredentials().getCredentialsType().toString());
-        Assert.assertEquals(deviceCredentials.getCredentialsId(), response.getDeviceCredentials().getCredentialsId());
+        Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.getCredentialsType().toString());
         Assert.assertEquals(deviceCredentials.getCredentialsType(), DeviceCredentialsType.X509_CERTIFICATE);
         String cert = EncryptionUtil.trimNewLines(deviceCredentials.getCredentialsValue());
@@ -167,11 +161,11 @@ public abstract class AbstractMqttProvisionProtoDeviceTest extends AbstractMqttI
         Assert.assertEquals(deviceCredentials.getCredentialsId(), sha3Hash);
         Assert.assertEquals(deviceCredentials.getCredentialsValue(), "testHash");
-        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.getProvisionResponseStatus().toString());
+        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.getStatus().toString());
     }
     protected void processTestProvisioningCreateNewDeviceWithMqttBasic() throws Exception {
-        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.PROTOBUF, null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
+        super.processBeforeTest("Test Provision device3", "Test Provision gateway", TransportPayloadType.PROTOBUF, null, null, null, null, DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES, "testProvisionKey", "testProvisionSecret");
         CredentialsDataProto requestCredentials = CredentialsDataProto.newBuilder().setValidateBasicMqttCredRequestMsg(
                 ValidateBasicMqttCredRequestMsg.newBuilder()
                         .setClientId("test_clientId")
@@ -185,12 +179,10 @@ public abstract class AbstractMqttProvisionProtoDeviceTest extends AbstractMqttI
         Device createdDevice = deviceService.findDeviceByTenantIdAndName(savedTenant.getTenantId(), "Test Provision device");
         Assert.assertNotNull(createdDevice);
-        Assert.assertEquals(createdDevice.getId().getId(), new UUID(response.getDeviceCredentials().getDeviceIdMSB(), response.getDeviceCredentials().getDeviceIdLSB()));
         DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedTenant.getTenantId(), createdDevice.getId());
-        Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.getDeviceCredentials().getCredentialsType().toString());
-        Assert.assertEquals(deviceCredentials.getCredentialsId(), response.getDeviceCredentials().getCredentialsId());
+        Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.getCredentialsType().toString());
         Assert.assertEquals(deviceCredentials.getCredentialsType(), DeviceCredentialsType.MQTT_BASIC);
         Assert.assertEquals(deviceCredentials.getCredentialsId(), EncryptionUtil.getSha3Hash("|", "test_clientId", "test_username"));
@@ -200,26 +192,23 @@ public abstract class AbstractMqttProvisionProtoDeviceTest extends AbstractMqttI
         mqttCredentials.setPassword("test_password");
         Assert.assertEquals(deviceCredentials.getCredentialsValue(), JacksonUtil.toString(mqttCredentials));
-        Assert.assertEquals(deviceCredentials.getCredentialsId(), response.getDeviceCredentials().getCredentialsId());
-        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.getProvisionResponseStatus().toString());
+        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.getStatus().toString());
     }
     protected void processTestProvisioningCheckPreProvisionedDevice() throws Exception {
-        super.processBeforeTest("Test Provision device", "Test Provision gateway", TransportPayloadType.PROTOBUF, null, null, DeviceProfileProvisionType.CHECK_PRE_PROVISIONED_DEVICES, "testProvisionKey", "testProvisionSecret");
+        super.processBeforeTest("Test Provision device", "Test Provision gateway", TransportPayloadType.PROTOBUF, null, null, null, null, DeviceProfileProvisionType.CHECK_PRE_PROVISIONED_DEVICES, "testProvisionKey", "testProvisionSecret");
         ProvisionDeviceResponseMsg response = ProvisionDeviceResponseMsg.parseFrom(createMqttClientAndPublish().getPayloadBytes());
-        Assert.assertEquals(savedDevice.getId().getId(), new UUID(response.getDeviceCredentials().getDeviceIdMSB(), response.getDeviceCredentials().getDeviceIdLSB()));
         DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedTenant.getTenantId(), savedDevice.getId());
-        Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.getDeviceCredentials().getCredentialsType().toString());
-        Assert.assertEquals(deviceCredentials.getCredentialsId(), response.getDeviceCredentials().getCredentialsId());
-        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.getProvisionResponseStatus().toString());
+        Assert.assertEquals(deviceCredentials.getCredentialsType().name(), response.getCredentialsType().toString());
+        Assert.assertEquals(ProvisionResponseStatus.SUCCESS.name(), response.getStatus().toString());
     }
     protected void processTestProvisioningWithBadKeyDevice() throws Exception {
-        super.processBeforeTest("Test Provision device", "Test Provision gateway", TransportPayloadType.PROTOBUF, null, null, DeviceProfileProvisionType.CHECK_PRE_PROVISIONED_DEVICES, "testProvisionKeyOrig", "testProvisionSecret");
+        super.processBeforeTest("Test Provision device", "Test Provision gateway", TransportPayloadType.PROTOBUF, null, null, null, null, DeviceProfileProvisionType.CHECK_PRE_PROVISIONED_DEVICES, "testProvisionKeyOrig", "testProvisionSecret");
         ProvisionDeviceResponseMsg response = ProvisionDeviceResponseMsg.parseFrom(createMqttClientAndPublish().getPayloadBytes());
-        Assert.assertEquals(ProvisionResponseStatus.NOT_FOUND.name(), response.getProvisionResponseStatus().toString());
+        Assert.assertEquals(ProvisionResponseStatus.NOT_FOUND.name(), response.getStatus().toString());
     }
     protected TestMqttCallback createMqttClientAndPublish() throws Exception {
--- a/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcDefaultIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcDefaultIntegrationTest.java
View file @6b3448d
@@ -15,49 +15,14 @@
  */
 package org.thingsboard.server.mqtt.rpc;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.nimbusds.jose.util.StandardCharset;
 import com.datastax.oss.driver.api.core.uuid.Uuids;
-import io.netty.handler.codec.mqtt.MqttQoS;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
-import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
-import org.eclipse.paho.client.mqttv3.MqttCallback;
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
-import org.eclipse.paho.client.mqttv3.MqttException;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
-import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.DeviceProfileType;
-import org.thingsboard.server.common.data.DeviceTransportType;
-import org.thingsboard.server.common.data.Tenant;
-import org.thingsboard.server.common.data.TransportPayloadType;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileConfiguration;
-import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
-import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
-import org.thingsboard.server.common.data.device.profile.MqttTopics;
-import org.thingsboard.server.common.data.security.Authority;
-import org.thingsboard.server.common.data.security.DeviceCredentials;
-import org.thingsboard.server.controller.AbstractControllerTest;
-import org.thingsboard.server.dao.util.mapping.JacksonUtil;
 import org.thingsboard.server.service.security.AccessValidator;
-import java.util.Arrays;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 /**
--- a/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcIntegrationTest.java
View file @6b3448d
@@ -15,9 +15,7 @@
  */
 package org.thingsboard.server.mqtt.rpc;
-import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.nimbusds.jose.util.StandardCharset;
 import io.netty.handler.codec.mqtt.MqttQoS;
@@ -26,35 +24,18 @@ import org.apache.commons.lang3.StringUtils;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
 import org.eclipse.paho.client.mqttv3.MqttCallback;
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
 import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.DeviceProfileType;
-import org.thingsboard.server.common.data.DeviceTransportType;
-import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TransportPayloadType;
-import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileConfiguration;
-import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
-import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.device.profile.MqttTopics;
-import org.thingsboard.server.common.data.security.Authority;
-import org.thingsboard.server.common.data.security.DeviceCredentials;
-import org.thingsboard.server.controller.AbstractControllerTest;
 import org.thingsboard.server.dao.util.mapping.JacksonUtil;
 import org.thingsboard.server.mqtt.AbstractMqttIntegrationTest;
-import org.thingsboard.server.service.security.AccessValidator;
 import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
--- a/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcJsonIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcJsonIntegrationTest.java
View file @6b3448d
@@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.thingsboard.server.common.data.TransportPayloadType;
--- a/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcProtoIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcProtoIntegrationTest.java
View file @6b3448d
@@ -22,16 +22,12 @@ import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.thingsboard.server.common.data.TransportPayloadType;
 import org.thingsboard.server.common.data.device.profile.MqttTopics;
 import org.thingsboard.server.gen.transport.TransportApiProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 @Slf4j
 public abstract class AbstractMqttServerSideRpcProtoIntegrationTest extends AbstractMqttServerSideRpcIntegrationTest {
--- a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/attributes/AbstractMqttAttributesIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/attributes/AbstractMqttAttributesIntegrationTest.java
View file @6b3448d
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.mqtt.telemetry.attributes;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
 import org.junit.After;
@@ -142,7 +143,7 @@ public abstract class AbstractMqttAttributesIntegrationTest extends AbstractMqtt
     }
-    protected void assertAttributesValues(List<Map<String, Object>> deviceValues, Set<String> expectedKeySet) {
+    protected void assertAttributesValues(List<Map<String, Object>> deviceValues, Set<String> expectedKeySet) throws JsonProcessingException {
         for (Map<String, Object> map : deviceValues) {
             String key = (String) map.get("key");
             Object value = map.get("value");
--- a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/attributes/AbstractMqttAttributesProtoIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/attributes/AbstractMqttAttributesProtoIntegrationTest.java
View file @6b3448d
@@ -15,18 +15,24 @@
  */
 package org.thingsboard.server.mqtt.telemetry.attributes;
+import com.github.os72.protobuf.dynamic.DynamicSchema;
+import com.google.protobuf.Descriptors;
+import com.google.protobuf.DynamicMessage;
+import com.squareup.wire.schema.internal.parser.ProtoFileElement;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.thingsboard.server.common.data.TransportPayloadType;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.ProtoTransportPayloadConfiguration;
+import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeConfiguration;
 import org.thingsboard.server.gen.transport.TransportApiProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import java.util.Arrays;
 import java.util.List;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -35,11 +41,6 @@ public abstract class AbstractMqttAttributesProtoIntegrationTest extends Abstrac
     private static final String POST_DATA_ATTRIBUTES_TOPIC = "proto/attributes";
-    @Before
-    public void beforeTest() throws Exception {
-        processBeforeTest("Test Post Attributes device", "Test Post Attributes gateway", TransportPayloadType.PROTOBUF, null, POST_DATA_ATTRIBUTES_TOPIC);
-    }
-
     @After
     public void afterTest() throws Exception {
         processAfterTest();
@@ -47,13 +48,49 @@ public abstract class AbstractMqttAttributesProtoIntegrationTest extends Abstrac
     @Test
     public void testPushMqttAttributes() throws Exception {
+        super.processBeforeTest("Test Post Attributes device", "Test Post Attributes gateway", TransportPayloadType.PROTOBUF, null, POST_DATA_ATTRIBUTES_TOPIC);
         List<String> expectedKeys = Arrays.asList("key1", "key2", "key3", "key4", "key5");
-        TransportProtos.PostAttributeMsg msg = getPostAttributeMsg(expectedKeys);
-        processAttributesTest(POST_DATA_ATTRIBUTES_TOPIC, expectedKeys, msg.toByteArray());
+        DeviceProfileTransportConfiguration transportConfiguration = deviceProfile.getProfileData().getTransportConfiguration();
+        assertTrue(transportConfiguration instanceof MqttDeviceProfileTransportConfiguration);
+        MqttDeviceProfileTransportConfiguration mqttTransportConfiguration = (MqttDeviceProfileTransportConfiguration) transportConfiguration;
+        TransportPayloadTypeConfiguration transportPayloadTypeConfiguration = mqttTransportConfiguration.getTransportPayloadTypeConfiguration();
+        assertTrue(transportPayloadTypeConfiguration instanceof ProtoTransportPayloadConfiguration);
+        ProtoTransportPayloadConfiguration protoTransportPayloadConfiguration = (ProtoTransportPayloadConfiguration) transportPayloadTypeConfiguration;
+        ProtoFileElement transportProtoSchemaFile = protoTransportPayloadConfiguration.getTransportProtoSchema(DEVICE_ATTRIBUTES_PROTO_SCHEMA);
+        DynamicSchema attributesSchema = protoTransportPayloadConfiguration.getDynamicSchema(transportProtoSchemaFile, ProtoTransportPayloadConfiguration.ATTRIBUTES_PROTO_SCHEMA);
+
+        DynamicMessage.Builder nestedJsonObjectBuilder = attributesSchema.newMessageBuilder("PostAttributes.JsonObject.NestedJsonObject");
+        Descriptors.Descriptor nestedJsonObjectBuilderDescriptor = nestedJsonObjectBuilder.getDescriptorForType();
+        assertNotNull(nestedJsonObjectBuilderDescriptor);
+        DynamicMessage nestedJsonObject = nestedJsonObjectBuilder.setField(nestedJsonObjectBuilderDescriptor.findFieldByName("key"), "value").build();
+
+        DynamicMessage.Builder jsonObjectBuilder = attributesSchema.newMessageBuilder("PostAttributes.JsonObject");
+        Descriptors.Descriptor jsonObjectBuilderDescriptor = jsonObjectBuilder.getDescriptorForType();
+        assertNotNull(jsonObjectBuilderDescriptor);
+        DynamicMessage jsonObject = jsonObjectBuilder
+                .setField(jsonObjectBuilderDescriptor.findFieldByName("someNumber"), 42)
+                .addRepeatedField(jsonObjectBuilderDescriptor.findFieldByName("someArray"), 1)
+                .addRepeatedField(jsonObjectBuilderDescriptor.findFieldByName("someArray"), 2)
+                .addRepeatedField(jsonObjectBuilderDescriptor.findFieldByName("someArray"), 3)
+                .setField(jsonObjectBuilderDescriptor.findFieldByName("someNestedObject"), nestedJsonObject)
+                .build();
+
+        DynamicMessage.Builder postAttributesBuilder = attributesSchema.newMessageBuilder("PostAttributes");
+        Descriptors.Descriptor postAttributesMsgDescriptor = postAttributesBuilder.getDescriptorForType();
+        assertNotNull(postAttributesMsgDescriptor);
+        DynamicMessage postAttributesMsg = postAttributesBuilder
+                .setField(postAttributesMsgDescriptor.findFieldByName("key1"), "value1")
+                .setField(postAttributesMsgDescriptor.findFieldByName("key2"), true)
+                .setField(postAttributesMsgDescriptor.findFieldByName("key3"), 3.0)
+                .setField(postAttributesMsgDescriptor.findFieldByName("key4"), 4)
+                .setField(postAttributesMsgDescriptor.findFieldByName("key5"), jsonObject)
+                .build();
+        processAttributesTest(POST_DATA_ATTRIBUTES_TOPIC, expectedKeys, postAttributesMsg.toByteArray());
     }
     @Test
     public void testPushMqttAttributesGateway() throws Exception {
+        super.processBeforeTest("Test Post Attributes device", "Test Post Attributes gateway", TransportPayloadType.PROTOBUF, null, null);
         TransportApiProtos.GatewayAttributesMsg.Builder gatewayAttributesMsgProtoBuilder = TransportApiProtos.GatewayAttributesMsg.newBuilder();
         List<String> expectedKeys = Arrays.asList("key1", "key2", "key3", "key4", "key5");
         String deviceName1 = "Device A";
--- a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/attributes/nosql/MqttAttributesNoSqlJsonIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/attributes/nosql/MqttAttributesNoSqlJsonIntegrationTest.java
View file @6b3448d
@@ -16,7 +16,6 @@
 package org.thingsboard.server.mqtt.telemetry.attributes.nosql;
 import org.thingsboard.server.dao.service.DaoNoSqlTest;
-import org.thingsboard.server.mqtt.telemetry.attributes.AbstractMqttAttributesIntegrationTest;
 import org.thingsboard.server.mqtt.telemetry.attributes.AbstractMqttAttributesJsonIntegrationTest;
 @DaoNoSqlTest
--- a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/attributes/nosql/MqttAttributesNoSqlProtoIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/attributes/nosql/MqttAttributesNoSqlProtoIntegrationTest.java
View file @6b3448d
@@ -16,7 +16,6 @@
 package org.thingsboard.server.mqtt.telemetry.attributes.nosql;
 import org.thingsboard.server.dao.service.DaoNoSqlTest;
-import org.thingsboard.server.mqtt.telemetry.attributes.AbstractMqttAttributesIntegrationTest;
 import org.thingsboard.server.mqtt.telemetry.attributes.AbstractMqttAttributesProtoIntegrationTest;
 @DaoNoSqlTest
--- a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/attributes/sql/MqttAttributesSqlProtoIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/attributes/sql/MqttAttributesSqlProtoIntegrationTest.java
View file @6b3448d
@@ -16,7 +16,6 @@
 package org.thingsboard.server.mqtt.telemetry.attributes.sql;
 import org.thingsboard.server.dao.service.DaoSqlTest;
-import org.thingsboard.server.mqtt.telemetry.attributes.AbstractMqttAttributesJsonIntegrationTest;
 import org.thingsboard.server.mqtt.telemetry.attributes.AbstractMqttAttributesProtoIntegrationTest;
 @DaoSqlTest
--- a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java
View file @6b3448d
@@ -27,7 +27,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.thingsboard.server.common.data.Device;
-import org.thingsboard.server.common.data.TransportPayloadType;
 import org.thingsboard.server.common.data.device.profile.MqttTopics;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.mqtt.AbstractMqttIntegrationTest;
@@ -128,7 +127,34 @@ public abstract class AbstractMqttTimeseriesIntegrationTest extends AbstractMqtt
         } else {
             getTelemetryValuesUrl = "/api/plugins/telemetry/DEVICE/" + deviceId + "/values/timeseries?keys=" + String.join(",", actualKeySet);
         }
-        Map<String, List<Map<String, String>>> values = doGetAsync(getTelemetryValuesUrl, Map.class);
+        start = System.currentTimeMillis();
+        end = System.currentTimeMillis() + 5000;
+        Map<String, List<Map<String, String>>> values = null;
+        while (start <= end) {
+            values = doGetAsync(getTelemetryValuesUrl, Map.class);
+            boolean valid = values.size() == expectedKeys.size();
+            if (valid) {
+                for (String key : expectedKeys) {
+                    List<Map<String, String>> tsValues = values.get(key);
+                    if (tsValues != null && tsValues.size() > 0) {
+                        Object ts = tsValues.get(0).get("ts");
+                        if (ts == null) {
+                            valid = false;
+                            break;
+                        }
+                    } else {
+                        valid = false;
+                        break;
+                    }
+                }
+            }
+            if (valid) {
+                break;
+            }
+            Thread.sleep(100);
+            start += 100;
+        }
+        assertNotNull(values);
         if (withTs) {
             assertTs(values, expectedKeys, 10000, 0);
--- a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/timeseries/AbstractMqttTimeseriesJsonIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/timeseries/AbstractMqttTimeseriesJsonIntegrationTest.java
View file @6b3448d
@@ -27,7 +27,6 @@ import org.thingsboard.server.common.data.device.profile.MqttTopics;
 import java.util.Arrays;
 import java.util.List;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 @Slf4j
--- a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/timeseries/AbstractMqttTimeseriesProtoIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/timeseries/AbstractMqttTimeseriesProtoIntegrationTest.java
View file @6b3448d
@@ -15,33 +15,36 @@
  */
 package org.thingsboard.server.mqtt.telemetry.timeseries;
+import com.github.os72.protobuf.dynamic.DynamicSchema;
+import com.google.protobuf.Descriptors;
+import com.google.protobuf.DynamicMessage;
+import com.squareup.wire.schema.internal.parser.ProtoFileElement;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.DeviceProfileProvisionType;
 import org.thingsboard.server.common.data.TransportPayloadType;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.MqttDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.ProtoTransportPayloadConfiguration;
 import org.thingsboard.server.common.data.device.profile.MqttTopics;
+import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeConfiguration;
 import org.thingsboard.server.gen.transport.TransportApiProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import java.util.Arrays;
 import java.util.List;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 @Slf4j
 public abstract class AbstractMqttTimeseriesProtoIntegrationTest extends AbstractMqttTimeseriesIntegrationTest {
     private static final String POST_DATA_TELEMETRY_TOPIC = "proto/telemetry";
-    @Before
-    public void beforeTest() throws Exception {
-        processBeforeTest("Test Post Telemetry device proto payload", "Test Post Telemetry gateway proto payload", TransportPayloadType.PROTOBUF, POST_DATA_TELEMETRY_TOPIC, null);
-    }
-
     @After
     public void afterTest() throws Exception {
         processAfterTest();
@@ -49,20 +52,127 @@ public abstract class AbstractMqttTimeseriesProtoIntegrationTest extends Abstrac
     @Test
     public void testPushMqttTelemetry() throws Exception {
+        super.processBeforeTest("Test Post Telemetry device proto payload", "Test Post Telemetry gateway proto payload", TransportPayloadType.PROTOBUF, POST_DATA_TELEMETRY_TOPIC, null);
         List<String> expectedKeys = Arrays.asList("key1", "key2", "key3", "key4", "key5");
-        TransportProtos.TsKvListProto tsKvListProto = getTsKvListProto(expectedKeys, 0);
-        processTelemetryTest(POST_DATA_TELEMETRY_TOPIC, expectedKeys, tsKvListProto.toByteArray(), false);
+        DeviceProfileTransportConfiguration transportConfiguration = deviceProfile.getProfileData().getTransportConfiguration();
+        assertTrue(transportConfiguration instanceof MqttDeviceProfileTransportConfiguration);
+        MqttDeviceProfileTransportConfiguration mqttTransportConfiguration = (MqttDeviceProfileTransportConfiguration) transportConfiguration;
+        TransportPayloadTypeConfiguration transportPayloadTypeConfiguration = mqttTransportConfiguration.getTransportPayloadTypeConfiguration();
+        assertTrue(transportPayloadTypeConfiguration instanceof ProtoTransportPayloadConfiguration);
+        ProtoTransportPayloadConfiguration protoTransportPayloadConfiguration = (ProtoTransportPayloadConfiguration) transportPayloadTypeConfiguration;
+        ProtoFileElement transportProtoSchema = protoTransportPayloadConfiguration.getTransportProtoSchema(DEVICE_TELEMETRY_PROTO_SCHEMA);
+        DynamicSchema telemetrySchema = protoTransportPayloadConfiguration.getDynamicSchema(transportProtoSchema, "telemetrySchema");
+
+        DynamicMessage.Builder nestedJsonObjectBuilder = telemetrySchema.newMessageBuilder("PostTelemetry.JsonObject.NestedJsonObject");
+        Descriptors.Descriptor nestedJsonObjectBuilderDescriptor = nestedJsonObjectBuilder.getDescriptorForType();
+        assertNotNull(nestedJsonObjectBuilderDescriptor);
+        DynamicMessage nestedJsonObject = nestedJsonObjectBuilder.setField(nestedJsonObjectBuilderDescriptor.findFieldByName("key"), "value").build();
+
+        DynamicMessage.Builder jsonObjectBuilder = telemetrySchema.newMessageBuilder("PostTelemetry.JsonObject");
+        Descriptors.Descriptor jsonObjectBuilderDescriptor = jsonObjectBuilder.getDescriptorForType();
+        assertNotNull(jsonObjectBuilderDescriptor);
+        DynamicMessage jsonObject = jsonObjectBuilder
+                .setField(jsonObjectBuilderDescriptor.findFieldByName("someNumber"), 42)
+                .addRepeatedField(jsonObjectBuilderDescriptor.findFieldByName("someArray"), 1)
+                .addRepeatedField(jsonObjectBuilderDescriptor.findFieldByName("someArray"), 2)
+                .addRepeatedField(jsonObjectBuilderDescriptor.findFieldByName("someArray"), 3)
+                .setField(jsonObjectBuilderDescriptor.findFieldByName("someNestedObject"), nestedJsonObject)
+                .build();
+
+        DynamicMessage.Builder postTelemetryBuilder = telemetrySchema.newMessageBuilder("PostTelemetry");
+        Descriptors.Descriptor postTelemetryMsgDescriptor = postTelemetryBuilder.getDescriptorForType();
+        assertNotNull(postTelemetryMsgDescriptor);
+        DynamicMessage postTelemetryMsg = postTelemetryBuilder
+                .setField(postTelemetryMsgDescriptor.findFieldByName("key1"), "value1")
+                .setField(postTelemetryMsgDescriptor.findFieldByName("key2"), true)
+                .setField(postTelemetryMsgDescriptor.findFieldByName("key3"), 3.0)
+                .setField(postTelemetryMsgDescriptor.findFieldByName("key4"), 4)
+                .setField(postTelemetryMsgDescriptor.findFieldByName("key5"), jsonObject)
+                .build();
+        processTelemetryTest(POST_DATA_TELEMETRY_TOPIC, expectedKeys, postTelemetryMsg.toByteArray(), false);
     }
     @Test
     public void testPushMqttTelemetryWithTs() throws Exception {
+        String schemaStr = "syntax =\"proto3\";\n" +
+                "\n" +
+                "package test;\n" +
+                "\n" +
+                "message PostTelemetry {\n" +
+                "  int64 ts = 1;\n" +
+                "  Values values = 2;\n" +
+                "  \n" +
+                "  message Values {\n" +
+                "    string key1 = 3;\n" +
+                "    bool key2 = 4;\n" +
+                "    double key3 = 5;\n" +
+                "    int32 key4 = 6;\n" +
+                "    JsonObject key5 = 7;\n" +
+                "  }\n" +
+                "  \n" +
+                "  message JsonObject {\n" +
+                "    int32 someNumber = 8;\n" +
+                "    repeated int32 someArray = 9;\n" +
+                "    NestedJsonObject someNestedObject = 10;\n" +
+                "    message NestedJsonObject {\n" +
+                "       string key = 11;\n" +
+                "    }\n" +
+                "  }\n" +
+                "}";
+        super.processBeforeTest("Test Post Telemetry device proto payload", "Test Post Telemetry gateway proto payload", TransportPayloadType.PROTOBUF, POST_DATA_TELEMETRY_TOPIC, null, schemaStr, null, DeviceProfileProvisionType.DISABLED, null, null);
         List<String> expectedKeys = Arrays.asList("key1", "key2", "key3", "key4", "key5");
-        TransportProtos.TsKvListProto tsKvListProto = getTsKvListProto(expectedKeys, 10000);
-        processTelemetryTest(POST_DATA_TELEMETRY_TOPIC, expectedKeys, tsKvListProto.toByteArray(), true);
+        DeviceProfileTransportConfiguration transportConfiguration = deviceProfile.getProfileData().getTransportConfiguration();
+        assertTrue(transportConfiguration instanceof MqttDeviceProfileTransportConfiguration);
+        MqttDeviceProfileTransportConfiguration mqttTransportConfiguration = (MqttDeviceProfileTransportConfiguration) transportConfiguration;
+        TransportPayloadTypeConfiguration transportPayloadTypeConfiguration = mqttTransportConfiguration.getTransportPayloadTypeConfiguration();
+        assertTrue(transportPayloadTypeConfiguration instanceof ProtoTransportPayloadConfiguration);
+        ProtoTransportPayloadConfiguration protoTransportPayloadConfiguration = (ProtoTransportPayloadConfiguration) transportPayloadTypeConfiguration;
+        ProtoFileElement transportProtoSchema = protoTransportPayloadConfiguration.getTransportProtoSchema(schemaStr);
+        DynamicSchema telemetrySchema = protoTransportPayloadConfiguration.getDynamicSchema(transportProtoSchema, "telemetrySchema");
+
+        DynamicMessage.Builder nestedJsonObjectBuilder = telemetrySchema.newMessageBuilder("PostTelemetry.JsonObject.NestedJsonObject");
+        Descriptors.Descriptor nestedJsonObjectBuilderDescriptor = nestedJsonObjectBuilder.getDescriptorForType();
+        assertNotNull(nestedJsonObjectBuilderDescriptor);
+        DynamicMessage nestedJsonObject = nestedJsonObjectBuilder.setField(nestedJsonObjectBuilderDescriptor.findFieldByName("key"), "value").build();
+
+        DynamicMessage.Builder jsonObjectBuilder = telemetrySchema.newMessageBuilder("PostTelemetry.JsonObject");
+        Descriptors.Descriptor jsonObjectBuilderDescriptor = jsonObjectBuilder.getDescriptorForType();
+        assertNotNull(jsonObjectBuilderDescriptor);
+        DynamicMessage jsonObject = jsonObjectBuilder
+                .setField(jsonObjectBuilderDescriptor.findFieldByName("someNumber"), 42)
+                .addRepeatedField(jsonObjectBuilderDescriptor.findFieldByName("someArray"), 1)
+                .addRepeatedField(jsonObjectBuilderDescriptor.findFieldByName("someArray"), 2)
+                .addRepeatedField(jsonObjectBuilderDescriptor.findFieldByName("someArray"), 3)
+                .setField(jsonObjectBuilderDescriptor.findFieldByName("someNestedObject"), nestedJsonObject)
+                .build();
+
+
+        DynamicMessage.Builder valuesBuilder = telemetrySchema.newMessageBuilder("PostTelemetry.Values");
+        Descriptors.Descriptor valuesDescriptor = valuesBuilder.getDescriptorForType();
+        assertNotNull(valuesDescriptor);
+
+        DynamicMessage valuesMsg = valuesBuilder
+                .setField(valuesDescriptor.findFieldByName("key1"), "value1")
+                .setField(valuesDescriptor.findFieldByName("key2"), true)
+                .setField(valuesDescriptor.findFieldByName("key3"), 3.0)
+                .setField(valuesDescriptor.findFieldByName("key4"), 4)
+                .setField(valuesDescriptor.findFieldByName("key5"), jsonObject)
+                .build();
+
+        DynamicMessage.Builder postTelemetryBuilder = telemetrySchema.newMessageBuilder("PostTelemetry");
+        Descriptors.Descriptor postTelemetryMsgDescriptor = postTelemetryBuilder.getDescriptorForType();
+        assertNotNull(postTelemetryMsgDescriptor);
+        DynamicMessage postTelemetryMsg = postTelemetryBuilder
+                .setField(postTelemetryMsgDescriptor.findFieldByName("ts"), 10000L)
+                .setField(postTelemetryMsgDescriptor.findFieldByName("values"), valuesMsg)
+                .build();
+
+        processTelemetryTest(POST_DATA_TELEMETRY_TOPIC, expectedKeys, postTelemetryMsg.toByteArray(), true);
     }
     @Test
     public void testPushMqttTelemetryGateway() throws Exception {
+        super.processBeforeTest("Test Post Telemetry device proto payload", "Test Post Telemetry gateway proto payload", TransportPayloadType.PROTOBUF, null, null, null, null, DeviceProfileProvisionType.DISABLED, null, null);
         TransportApiProtos.GatewayTelemetryMsg.Builder gatewayTelemetryMsgProtoBuilder = TransportApiProtos.GatewayTelemetryMsg.newBuilder();
         List<String> expectedKeys = Arrays.asList("key1", "key2", "key3", "key4", "key5");
         String deviceName1 = "Device A";
@@ -76,6 +186,7 @@ public abstract class AbstractMqttTimeseriesProtoIntegrationTest extends Abstrac
     @Test
     public void testGatewayConnect() throws Exception {
+        super.processBeforeTest("Test Post Telemetry device proto payload", "Test Post Telemetry gateway proto payload", TransportPayloadType.PROTOBUF, POST_DATA_TELEMETRY_TOPIC, null, null, null, DeviceProfileProvisionType.DISABLED, null, null);
         String deviceName = "Device A";
         TransportApiProtos.ConnectMsg connectMsgProto = getConnectProto(deviceName);
         MqttAsyncClient client = getMqttAsyncClient(gatewayAccessToken);
--- a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/timeseries/sql/MqttTimeseriesSqlJsonIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/timeseries/sql/MqttTimeseriesSqlJsonIntegrationTest.java
View file @6b3448d
@@ -16,7 +16,6 @@
 package org.thingsboard.server.mqtt.telemetry.timeseries.sql;
 import org.thingsboard.server.dao.service.DaoSqlTest;
-import org.thingsboard.server.mqtt.telemetry.timeseries.AbstractMqttTimeseriesIntegrationTest;
 import org.thingsboard.server.mqtt.telemetry.timeseries.AbstractMqttTimeseriesJsonIntegrationTest;
 /**
--- a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/timeseries/sql/MqttTimeseriesSqlProtoIntegrationTest.java
View file @6b3448d
+++ b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/timeseries/sql/MqttTimeseriesSqlProtoIntegrationTest.java
View file @6b3448d
@@ -16,7 +16,6 @@
 package org.thingsboard.server.mqtt.telemetry.timeseries.sql;
 import org.thingsboard.server.dao.service.DaoSqlTest;
-import org.thingsboard.server.mqtt.telemetry.timeseries.AbstractMqttTimeseriesJsonIntegrationTest;
 import org.thingsboard.server.mqtt.telemetry.timeseries.AbstractMqttTimeseriesProtoIntegrationTest;
 /**
--- a/common/data/pom.xml
View file @6b3448d
+++ b/common/data/pom.xml
View file @6b3448d
@@ -71,6 +71,14 @@
             <artifactId>java-driver-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.wire</groupId>
+            <artifactId>wire-schema</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thingsboard</groupId>
+            <artifactId>protobuf-dynamic</artifactId>
+        </dependency>
     </dependencies>
     <build>
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ApiFeature.java
View file @6b3448d
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ApiFeature.java
View file @6b3448d
@@ -18,16 +18,21 @@ package org.thingsboard.server.common.data;
 import lombok.Getter;
 public enum ApiFeature {
-    TRANSPORT("transportApiState"),
-    DB("dbApiState"),
-    RE("ruleEngineApiState"),
-    JS("jsExecutionApiState");
+    TRANSPORT("transportApiState", "Device API"),
+    DB("dbApiState", "Telemetry persistence"),
+    RE("ruleEngineApiState", "Rule Engine execution"),
+    JS("jsExecutionApiState", "JavaScript functions execution"),
+    EMAIL("emailApiState", "Email messages"),
+    SMS("smsApiState", "SMS messages");
     @Getter
     private final String apiStateKey;
+    @Getter
+    private final String label;
-    ApiFeature(String apiStateKey) {
+    ApiFeature(String apiStateKey, String label) {
         this.apiStateKey = apiStateKey;
+        this.label = label;
     }
 }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ApiUsageRecordKey.java
View file @6b3448d
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ApiUsageRecordKey.java
View file @6b3448d
@@ -23,11 +23,15 @@ public enum ApiUsageRecordKey {
     TRANSPORT_DP_COUNT(ApiFeature.TRANSPORT, "transportDataPointsCount", "transportDataPointsLimit"),
     STORAGE_DP_COUNT(ApiFeature.DB, "storageDataPointsCount", "storageDataPointsLimit"),
     RE_EXEC_COUNT(ApiFeature.RE, "ruleEngineExecutionCount", "ruleEngineExecutionLimit"),
-    JS_EXEC_COUNT(ApiFeature.JS, "jsExecutionCount", "jsExecutionLimit");
+    JS_EXEC_COUNT(ApiFeature.JS, "jsExecutionCount", "jsExecutionLimit"),
+    EMAIL_EXEC_COUNT(ApiFeature.EMAIL, "emailCount", "emailLimit"),
+    SMS_EXEC_COUNT(ApiFeature.SMS, "smsCount", "smsLimit");
     private static final ApiUsageRecordKey[] JS_RECORD_KEYS = {JS_EXEC_COUNT};
     private static final ApiUsageRecordKey[] RE_RECORD_KEYS = {RE_EXEC_COUNT};
     private static final ApiUsageRecordKey[] DB_RECORD_KEYS = {STORAGE_DP_COUNT};
     private static final ApiUsageRecordKey[] TRANSPORT_RECORD_KEYS = {TRANSPORT_MSG_COUNT, TRANSPORT_DP_COUNT};
+    private static final ApiUsageRecordKey[] EMAIL_RECORD_KEYS = {EMAIL_EXEC_COUNT};
+    private static final ApiUsageRecordKey[] SMS_RECORD_KEYS = {SMS_EXEC_COUNT};
     @Getter
     private final ApiFeature apiFeature;
@@ -52,6 +56,10 @@ public enum ApiUsageRecordKey {
                 return RE_RECORD_KEYS;
             case JS:
                 return JS_RECORD_KEYS;
+            case EMAIL:
+                return EMAIL_RECORD_KEYS;
+            case SMS:
+                return SMS_RECORD_KEYS;
             default:
                 return new ApiUsageRecordKey[]{};
         }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ApiUsageState.java
View file @6b3448d
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ApiUsageState.java
View file @6b3448d
@@ -47,6 +47,12 @@ public class ApiUsageState extends BaseData<ApiUsageStateId> implements HasTenan
     @Getter
     @Setter
     private ApiUsageStateValue jsExecState;
+    @Getter
+    @Setter
+    private ApiUsageStateValue emailExecState;
+    @Getter
+    @Setter
+    private ApiUsageStateValue smsExecState;
     public ApiUsageState() {
         super();
@@ -64,6 +70,8 @@ public class ApiUsageState extends BaseData<ApiUsageStateId> implements HasTenan
         this.dbStorageState = ur.getDbStorageState();
         this.reExecState = ur.getReExecState();
         this.jsExecState = ur.getJsExecState();
+        this.emailExecState = ur.getEmailExecState();
+        this.smsExecState = ur.getSmsExecState();
     }
     public boolean isTransportEnabled() {
@@ -81,4 +89,12 @@ public class ApiUsageState extends BaseData<ApiUsageStateId> implements HasTenan
     public boolean isJsExecEnabled() {
         return !ApiUsageStateValue.DISABLED.equals(jsExecState);
     }
+
+    public boolean isEmailSendEnabled(){
+        return !ApiUsageStateValue.DISABLED.equals(emailExecState);
+    }
+
+    public boolean isSmsSendEnabled(){
+        return !ApiUsageStateValue.DISABLED.equals(smsExecState);
+    }
 }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ApiUsageStateMailMessage.java 0 → 100644
View file @6b3448d
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ApiUsageStateMailMessage.java 0 → 100644
View file @6b3448d
+/**
+ * Copyright © 2016-2020 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;
+
+import lombok.Data;
+
+@Data
+public class ApiUsageStateMailMessage {
+    private final ApiUsageRecordKey key;
+    private final long threshold;
+    private final long value;
+}
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileTransportConfiguration.java
View file @6b3448d
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileTransportConfiguration.java
View file @6b3448d
@@ -29,7 +29,7 @@ import org.thingsboard.server.common.data.DeviceTransportType;
         property = "type")
 @JsonSubTypes({
          @JsonSubTypes.Type(value = DefaultDeviceProfileTransportConfiguration.class, name = "DEFAULT"),
-        @JsonSubTypes.Type(value = MqttDeviceProfileTransportConfiguration.class, name = "MQTT"),
+         @JsonSubTypes.Type(value = MqttDeviceProfileTransportConfiguration.class, name = "MQTT"),
          @JsonSubTypes.Type(value = Lwm2mDeviceProfileTransportConfiguration.class, name = "LWM2M")})
 public interface DeviceProfileTransportConfiguration {
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/JsonTransportPayloadConfiguration.java 0 → 100644
View file @6b3448d
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/JsonTransportPayloadConfiguration.java 0 → 100644
View file @6b3448d
+/**
+ * Copyright © 2016-2020 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;
+
+import lombok.Data;
+import org.thingsboard.server.common.data.TransportPayloadType;
+
+@Data
+public class JsonTransportPayloadConfiguration implements TransportPayloadTypeConfiguration {
+
+    @Override
+    public TransportPayloadType getTransportPayloadType() {
+        return TransportPayloadType.JSON;
+    }
+}
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttDeviceProfileTransportConfiguration.java
View file @6b3448d
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttDeviceProfileTransportConfiguration.java
View file @6b3448d
@@ -16,20 +16,27 @@
 package org.thingsboard.server.common.data.device.profile;
 import lombok.Data;
-import org.thingsboard.server.common.data.TransportPayloadType;
 import org.thingsboard.server.common.data.DeviceTransportType;
 @Data
 public class MqttDeviceProfileTransportConfiguration implements DeviceProfileTransportConfiguration {
-    private TransportPayloadType transportPayloadType = TransportPayloadType.JSON;
-
     private String deviceTelemetryTopic = MqttTopics.DEVICE_TELEMETRY_TOPIC;
     private String deviceAttributesTopic = MqttTopics.DEVICE_ATTRIBUTES_TOPIC;
+    private TransportPayloadTypeConfiguration transportPayloadTypeConfiguration;
     @Override
     public DeviceTransportType getType() {
         return DeviceTransportType.MQTT;
     }
+    public TransportPayloadTypeConfiguration getTransportPayloadTypeConfiguration() {
+        if (transportPayloadTypeConfiguration != null) {
+            return transportPayloadTypeConfiguration;
+        } else {
+            return new JsonTransportPayloadConfiguration();
+        }
+    }
+
+
 }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/ProtoTransportPayloadConfiguration.java 0 → 100644
View file @6b3448d
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/ProtoTransportPayloadConfiguration.java 0 → 100644
View file @6b3448d
+/**
+ * Copyright © 2016-2020 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;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.github.os72.protobuf.dynamic.DynamicSchema;
+import com.github.os72.protobuf.dynamic.EnumDefinition;
+import com.github.os72.protobuf.dynamic.MessageDefinition;
+import com.google.protobuf.Descriptors;
+import com.google.protobuf.DynamicMessage;
+import com.squareup.wire.schema.Location;
+import com.squareup.wire.schema.internal.parser.EnumConstantElement;
+import com.squareup.wire.schema.internal.parser.EnumElement;
+import com.squareup.wire.schema.internal.parser.FieldElement;
+import com.squareup.wire.schema.internal.parser.MessageElement;
+import com.squareup.wire.schema.internal.parser.OneOfElement;
+import com.squareup.wire.schema.internal.parser.ProtoFileElement;
+import com.squareup.wire.schema.internal.parser.ProtoParser;
+import com.squareup.wire.schema.internal.parser.TypeElement;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.TransportPayloadType;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Data
+public class ProtoTransportPayloadConfiguration implements TransportPayloadTypeConfiguration {
+
+    public static final Location LOCATION = new Location("", "", -1, -1);
+    public static final String ATTRIBUTES_PROTO_SCHEMA = "attributes proto schema";
+    public static final String TELEMETRY_PROTO_SCHEMA = "telemetry proto schema";
+
+    private String deviceTelemetryProtoSchema;
+    private String deviceAttributesProtoSchema;
+
+    @Override
+    public TransportPayloadType getTransportPayloadType() {
+        return TransportPayloadType.PROTOBUF;
+    }
+
+    public Descriptors.Descriptor getTelemetryDynamicMessageDescriptor(String deviceTelemetryProtoSchema) {
+        return getDescriptor(deviceTelemetryProtoSchema, TELEMETRY_PROTO_SCHEMA);
+    }
+
+    public Descriptors.Descriptor getAttributesDynamicMessageDescriptor(String deviceAttributesProtoSchema) {
+        return getDescriptor(deviceAttributesProtoSchema, ATTRIBUTES_PROTO_SCHEMA);
+    }
+
+    private Descriptors.Descriptor getDescriptor(String protoSchema, String schemaName) {
+        try {
+            ProtoFileElement protoFileElement = getTransportProtoSchema(protoSchema);
+            DynamicSchema dynamicSchema = getDynamicSchema(protoFileElement, schemaName);
+            String lastMsgName = getMessageTypes(protoFileElement.getTypes()).stream()
+                    .map(MessageElement::getName).reduce((previous, last) -> last).get();
+            DynamicMessage.Builder builder = dynamicSchema.newMessageBuilder(lastMsgName);
+            return builder.getDescriptorForType();
+        } catch (Exception e) {
+            log.warn("Failed to get Message Descriptor due to {}", e.getMessage());
+            return null;
+        }
+    }
+
+    public DynamicSchema getDynamicSchema(ProtoFileElement protoFileElement, String schemaName) {
+        DynamicSchema.Builder schemaBuilder = DynamicSchema.newBuilder();
+        schemaBuilder.setName(schemaName);
+        schemaBuilder.setPackage(!isEmptyStr(protoFileElement.getPackageName()) ?
+                protoFileElement.getPackageName() : schemaName.toLowerCase());
+        List<TypeElement> types = protoFileElement.getTypes();
+        List<MessageElement> messageTypes = getMessageTypes(types);
+
+        if (!messageTypes.isEmpty()) {
+            List<EnumElement> enumTypes = getEnumElements(types);
+            if (!enumTypes.isEmpty()) {
+                enumTypes.forEach(enumElement -> {
+                    EnumDefinition enumDefinition = getEnumDefinition(enumElement);
+                    schemaBuilder.addEnumDefinition(enumDefinition);
+                });
+            }
+            List<MessageDefinition> messageDefinitions = getMessageDefinitions(messageTypes);
+            messageDefinitions.forEach(schemaBuilder::addMessageDefinition);
+            try {
+                return schemaBuilder.build();
+            } catch (Descriptors.DescriptorValidationException e) {
+                throw new RuntimeException("Failed to create dynamic schema due to: " + e.getMessage());
+            }
+        } else {
+            throw new RuntimeException("Failed to get Dynamic Schema! Message types is empty for schema:" + schemaName);
+        }
+    }
+
+    public ProtoFileElement getTransportProtoSchema(String protoSchema) {
+        return new ProtoParser(LOCATION, protoSchema.toCharArray()).readProtoFile();
+    }
+
+    private List<MessageElement> getMessageTypes(List<TypeElement> types) {
+        return types.stream()
+                .filter(typeElement -> typeElement instanceof MessageElement)
+                .map(typeElement -> (MessageElement) typeElement)
+                .collect(Collectors.toList());
+    }
+
+    private List<EnumElement> getEnumElements(List<TypeElement> types) {
+        return types.stream()
+                .filter(typeElement -> typeElement instanceof EnumElement)
+                .map(typeElement -> (EnumElement) typeElement)
+                .collect(Collectors.toList());
+    }
+
+    private List<MessageDefinition> getMessageDefinitions(List<MessageElement> messageElementsList) {
+        if (!messageElementsList.isEmpty()) {
+            List<MessageDefinition> messageDefinitions = new ArrayList<>();
+            messageElementsList.forEach(messageElement -> {
+                MessageDefinition.Builder messageDefinitionBuilder = MessageDefinition.newBuilder(messageElement.getName());
+
+                List<TypeElement> nestedTypes = messageElement.getNestedTypes();
+                if (!nestedTypes.isEmpty()) {
+                    List<EnumElement> nestedEnumTypes = getEnumElements(nestedTypes);
+                    if (!nestedEnumTypes.isEmpty()) {
+                        nestedEnumTypes.forEach(enumElement -> {
+                            EnumDefinition nestedEnumDefinition = getEnumDefinition(enumElement);
+                            messageDefinitionBuilder.addEnumDefinition(nestedEnumDefinition);
+                        });
+                    }
+                    List<MessageElement> nestedMessageTypes = getMessageTypes(nestedTypes);
+                    List<MessageDefinition> nestedMessageDefinitions = getMessageDefinitions(nestedMessageTypes);
+                    nestedMessageDefinitions.forEach(messageDefinitionBuilder::addMessageDefinition);
+                }
+                List<FieldElement> messageElementFields = messageElement.getFields();
+                List<OneOfElement> oneOfs = messageElement.getOneOfs();
+                if (!oneOfs.isEmpty()) {
+                    for (OneOfElement oneOfelement : oneOfs) {
+                        MessageDefinition.OneofBuilder oneofBuilder = messageDefinitionBuilder.addOneof(oneOfelement.getName());
+                        addMessageFieldsToTheOneOfDefinition(oneOfelement.getFields(), oneofBuilder);
+                    }
+                }
+                if (!messageElementFields.isEmpty()) {
+                    addMessageFieldsToTheMessageDefinition(messageElementFields, messageDefinitionBuilder);
+                }
+                messageDefinitions.add(messageDefinitionBuilder.build());
+            });
+            return messageDefinitions;
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    private EnumDefinition getEnumDefinition(EnumElement enumElement) {
+        List<EnumConstantElement> enumElementTypeConstants = enumElement.getConstants();
+        EnumDefinition.Builder enumDefinitionBuilder = EnumDefinition.newBuilder(enumElement.getName());
+        if (!enumElementTypeConstants.isEmpty()) {
+            enumElementTypeConstants.forEach(constantElement -> enumDefinitionBuilder.addValue(constantElement.getName(), constantElement.getTag()));
+        }
+        return enumDefinitionBuilder.build();
+    }
+
+
+    private void addMessageFieldsToTheMessageDefinition(List<FieldElement> messageElementFields, MessageDefinition.Builder messageDefinitionBuilder) {
+        messageElementFields.forEach(fieldElement -> {
+            String labelStr = null;
+            if (fieldElement.getLabel() != null) {
+                labelStr = fieldElement.getLabel().name().toLowerCase();
+            }
+            messageDefinitionBuilder.addField(
+                    labelStr,
+                    fieldElement.getType(),
+                    fieldElement.getName(),
+                    fieldElement.getTag());
+        });
+    }
+
+    private void addMessageFieldsToTheOneOfDefinition(List<FieldElement> oneOfsElementFields, MessageDefinition.OneofBuilder oneofBuilder) {
+        oneOfsElementFields.forEach(fieldElement -> oneofBuilder.addField(
+                fieldElement.getType(),
+                fieldElement.getName(),
+                fieldElement.getTag()));
+        oneofBuilder.msgDefBuilder();
+    }
+
+    private boolean isEmptyStr(String str) {
+        return str == null || "".equals(str);
+    }
+
+}
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/TransportPayloadTypeConfiguration.java 0 → 100644
View file @6b3448d
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/TransportPayloadTypeConfiguration.java 0 → 100644
View file @6b3448d
+/**
+ * Copyright © 2016-2020 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;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.thingsboard.server.common.data.TransportPayloadType;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonTypeInfo(
+        use = JsonTypeInfo.Id.NAME,
+        include = JsonTypeInfo.As.PROPERTY,
+        property = "transportPayloadType")
+@JsonSubTypes({
+        @JsonSubTypes.Type(value = JsonTransportPayloadConfiguration.class, name = "JSON"),
+        @JsonSubTypes.Type(value = ProtoTransportPayloadConfiguration.class, name = "PROTOBUF")})
+public interface TransportPayloadTypeConfiguration {
+
+    @JsonIgnore
+    TransportPayloadType getTransportPayloadType();
+
+}
--- a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
View file @6b3448d
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
View file @6b3448d
@@ -42,6 +42,8 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura
     private long maxJSExecutions;
     private long maxDPStorageDays;
     private int maxRuleNodeExecutionsPerMessage;
+    private long maxEmails;
+    private long maxSms;
     private double warnThreshold;
@@ -58,6 +60,10 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura
                 return maxREExecutions;
             case STORAGE_DP_COUNT:
                 return maxDPStorageDays;
+            case EMAIL_EXEC_COUNT:
+                return maxEmails;
+            case SMS_EXEC_COUNT:
+                return maxSms;
         }
         return 0L;
     }
--- a/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerTemplate.java
View file @6b3448d
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerTemplate.java
View file @6b3448d
@@ -46,7 +46,6 @@ public class TbKafkaConsumerTemplate<T extends TbQueueMsg> extends AbstractTbQue
     private TbKafkaConsumerTemplate(TbKafkaSettings settings, TbKafkaDecoder<T> decoder,
                                     String clientId, String groupId, String topic,
                                     boolean autoCommit, int autoCommitIntervalMs,
-                                    int maxPollRecords,
                                     TbQueueAdmin admin) {
         super(topic);
         Properties props = settings.toProps();
@@ -54,6 +53,9 @@ public class TbKafkaConsumerTemplate<T extends TbQueueMsg> extends AbstractTbQue
         if (groupId != null) {
             props.put(ConsumerConfig.GROUP_ID_CONFIG, groupId);
         }
+        if (settings.getMaxPollIntervalMs() > 0) {
+            props.put(ConsumerConfig.MAX_POLL_INTERVAL_MS_CONFIG, settings.getMaxPollIntervalMs());
+        }
         props.put(ConsumerConfig.MAX_POLL_RECORDS_CONFIG, settings.getMaxPollRecords());
         props.put(ConsumerConfig.MAX_PARTITION_FETCH_BYTES_CONFIG, settings.getMaxPartitionFetchBytes());
         props.put(ConsumerConfig.FETCH_MAX_BYTES_CONFIG, settings.getFetchMaxBytes());
@@ -61,9 +63,6 @@ public class TbKafkaConsumerTemplate<T extends TbQueueMsg> extends AbstractTbQue
         props.put(ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, autoCommitIntervalMs);
         props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
         props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.ByteArrayDeserializer");
-        if (maxPollRecords > 0) {
-            props.put(ConsumerConfig.MAX_POLL_RECORDS_CONFIG, maxPollRecords);
-        }
         this.admin = admin;
         this.consumer = new KafkaConsumer<>(props);
         this.decoder = decoder;
--- a/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaSettings.java
View file @6b3448d
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaSettings.java
View file @6b3448d
@@ -63,6 +63,10 @@ public class TbKafkaSettings {
     @Getter
     private int maxPollRecords;
+    @Value("${queue.kafka.max_poll_interval_ms:0}")
+    @Getter
+    private int maxPollIntervalMs;
+
     @Value("${queue.kafka.max_partition_fetch_bytes:16777216}")
     @Getter
     private int maxPartitionFetchBytes;
@@ -111,4 +115,5 @@ public class TbKafkaSettings {
         }
         return props;
     }
+
 }
--- a/common/queue/src/main/proto/queue.proto
View file @6b3448d
+++ b/common/queue/src/main/proto/queue.proto
View file @6b3448d
@@ -269,8 +269,9 @@ message ProvisionDeviceCredentialsMsg {
 }
 message ProvisionDeviceResponseMsg {
-  DeviceCredentialsProto deviceCredentials = 1;
-  ProvisionResponseStatus provisionResponseStatus = 2;
+  ProvisionResponseStatus status = 1;
+  CredentialsType credentialsType = 2;
+  string credentialsValue = 3;
 }
 enum ProvisionResponseStatus {