Merge branch 'master' of github.com:thingsboard/thingsboard into feature/tbmsg-refactoring

application/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>application</artifactId>

application/src/main/data/json/system/scada_symbols/dynamic-horizontal-scale-hp.svg

@@ -18,12 +18,12 @@
     },
     {
       "tag": "highCriticalScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar highCriticalState = ctx.values.highCriticalState;\nif (showHighCriticalScale && highCriticalState !== null) {\n    element.show();\n    var offset = calculateOffset(highCriticalState, minValue, maxValue);\n    element.width(653-offset);\n} else {\n    element.hide();\n}\n\nif (showHighCriticalScale && value !== null && highCriticalState !== null) {\n    if (value >= highCriticalState && value <= ctx.properties.maxValue) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar highCriticalState = ctx.values.highCriticalState;\nif (showHighCriticalScale && highCriticalState !== null) {\n    element.show();\n    var offset = calculateOffset(highCriticalState, minValue, maxValue);\n    element.width(653-offset);\n} else {\n    element.hide();\n}\n\nif (showHighCriticalScale && value !== null && highCriticalState !== null) {\n    if (value >= highCriticalState) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
       "actions": null
     },
     {
       "tag": "highWarningScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar showHighWarningScale = ctx.properties.showHighWarningScale;\nvar highWarningState = ctx.values.highWarningState;\nvar highCriticalState = ctx.values.highCriticalState;\nif (showHighWarningScale && highWarningState !== null) {\n    element.show();\n    var offset = calculateOffset(highWarningState, minValue, maxValue);\n    element.width(653-offset);\n} else {\n    element.hide();\n}\n\nif (showHighWarningScale && value !== null) {\n    if (!showHighCriticalScale) {\n        highCriticalState = ctx.properties.maxValue;\n    }\n    \n    if (highWarningState !== null && highCriticalState !== null) {\n        if (value < highCriticalState && value >= highWarningState) {\n            element.fill(ctx.properties.activeWarningScaleColor);\n        } else {\n            element.fill(ctx.properties.defaultWarningScaleColor);\n        }\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar showHighWarningScale = ctx.properties.showHighWarningScale;\nvar highWarningState = ctx.values.highWarningState;\nvar highCriticalState = ctx.values.highCriticalState;\nif (showHighWarningScale && highWarningState !== null) {\n    element.show();\n    var offset = calculateOffset(highWarningState, minValue, maxValue);\n    element.width(653-offset);\n} else {\n    element.hide();\n}\n\nif (showHighWarningScale && value !== null) {\n    if (!showHighCriticalScale) {\n        highCriticalState = Number.MAX_SAFE_INTEGER;\n    }\n    \n    if (highWarningState !== null && highCriticalState !== null) {\n        if (value < highCriticalState && value >= highWarningState) {\n            element.fill(ctx.properties.activeWarningScaleColor);\n        } else {\n            element.fill(ctx.properties.defaultWarningScaleColor);\n        }\n    }\n}",
       "actions": null
     },
     {
@@ -33,12 +33,12 @@
     },
     {
       "tag": "lowCriticalScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowCriticalValue = ctx.values.lowCriticalState;\n\nif (showLowCriticalScale && lowCriticalValue !== null) {\n    element.show();\n    var offset = calculateOffset(lowCriticalValue, minValue, maxValue);\n    element.width(offset);\n} else {\n    element.hide();\n}\n\nif (showLowCriticalScale && value !== null) {\n    var lowCriticalScale = ctx.values.lowCriticalState;\n    if (value <= lowCriticalScale && value >= ctx.properties.minValue) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowCriticalValue = ctx.values.lowCriticalState;\n\nif (showLowCriticalScale && lowCriticalValue !== null) {\n    element.show();\n    var offset = calculateOffset(lowCriticalValue, minValue, maxValue);\n    element.width(offset);\n} else {\n    element.hide();\n}\n\nif (showLowCriticalScale && value !== null) {\n    var lowCriticalScale = ctx.values.lowCriticalState;\n    if (value <= lowCriticalScale) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
       "actions": null
     },
     {
       "tag": "lowWarningScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowWarningScale = ctx.properties.showLowWarningScale;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowWarningState = ctx.values.lowWarningState;\nvar lowCriticalState = ctx.values.lowCriticalState;\nif (showLowWarningScale && lowWarningState !== null) {\n    element.show();\n    var offset = calculateOffset(lowWarningState, minValue, maxValue);\n    element.width(offset);\n} else {\n    element.hide();\n}\n\nif (showLowWarningScale && value !== null) {\n    if (!showLowCriticalScale) {\n        lowCriticalState = ctx.properties.minValue;\n    }\n    if (lowCriticalState !== null && lowWarningState !== null) {\n        if (value > lowCriticalState && value <= lowWarningState) {\n            element.fill(ctx.properties.activeWarningScaleColor);\n        } else {\n            element.fill(ctx.properties.defaultWarningScaleColor);\n        }\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowWarningScale = ctx.properties.showLowWarningScale;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowWarningState = ctx.values.lowWarningState;\nvar lowCriticalState = ctx.values.lowCriticalState;\nif (showLowWarningScale && lowWarningState !== null) {\n    element.show();\n    var offset = calculateOffset(lowWarningState, minValue, maxValue);\n    element.width(offset);\n} else {\n    element.hide();\n}\n\nif (showLowWarningScale && value !== null) {\n    if (!showLowCriticalScale) {\n        lowCriticalState = Number.MIN_SAFE_INTEGER;\n    }\n    if (lowCriticalState !== null && lowWarningState !== null) {\n        if (value > lowCriticalState && value <= lowWarningState) {\n            element.fill(ctx.properties.activeWarningScaleColor);\n        } else {\n            element.fill(ctx.properties.defaultWarningScaleColor);\n        }\n    }\n}",
       "actions": null
     },
     {

application/src/main/data/json/system/scada_symbols/dynamic-vertical-scale-hp.svg

@@ -18,12 +18,12 @@
     },
     {
       "tag": "highCriticalScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar highCriticalState = ctx.values.highCriticalState;\nif (showHighCriticalScale && highCriticalState !== null) {\n    element.show();\n    var offset = calculateOffset(highCriticalState, minValue, maxValue);\n    element.height(653-offset);\n} else {\n    element.hide();\n}\n\nif (showHighCriticalScale && value !== null && highCriticalState !== null) {\n    if (value >= highCriticalState && value <= ctx.properties.maxValue) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar highCriticalState = ctx.values.highCriticalState;\nif (showHighCriticalScale && highCriticalState !== null) {\n    element.show();\n    var offset = calculateOffset(highCriticalState, minValue, maxValue);\n    element.height(653-offset);\n} else {\n    element.hide();\n}\n\nif (showHighCriticalScale && value !== null && highCriticalState !== null) {\n    if (value >= highCriticalState) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
       "actions": null
     },
     {
       "tag": "highWarningScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar showHighWarningScale = ctx.properties.showHighWarningScale;\nvar highWarningState = ctx.values.highWarningState;\nvar highCriticalState = ctx.values.highCriticalState;\nif (showHighWarningScale && highWarningState !== null) {\n    element.show();\n    var offset = calculateOffset(highWarningState, minValue, maxValue);\n    element.height(653-offset);\n} else {\n    element.hide();\n}\nif (showHighWarningScale && value !== null) {\n    if (!showHighCriticalScale) {\n        highCriticalState = ctx.properties.maxValue;\n    }\n    if (highWarningState !== null && highCriticalState !== null) {\n        if (value < highCriticalState && value >= highWarningState) {\n            element.fill(ctx.properties.activeWarningScaleColor);\n        } else {\n            element.fill(ctx.properties.defaultWarningScaleColor);\n        }\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar showHighWarningScale = ctx.properties.showHighWarningScale;\nvar highWarningState = ctx.values.highWarningState;\nvar highCriticalState = ctx.values.highCriticalState;\nif (showHighWarningScale && highWarningState !== null) {\n    element.show();\n    var offset = calculateOffset(highWarningState, minValue, maxValue);\n    element.height(653-offset);\n} else {\n    element.hide();\n}\nif (showHighWarningScale && value !== null) {\n    if (!showHighCriticalScale) {\n        highCriticalState = Number.MAX_SAFE_INTEGER;\n    }\n    if (highWarningState !== null && highCriticalState !== null) {\n        if (value < highCriticalState && value >= highWarningState) {\n            element.fill(ctx.properties.activeWarningScaleColor);\n        } else {\n            element.fill(ctx.properties.defaultWarningScaleColor);\n        }\n    }\n}",
       "actions": null
     },
     {
@@ -33,12 +33,12 @@
     },
     {
       "tag": "lowCriticalScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowCriticalValue = ctx.values.lowCriticalState;\n\nif (showLowCriticalScale && lowCriticalValue !== null) {\n    element.show();\n    var offset = calculateOffset(lowCriticalValue, minValue, maxValue);\n    element.height(offset);\n} else {\n    element.hide();\n}\nif (showLowCriticalScale && value !== null) {\n    var lowCriticalScale = ctx.values.lowCriticalState;\n    if (value <= lowCriticalScale && value >= ctx.properties.minValue) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowCriticalValue = ctx.values.lowCriticalState;\n\nif (showLowCriticalScale && lowCriticalValue !== null) {\n    element.show();\n    var offset = calculateOffset(lowCriticalValue, minValue, maxValue);\n    element.height(offset);\n} else {\n    element.hide();\n}\nif (showLowCriticalScale && value !== null) {\n    var lowCriticalScale = ctx.values.lowCriticalState;\n    if (value <= lowCriticalScale) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
       "actions": null
     },
     {
       "tag": "lowWarningScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowWarningScale = ctx.properties.showLowWarningScale;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowWarningState = ctx.values.lowWarningState;\nvar lowCriticalState = ctx.values.lowCriticalState;\nif (showLowWarningScale && lowWarningState !== null) {\n    element.show();\n    var offset = calculateOffset(lowWarningState, minValue, maxValue);\n    element.height(offset);\n} else {\n    element.hide();\n}\nif (showLowWarningScale && value !== null) {\n    if (!showLowCriticalScale) {\n        lowCriticalState = ctx.properties.minValue;\n    }\n    if (lowCriticalState !== null && lowWarningState !== null) {\n        if (value > lowCriticalState && value <= lowWarningState) {\n            element.fill(ctx.properties.activeWarningScaleColor);\n        } else {\n            element.fill(ctx.properties.defaultWarningScaleColor);\n        }\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowWarningScale = ctx.properties.showLowWarningScale;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowWarningState = ctx.values.lowWarningState;\nvar lowCriticalState = ctx.values.lowCriticalState;\nif (showLowWarningScale && lowWarningState !== null) {\n    element.show();\n    var offset = calculateOffset(lowWarningState, minValue, maxValue);\n    element.height(offset);\n} else {\n    element.hide();\n}\nif (showLowWarningScale && value !== null) {\n    if (!showLowCriticalScale) {\n        lowCriticalState = Number.MIN_SAFE_INTEGER;\n    }\n    if (lowCriticalState !== null && lowWarningState !== null) {\n        if (value > lowCriticalState && value <= lowWarningState) {\n            element.fill(ctx.properties.activeWarningScaleColor);\n        } else {\n            element.fill(ctx.properties.defaultWarningScaleColor);\n        }\n    }\n}",
       "actions": null
     },
     {

application/src/main/data/json/system/scada_symbols/filter-hp.svg

@@ -163,8 +163,8 @@
     },
     {
       "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
       "group": null,
       "type": "value",
       "valueType": "BOOLEAN",

application/src/main/data/json/system/scada_symbols/heat-pump-hp.svg

@@ -306,8 +306,8 @@
     },
     {
       "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
       "group": null,
       "type": "value",
       "valueType": "BOOLEAN",

application/src/main/data/json/system/scada_symbols/horizontal-tank-hp.svg

@@ -247,8 +247,8 @@
     },
     {
       "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
       "group": null,
       "type": "value",
       "valueType": "BOOLEAN",

application/src/main/data/json/system/scada_symbols/horizontal-valve-hp.svg

@@ -272,8 +272,8 @@
     },
     {
       "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
       "group": null,
       "type": "value",
       "valueType": "BOOLEAN",

application/src/main/data/json/system/scada_symbols/pool-hp.svg

@@ -247,8 +247,8 @@
     },
     {
       "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
       "group": null,
       "type": "value",
       "valueType": "BOOLEAN",

application/src/main/data/json/system/scada_symbols/pump-hp.svg

@@ -206,8 +206,8 @@
     },
     {
       "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
       "group": null,
       "type": "value",
       "valueType": "BOOLEAN",

application/src/main/data/json/system/scada_symbols/sand-filter-hp.svg

@@ -279,8 +279,8 @@
     },
     {
       "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
       "group": null,
       "type": "value",
       "valueType": "BOOLEAN",

application/src/main/data/json/system/scada_symbols/short-vertical-tank-hp.svg

@@ -247,8 +247,8 @@
     },
     {
       "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
       "group": null,
       "type": "value",
       "valueType": "BOOLEAN",

application/src/main/data/json/system/scada_symbols/simple-horizontal-scale-hp.svg

@@ -18,12 +18,12 @@
     },
     {
       "tag": "highCriticalScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar highCriticalValue = ctx.properties.highCriticalScale;\nvar value = ctx.values.value;\n\nif (showHighCriticalScale) {\n    element.show();\n    var offset = calculateOffset(highCriticalValue, minValue, maxValue);\n    element.width(653-offset);\n} else {\n    element.hide();\n}\n\nif (showHighCriticalScale && value !== null) {\n    var highCriticalScale = ctx.properties.highCriticalScale;\n    if (value >= highCriticalScale && value <= ctx.properties.maxValue) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar highCriticalValue = ctx.properties.highCriticalScale;\nvar value = ctx.values.value;\n\nif (showHighCriticalScale) {\n    element.show();\n    var offset = calculateOffset(highCriticalValue, minValue, maxValue);\n    element.width(653-offset);\n} else {\n    element.hide();\n}\nif (showHighCriticalScale && value !== null) {\n    var highCriticalScale = ctx.properties.highCriticalScale;\n    if (value >= highCriticalScale) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
       "actions": null
     },
     {
       "tag": "highWarningScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighWarningScale = ctx.properties.showHighWarningScale;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar highWarningValue = ctx.properties.highWarningScale;\nvar value = ctx.values.value;\n\nif (showHighWarningScale) {\n    element.show();\n    var offset = calculateOffset(highWarningValue, minValue, maxValue);\n    element.width(653-offset);\n} else {\n    element.hide();\n}\n\nif (showHighWarningScale && value !== null) {\n    var highCriticalScale = ctx.properties.highCriticalScale;\n    if (!showHighCriticalScale) {\n        highCriticalScale = ctx.properties.maxValue;\n    }\n    var highWarningScale = ctx.properties.highWarningScale;\n    if (value < highCriticalScale && value >= highWarningScale) {\n        element.fill(ctx.properties.activeWarningScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultWarningScaleColor);\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighWarningScale = ctx.properties.showHighWarningScale;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar highWarningValue = ctx.properties.highWarningScale;\nvar value = ctx.values.value;\n\nif (showHighWarningScale) {\n    element.show();\n    var offset = calculateOffset(highWarningValue, minValue, maxValue);\n    element.width(653-offset);\n} else {\n    element.hide();\n}\n\nif (showHighWarningScale && value !== null) {\n    var highCriticalScale = ctx.properties.highCriticalScale;\n    if (!showHighCriticalScale) {\n        highCriticalScale = Number.MAX_SAFE_INTEGER;\n    }\n    var highWarningScale = ctx.properties.highWarningScale;\n    if (value < highCriticalScale && value >= highWarningScale) {\n        element.fill(ctx.properties.activeWarningScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultWarningScaleColor);\n    }\n}",
       "actions": null
     },
     {
@@ -33,12 +33,12 @@
     },
     {
       "tag": "lowCriticalScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowCriticalScale = ctx.properties.lowCriticalScale;\n\nif (showLowCriticalScale) {\n    element.show();\n    var offset = calculateOffset(lowCriticalScale, minValue, maxValue);\n    var childrenElement = element.children();\n    element.width(offset);\n} else {\n    element.hide();\n}\n\nif (showLowCriticalScale && value !== null) {\n    if (value <= lowCriticalScale && value >= ctx.properties.minValue) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowCriticalScale = ctx.properties.lowCriticalScale;\n\nif (showLowCriticalScale) {\n    element.show();\n    var offset = calculateOffset(lowCriticalScale, minValue, maxValue);\n    var childrenElement = element.children();\n    element.width(offset);\n} else {\n    element.hide();\n}\n\nif (showLowCriticalScale && value !== null) {\n    if (value <= lowCriticalScale) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
       "actions": null
     },
     {
       "tag": "lowWarningScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowWarningScale = ctx.properties.showLowWarningScale;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowWarningScale = ctx.properties.lowWarningScale;\nif (showLowWarningScale) {\n    element.show();\n    var offset = calculateOffset(lowWarningScale, minValue, maxValue);\n    element.width(offset);\n} else {\n    element.hide();\n}\n\nif (showLowWarningScale && value !== null) {\n    var lowCriticalScale = ctx.properties.lowCriticalScale;\n    if (!showLowCriticalScale) {\n        lowCriticalScale = ctx.properties.minValue;\n    }\n    if (value > lowCriticalScale && value <= lowWarningScale) {\n        element.fill(ctx.properties.activeWarningScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultWarningScaleColor);\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowWarningScale = ctx.properties.showLowWarningScale;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowWarningScale = ctx.properties.lowWarningScale;\nif (showLowWarningScale) {\n    element.show();\n    var offset = calculateOffset(lowWarningScale, minValue, maxValue);\n    element.width(offset);\n} else {\n    element.hide();\n}\n\nif (showLowWarningScale && value !== null) {\n    var lowCriticalScale = ctx.properties.lowCriticalScale;\n    if (!showLowCriticalScale) {\n        lowCriticalScale = Number.MIN_SAFE_INTEGER;\n    }\n    if (value > lowCriticalScale && value <= lowWarningScale) {\n        element.fill(ctx.properties.activeWarningScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultWarningScaleColor);\n    }\n}",
       "actions": null
     },
     {

application/src/main/data/json/system/scada_symbols/simple-vertical-scale-hp.svg

@@ -18,12 +18,12 @@
     },
     {
       "tag": "highCriticalScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar highCriticalScale = ctx.properties.highCriticalScale;\n\nif (showHighCriticalScale) {\n    element.show();\n    var offset = calculateOffset(highCriticalScale, minValue, maxValue);\n    element.height(653-offset);\n} else {\n    element.hide();\n}\n\nif (showHighCriticalScale && value !== null) {\n    var highCriticalScale = ctx.properties.highCriticalScale;\n    if (value >= highCriticalScale && value <= ctx.properties.maxValue) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar highCriticalScale = ctx.properties.highCriticalScale;\n\nif (showHighCriticalScale) {\n    element.show();\n    var offset = calculateOffset(highCriticalScale, minValue, maxValue);\n    element.height(653-offset);\n} else {\n    element.hide();\n}\n\nif (showHighCriticalScale && value !== null) {\n    var highCriticalScale = ctx.properties.highCriticalScale;\n    if (value >= highCriticalScale) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
       "actions": null
     },
     {
       "tag": "highWarningScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighWarningScale = ctx.properties.showHighWarningScale;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar highWarningValue = ctx.properties.highWarningScale;\nif (showHighWarningScale) {\n    element.show();\n    var offset = calculateOffset(highWarningValue, minValue, maxValue);\n    element.height(653-offset);\n} else {\n    element.hide();\n}\nif (showHighWarningScale && value !== null) {\n    var highCriticalScale = ctx.properties.highCriticalScale;\n    if (!showHighCriticalScale) {\n        highCriticalScale = ctx.properties.maxValue;\n    }\n    var highWarningScale = ctx.properties.highWarningScale;\n    if (value < highCriticalScale && value >= highWarningScale) {\n        element.fill(ctx.properties.activeWarningScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultWarningScaleColor);\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showHighWarningScale = ctx.properties.showHighWarningScale;\nvar showHighCriticalScale = ctx.properties.showHighCriticalScale;\nvar highWarningValue = ctx.properties.highWarningScale;\nif (showHighWarningScale) {\n    element.show();\n    var offset = calculateOffset(highWarningValue, minValue, maxValue);\n    element.height(653-offset);\n} else {\n    element.hide();\n}\nif (showHighWarningScale && value !== null) {\n    var highCriticalScale = ctx.properties.highCriticalScale;\n    if (!showHighCriticalScale) {\n        highCriticalScale = Number.MAX_SAFE_INTEGER;\n    }\n    var highWarningScale = ctx.properties.highWarningScale;\n    if (value < highCriticalScale && value >= highWarningScale) {\n        element.fill(ctx.properties.activeWarningScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultWarningScaleColor);\n    }\n}",
       "actions": null
     },
     {
@@ -33,12 +33,12 @@
     },
     {
       "tag": "lowCriticalScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowCriticalScale = ctx.properties.lowCriticalScale;\nif (showLowCriticalScale) {\n    element.show();\n    var offset = calculateOffset(lowCriticalScale, minValue, maxValue);\n    element.height(offset);\n} else {\n    element.hide();\n}\n\nif (showLowCriticalScale && value !== null) {\n    if (value <= lowCriticalScale && value >= ctx.properties.minValue) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowCriticalScale = ctx.properties.lowCriticalScale;\nif (showLowCriticalScale) {\n    element.show();\n    var offset = calculateOffset(lowCriticalScale, minValue, maxValue);\n    element.height(offset);\n} else {\n    element.hide();\n}\n\nif (showLowCriticalScale && value !== null) {\n    if (value <= lowCriticalScale) {\n        element.fill(ctx.properties.activeCriticalScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultCriticalScaleColor)\n    }\n}",
       "actions": null
     },
     {
       "tag": "lowWarningScale",
-      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowWarningScale = ctx.properties.showLowWarningScale;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowWarningScale = ctx.properties.lowWarningScale;\nif (showLowWarningScale) {\n    element.show();\n    var offset = calculateOffset(lowWarningScale, minValue, maxValue);\n    element.height(offset);\n} else {\n    element.hide();\n}\n\nif (showLowWarningScale && value !== null) {\n    var lowCriticalScale = ctx.properties.lowCriticalScale;\n    if (!showLowCriticalScale) {\n        lowCriticalScale = ctx.properties.minValue;\n    }\n    if (value > lowCriticalScale && value <= lowWarningScale) {\n        element.fill(ctx.properties.activeWarningScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultWarningScaleColor);\n    }\n}",
+      "stateRenderFunction": "function calculateOffset(value, minValue, maxValue) {\n    var clampedValue = Math.max(minValue, Math.min(value, maxValue));\n    var normalizedValue = (clampedValue - minValue) / (maxValue - minValue);\n    var offset = normalizedValue * 653;\n    return offset;\n}\n\nvar value = ctx.values.value;\nvar minValue = ctx.properties.minValue;\nvar maxValue = ctx.properties.maxValue;\nvar showLowWarningScale = ctx.properties.showLowWarningScale;\nvar showLowCriticalScale = ctx.properties.showLowCriticalScale;\nvar lowWarningScale = ctx.properties.lowWarningScale;\nif (showLowWarningScale) {\n    element.show();\n    var offset = calculateOffset(lowWarningScale, minValue, maxValue);\n    element.height(offset);\n} else {\n    element.hide();\n}\nif (showLowWarningScale && value !== null) {\n    var lowCriticalScale = ctx.properties.lowCriticalScale;\n    if (!showLowCriticalScale) {\n        lowCriticalScale = Number.MIN_SAFE_INTEGER;\n    }\n    if (value > lowCriticalScale && value <= lowWarningScale) {\n        element.fill(ctx.properties.activeWarningScaleColor);\n    } else {\n        element.fill(ctx.properties.defaultWarningScaleColor);\n    }\n}",
       "actions": null
     },
     {

application/src/main/data/json/system/scada_symbols/vertical-tank-hp.svg

@@ -247,8 +247,8 @@
     },
     {
       "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
       "group": null,
       "type": "value",
       "valueType": "BOOLEAN",

application/src/main/data/json/system/scada_symbols/vertical-valve-hp.svg

@@ -272,8 +272,8 @@
     },
     {
       "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
       "group": null,
       "type": "value",
       "valueType": "BOOLEAN",

application/src/main/data/json/system/widget_bundles/buttons.json

@@ -11,6 +11,7 @@
     "action_button",
     "command_button",
     "toggle_button",
+    "two_segment_button",
     "power_button"
   ]
 }

application/src/main/data/json/system/widget_bundles/control_widgets.json

@@ -11,6 +11,7 @@
     "single_switch",
     "command_button",
     "toggle_button",
+    "two_segment_button",
     "power_button",
     "slider",
     "control_widgets.switch_control",

application/src/main/data/json/system/widget_bundles/general_high_performance_scada_symbols.json

@@ -5,7 +5,7 @@
     "image": "tb-image:aHBfc2NhZGFfZ2VuZXJhbF9zeW1ib2xzX3N5c3RlbV9idW5kbGVfaW1hZ2UucG5n:IkdlbmVyYWwgaGlnaC1wZXJmb3JtYW5jZSBTQ0FEQSBzdW1ib2xzIiBzeXN0ZW0gYnVuZGxlIGltYWdl:SU1BR0U=;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAA8FBMVEXe3t7f39/f39/X19cAAADf39/e3t7d3d3e3t6VlZXI3/eZmZlmZmbGxsbr6+vc3Nytra3Y2Nikrri3xtZ9fX0aGho1NTW5ubnS0tKUlJS/v7+urq6zs7Pa2tqJiYm0tLR5eXnPz8/b29t8fHyhoaJxcXImJia+vr5WVlZjY2NNTU0wMDCpqamzx9zCx9GxsbGEhIRZWVlubm7Q09jJycmLmbhvg6tBQUG3ydvR0dEbPoW90+qzu8spSosNM3+nsMWZpb6TlpkAKHhhZWpfX19UVFRGRkbU1NR9jrKmpqZTbJ43VZFdZm5qampFYZh4foRgw9f8AAAACHRSTlPvvyAgAK+wr43PeosAAAVgSURBVHja7d1pV9pAGIZhuj9TMw1t02RiZawkYYlKRSm21qWb3Zf//286Y8RCgBgIlBecWwkh+sHrvIF45hyldPfOrRKWvXt37pbuLD9DpRgPsBKtwGmVVFoVCAyEWjcWsreftAdiTQp5YSU5IJaBgFgGAmIZCIhlICCWgWDSBJ9hYnEQyWbboiD8OWZayNFruSFlAzEQopCd9aSdohAh9NHFQbYeJW0UhVgMgIv+IrHMEMFCACHjCGtSS8pltS9CIBTcC0OhH+odshDJOXfBY2ZJRFHoiucJxI3kof4KXM4OWVRzpAu9E1OFxJZluXAc7ikOLx8+h8uRTEnKS4iFqx24gigkObWstuNIRBZz+yDMGQGJOWmIjACOGvBvIgIWEy5Q64O01Q7VUyuBIIpjCcc9jEPImOtj8WF8cbh/Iq7lSqKQsbkYjll0X35XH7JsF0QDoQKxbegPfX+5kxzVx5cI8uXbWkbfHkMlvPWMNr9QgNgv1zLzbAAeMvNmA3nyOunJNBDb3smGbEBJ1pHZ5mwgTx8mTQXBtRDbtpcAYg9ORH7+LFOQl2mI/8tH53zTiShB7BRkW0rX3/8kMyAbEZwd/1f9fJMYpNoPqalPue1sZ0BkiB3Hj+rn9XlAdn++nQqCFGRbQz4rTx+kqiB9P7TvY0duSHzCHCC778XHt7OYSCOOG2mIPQgRn/zzzpwgu+8BJZkKUlWQvl44a75cczImgo66/okO6nOA/IGK/yx4aqVLQ9IRm0gOSHX0dYTSc8SGgpSvn4jt/a8L4m70duqX33o2ZN1WdbaQUaez8OsIFKTCvfHVOxUNwdambuNis6Fv+rNXx6YBqTzOqFK1dehlA7Yq2VxFAZIlqVQqVQUBbPTXUxCDXEiuMMlepefoDcQecCRbOpAQl5JqtaI0A1Wr6qbSCsDGUIQmAnaVPz6WO4lFQZLs60LeFgyBrS1pD3r3SwS5tOhN8uDKhjyRggxVCEEKck0GMj4DKZSBjM9ACmUg41tRyMFZCxe1sPjyQR4jaQDSPf1+1AXw9fTkAAsvH8QPkdQHaZ220PpwgFdHFAaSE7JnRS+h6occvAOgID9eteYh4Zik/BDL2tsahOi634HTk5OjLmZesO0jf/khOn8rBXmnz6oP73BweoxZFzx7lp8yIcSKvAHI8UkLCtKCOr1QrDfldM1nzzSlPBRHYcjeOvohrZNjQCHOgKOzYoyoIVmqtobUApZONpuiGGT/ZerJfvS72+2eqfPr6/cTFKrpY6hAM95gRKxZBLIfPkYK8kp3DBx3vx6gSLyJERDFGOfm00PkFpCCzK6QYThvHANgDKlyQxRjjhDGCn8/jV8aDURlIAZiIAYyPwhjBmIgBmIgBmIgU0I4Y80mY2LpIaJ2sSzCMZwMMFFNb5EQBBoSYETbNYEJ8hpYKETUxgzEV778611h0OazgBzvJoWYuGDcQNTCj8i93sXKwCwg6yLpG6YYybiBjBGi6SNnRf4QZvKCaMxAkpFkr3dRgjCG4XgQNBpB4F273kUdknXcQAzEQAzEQAzEQAzkhkG8etIarlpOyIj/r2UgNwMytHy0rJCh5SNCEC/KXKfKXj6iBEHDG+lr5Fk+IgXhjWbWOlX28hElCFBmQ5VzLx9RgkxUECFvtCFkryOXGUhGBmIgKgPJ6CZDGkkBpo4GhGw3FSJCDsBjZVBrQojF2oBz6FiuAK0mhLTDNrhGtCVoNSGEMw7Z1jsctCph4hxyb9kxLSQCwaaAhDEASW0sU0DgSlF2V+A5Am7F7ecg1k29stPNQKhlINRamTfWLd3CSnS/dHslRqIYd2/fw7JXunX77l/CoXsjeoRJ3gAAAABJRU5ErkJggg==",
     "scada": true,
     "description": "Bundle with high-performance SCADA symbols",
-    "order": 9500,
+    "order": 9400,
     "name": "General high-performance SCADA symbols"
   },
   "widgetTypeFqns": [

application/src/main/data/upgrade/basic/schema_update.sql

@@ -143,7 +143,7 @@ $$
             LOOP
                 generatedBundleId := NULL;
                 -- migrate android config
-                IF (qrCodeRecord.android_config IS NOT NULL AND qrCodeRecord.android_config::jsonb -> 'appPackage' IS NOT NULL) THEN
+                IF (qrCodeRecord.android_config::jsonb ->> 'appPackage' IS NOT NULL) THEN
                     androidPkgName := qrCodeRecord.android_config::jsonb ->> 'appPackage';
                     SELECT id into androidAppId FROM mobile_app WHERE pkg_name = androidPkgName AND platform_type = 'ANDROID';
                     IF androidAppId IS NULL THEN
@@ -154,17 +154,16 @@ $$
                         generatedBundleId := uuid_generate_v4();
                         INSERT INTO mobile_app_bundle(id, created_time, tenant_id, title, android_app_id)
                         VALUES (generatedBundleId, (extract(epoch from now()) * 1000), qrCodeRecord.tenant_id, androidPkgName || ' (autogenerated)', androidAppId);
-                        UPDATE qr_code_settings SET mobile_app_bundle_id = generatedBundleId,
+                        UPDATE qr_code_settings SET mobile_app_bundle_id = generatedBundleId;
-                                                    android_enabled = (qrCodeRecord.android_config::jsonb ->> 'enabled')::boolean WHERE id = qrCodeRecord.id;
                     ELSE
                         UPDATE mobile_app SET store_info = qrCodeRecord.android_config::jsonb - 'appPackage' - 'enabled' WHERE id = androidAppId;
-                        UPDATE qr_code_settings SET mobile_app_bundle_id = (SELECT id FROM mobile_app_bundle WHERE mobile_app_bundle.android_app_id = androidAppId),
+                        UPDATE qr_code_settings SET mobile_app_bundle_id = (SELECT id FROM mobile_app_bundle WHERE mobile_app_bundle.android_app_id = androidAppId);
-                                                    android_enabled = (qrCodeRecord.android_config::jsonb ->> 'enabled')::boolean WHERE id = qrCodeRecord.id;
                     END IF;
                 END IF;
+                UPDATE qr_code_settings SET android_enabled = (qrCodeRecord.android_config::jsonb ->> 'enabled')::boolean WHERE id = qrCodeRecord.id;
 
                 -- migrate ios config
-                IF (qrCodeRecord.ios_config IS NOT NULL AND qrCodeRecord.ios_config::jsonb -> 'appId' IS NOT NULL) THEN
+                IF (qrCodeRecord.ios_config::jsonb ->> 'appId' IS NOT NULL) THEN
                     iosPkgName := substring(qrCodeRecord.ios_config::jsonb ->> 'appId', strpos(qrCodeRecord.ios_config::jsonb ->> 'appId', '.') + 1);
                     SELECT id INTO iosAppId FROM mobile_app WHERE pkg_name = iosPkgName AND platform_type = 'IOS';
                     IF iosAppId IS NULL THEN
@@ -176,19 +175,19 @@ $$
                             generatedBundleId := uuid_generate_v4();
                             INSERT INTO mobile_app_bundle(id, created_time, tenant_id, title, ios_app_id)
                             VALUES (generatedBundleId, (extract(epoch from now()) * 1000), qrCodeRecord.tenant_id, iosPkgName || ' (autogenerated)', iosAppId);
-                            UPDATE qr_code_settings SET mobile_app_bundle_id = generatedBundleId,
+                            UPDATE qr_code_settings SET mobile_app_bundle_id = generatedBundleId;
-                                                        ios_enabled = (qrCodeRecord.ios_config::jsonb ->> 'enabled')::boolean WHERE id = qrCodeRecord.id;
                         ELSE
                             UPDATE mobile_app_bundle SET ios_app_id = iosAppId WHERE id = generatedBundleId;
                         END IF;
                     ELSE
-                        UPDATE qr_code_settings SET mobile_app_bundle_id = (SELECT id FROM mobile_app_bundle WHERE mobile_app_bundle.ios_app_id = iosAppId),
+                        UPDATE qr_code_settings SET mobile_app_bundle_id = (SELECT id FROM mobile_app_bundle WHERE mobile_app_bundle.ios_app_id = iosAppId);
-                                                    ios_enabled = (qrCodeRecord.ios_config::jsonb -> 'enabled')::boolean WHERE id = qrCodeRecord.id;
                         UPDATE mobile_app SET store_info = qrCodeRecord.ios_config::jsonb - 'enabled' WHERE id = iosAppId;
                     END IF;
                 END IF;
+                UPDATE qr_code_settings SET ios_enabled = (qrCodeRecord.ios_config::jsonb -> 'enabled')::boolean WHERE id = qrCodeRecord.id;
             END LOOP;
             ALTER TABLE qr_code_settings RENAME CONSTRAINT mobile_app_settings_tenant_id_unq_key TO qr_code_settings_tenant_id_unq_key;
+            ALTER TABLE qr_code_settings RENAME CONSTRAINT mobile_app_settings_pkey TO qr_code_settings_pkey;
         END IF;
         ALTER TABLE qr_code_settings DROP COLUMN IF EXISTS android_config, DROP COLUMN IF EXISTS ios_config;
     END;

application/src/main/java/org/thingsboard/server/controller/BaseController.java

@@ -19,6 +19,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.ListenableFuture;
 import jakarta.mail.MessagingException;
+import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.ConstraintViolation;
 import lombok.Getter;
@@ -28,6 +29,7 @@ import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataAccessException;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -182,7 +184,9 @@ import org.thingsboard.server.service.sync.vc.EntitiesVersionControlService;
 import org.thingsboard.server.service.telemetry.AlarmSubscriptionService;
 import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 
+import java.io.IOException;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -194,6 +198,7 @@ import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.zip.GZIPOutputStream;
 
 import static org.thingsboard.server.common.data.StringUtils.isNotEmpty;
 import static org.thingsboard.server.common.data.query.EntityKeyType.ENTITY_FIELD;
@@ -1008,6 +1013,22 @@ public abstract class BaseController {
         }
     }
 
+    protected void compressResponseWithGzipIFAccepted(String acceptEncodingHeader, HttpServletResponse response, byte[] content) throws IOException {
+        if (StringUtils.isNotEmpty(acceptEncodingHeader) && acceptEncodingHeader.contains("gzip")) {
+            response.setHeader(HttpHeaders.CONTENT_ENCODING, "gzip");
+            response.setCharacterEncoding(StandardCharsets.UTF_8.displayName());
+            try (GZIPOutputStream gzipOutputStream = new GZIPOutputStream(response.getOutputStream())) {
+                gzipOutputStream.write(content);
+                gzipOutputStream.finish();
+            }
+        } else {
+            try (ServletOutputStream outputStream = response.getOutputStream()) {
+                outputStream.write(content);
+                outputStream.flush();
+            }
+        }
+    }
+
     protected <T> ResponseEntity<T> response(HttpStatus status) {
         return ResponseEntity.status(status).build();
     }

application/src/main/java/org/thingsboard/server/controller/DashboardController.java

@@ -22,8 +22,10 @@ import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -31,6 +33,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -67,6 +70,7 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID;
 import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.DASHBOARD_ID_PARAM_DESCRIPTION;
@@ -149,17 +153,20 @@ public class DashboardController extends BaseController {
     )
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @GetMapping(value = "/dashboard/{dashboardId}")
-    public Dashboard getDashboardById(@Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
+    public void getDashboardById(@Parameter(description = DASHBOARD_ID_PARAM_DESCRIPTION)
                                       @PathVariable(DASHBOARD_ID) String strDashboardId,
                                       @Parameter(description = INCLUDE_RESOURCES_DESCRIPTION)
-                                      @RequestParam(value = INCLUDE_RESOURCES, required = false) boolean includeResources) throws ThingsboardException {
+                                      @RequestParam(value = INCLUDE_RESOURCES, required = false) boolean includeResources,
+                                      @RequestHeader(name = HttpHeaders.ACCEPT_ENCODING, required = false) String acceptEncodingHeader,
+                                      HttpServletResponse response) throws Exception {
         checkParameter(DASHBOARD_ID, strDashboardId);
         DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
         Dashboard dashboard = checkDashboardId(dashboardId, Operation.READ);
         if (includeResources) {
             dashboard.setResources(tbResourceService.exportResources(dashboard, getCurrentUser()));
         }
-        return dashboard;
+        response.setContentType(APPLICATION_JSON_VALUE);
+        compressResponseWithGzipIFAccepted(acceptEncodingHeader, response, JacksonUtil.writeValueAsBytes(dashboard));
     }
 
     @ApiOperation(value = "Create Or Update Dashboard (saveDashboard)",
@@ -171,11 +178,15 @@ public class DashboardController extends BaseController {
                     TENANT_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @PostMapping(value = "/dashboard")
-    public Dashboard saveDashboard(@io.swagger.v3.oas.annotations.parameters.RequestBody(description = "A JSON value representing the dashboard.")
+    public void saveDashboard(@io.swagger.v3.oas.annotations.parameters.RequestBody(description = "A JSON value representing the dashboard.")
-                                   @RequestBody Dashboard dashboard) throws Exception {
+                                   @RequestBody Dashboard dashboard,
+                                   @RequestHeader(name = HttpHeaders.ACCEPT_ENCODING, required = false) String acceptEncodingHeader,
+                                   HttpServletResponse response) throws Exception {
         dashboard.setTenantId(getTenantId());
         checkEntity(dashboard.getId(), dashboard, Resource.DASHBOARD);
-        return tbDashboardService.save(dashboard, getCurrentUser());
+        var savedDashboard = tbDashboardService.save(dashboard, getCurrentUser());
+        response.setContentType(APPLICATION_JSON_VALUE);
+        compressResponseWithGzipIFAccepted(acceptEncodingHeader, response, JacksonUtil.writeValueAsBytes(savedDashboard));
     }
 
     @ApiOperation(value = "Delete the Dashboard (deleteDashboard)",
@@ -408,12 +419,13 @@ public class DashboardController extends BaseController {
                     "If 'homeDashboardId' parameter is not set on the User and Customer levels then checks the same parameter for the Tenant that owns the user. "
                     + DASHBOARD_DEFINITION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH)
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/dashboard/home", method = RequestMethod.GET)
+    @GetMapping(value = "/dashboard/home")
-    @ResponseBody
+    public void getHomeDashboard(@RequestHeader(name = HttpHeaders.ACCEPT_ENCODING, required = false) String acceptEncodingHeader,
-    public HomeDashboard getHomeDashboard() throws ThingsboardException {
+                                 HttpServletResponse response) throws Exception {
         SecurityUser securityUser = getCurrentUser();
+        response.setContentType(APPLICATION_JSON_VALUE);
         if (securityUser.isSystemAdmin()) {
-            return null;
+            return;
         }
         User user = userService.findUserById(securityUser.getTenantId(), securityUser.getId());
         JsonNode additionalInfo = user.getAdditionalInfo();
@@ -431,7 +443,9 @@ public class DashboardController extends BaseController {
                 homeDashboard = extractHomeDashboardFromAdditionalInfo(additionalInfo);
             }
         }
-        return homeDashboard;
+        if (homeDashboard != null) {
+            compressResponseWithGzipIFAccepted(acceptEncodingHeader, response, JacksonUtil.writeValueAsBytes(homeDashboard));
+        }
     }
 
     @ApiOperation(value = "Get Home Dashboard Info (getHomeDashboardInfo)",

application/src/main/java/org/thingsboard/server/controller/ImageController.java

@@ -61,7 +61,9 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 
+import java.io.ByteArrayOutputStream;
 import java.util.concurrent.TimeUnit;
+import java.util.zip.GZIPOutputStream;
 
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_NUMBER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PAGE_SIZE_DESCRIPTION;
@@ -70,6 +72,7 @@ import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_INC
 import static org.thingsboard.server.controller.ControllerConstants.RESOURCE_TEXT_SEARCH_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_ORDER_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.SORT_PROPERTY_DESCRIPTION;
+import static org.thingsboard.server.dao.util.ImageUtils.mediaTypeToFileExtension;
 
 @Slf4j
 @RestController
@@ -179,15 +182,17 @@ public class ImageController extends BaseController {
                                                            @PathVariable String type,
                                                            @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
                                                            @PathVariable String key,
-                                                           @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws Exception {
+                                                           @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag,
-        return downloadIfChanged(type, key, etag, false);
+                                                           @RequestHeader(name = HttpHeaders.ACCEPT_ENCODING, required = false) String acceptEncodingHeader) throws Exception {
+        return downloadIfChanged(type, key, etag, acceptEncodingHeader, false);
     }
 
     @GetMapping(value = "/api/images/public/{publicResourceKey}", produces = "image/*")
     public ResponseEntity<ByteArrayResource> downloadPublicImage(@PathVariable String publicResourceKey,
-                                                                 @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws Exception {
+                                                                 @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag,
+                                                                 @RequestHeader(name = HttpHeaders.ACCEPT_ENCODING, required = false) String acceptEncodingHeader) throws Exception {
         ImageCacheKey cacheKey = ImageCacheKey.forPublicImage(publicResourceKey);
-        return downloadIfChanged(cacheKey, etag, () -> imageService.getPublicImageInfoByKey(publicResourceKey));
+        return downloadIfChanged(cacheKey, etag, acceptEncodingHeader, () -> imageService.getPublicImageInfoByKey(publicResourceKey));
     }
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@@ -213,8 +218,9 @@ public class ImageController extends BaseController {
                                                                   @PathVariable String type,
                                                                   @Parameter(description = IMAGE_KEY_PARAM_DESCRIPTION, required = true)
                                                                   @PathVariable String key,
-                                                                  @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag) throws Exception {
+                                                                  @RequestHeader(name = HttpHeaders.IF_NONE_MATCH, required = false) String etag,
-        return downloadIfChanged(type, key, etag, true);
+                                                                  @RequestHeader(name = HttpHeaders.ACCEPT_ENCODING, required = false) String acceptEncodingHeader) throws Exception {
+        return downloadIfChanged(type, key, etag, acceptEncodingHeader, true);
     }
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
@@ -268,12 +274,12 @@ public class ImageController extends BaseController {
         return (result.isSuccess() ? ResponseEntity.ok() : ResponseEntity.badRequest()).body(result);
     }
 
-    private ResponseEntity<ByteArrayResource> downloadIfChanged(String type, String key, String etag, boolean preview) throws Exception {
+    private ResponseEntity<ByteArrayResource> downloadIfChanged(String type, String key, String etag, String acceptEncodingHeader, boolean preview) throws Exception {
         ImageCacheKey cacheKey = ImageCacheKey.forImage(getTenantId(type), key, preview);
-        return downloadIfChanged(cacheKey, etag, () -> checkImageInfo(type, key, Operation.READ));
+        return downloadIfChanged(cacheKey, etag, acceptEncodingHeader, () -> checkImageInfo(type, key, Operation.READ));
     }
 
-    private ResponseEntity<ByteArrayResource> downloadIfChanged(ImageCacheKey cacheKey, String etag, ThrowingSupplier<TbResourceInfo> imageInfoSupplier) throws Exception {
+    private ResponseEntity<ByteArrayResource> downloadIfChanged(ImageCacheKey cacheKey, String etag, String acceptEncodingHeader, ThrowingSupplier<TbResourceInfo> imageInfoSupplier) throws Exception {
         if (StringUtils.isNotEmpty(etag)) {
             etag = StringUtils.remove(etag, '\"'); // etag is wrapped in double quotes due to HTTP specification
             if (etag.equals(tbImageService.getETag(cacheKey))) {
@@ -294,7 +300,6 @@ public class ImageController extends BaseController {
         tbImageService.putETag(cacheKey, descriptor.getEtag());
         var result = ResponseEntity.ok()
                 .header("Content-Type", descriptor.getMediaType())
-                .contentLength(data.length)
                 .eTag(descriptor.getEtag());
         if (!cacheKey.isPublic()) {
             result
@@ -308,7 +313,19 @@ public class ImageController extends BaseController {
         } else {
             result.cacheControl(CacheControl.noCache());
         }
-        return result.body(new ByteArrayResource(data));
+        var responseData = data;
+        if (mediaTypeToFileExtension(descriptor.getMediaType()).equals("svg") &&
+                StringUtils.isNotEmpty(acceptEncodingHeader) && acceptEncodingHeader.contains("gzip")) {
+            result.header(HttpHeaders.CONTENT_ENCODING, "gzip");
+            var outputStream = new ByteArrayOutputStream();
+            try (GZIPOutputStream gzipOutputStream = new GZIPOutputStream(outputStream)) {
+                gzipOutputStream.write(data);
+                gzipOutputStream.finish();
+            }
+            responseData = outputStream.toByteArray();
+        }
+        result.contentLength(responseData.length);
+        return result.body(new ByteArrayResource(responseData));
     }
 
     private TbResourceInfo checkImageInfo(String imageType, String key, Operation operation) throws ThingsboardException {

application/src/main/java/org/thingsboard/server/controller/NotificationController.java

@@ -477,7 +477,7 @@ public class NotificationController extends BaseController {
                     SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
     @GetMapping("/notification/deliveryMethods")
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
-    public Set<NotificationDeliveryMethod> getAvailableDeliveryMethods(@AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
+    public List<NotificationDeliveryMethod> getAvailableDeliveryMethods(@AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
         return notificationCenter.getAvailableDeliveryMethods(user.getTenantId());
     }
 

application/src/main/java/org/thingsboard/server/controller/QrCodeSettingsController.java

@@ -176,7 +176,7 @@ public class QrCodeSettingsController extends BaseController {
             return ResponseEntity.status(HttpStatus.FOUND)
                     .header("Location", googlePlayLink)
                     .build();
-        } else if (userAgent.contains("iPhone") || userAgent.contains("iPad") && qrCodeSettings.isIosEnabled()) {
+        } else if ((userAgent.contains("iPhone") || userAgent.contains("iPad")) && qrCodeSettings.isIosEnabled()) {
             String appStoreLink = qrCodeSettings.getAppStoreLink();
             return ResponseEntity.status(HttpStatus.FOUND)
                     .header("Location", appStoreLink)

application/src/main/java/org/thingsboard/server/controller/TelemetryController.java

@@ -47,6 +47,10 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.rule.engine.api.AttributesDeleteRequest;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
+import org.thingsboard.rule.engine.api.TimeseriesDeleteRequest;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
@@ -399,7 +403,7 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> saveEntityAttributesV2(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope")AttributeScope scope,
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope") AttributeScope scope,
             @io.swagger.v3.oas.annotations.parameters.RequestBody(description = ATTRIBUTES_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody JsonNode request) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
         return saveAttributes(getTenantId(), entityId, scope, request);
@@ -423,8 +427,8 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> saveEntityTelemetry(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @Parameter(description = TELEMETRY_SCOPE_DESCRIPTION, required = true, schema = @Schema(allowableValues = "ANY")) @PathVariable("scope")String scope,
+            @Parameter(description = TELEMETRY_SCOPE_DESCRIPTION, required = true, schema = @Schema(allowableValues = "ANY")) @PathVariable("scope") String scope,
-            @io.swagger.v3.oas.annotations.parameters.RequestBody(description = TELEMETRY_JSON_REQUEST_DESCRIPTION, required = true)@RequestBody String requestBody) throws ThingsboardException {
+            @io.swagger.v3.oas.annotations.parameters.RequestBody(description = TELEMETRY_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody String requestBody) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
         return saveTelemetry(getTenantId(), entityId, requestBody, 0L);
     }
@@ -447,9 +451,9 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> saveEntityTelemetryWithTTL(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @Parameter(description = TELEMETRY_SCOPE_DESCRIPTION, required = true, schema = @Schema(allowableValues = "ANY")) @PathVariable("scope")String scope,
+            @Parameter(description = TELEMETRY_SCOPE_DESCRIPTION, required = true, schema = @Schema(allowableValues = "ANY")) @PathVariable("scope") String scope,
-                    @Parameter(description = "A long value representing TTL (Time to Live) parameter.", required = true)@PathVariable("ttl")Long ttl,
+            @Parameter(description = "A long value representing TTL (Time to Live) parameter.", required = true) @PathVariable("ttl") Long ttl,
-            @io.swagger.v3.oas.annotations.parameters.RequestBody(description = TELEMETRY_JSON_REQUEST_DESCRIPTION, required = true)@RequestBody String requestBody) throws ThingsboardException {
+            @io.swagger.v3.oas.annotations.parameters.RequestBody(description = TELEMETRY_JSON_REQUEST_DESCRIPTION, required = true) @RequestBody String requestBody) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
         return saveTelemetry(getTenantId(), entityId, requestBody, ttl);
     }
@@ -518,19 +522,25 @@ public class TelemetryController extends BaseController {
             for (String key : keys) {
                 deleteTsKvQueries.add(new BaseDeleteTsKvQuery(key, deleteFromTs, deleteToTs, rewriteLatestIfDeleted, deleteLatest));
             }
-            tsSubService.deleteTimeseriesAndNotify(tenantId, entityId, keys, deleteTsKvQueries, new FutureCallback<>() {
+            tsSubService.deleteTimeseries(TimeseriesDeleteRequest.builder()
-                @Override
+                    .tenantId(tenantId)
-                public void onSuccess(@Nullable Void tmp) {
+                    .entityId(entityId)
-                    logTimeseriesDeleted(user, entityId, keys, deleteFromTs, deleteToTs, null);
+                    .keys(keys)
-                    result.setResult(new ResponseEntity<>(HttpStatus.OK));
+                    .deleteHistoryQueries(deleteTsKvQueries)
-                }
+                    .callback(new FutureCallback<>() {
-
+                        @Override
-                @Override
+                        public void onSuccess(@Nullable List<String> tmp) {
-                public void onFailure(Throwable t) {
+                            logTimeseriesDeleted(user, entityId, keys, deleteFromTs, deleteToTs, null);
-                    logTimeseriesDeleted(user, entityId, keys, deleteFromTs, deleteToTs, t);
+                            result.setResult(new ResponseEntity<>(HttpStatus.OK));
-                    result.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
+                        }
-                }
+
-            });
+                        @Override
+                        public void onFailure(Throwable t) {
+                            logTimeseriesDeleted(user, entityId, keys, deleteFromTs, deleteToTs, t);
+                            result.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
+                        }
+                    })
+                    .build());
         });
     }
 
@@ -550,8 +560,8 @@ public class TelemetryController extends BaseController {
     @ResponseBody
     public DeferredResult<ResponseEntity> deleteDeviceAttributes(
             @Parameter(description = DEVICE_ID_PARAM_DESCRIPTION, required = true) @PathVariable(DEVICE_ID) String deviceIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope")AttributeScope scope,
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"}, requiredMode = Schema.RequiredMode.REQUIRED)) @PathVariable("scope") AttributeScope scope,
-                    @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION, required = true)@RequestParam(name = "keys")String keysStr) throws ThingsboardException {
+            @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION, required = true) @RequestParam(name = "keys") String keysStr) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE, deviceIdStr);
         return deleteAttributes(entityId, scope, keysStr);
     }
@@ -573,8 +583,8 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> deleteEntityAttributes(
             @Parameter(description = ENTITY_TYPE_PARAM_DESCRIPTION, required = true, schema = @Schema(defaultValue = "DEVICE")) @PathVariable("entityType") String entityType,
             @Parameter(description = ENTITY_ID_PARAM_DESCRIPTION, required = true) @PathVariable("entityId") String entityIdStr,
-            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, required = true, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"})) @PathVariable("scope")AttributeScope scope,
+            @Parameter(description = ATTRIBUTES_SCOPE_DESCRIPTION, required = true, schema = @Schema(allowableValues = {"SERVER_SCOPE", "SHARED_SCOPE", "CLIENT_SCOPE"})) @PathVariable("scope") AttributeScope scope,
-                    @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION, required = true)@RequestParam(name = "keys")String keysStr) throws ThingsboardException {
+            @Parameter(description = ATTRIBUTES_KEYS_DESCRIPTION, required = true) @RequestParam(name = "keys") String keysStr) throws ThingsboardException {
         EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
         return deleteAttributes(entityId, scope, keysStr);
     }
@@ -587,24 +597,30 @@ public class TelemetryController extends BaseController {
         SecurityUser user = getCurrentUser();
 
         return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.WRITE_ATTRIBUTES, entityIdSrc, (result, tenantId, entityId) -> {
-            tsSubService.deleteAndNotify(tenantId, entityId, scope.name(), keys, new FutureCallback<Void>() {
+            tsSubService.deleteAttributes(AttributesDeleteRequest.builder()
-                @Override
+                    .tenantId(tenantId)
-                public void onSuccess(@Nullable Void tmp) {
+                    .entityId(entityId)
-                    logAttributesDeleted(user, entityId, scope, keys, null);
+                    .scope(scope)
-                    if (entityIdSrc.getEntityType().equals(EntityType.DEVICE)) {
+                    .keys(keys)
-                        DeviceId deviceId = new DeviceId(entityId.getId());
+                    .callback(new FutureCallback<>() {
-                        tbClusterService.pushMsgToCore(DeviceAttributesEventNotificationMsg.onDelete(
+                        @Override
-                                user.getTenantId(), deviceId, scope.name(), keys), null);
+                        public void onSuccess(@Nullable Void tmp) {
-                    }
+                            logAttributesDeleted(user, entityId, scope, keys, null);
-                    result.setResult(new ResponseEntity<>(HttpStatus.OK));
+                            if (entityIdSrc.getEntityType().equals(EntityType.DEVICE)) {
-                }
+                                DeviceId deviceId = new DeviceId(entityId.getId());
-
+                                tbClusterService.pushMsgToCore(DeviceAttributesEventNotificationMsg.onDelete(
-                @Override
+                                        user.getTenantId(), deviceId, scope.name(), keys), null);
-                public void onFailure(Throwable t) {
+                            }
-                    logAttributesDeleted(user, entityId, scope, keys, t);
+                            result.setResult(new ResponseEntity<>(HttpStatus.OK));
-                    result.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
+                        }
-                }
+
-            });
+                        @Override
+                        public void onFailure(Throwable t) {
+                            logAttributesDeleted(user, entityId, scope, keys, t);
+                            result.setResult(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
+                        }
+                    })
+                    .build());
         });
     }
 
@@ -624,19 +640,25 @@ public class TelemetryController extends BaseController {
             }
             SecurityUser user = getCurrentUser();
             return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.WRITE_ATTRIBUTES, entityIdSrc, (result, tenantId, entityId) -> {
-                tsSubService.saveAndNotify(tenantId, entityId, scope, attributes, new FutureCallback<Void>() {
+                tsSubService.saveAttributes(AttributesSaveRequest.builder()
-                    @Override
+                        .tenantId(tenantId)
-                    public void onSuccess(@Nullable Void tmp) {
+                        .entityId(entityId)
-                        logAttributesUpdated(user, entityId, scope, attributes, null);
+                        .scope(scope)
-                        result.setResult(new ResponseEntity(HttpStatus.OK));
+                        .entries(attributes)
-                    }
+                        .callback(new FutureCallback<>() {
-
+                            @Override
-                    @Override
+                            public void onSuccess(@Nullable Void tmp) {
-                    public void onFailure(Throwable t) {
+                                logAttributesUpdated(user, entityId, scope, attributes, null);
-                        logAttributesUpdated(user, entityId, scope, attributes, t);
+                                result.setResult(new ResponseEntity(HttpStatus.OK));
-                        AccessValidator.handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR);
+                            }
-                    }
+
-                });
+                            @Override
+                            public void onFailure(Throwable t) {
+                                logAttributesUpdated(user, entityId, scope, attributes, t);
+                                AccessValidator.handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR);
+                            }
+                        })
+                        .build());
             });
         } else {
             return getImmediateDeferredResult("Request is not a JSON object", HttpStatus.BAD_REQUEST);
@@ -672,19 +694,26 @@ public class TelemetryController extends BaseController {
                 TenantProfile tenantProfile = tenantProfileCache.get(tenantId);
                 tenantTtl = TimeUnit.DAYS.toSeconds(((DefaultTenantProfileConfiguration) tenantProfile.getProfileData().getConfiguration()).getDefaultStorageTtlDays());
             }
-            tsSubService.saveAndNotify(tenantId, user.getCustomerId(), entityId, entries, tenantTtl, new FutureCallback<Void>() {
+            tsSubService.saveTimeseries(TimeseriesSaveRequest.builder()
-                @Override
+                    .tenantId(tenantId)
-                public void onSuccess(@Nullable Void tmp) {
+                    .customerId(user.getCustomerId())
-                    logTelemetryUpdated(user, entityId, entries, null);
+                    .entityId(entityId)
-                    result.setResult(new ResponseEntity(HttpStatus.OK));
+                    .entries(entries)
-                }
+                    .ttl(tenantTtl)
-
+                    .callback(new FutureCallback<Void>() {
-                @Override
+                        @Override
-                public void onFailure(Throwable t) {
+                        public void onSuccess(@Nullable Void tmp) {
-                    logTelemetryUpdated(user, entityId, entries, t);
+                            logTelemetryUpdated(user, entityId, entries, null);
-                    AccessValidator.handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR);
+                            result.setResult(new ResponseEntity(HttpStatus.OK));
-                }
+                        }
-            });
+
+                        @Override
+                        public void onFailure(Throwable t) {
+                            logTelemetryUpdated(user, entityId, entries, t);
+                            AccessValidator.handleError(t, result, HttpStatus.INTERNAL_SERVER_ERROR);
+                        }
+                    })
+                    .build());
         });
     }
 

application/src/main/java/org/thingsboard/server/service/apiusage/DefaultTbApiUsageStateService.java

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.rule.engine.api.MailService;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.data.ApiFeature;
 import org.thingsboard.server.common.data.ApiUsageRecordKey;
 import org.thingsboard.server.common.data.ApiUsageRecordState;
@@ -91,9 +92,9 @@ import java.util.stream.Collectors;
 public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService<EntityId> implements TbApiUsageStateService {
 
     public static final String HOURLY = "Hourly";
-    public static final FutureCallback<Integer> VOID_CALLBACK = new FutureCallback<Integer>() {
+    public static final FutureCallback<Void> VOID_CALLBACK = new FutureCallback<Void>() {
         @Override
-        public void onSuccess(@Nullable Integer result) {
+        public void onSuccess(@Nullable Void result) {
         }
 
         @Override
@@ -214,7 +215,12 @@ public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService
             updateLock.unlock();
         }
         log.trace("[{}][{}] Saving new stats: {}", tenantId, ownerId, updatedEntries);
-        tsWsService.saveAndNotifyInternal(tenantId, usageState.getApiUsageState().getId(), updatedEntries, VOID_CALLBACK);
+        tsWsService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
+                .tenantId(tenantId)
+                .entityId(usageState.getApiUsageState().getId())
+                .entries(updatedEntries)
+                .callback(VOID_CALLBACK)
+                .build());
         if (!result.isEmpty()) {
             persistAndNotify(usageState, result);
         }
@@ -321,7 +327,12 @@ public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService
             }
         }
         if (!profileThresholds.isEmpty()) {
-            tsWsService.saveAndNotifyInternal(tenantId, id, profileThresholds, VOID_CALLBACK);
+            tsWsService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
+                    .tenantId(tenantId)
+                    .entityId(id)
+                    .entries(profileThresholds)
+                    .callback(VOID_CALLBACK)
+                    .build());
         }
     }
 
@@ -348,7 +359,12 @@ public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService
         long ts = System.currentTimeMillis();
         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);
+        tsWsService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
+                .tenantId(state.getTenantId())
+                .entityId(state.getApiUsageState().getId())
+                .entries(stateTelemetry)
+                .callback(VOID_CALLBACK)
+                .build());
 
         if (state.getEntityType() == EntityType.TENANT && !state.getEntityId().equals(TenantId.SYS_TENANT_ID)) {
             String email = tenantService.findTenantById(state.getTenantId()).getEmail();
@@ -436,7 +452,12 @@ public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService
                 .map(key -> new BasicTsKvEntry(state.getCurrentCycleTs(), new LongDataEntry(key.getApiCountKey(), 0L)))
                 .collect(Collectors.toList());
 
-        tsWsService.saveAndNotifyInternal(state.getTenantId(), state.getApiUsageState().getId(), counts, VOID_CALLBACK);
+        tsWsService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
+                .tenantId(state.getTenantId())
+                .entityId(state.getApiUsageState().getId())
+                .entries(counts)
+                .callback(VOID_CALLBACK)
+                .build());
     }
 
     BaseApiUsageState getOrFetchState(TenantId tenantId, EntityId ownerId) {

application/src/main/java/org/thingsboard/server/service/device/ClaimDevicesServiceImpl.java

@@ -28,6 +28,8 @@ import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.rule.engine.api.AttributesDeleteRequest;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Customer;
@@ -37,7 +39,6 @@ import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
-import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BooleanDataEntry;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.customer.CustomerService;
@@ -178,11 +179,12 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
                 return Futures.immediateFuture(new ReclaimResult(unassignedCustomer));
             }
             SettableFuture<ReclaimResult> result = SettableFuture.create();
-            telemetryService.saveAndNotify(
+            telemetryService.saveAttributes(AttributesSaveRequest.builder()
-                    tenantId, savedDevice.getId(), AttributeScope.SERVER_SCOPE, List.of(
+                    .tenantId(tenantId)
-                            new BaseAttributeKvEntry(new BooleanDataEntry(CLAIM_ATTRIBUTE_NAME, true), System.currentTimeMillis())
+                    .entityId(savedDevice.getId())
-                    ),
+                    .scope(AttributeScope.SERVER_SCOPE)
-                    new FutureCallback<>() {
+                    .entry(new BooleanDataEntry(CLAIM_ATTRIBUTE_NAME, true))
+                    .callback(new FutureCallback<>() {
                         @Override
                         public void onSuccess(@Nullable Void tmp) {
                             result.set(new ReclaimResult(unassignedCustomer));
@@ -192,7 +194,8 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
                         public void onFailure(Throwable t) {
                             result.setException(t);
                         }
-                    });
+                    })
+                    .build());
             return result;
         }
         cacheEviction(device.getId());
@@ -221,18 +224,13 @@ public class ClaimDevicesServiceImpl implements ClaimDevicesService {
             cache.evict(data.getKey());
         }
         SettableFuture<Void> result = SettableFuture.create();
-        telemetryService.deleteAndNotify(device.getTenantId(),
+        telemetryService.deleteAttributes(AttributesDeleteRequest.builder()
-                device.getId(), AttributeScope.SERVER_SCOPE, Arrays.asList(CLAIM_ATTRIBUTE_NAME, CLAIM_DATA_ATTRIBUTE_NAME), new FutureCallback<>() {
+                .tenantId(device.getTenantId())
-                    @Override
+                .entityId(device.getId())
-                    public void onSuccess(@Nullable Void tmp) {
+                .scope(AttributeScope.SERVER_SCOPE)
-                        result.set(tmp);
+                .keys(Arrays.asList(CLAIM_ATTRIBUTE_NAME, CLAIM_DATA_ATTRIBUTE_NAME))
-                    }
+                .future(result)
-
+                .build());
-                    @Override
-                    public void onFailure(Throwable t) {
-                        result.setException(t);
-                    }
-                });
         return result;
     }
 

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

@@ -32,6 +32,8 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardExecutors;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.cache.TbTransactionalCache;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.AttributeScope;
@@ -41,7 +43,6 @@ import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.edge.EdgeEvent;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
 import org.thingsboard.server.common.data.kv.BooleanDataEntry;
 import org.thingsboard.server.common.data.kv.LongDataEntry;
 import org.thingsboard.server.common.data.msg.TbMsgType;
@@ -68,7 +69,6 @@ import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -413,23 +413,27 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
                         if (Boolean.TRUE.equals(sessionNewEvents.get(edgeId))) {
                             log.trace("[{}][{}] Set session new events flag to false", tenantId, edgeId.getId());
                             sessionNewEvents.put(edgeId, false);
-                            processEdgeEventMigrationIfNeeded(session, edgeId);
                             session.processHighPriorityEvents();
-                            Futures.addCallback(session.processEdgeEvents(), new FutureCallback<>() {
+                            processEdgeEventMigrationIfNeeded(session, edgeId);
-                                @Override
+                            if (Boolean.TRUE.equals(edgeEventsMigrationProcessed.get(edgeId))) {
-                                public void onSuccess(Boolean newEventsAdded) {
+                                Futures.addCallback(session.processEdgeEvents(), new FutureCallback<>() {
-                                    if (Boolean.TRUE.equals(newEventsAdded)) {
+                                    @Override
-                                        sessionNewEvents.put(edgeId, true);
+                                    public void onSuccess(Boolean newEventsAdded) {
+                                        if (Boolean.TRUE.equals(newEventsAdded)) {
+                                            sessionNewEvents.put(edgeId, true);
+                                        }
+                                        scheduleEdgeEventsCheck(session);
                                     }
-                                    scheduleEdgeEventsCheck(session);
+
-                                }
+                                    @Override
-
+                                    public void onFailure(Throwable t) {
-                                @Override
+                                        log.warn("[{}] Failed to process edge events for edge [{}]!", tenantId, session.getEdge().getId().getId(), t);
-                                public void onFailure(Throwable t) {
+                                        scheduleEdgeEventsCheck(session);
-                                    log.warn("[{}] Failed to process edge events for edge [{}]!", tenantId, session.getEdge().getId().getId(), t);
+                                    }
-                                    scheduleEdgeEventsCheck(session);
+                                }, ctx.getGrpcCallbackExecutorService());
-                                }
+                            } else {
-                            }, ctx.getGrpcCallbackExecutorService());
+                                scheduleEdgeEventsCheck(session);
+                            }
                         } else {
                             scheduleEdgeEventsCheck(session);
                         }
@@ -457,8 +461,6 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
                 scheduleEdgeEventsCheck(session);
             } else if (Boolean.FALSE.equals(eventsExist)) {
                 edgeEventsMigrationProcessed.put(edgeId, true);
-            } else {
-                scheduleEdgeEventsCheck(session);
             }
         }
     }
@@ -503,24 +505,40 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
     private void save(TenantId tenantId, EdgeId edgeId, String key, long value) {
         log.debug("[{}][{}] Updating long edge telemetry [{}] [{}]", tenantId, edgeId, key, value);
         if (persistToTelemetry) {
-            tsSubService.saveAndNotify(
+            tsSubService.saveTimeseries(TimeseriesSaveRequest.builder()
-                    tenantId, edgeId,
+                    .tenantId(tenantId)
-                    Collections.singletonList(new BasicTsKvEntry(System.currentTimeMillis(), new LongDataEntry(key, value))),
+                    .entityId(edgeId)
-                    new AttributeSaveCallback(tenantId, edgeId, key, value));
+                    .entry(new LongDataEntry(key, value))
+                    .callback(new AttributeSaveCallback(tenantId, edgeId, key, value))
+                    .build());
         } else {
-            tsSubService.saveAttrAndNotify(tenantId, edgeId, AttributeScope.SERVER_SCOPE, key, value, new AttributeSaveCallback(tenantId, edgeId, key, value));
+            tsSubService.saveAttributes(AttributesSaveRequest.builder()
+                    .tenantId(tenantId)
+                    .entityId(edgeId)
+                    .scope(AttributeScope.SERVER_SCOPE)
+                    .entry(new LongDataEntry(key, value))
+                    .callback(new AttributeSaveCallback(tenantId, edgeId, key, value))
+                    .build());
         }
     }
 
     private void save(TenantId tenantId, EdgeId edgeId, String key, boolean value) {
         log.debug("[{}][{}] Updating boolean edge telemetry [{}] [{}]", tenantId, edgeId, key, value);
         if (persistToTelemetry) {
-            tsSubService.saveAndNotify(
+            tsSubService.saveTimeseries(TimeseriesSaveRequest.builder()
-                    tenantId, edgeId,
+                    .tenantId(tenantId)
-                    Collections.singletonList(new BasicTsKvEntry(System.currentTimeMillis(), new BooleanDataEntry(key, value))),
+                    .entityId(edgeId)
-                    new AttributeSaveCallback(tenantId, edgeId, key, value));
+                    .entry(new BooleanDataEntry(key, value))
+                    .callback(new AttributeSaveCallback(tenantId, edgeId, key, value))
+                    .build());
         } else {
-            tsSubService.saveAttrAndNotify(tenantId, edgeId, AttributeScope.SERVER_SCOPE, key, value, new AttributeSaveCallback(tenantId, edgeId, key, value));
+            tsSubService.saveAttributes(AttributesSaveRequest.builder()
+                    .tenantId(tenantId)
+                    .entityId(edgeId)
+                    .scope(AttributeScope.SERVER_SCOPE)
+                    .entry(new BooleanDataEntry(key, value))
+                    .callback(new AttributeSaveCallback(tenantId, edgeId, key, value))
+                    .build());
         }
     }
 

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

@@ -110,7 +110,7 @@ public abstract class EdgeGrpcSession implements Closeable {
     private static final String QUEUE_START_TS_ATTR_KEY = "queueStartTs";
     private static final String QUEUE_START_SEQ_ID_ATTR_KEY = "queueStartSeqId";
 
-    private static final int MAX_DOWNLINK_ATTEMPTS = 10;
+    private static final int MAX_DOWNLINK_ATTEMPTS = 3;
     private static final String RATE_LIMIT_REACHED = "Rate limit reached";
 
     protected static final ConcurrentLinkedQueue<EdgeEvent> highPriorityQueue = new ConcurrentLinkedQueue<>();

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

@@ -31,6 +31,7 @@ import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
@@ -293,23 +294,36 @@ public abstract class BaseTelemetryProcessor extends BaseEdgeProcessor {
         JsonObject json = JsonUtils.getJsonObject(msg.getKvList());
         List<AttributeKvEntry> attributes = new ArrayList<>(JsonConverter.convertToAttributes(json));
         String scope = metaData.getValue("scope");
-        tsSubService.saveAndNotify(tenantId, entityId, AttributeScope.valueOf(scope), attributes, new FutureCallback<Void>() {
+        tsSubService.saveAttributes(AttributesSaveRequest.builder()
-            @Override
+                .tenantId(tenantId)
-            public void onSuccess(@Nullable Void tmp) {
+                .entityId(entityId)
-                var defaultQueueAndRuleChain = getDefaultQueueNameAndRuleChainId(tenantId, entityId);
+                .scope(AttributeScope.valueOf(scope))
-                TbMsg tbMsg = TbMsg.newMsg()
+                .entries(attributes)
-                        .queueName(defaultQueueAndRuleChain.getKey())
+                .callback(new FutureCallback<>() {
-                        .type(TbMsgType.ATTRIBUTES_UPDATED)
-                        .originator(entityId)
-                        .customerId(customerId)
-                        .copyMetaData(metaData)
-                        .data(gson.toJson(json))
-                        .ruleChainId(defaultQueueAndRuleChain.getValue())
-                        .build();
-                edgeCtx.getClusterService().pushMsgToRuleEngine(tenantId, tbMsg.getOriginator(), tbMsg, new TbQueueCallback() {
                     @Override
-                    public void onSuccess(TbQueueMsgMetadata metadata) {
+                    public void onSuccess(@Nullable Void tmp) {
-                        futureToSet.set(null);
+                        var defaultQueueAndRuleChain = getDefaultQueueNameAndRuleChainId(tenantId, entityId);
+                        TbMsg tbMsg = TbMsg.newMsg()
+                                .queueName(defaultQueueAndRuleChain.getKey())
+                                .type(TbMsgType.ATTRIBUTES_UPDATED)
+                                .originator(entityId)
+                                .customerId(customerId)
+                                .copyMetaData(metaData)
+                                .data(gson.toJson(json))
+                                .ruleChainId(defaultQueueAndRuleChain.getValue())
+                                .build();
+                        edgeCtx.getClusterService().pushMsgToRuleEngine(tenantId, tbMsg.getOriginator(), tbMsg, new TbQueueCallback() {
+                            @Override
+                            public void onSuccess(TbQueueMsgMetadata metadata) {
+                                futureToSet.set(null);
+                            }
+
+                            @Override
+                            public void onFailure(Throwable t) {
+                                log.error("[{}] Can't process attributes update [{}]", tenantId, msg, t);
+                                futureToSet.setException(t);
+                            }
+                        });
                     }
 
                     @Override
@@ -317,15 +331,8 @@ public abstract class BaseTelemetryProcessor extends BaseEdgeProcessor {
                         log.error("[{}] Can't process attributes update [{}]", tenantId, msg, t);
                         futureToSet.setException(t);
                     }
-                });
+                })
-            }
+                .build());
-
-            @Override
-            public void onFailure(Throwable t) {
-                log.error("[{}] Can't process attributes update [{}]", tenantId, msg, t);
-                futureToSet.setException(t);
-            }
-        });
         return futureToSet;
     }
 

application/src/main/java/org/thingsboard/server/service/entitiy/entityview/DefaultTbEntityViewService.java

@@ -25,6 +25,10 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ConcurrentReferenceHashMap;
+import org.thingsboard.rule.engine.api.AttributesDeleteRequest;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
+import org.thingsboard.rule.engine.api.TimeseriesDeleteRequest;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.EntityType;
@@ -55,6 +59,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
@@ -273,36 +278,41 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
             return Futures.transform(getAttrFuture, attributeKvEntries -> {
                 List<AttributeKvEntry> attributes;
                 if (attributeKvEntries != null && !attributeKvEntries.isEmpty()) {
-                    attributes =
+                    attributes = attributeKvEntries.stream()
-                            attributeKvEntries.stream()
+                            .filter(attributeKvEntry -> {
-                                    .filter(attributeKvEntry -> {
+                                long startTime = entityView.getStartTimeMs();
-                                        long startTime = entityView.getStartTimeMs();
+                                long endTime = entityView.getEndTimeMs();
-                                        long endTime = entityView.getEndTimeMs();
+                                long lastUpdateTs = attributeKvEntry.getLastUpdateTs();
-                                        long lastUpdateTs = attributeKvEntry.getLastUpdateTs();
+                                return startTime == 0 && endTime == 0 ||
-                                        return startTime == 0 && endTime == 0 ||
+                                        (endTime == 0 && startTime < lastUpdateTs) ||
-                                                (endTime == 0 && startTime < lastUpdateTs) ||
+                                        (startTime == 0 && endTime > lastUpdateTs) ||
-                                                (startTime == 0 && endTime > lastUpdateTs) ||
+                                        (startTime < lastUpdateTs && endTime > lastUpdateTs);
-                                                (startTime < lastUpdateTs && endTime > lastUpdateTs);
+                            }).collect(Collectors.toList());
-                                    }).collect(Collectors.toList());
+                    tsSubService.saveAttributes(AttributesSaveRequest.builder()
-                    tsSubService.saveAndNotify(entityView.getTenantId(), entityId, scope, attributes, new FutureCallback<Void>() {
+                            .tenantId(entityView.getTenantId())
-                        @Override
+                            .entityId(entityId)
-                        public void onSuccess(@Nullable Void tmp) {
+                            .scope(scope)
-                            try {
+                            .entries(attributes)
-                                logAttributesUpdated(entityView.getTenantId(), user, entityId, scope, attributes, null);
+                            .callback(new FutureCallback<>() {
-                            } catch (ThingsboardException e) {
+                                @Override
-                                log.error("Failed to log attribute updates", e);
+                                public void onSuccess(@Nullable Void tmp) {
-                            }
+                                    try {
-                        }
+                                        logAttributesUpdated(entityView.getTenantId(), user, entityId, scope, attributes, null);
-
+                                    } catch (ThingsboardException e) {
-                        @Override
+                                        log.error("Failed to log attribute updates", e);
-                        public void onFailure(Throwable t) {
+                                    }
-                            try {
+                                }
-                                logAttributesUpdated(entityView.getTenantId(), user, entityId, scope, attributes, t);
+
-                            } catch (ThingsboardException e) {
+                                @Override
-                                log.error("Failed to log attribute updates", e);
+                                public void onFailure(Throwable t) {
-                            }
+                                    try {
-                        }
+                                        logAttributesUpdated(entityView.getTenantId(), user, entityId, scope, attributes, t);
-                    });
+                                    } catch (ThingsboardException e) {
+                                        log.error("Failed to log attribute updates", e);
+                                    }
+                                }
+                            })
+                            .build());
                 }
                 return null;
             }, MoreExecutors.directExecutor());
@@ -334,15 +344,22 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
         }, MoreExecutors.directExecutor());
         return Futures.transform(latestFuture, latestValues -> {
             if (latestValues != null && !latestValues.isEmpty()) {
-                tsSubService.saveLatestAndNotify(entityView.getTenantId(), entityId, latestValues, new FutureCallback<Void>() {
+                tsSubService.saveTimeseries(TimeseriesSaveRequest.builder()
-                    @Override
+                        .tenantId(entityView.getTenantId())
-                    public void onSuccess(@Nullable Void tmp) {
+                        .entityId(entityId)
-                    }
+                        .entries(latestValues)
+                        .onlyLatest(true)
+                        .callback(new FutureCallback<Void>() {
+                            @Override
+                            public void onSuccess(@Nullable Void tmp) {
+                            }
 
-                    @Override
+                            @Override
-                    public void onFailure(Throwable t) {
+                            public void onFailure(Throwable t) {
-                    }
+                                log.error("[{}][{}] Failed to save entity view latest timeseries: {}", tenantId, entityView.getId(), latestValues, t);
-                });
+                            }
+                        })
+                        .build());
             }
             return null;
         }, MoreExecutors.directExecutor());
@@ -352,27 +369,33 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
         EntityViewId entityId = entityView.getId();
         SettableFuture<Void> resultFuture = SettableFuture.create();
         if (keys != null && !keys.isEmpty()) {
-            tsSubService.deleteAndNotify(entityView.getTenantId(), entityId, scope, keys, new FutureCallback<Void>() {
+            tsSubService.deleteAttributes(AttributesDeleteRequest.builder()
-                @Override
+                    .tenantId(entityView.getTenantId())
-                public void onSuccess(@Nullable Void tmp) {
+                    .entityId(entityId)
-                    try {
+                    .scope(scope)
-                        logAttributesDeleted(entityView.getTenantId(), user, entityId, scope, keys, null);
+                    .keys(keys)
-                    } catch (ThingsboardException e) {
+                    .callback(new FutureCallback<>() {
-                        log.error("Failed to log attribute delete", e);
+                        @Override
-                    }
+                        public void onSuccess(@Nullable Void tmp) {
-                    resultFuture.set(tmp);
+                            try {
-                }
+                                logAttributesDeleted(entityView.getTenantId(), user, entityId, scope, keys, null);
+                            } catch (ThingsboardException e) {
+                                log.error("Failed to log attribute delete", e);
+                            }
+                            resultFuture.set(tmp);
+                        }
 
-                @Override
+                        @Override
-                public void onFailure(Throwable t) {
+                        public void onFailure(Throwable t) {
-                    try {
+                            try {
-                        logAttributesDeleted(entityView.getTenantId(), user, entityId, scope, keys, t);
+                                logAttributesDeleted(entityView.getTenantId(), user, entityId, scope, keys, t);
-                    } catch (ThingsboardException e) {
+                            } catch (ThingsboardException e) {
-                        log.error("Failed to log attribute delete", e);
+                                log.error("Failed to log attribute delete", e);
-                    }
+                            }
-                    resultFuture.setException(t);
+                            resultFuture.setException(t);
-                }
+                        }
-            });
+                    })
+                    .build());
         } else {
             resultFuture.set(null);
         }
@@ -382,51 +405,32 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
     private ListenableFuture<Void> deleteLatestFromEntityView(EntityView entityView, List<String> keys, User user) {
         EntityViewId entityId = entityView.getId();
         SettableFuture<Void> resultFuture = SettableFuture.create();
-        if (keys != null && !keys.isEmpty()) {
+        tsSubService.deleteTimeseries(TimeseriesDeleteRequest.builder()
-            tsSubService.deleteLatest(entityView.getTenantId(), entityId, keys, new FutureCallback<Void>() {
+                .tenantId(entityView.getTenantId())
-                @Override
+                .entityId(entityId)
-                public void onSuccess(@Nullable Void tmp) {
+                .keys(keys)
-                    try {
+                .callback(new FutureCallback<>() {
-                        logTimeseriesDeleted(entityView.getTenantId(), user, entityId, keys, null);
+                    @Override
-                    } catch (ThingsboardException e) {
+                    public void onSuccess(@Nullable List<String> result) {
-                        log.error("Failed to log timeseries delete", e);
+                        try {
-                    }
+                            logTimeseriesDeleted(entityView.getTenantId(), user, entityId, result, null);
-                    resultFuture.set(tmp);
+                        } catch (ThingsboardException e) {
-                }
+                            log.error("Failed to log timeseries delete", e);
-
+                        }
-                @Override
+                        resultFuture.set(null);
-                public void onFailure(Throwable t) {
-                    try {
-                        logTimeseriesDeleted(entityView.getTenantId(), user, entityId, keys, t);
-                    } catch (ThingsboardException e) {
-                        log.error("Failed to log timeseries delete", e);
-                    }
-                    resultFuture.setException(t);
-                }
-            });
-        } else {
-            tsSubService.deleteAllLatest(entityView.getTenantId(), entityId, new FutureCallback<Collection<String>>() {
-                @Override
-                public void onSuccess(@Nullable Collection<String> keys) {
-                    try {
-                        logTimeseriesDeleted(entityView.getTenantId(), user, entityId, new ArrayList<>(keys), null);
-                    } catch (ThingsboardException e) {
-                        log.error("Failed to log timeseries delete", e);
                     }
-                    resultFuture.set(null);
-                }
 
-                @Override
+                    @Override
-                public void onFailure(Throwable t) {
+                    public void onFailure(Throwable t) {
-                    try {
+                        try {
-                        logTimeseriesDeleted(entityView.getTenantId(), user, entityId, Collections.emptyList(), t);
+                            logTimeseriesDeleted(entityView.getTenantId(), user, entityId, Optional.ofNullable(keys).orElse(Collections.emptyList()), t);
-                    } catch (ThingsboardException e) {
+                        } catch (ThingsboardException e) {
-                        log.error("Failed to log timeseries delete", e);
+                            log.error("Failed to log timeseries delete", e);
+                        }
+                        resultFuture.setException(t);
                     }
-                    resultFuture.setException(t);
+                })
-                }
+                .build());
-            });
-        }
         return resultFuture;
     }
 

application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperService.java

@@ -117,9 +117,10 @@ public class HousekeeperService {
             throw new IllegalArgumentException("Unsupported task type " + taskType);
         }
 
+        Future<Object> future = null;
         try {
             long startTs = System.currentTimeMillis();
-            Future<Object> future = taskExecutor.submit(() -> {
+            future = taskExecutor.submit(() -> {
                 taskProcessor.process((T) task);
                 return null;
             });
@@ -137,7 +138,7 @@ public class HousekeeperService {
             if (e instanceof ExecutionException) {
                 error = e.getCause();
             } else if (e instanceof TimeoutException) {
-                error = new TimeoutException("Timeout after " + config.getTaskProcessingTimeout() + " seconds");
+                error = new TimeoutException("Timeout after " + config.getTaskProcessingTimeout() + " ms");
             }
 
             if (msg.getTask().getAttempt() < config.getMaxReprocessingAttempts()) {
@@ -153,6 +154,10 @@ public class HousekeeperService {
                         .build());
             }
             statsService.ifPresent(statsService -> statsService.reportFailure(taskType, msg));
+        } finally {
+            if (future != null && !future.isDone()) {
+                future.cancel(true);
+            }
         }
     }
 

application/src/main/java/org/thingsboard/server/service/housekeeper/processor/HousekeeperTaskProcessor.java

@@ -20,6 +20,8 @@ import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
 import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
 import org.thingsboard.server.common.msg.housekeeper.HousekeeperClient;
 
+import java.util.concurrent.Future;
+
 public abstract class HousekeeperTaskProcessor<T extends HousekeeperTask> {
 
     @Autowired
@@ -29,4 +31,13 @@ public abstract class HousekeeperTaskProcessor<T extends HousekeeperTask> {
 
     public abstract HousekeeperTaskType getTaskType();
 
+    public <V> V wait(Future<V> future) throws Exception {
+        try {
+            return future.get(); // will be interrupted after taskProcessingTimeout
+        } catch (InterruptedException e) {
+            future.cancel(true); // interrupting the underlying task
+            throw e;
+        }
+    }
+
 }

application/src/main/java/org/thingsboard/server/service/housekeeper/processor/LatestTsDeletionTaskProcessor.java

@@ -33,7 +33,7 @@ public class LatestTsDeletionTaskProcessor extends HousekeeperTaskProcessor<Late
 
     @Override
     public void process(LatestTsDeletionHousekeeperTask task) throws Exception {
-        timeseriesService.removeLatest(task.getTenantId(), task.getEntityId(), List.of(task.getKey())).get();
+        wait(timeseriesService.removeLatest(task.getTenantId(), task.getEntityId(), List.of(task.getKey())));
         log.debug("[{}][{}][{}] Deleted latest telemetry for key '{}'", task.getTenantId(), task.getEntityId().getEntityType(), task.getEntityId(), task.getKey());
     }
 

application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TsHistoryDeletionTaskProcessor.java

@@ -36,7 +36,7 @@ public class TsHistoryDeletionTaskProcessor extends HousekeeperTaskProcessor<TsH
     @Override
     public void process(TsHistoryDeletionHousekeeperTask task) throws Exception {
         DeleteTsKvQuery deleteQuery = new BaseDeleteTsKvQuery(task.getKey(), 0, System.currentTimeMillis(), false, false);
-        timeseriesService.remove(task.getTenantId(), task.getEntityId(), List.of(deleteQuery)).get();
+        wait(timeseriesService.remove(task.getTenantId(), task.getEntityId(), List.of(deleteQuery)));
         log.debug("[{}][{}][{}] Deleted timeseries history for key '{}'", task.getTenantId(), task.getEntityId().getEntityType(), task.getEntityId(), task.getKey());
     }
 

application/src/main/java/org/thingsboard/server/service/install/update/ResourcesUpdater.java

@@ -101,7 +101,7 @@ public class ResourcesUpdater {
         for (DashboardId dashboardId : dashboards) {
             executor.submit(() -> {
                 Dashboard dashboard = dashboardService.findDashboardById(TenantId.SYS_TENANT_ID, dashboardId);
-                boolean updated = resourceService.updateResourcesUsage(dashboard); // will convert resources ids to new structure
+                boolean updated = resourceService.updateResourcesUsage(dashboard.getTenantId(), dashboard); // will convert resources ids to new structure
                 if (updated) {
                     dashboardService.saveDashboard(dashboard);
                     updatedCount.incrementAndGet();
@@ -130,7 +130,7 @@ public class ResourcesUpdater {
         for (WidgetTypeId widgetTypeId : widgets) {
             executor.submit(() -> {
                 WidgetTypeDetails widgetTypeDetails = widgetTypeService.findWidgetTypeDetailsById(TenantId.SYS_TENANT_ID, widgetTypeId);
-                boolean updated = resourceService.updateResourcesUsage(widgetTypeDetails);
+                boolean updated = resourceService.updateResourcesUsage(widgetTypeDetails.getTenantId(), widgetTypeDetails);
                 if (updated) {
                     widgetTypeService.saveWidgetType(widgetTypeDetails);
                     updatedCount.incrementAndGet();

application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java

@@ -149,7 +149,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
                     return; // if originated by rule - just ignore delivery method
                 }
             }
-            if (ruleId == null) {
+            if (ruleId == null && !notificationTemplate.getNotificationType().isSystem()) {
                 if (targets.stream().noneMatch(target -> target.getConfiguration().getType().getSupportedDeliveryMethods().contains(deliveryMethod))) {
                     throw new IllegalArgumentException("Recipients for " + deliveryMethod.getName() + " delivery method not chosen");
                 }
@@ -225,13 +225,13 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
         NotificationTemplate notificationTemplate = notificationTemplateService.findTenantOrSystemNotificationTemplate(tenantId, type)
                 .orElseThrow(() -> new IllegalArgumentException("No notification template found for type " + type));
         NotificationRequest notificationRequest = NotificationRequest.builder()
-                .tenantId(TenantId.SYS_TENANT_ID)
+                .tenantId(tenantId)
                 .targets(List.of(targetId.getId()))
                 .templateId(notificationTemplate.getId())
                 .info(info)
                 .originatorEntityId(TenantId.SYS_TENANT_ID)
                 .build();
-        processNotificationRequest(TenantId.SYS_TENANT_ID, notificationRequest, null);
+        processNotificationRequest(tenantId, notificationRequest, null);
     }
 
     private void processNotificationRequestAsync(NotificationProcessingContext ctx, List<NotificationTarget> targets, FutureCallback<NotificationRequestStats> callback) {
@@ -417,7 +417,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
     }
 
     @Override
-    public Set<NotificationDeliveryMethod> getAvailableDeliveryMethods(TenantId tenantId) {
+    public List<NotificationDeliveryMethod> getAvailableDeliveryMethods(TenantId tenantId) {
         return channels.values().stream()
                 .filter(channel -> {
                     try {
@@ -428,7 +428,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
                     }
                 })
                 .map(NotificationChannel::getDeliveryMethod)
-                .collect(Collectors.toSet());
+                .sorted().toList();
     }
 
     @Override

application/src/main/java/org/thingsboard/server/service/ota/DefaultOtaPackageStateService.java

@@ -20,7 +20,10 @@ import jakarta.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.thingsboard.rule.engine.api.AttributesDeleteRequest;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
@@ -54,7 +57,6 @@ import org.thingsboard.server.queue.provider.TbCoreQueueFactory;
 import org.thingsboard.server.queue.provider.TbRuleEngineQueueFactory;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -128,7 +130,7 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
                     // Device was updated and new firmware is different from previous firmware.
                     send(device.getTenantId(), device.getId(), newFirmwareId, System.currentTimeMillis(), FIRMWARE);
                 }
-            } else if (oldFirmwareId != null){
+            } else if (oldFirmwareId != null) {
                 // Device was updated and new firmware is not set.
                 remove(device, FIRMWARE);
             }
@@ -155,7 +157,7 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
                     // Device was updated and new firmware is different from previous firmware.
                     send(device.getTenantId(), device.getId(), newSoftwareId, System.currentTimeMillis(), SOFTWARE);
                 }
-            } else if (oldSoftwareId != null){
+            } else if (oldSoftwareId != null) {
                 // Device was updated and new firmware is not set.
                 remove(device, SOFTWARE);
             }
@@ -261,17 +263,22 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
         telemetry.add(new BasicTsKvEntry(ts, new LongDataEntry(getTargetTelemetryKey(firmware.getType(), TS), ts)));
         telemetry.add(new BasicTsKvEntry(ts, new StringDataEntry(getTelemetryKey(firmware.getType(), STATE), OtaPackageUpdateStatus.QUEUED.name())));
 
-        telemetryService.saveAndNotify(tenantId, deviceId, telemetry, new FutureCallback<>() {
+        telemetryService.saveTimeseries(TimeseriesSaveRequest.builder()
-            @Override
+                .tenantId(tenantId)
-            public void onSuccess(@Nullable Void tmp) {
+                .entityId(deviceId)
-                log.trace("[{}] Success save firmware status!", deviceId);
+                .entries(telemetry)
-            }
+                .callback(new FutureCallback<Void>() {
+                    @Override
+                    public void onSuccess(@Nullable Void tmp) {
+                        log.trace("[{}] Success save firmware status!", deviceId);
+                    }
 
-            @Override
+                    @Override
-            public void onFailure(Throwable t) {
+                    public void onFailure(Throwable t) {
-                log.error("[{}] Failed to save firmware status!", deviceId, t);
+                        log.error("[{}] Failed to save firmware status!", deviceId, t);
-            }
+                    }
-        });
+                })
+                .build());
     }
 
 
@@ -282,19 +289,24 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
 
         BasicTsKvEntry status = new BasicTsKvEntry(System.currentTimeMillis(), new StringDataEntry(getTelemetryKey(otaPackageType, STATE), OtaPackageUpdateStatus.INITIATED.name()));
 
-        telemetryService.saveAndNotify(tenantId, deviceId, Collections.singletonList(status), new FutureCallback<>() {
+        telemetryService.saveTimeseries(TimeseriesSaveRequest.builder()
-            @Override
+                .tenantId(tenantId)
-            public void onSuccess(@Nullable Void tmp) {
+                .entityId(deviceId)
-                log.trace("[{}] Success save telemetry with target {} for device!", deviceId, otaPackage);
+                .entry(status)
-                updateAttributes(device, otaPackage, ts, tenantId, deviceId, otaPackageType);
+                .callback(new FutureCallback<>() {
-            }
+                    @Override
+                    public void onSuccess(@Nullable Void tmp) {
+                        log.trace("[{}] Success save telemetry with target {} for device!", deviceId, otaPackage);
+                        updateAttributes(device, otaPackage, ts, tenantId, deviceId, otaPackageType);
+                    }
 
-            @Override
+                    @Override
-            public void onFailure(Throwable t) {
+                    public void onFailure(Throwable t) {
-                log.error("[{}] Failed to save telemetry with target {} for device!", deviceId, otaPackage, t);
+                        log.error("[{}] Failed to save telemetry with target {} for device!", deviceId, otaPackage, t);
-                updateAttributes(device, otaPackage, ts, tenantId, deviceId, otaPackageType);
+                        updateAttributes(device, otaPackage, ts, tenantId, deviceId, otaPackageType);
-            }
+                    }
-        });
+                })
+                .build());
     }
 
     private void updateAttributes(Device device, OtaPackageInfo otaPackage, long ts, TenantId tenantId, DeviceId deviceId, OtaPackageType otaPackageType) {
@@ -336,17 +348,23 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
 
         remove(device, otaPackageType, attrToRemove);
 
-        telemetryService.saveAndNotify(tenantId, deviceId, AttributeScope.SHARED_SCOPE, attributes, new FutureCallback<>() {
+        telemetryService.saveAttributes(AttributesSaveRequest.builder()
-            @Override
+                .tenantId(tenantId)
-            public void onSuccess(@Nullable Void tmp) {
+                .entityId(deviceId)
-                log.trace("[{}] Success save attributes with target firmware!", deviceId);
+                .scope(AttributeScope.SHARED_SCOPE)
-            }
+                .entries(attributes)
+                .callback(new FutureCallback<>() {
+                    @Override
+                    public void onSuccess(@Nullable Void tmp) {
+                        log.trace("[{}] Success save attributes with target firmware!", deviceId);
+                    }
 
-            @Override
+                    @Override
-            public void onFailure(Throwable t) {
+                    public void onFailure(Throwable t) {
-                log.error("[{}] Failed to save attributes with target firmware!", deviceId, t);
+                        log.error("[{}] Failed to save attributes with target firmware!", deviceId, t);
-            }
+                    }
-        });
+                })
+                .build());
     }
 
     private void remove(Device device, OtaPackageType otaPackageType) {
@@ -354,8 +372,12 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
     }
 
     private void remove(Device device, OtaPackageType otaPackageType, List<String> attributesKeys) {
-        telemetryService.deleteAndNotify(device.getTenantId(), device.getId(), AttributeScope.SHARED_SCOPE, attributesKeys,
+        telemetryService.deleteAttributes(AttributesDeleteRequest.builder()
-                new FutureCallback<>() {
+                .tenantId(device.getTenantId())
+                .entityId(device.getId())
+                .scope(AttributeScope.SHARED_SCOPE)
+                .keys(attributesKeys)
+                .callback(new FutureCallback<>() {
                     @Override
                     public void onSuccess(@Nullable Void tmp) {
                         log.trace("[{}] Success remove target {} attributes!", device.getId(), otaPackageType);
@@ -366,6 +388,8 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService {
                     public void onFailure(Throwable t) {
                         log.error("[{}] Failed to remove target {} attributes!", device.getId(), otaPackageType, t);
                     }
-                });
+                })
+                .build());
     }
+
 }

application/src/main/java/org/thingsboard/server/service/resource/DefaultTbResourceService.java

@@ -46,7 +46,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
-import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -132,12 +132,12 @@ public class DefaultTbResourceService extends AbstractTbEntityService implements
 
     @Override
     public List<ResourceExportData> exportResources(Dashboard dashboard, SecurityUser user) throws ThingsboardException {
-        return exportResources(dashboard, imageService::getUsedImages, resourceService::getUsedResources, user);
+        return exportResources(() -> imageService.getUsedImages(dashboard), () -> resourceService.getUsedResources(user.getTenantId(), dashboard), user);
     }
 
     @Override
     public List<ResourceExportData> exportResources(WidgetTypeDetails widgetTypeDetails, SecurityUser user) throws ThingsboardException {
-        return exportResources(widgetTypeDetails, imageService::getUsedImages, resourceService::getUsedResources, user);
+        return exportResources(() -> imageService.getUsedImages(widgetTypeDetails), () -> resourceService.getUsedResources(user.getTenantId(), widgetTypeDetails), user);
     }
 
     @Override
@@ -153,13 +153,12 @@ public class DefaultTbResourceService extends AbstractTbEntityService implements
         }
     }
 
-    private <T> List<ResourceExportData> exportResources(T entity,
+    private <T> List<ResourceExportData> exportResources(Supplier<Collection<TbResourceInfo>> imagesProcessor,
-                                                         Function<T, Collection<TbResourceInfo>> imagesProcessor,
+                                                         Supplier<Collection<TbResourceInfo>> resourcesProcessor,
-                                                         Function<T, Collection<TbResourceInfo>> resourcesProcessor,
                                                          SecurityUser user) throws ThingsboardException {
         List<TbResourceInfo> resources = new ArrayList<>();
-        resources.addAll(imagesProcessor.apply(entity));
+        resources.addAll(imagesProcessor.get());
-        resources.addAll(resourcesProcessor.apply(entity));
+        resources.addAll(resourcesProcessor.get());
         for (TbResourceInfo resourceInfo : resources) {
             accessControlService.checkPermission(user, Resource.TB_RESOURCE, Operation.READ, resourceInfo.getId(), resourceInfo);
         }

application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java

@@ -38,6 +38,8 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardExecutors;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.ApiUsageRecordKey;
 import org.thingsboard.server.common.data.AttributeScope;
@@ -51,6 +53,7 @@ import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UUIDBased;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
+import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
 import org.thingsboard.server.common.data.kv.BooleanDataEntry;
 import org.thingsboard.server.common.data.kv.KvEntry;
@@ -872,24 +875,30 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
     }
 
     private void save(DeviceId deviceId, String key, long value) {
-        if (persistToTelemetry) {
+        save(deviceId, new LongDataEntry(key, value), getCurrentTimeMillis());
-            tsSubService.saveAndNotifyInternal(
-                    TenantId.SYS_TENANT_ID, deviceId,
-                    Collections.singletonList(new BasicTsKvEntry(getCurrentTimeMillis(), new LongDataEntry(key, value))),
-                    telemetryTtl, new TelemetrySaveCallback<>(deviceId, key, value));
-        } else {
-            tsSubService.saveAttrAndNotify(TenantId.SYS_TENANT_ID, deviceId, AttributeScope.SERVER_SCOPE, key, value, new TelemetrySaveCallback<>(deviceId, key, value));
-        }
     }
 
     private void save(DeviceId deviceId, String key, boolean value) {
+        save(deviceId, new BooleanDataEntry(key, value), getCurrentTimeMillis());
+    }
+
+    private void save(DeviceId deviceId, KvEntry kvEntry, long ts) {
         if (persistToTelemetry) {
-            tsSubService.saveAndNotifyInternal(
+            tsSubService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
-                    TenantId.SYS_TENANT_ID, deviceId,
+                    .tenantId(TenantId.SYS_TENANT_ID)
-                    Collections.singletonList(new BasicTsKvEntry(getCurrentTimeMillis(), new BooleanDataEntry(key, value))),
+                    .entityId(deviceId)
-                    telemetryTtl, new TelemetrySaveCallback<>(deviceId, key, value));
+                    .entry(new BasicTsKvEntry(ts, kvEntry))
+                    .ttl(telemetryTtl)
+                    .callback(new TelemetrySaveCallback<>(deviceId, kvEntry))
+                    .build());
         } else {
-            tsSubService.saveAttrAndNotify(TenantId.SYS_TENANT_ID, deviceId, AttributeScope.SERVER_SCOPE, key, value, new TelemetrySaveCallback<>(deviceId, key, value));
+            tsSubService.saveAttributes(AttributesSaveRequest.builder()
+                    .tenantId(TenantId.SYS_TENANT_ID)
+                    .entityId(deviceId)
+                    .scope(AttributeScope.SERVER_SCOPE)
+                    .entry(new BaseAttributeKvEntry(ts, kvEntry))
+                    .callback(new TelemetrySaveCallback<>(deviceId, kvEntry))
+                    .build());
         }
     }
 
@@ -899,23 +908,21 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
 
     private static class TelemetrySaveCallback<T> implements FutureCallback<T> {
         private final DeviceId deviceId;
-        private final String key;
+        private final KvEntry kvEntry;
-        private final Object value;
 
-        TelemetrySaveCallback(DeviceId deviceId, String key, Object value) {
+        TelemetrySaveCallback(DeviceId deviceId, KvEntry kvEntry) {
             this.deviceId = deviceId;
-            this.key = key;
+            this.kvEntry = kvEntry;
-            this.value = value;
         }
 
         @Override
         public void onSuccess(@Nullable T result) {
-            log.trace("[{}] Successfully updated attribute [{}] with value [{}]", deviceId, key, value);
+            log.trace("[{}] Successfully updated entry {}", deviceId, kvEntry);
         }
 
         @Override
         public void onFailure(Throwable t) {
-            log.warn("[{}] Failed to update attribute [{}] with value [{}]", deviceId, key, value, t);
+            log.warn("[{}] Failed to update entry {}", deviceId, kvEntry, t);
         }
     }
 }

application/src/main/java/org/thingsboard/server/service/stats/DefaultRuleEngineStatisticsService.java

@@ -22,6 +22,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.data.id.QueueStatsId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
@@ -37,7 +38,6 @@ import org.thingsboard.server.queue.util.TbRuleEngineComponent;
 import org.thingsboard.server.service.queue.TbRuleEngineConsumerStats;
 import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -53,9 +53,9 @@ import java.util.stream.Collectors;
 public class DefaultRuleEngineStatisticsService implements RuleEngineStatisticsService {
 
     public static final String RULE_ENGINE_EXCEPTION = "ruleEngineException";
-    public static final FutureCallback<Integer> CALLBACK = new FutureCallback<Integer>() {
+    public static final FutureCallback<Void> CALLBACK = new FutureCallback<Void>() {
         @Override
-        public void onSuccess(@Nullable Integer result) {
+        public void onSuccess(@Nullable Void result) {
 
         }
 
@@ -89,7 +89,13 @@ public class DefaultRuleEngineStatisticsService implements RuleEngineStatisticsS
                     if (!tsList.isEmpty()) {
                         long ttl = apiLimitService.getLimit(tenantId, DefaultTenantProfileConfiguration::getQueueStatsTtlDays);
                         ttl = TimeUnit.DAYS.toSeconds(ttl);
-                        tsService.saveAndNotifyInternal(tenantId, queueStatsId, tsList, ttl, CALLBACK);
+                        tsService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
+                                .tenantId(tenantId)
+                                .entityId(queueStatsId)
+                                .entries(tsList)
+                                .ttl(ttl)
+                                .callback(CALLBACK)
+                                .build());
                     }
                 }
             } catch (Exception e) {
@@ -103,7 +109,13 @@ public class DefaultRuleEngineStatisticsService implements RuleEngineStatisticsS
                 TsKvEntry tsKv = new BasicTsKvEntry(e.getTs(), new JsonDataEntry(RULE_ENGINE_EXCEPTION, e.toJsonString(maxErrorMessageLength)));
                 long ttl = apiLimitService.getLimit(tenantId, DefaultTenantProfileConfiguration::getRuleEngineExceptionsTtlDays);
                 ttl = TimeUnit.DAYS.toSeconds(ttl);
-                tsService.saveAndNotifyInternal(tenantId, getQueueStatsId(tenantId, queueName), Collections.singletonList(tsKv), ttl, CALLBACK);
+                tsService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
+                        .tenantId(tenantId)
+                        .entityId(getQueueStatsId(tenantId, queueName))
+                        .entry(tsKv)
+                        .ttl(ttl)
+                        .callback(CALLBACK)
+                        .build());
             } catch (Exception e2) {
                 if (!"Asset is referencing to non-existent tenant!".equalsIgnoreCase(e2.getMessage())) {
                     log.debug("[{}] Failed to store the statistics", tenantId, e2);

application/src/main/java/org/thingsboard/server/service/sync/ie/importing/csv/AbstractBulkImportService.java

@@ -32,6 +32,8 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.thingsboard.common.util.DonAsynchron;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardExecutors;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.adaptor.JsonConverter;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
@@ -206,20 +208,27 @@ public abstract class AbstractBulkImportService<E extends HasId<? extends Entity
         accessValidator.validateEntityAndCallback(user, Operation.WRITE_TELEMETRY, entity.getId(), (result, tenantId, entityId) -> {
             TenantProfile tenantProfile = tenantProfileCache.get(tenantId);
             long tenantTtl = TimeUnit.DAYS.toSeconds(((DefaultTenantProfileConfiguration) tenantProfile.getProfileData().getConfiguration()).getDefaultStorageTtlDays());
-            tsSubscriptionService.saveAndNotify(tenantId, user.getCustomerId(), entityId, timeseries, tenantTtl, new FutureCallback<Void>() {
+            tsSubscriptionService.saveTimeseries(TimeseriesSaveRequest.builder()
-                @Override
+                    .tenantId(tenantId)
-                public void onSuccess(@Nullable Void tmp) {
+                    .customerId(user.getCustomerId())
-                    entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null, null,
+                    .entityId(entityId)
-                            ActionType.TIMESERIES_UPDATED, null, timeseries);
+                    .entries(timeseries)
-                }
+                    .ttl(tenantTtl)
-
+                    .callback(new FutureCallback<>() {
-                @Override
+                        @Override
-                public void onFailure(Throwable t) {
+                        public void onSuccess(@Nullable Void tmp) {
-                    entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null, null,
+                            entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null, null,
-                            ActionType.TIMESERIES_UPDATED, BaseController.toException(t), timeseries);
+                                    ActionType.TIMESERIES_UPDATED, null, timeseries);
-                    throw new RuntimeException(t);
+                        }
-                }
+
-            });
+                        @Override
+                        public void onFailure(Throwable t) {
+                            entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null, null,
+                                    ActionType.TIMESERIES_UPDATED, BaseController.toException(t), timeseries);
+                            throw new RuntimeException(t);
+                        }
+                    })
+                    .build());
         });
     }
 
@@ -229,23 +238,27 @@ public abstract class AbstractBulkImportService<E extends HasId<? extends Entity
         List<AttributeKvEntry> attributes = new ArrayList<>(JsonConverter.convertToAttributes(kvsEntry.getValue()));
 
         accessValidator.validateEntityAndCallback(user, Operation.WRITE_ATTRIBUTES, entity.getId(), (result, tenantId, entityId) -> {
-            tsSubscriptionService.saveAndNotify(tenantId, entityId, AttributeScope.valueOf(scope), attributes, new FutureCallback<>() {
+            tsSubscriptionService.saveAttributes(AttributesSaveRequest.builder()
-
+                    .tenantId(tenantId)
-                @Override
+                    .entityId(entityId)
-                public void onSuccess(Void unused) {
+                    .scope(AttributeScope.valueOf(scope))
-                    entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null,
+                    .entries(attributes)
-                            null, ActionType.ATTRIBUTES_UPDATED, null, AttributeScope.valueOf(scope), attributes);
+                    .callback(new FutureCallback<>() {
-                }
+                        @Override
-
+                        public void onSuccess(Void unused) {
-                @Override
+                            entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null,
-                public void onFailure(Throwable throwable) {
+                                    null, ActionType.ATTRIBUTES_UPDATED, null, AttributeScope.valueOf(scope), attributes);
-                    entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null,
+                        }
-                            null, ActionType.ATTRIBUTES_UPDATED, BaseController.toException(throwable),
+
-                            AttributeScope.valueOf(scope), attributes);
+                        @Override
-                    throw new RuntimeException(throwable);
+                        public void onFailure(Throwable throwable) {
-                }
+                            entityActionService.logEntityAction(user, (UUIDBased & EntityId) entityId, null,
-
+                                    null, ActionType.ATTRIBUTES_UPDATED, BaseController.toException(throwable),
-            });
+                                    AttributeScope.valueOf(scope), attributes);
+                            throw new RuntimeException(throwable);
+                        }
+                    })
+                    .build());
         });
     }
 

application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java

@@ -24,6 +24,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.ExportableEntity;
@@ -257,16 +258,22 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo
                         })
                         .collect(Collectors.toList());
                 // fixme: attributes are saved outside the transaction
-                tsSubService.saveAndNotify(user.getTenantId(), entity.getId(), scope, attributeKvEntries, new FutureCallback<Void>() {
+                tsSubService.saveAttributes(AttributesSaveRequest.builder()
-                    @Override
+                        .tenantId(user.getTenantId())
-                    public void onSuccess(@Nullable Void unused) {
+                        .entityId(entity.getId())
-                    }
+                        .scope(scope)
+                        .entries(attributeKvEntries)
+                        .callback(new FutureCallback<>() {
+                            @Override
+                            public void onSuccess(@Nullable Void unused) {
+                            }
 
-                    @Override
+                            @Override
-                    public void onFailure(Throwable thr) {
+                            public void onFailure(Throwable thr) {
-                        log.error("Failed to import attributes for {} {}", entity.getId().getEntityType(), entity.getId(), thr);
+                                log.error("Failed to import attributes for {} {}", entity.getId().getEntityType(), entity.getId(), thr);
-                    }
+                            }
-                });
+                        })
+                        .build());
             });
         });
     }

application/src/main/java/org/thingsboard/server/service/system/DefaultSystemInfoService.java

@@ -27,6 +27,7 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardExecutors;
 import org.thingsboard.rule.engine.api.MailService;
 import org.thingsboard.rule.engine.api.SmsService;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.data.AdminSettings;
 import org.thingsboard.server.common.data.ApiUsageState;
 import org.thingsboard.server.common.data.FeaturesInfo;
@@ -71,9 +72,9 @@ import static org.thingsboard.common.util.SystemUtil.getTotalMemory;
 @Slf4j
 public class DefaultSystemInfoService extends TbApplicationEventListener<PartitionChangeEvent> implements SystemInfoService {
 
-    public static final FutureCallback<Integer> CALLBACK = new FutureCallback<>() {
+    public static final FutureCallback<Void> CALLBACK = new FutureCallback<>() {
         @Override
-        public void onSuccess(@Nullable Integer result) {
+        public void onSuccess(@Nullable Void result) {
         }
 
         @Override
@@ -200,7 +201,13 @@ public class DefaultSystemInfoService extends TbApplicationEventListener<Partiti
 
     private void doSave(List<TsKvEntry> telemetry) {
         ApiUsageState apiUsageState = apiUsageStateClient.getApiUsageState(TenantId.SYS_TENANT_ID);
-        telemetryService.saveAndNotifyInternal(TenantId.SYS_TENANT_ID, apiUsageState.getId(), telemetry, systemInfoTtlSeconds, CALLBACK);
+        telemetryService.saveTimeseriesInternal(TimeseriesSaveRequest.builder()
+                .tenantId(TenantId.SYS_TENANT_ID)
+                .entityId(apiUsageState.getId())
+                .entries(telemetry)
+                .ttl(systemInfoTtlSeconds)
+                .callback(CALLBACK)
+                .build());
     }
 
     private List<SystemInfoData> getSystemData(ServiceInfo serviceInfo) {

application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java

@@ -19,29 +19,28 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.SettableFuture;
 import jakarta.annotation.Nullable;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.DonAsynchron;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.rule.engine.api.AttributesDeleteRequest;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
+import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
+import org.thingsboard.rule.engine.api.TimeseriesDeleteRequest;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.data.ApiUsageRecordKey;
-import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
-import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
-import org.thingsboard.server.common.data.kv.BooleanDataEntry;
-import org.thingsboard.server.common.data.kv.DeleteTsKvQuery;
-import org.thingsboard.server.common.data.kv.DoubleDataEntry;
-import org.thingsboard.server.common.data.kv.LongDataEntry;
-import org.thingsboard.server.common.data.kv.StringDataEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.kv.TsKvLatestRemovingResult;
 import org.thingsboard.server.common.msg.queue.TbCallback;
@@ -54,8 +53,6 @@ import org.thingsboard.server.service.entitiy.entityview.TbEntityViewService;
 import org.thingsboard.server.service.subscription.TbSubscriptionUtils;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -64,13 +61,14 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.function.Consumer;
 
 /**
  * Created by ashvayka on 27.03.18.
  */
 @Service
 @Slf4j
-public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionService implements TelemetrySubscriptionService {
+public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionService implements TelemetrySubscriptionService, RuleEngineTelemetryService {
 
     private final AttributesService attrService;
     private final TimeseriesService tsService;
@@ -115,76 +113,92 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
     }
 
     @Override
-    public ListenableFuture<Void> saveAndNotify(TenantId tenantId, EntityId entityId, TsKvEntry ts) {
+    public void saveTimeseries(TimeseriesSaveRequest request) {
-        SettableFuture<Void> future = SettableFuture.create();
+        TenantId tenantId = request.getTenantId();
-        saveAndNotify(tenantId, entityId, Collections.singletonList(ts), new VoidFutureCallback(future));
+        EntityId entityId = request.getEntityId();
-        return future;
+        checkInternalEntity(entityId);
+        boolean sysTenant = TenantId.SYS_TENANT_ID.equals(tenantId) || tenantId == null;
+        if (sysTenant || request.isOnlyLatest() || apiUsageStateService.getApiUsageState(tenantId).isDbStorageEnabled()) {
+            KvUtils.validate(request.getEntries(), valueNoXssValidation);
+            ListenableFuture<Integer> future = saveTimeseriesInternal(request);
+            if (!request.isOnlyLatest()) {
+                FutureCallback<Integer> callback = getApiUsageCallback(tenantId, request.getCustomerId(), sysTenant, request.getCallback());
+                Futures.addCallback(future, callback, tsCallBackExecutor);
+            }
+        } else {
+            request.getCallback().onFailure(new RuntimeException("DB storage writes are disabled due to API limits!"));
+        }
     }
 
     @Override
-    public void saveAndNotify(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Void> callback) {
+    public ListenableFuture<Integer> saveTimeseriesInternal(TimeseriesSaveRequest request) {
-        saveAndNotify(tenantId, null, entityId, ts, 0L, callback);
+        TenantId tenantId = request.getTenantId();
-    }
+        EntityId entityId = request.getEntityId();
+        ListenableFuture<Integer> saveFuture;
+        if (request.isOnlyLatest()) {
+            saveFuture = Futures.transform(tsService.saveLatest(tenantId, entityId, request.getEntries()), result -> 0, MoreExecutors.directExecutor());
+        } else if (request.isSaveLatest()) {
+            saveFuture = tsService.save(tenantId, entityId, request.getEntries(), request.getTtl());
+        } else {
+            saveFuture = tsService.saveWithoutLatest(tenantId, entityId, request.getEntries(), request.getTtl());
+        }
 
-    @Override
+        addMainCallback(saveFuture, request.getCallback());
-    public void saveAndNotify(TenantId tenantId, CustomerId customerId, EntityId entityId, List<TsKvEntry> ts, long ttl, FutureCallback<Void> callback) {
+        addWsCallback(saveFuture, success -> onTimeSeriesUpdate(tenantId, entityId, request.getEntries()));
-        doSaveAndNotify(tenantId, customerId, entityId, ts, ttl, callback, true);
+        if (request.isSaveLatest() && !request.isOnlyLatest()) {
+            addEntityViewCallback(tenantId, entityId, request.getEntries());
+        }
+        return saveFuture;
     }
 
     @Override
-    public void saveWithoutLatestAndNotify(TenantId tenantId, CustomerId customerId, EntityId entityId, List<TsKvEntry> ts, long ttl, FutureCallback<Void> callback) {
+    public void saveAttributes(AttributesSaveRequest request) {
-        doSaveAndNotify(tenantId, customerId, entityId, ts, ttl, callback, false);
+        checkInternalEntity(request.getEntityId());
+        saveAttributesInternal(request);
     }
 
-    private void doSaveAndNotify(TenantId tenantId, CustomerId customerId, EntityId entityId, List<TsKvEntry> ts, long ttl, FutureCallback<Void> callback, boolean saveLatest) {
+    @Override
-        checkInternalEntity(entityId);
+    public void saveAttributesInternal(AttributesSaveRequest request) {
-        boolean sysTenant = TenantId.SYS_TENANT_ID.equals(tenantId) || tenantId == null;
+        log.trace("Executing saveInternal [{}]", request);
-        if (sysTenant || apiUsageStateService.getApiUsageState(tenantId).isDbStorageEnabled()) {
+        ListenableFuture<List<Long>> saveFuture = attrService.save(request.getTenantId(), request.getEntityId(), request.getScope(), request.getEntries());
-            KvUtils.validate(ts, valueNoXssValidation);
+        addMainCallback(saveFuture, request.getCallback());
-            if (saveLatest) {
+        addWsCallback(saveFuture, success -> onAttributesUpdate(request.getTenantId(), request.getEntityId(), request.getScope().name(), request.getEntries(), request.isNotifyDevice()));
-                saveAndNotifyInternal(tenantId, entityId, ts, ttl, getCallback(tenantId, customerId, sysTenant, callback));
-            } else {
-                saveWithoutLatestAndNotifyInternal(tenantId, entityId, ts, ttl, getCallback(tenantId, customerId, sysTenant, callback));
-            }
-        } else {
-            callback.onFailure(new RuntimeException("DB storage writes are disabled due to API limits!"));
-        }
     }
 
-    private FutureCallback<Integer> getCallback(TenantId tenantId, CustomerId customerId, boolean sysTenant, FutureCallback<Void> callback) {
+    @Override
-        return new FutureCallback<>() {
+    public void deleteAttributes(AttributesDeleteRequest request) {
-            @Override
+        checkInternalEntity(request.getEntityId());
-            public void onSuccess(Integer result) {
+        deleteAttributesInternal(request);
-                if (!sysTenant && result != null && result > 0) {
-                    apiUsageClient.report(tenantId, customerId, ApiUsageRecordKey.STORAGE_DP_COUNT, result);
-                }
-                callback.onSuccess(null);
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                callback.onFailure(t);
-            }
-        };
     }
 
     @Override
-    public void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Integer> callback) {
+    public void deleteAttributesInternal(AttributesDeleteRequest request) {
-        saveAndNotifyInternal(tenantId, entityId, ts, 0L, callback);
+        ListenableFuture<List<String>> deleteFuture = attrService.removeAll(request.getTenantId(), request.getEntityId(), request.getScope(), request.getKeys());
+        addMainCallback(deleteFuture, request.getCallback());
+        addWsCallback(deleteFuture, success -> onAttributesDelete(request.getTenantId(), request.getEntityId(), request.getScope().name(), request.getKeys(), request.isNotifyDevice()));
     }
 
     @Override
-    public void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, long ttl, FutureCallback<Integer> callback) {
+    public void deleteTimeseries(TimeseriesDeleteRequest request) {
-        ListenableFuture<Integer> saveFuture = tsService.save(tenantId, entityId, ts, ttl);
+        checkInternalEntity(request.getEntityId());
-        addMainCallback(saveFuture, callback);
+        deleteTimeseriesInternal(request);
-        addWsCallback(saveFuture, success -> onTimeSeriesUpdate(tenantId, entityId, ts));
-        addEntityViewCallback(tenantId, entityId, ts);
     }
 
-    private void saveWithoutLatestAndNotifyInternal(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, long ttl, FutureCallback<Integer> callback) {
+    @Override
-        ListenableFuture<Integer> saveFuture = tsService.saveWithoutLatest(tenantId, entityId, ts, ttl);
+    public void deleteTimeseriesInternal(TimeseriesDeleteRequest request) {
-        addMainCallback(saveFuture, callback);
+        if (CollectionUtils.isNotEmpty(request.getKeys())) {
-        addWsCallback(saveFuture, success -> onTimeSeriesUpdate(tenantId, entityId, ts));
+            ListenableFuture<List<TsKvLatestRemovingResult>> deleteFuture;
+            if (request.getDeleteHistoryQueries() == null) {
+                deleteFuture = tsService.removeLatest(request.getTenantId(), request.getEntityId(), request.getKeys());
+            } else {
+                deleteFuture = tsService.remove(request.getTenantId(), request.getEntityId(), request.getDeleteHistoryQueries());
+                addWsCallback(deleteFuture, result -> onTimeSeriesDelete(request.getTenantId(), request.getEntityId(), request.getKeys(), result));
+            }
+            addMainCallback(deleteFuture, __ -> request.getCallback().onSuccess(request.getKeys()), request.getCallback()::onFailure);
+        } else {
+            ListenableFuture<List<String>> deleteFuture = tsService.removeAllLatest(request.getTenantId(), request.getEntityId());
+            addMainCallback(deleteFuture, request.getCallback()::onSuccess, request.getCallback()::onFailure);
+        }
     }
 
     private void addEntityViewCallback(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts) {
@@ -214,15 +228,21 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
                                         }
                                     }
                                     if (!entityViewLatest.isEmpty()) {
-                                        saveLatestAndNotify(tenantId, entityView.getId(), entityViewLatest, new FutureCallback<>() {
+                                        saveTimeseries(TimeseriesSaveRequest.builder()
-                                            @Override
+                                                .tenantId(tenantId)
-                                            public void onSuccess(@Nullable Void tmp) {
+                                                .entityId(entityView.getId())
-                                            }
+                                                .entries(entityViewLatest)
-
+                                                .onlyLatest(true)
-                                            @Override
+                                                .callback(new FutureCallback<>() {
-                                            public void onFailure(Throwable t) {
+                                                    @Override
-                                            }
+                                                    public void onSuccess(@Nullable Void tmp) {}
-                                        });
+
+                                                    @Override
+                                                    public void onFailure(Throwable t) {
+                                                        log.error("[{}][{}] Failed to save entity view latest timeseries: {}", tenantId, entityView.getId(), entityViewLatest, t);
+                                                    }
+                                                })
+                                                .build());
                                     }
                                 }
                             }
@@ -236,233 +256,6 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
         }
     }
 
-    @Override
-    public void saveAndNotify(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, FutureCallback<Void> callback) {
-        saveAndNotify(tenantId, entityId, scope, attributes, true, callback);
-    }
-
-    @Override
-    public void saveAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes, FutureCallback<Void> callback) {
-        saveAndNotify(tenantId, entityId, scope, attributes, true, callback);
-    }
-
-    @Override
-    public void saveAndNotify(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback) {
-        checkInternalEntity(entityId);
-        saveAndNotifyInternal(tenantId, entityId, scope, attributes, notifyDevice, callback);
-    }
-
-    @Override
-    public void saveAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback) {
-        checkInternalEntity(entityId);
-        saveAndNotifyInternal(tenantId, entityId, scope, attributes, notifyDevice, callback);
-    }
-
-    @Override
-    public void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback) {
-        ListenableFuture<List<Long>> saveFuture = attrService.save(tenantId, entityId, scope, attributes);
-        addVoidCallback(saveFuture, callback);
-        addWsCallback(saveFuture, success -> onAttributesUpdate(tenantId, entityId, scope, attributes, notifyDevice));
-    }
-
-    @Override
-    public void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback) {
-        ListenableFuture<List<Long>> saveFuture = attrService.save(tenantId, entityId, scope, attributes);
-        addVoidCallback(saveFuture, callback);
-        addWsCallback(saveFuture, success -> onAttributesUpdate(tenantId, entityId, scope.name(), attributes, notifyDevice));
-    }
-
-    @Override
-    public void saveLatestAndNotify(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Void> callback) {
-        checkInternalEntity(entityId);
-        saveLatestAndNotifyInternal(tenantId, entityId, ts, callback);
-    }
-
-    @Override
-    public void saveLatestAndNotifyInternal(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Void> callback) {
-        ListenableFuture<List<Long>> saveFuture = tsService.saveLatest(tenantId, entityId, ts);
-        addVoidCallback(saveFuture, callback);
-        addWsCallback(saveFuture, success -> onTimeSeriesUpdate(tenantId, entityId, ts));
-    }
-
-    @Override
-    public void deleteAndNotify(TenantId tenantId, EntityId entityId, String scope, List<String> keys, FutureCallback<Void> callback) {
-        checkInternalEntity(entityId);
-        deleteAndNotifyInternal(tenantId, entityId, scope, keys, false, callback);
-    }
-
-    @Override
-    public void deleteAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> keys, FutureCallback<Void> callback) {
-        checkInternalEntity(entityId);
-        deleteAndNotifyInternal(tenantId, entityId, scope, keys, false, callback);
-    }
-
-    @Override
-    public void deleteAndNotify(TenantId tenantId, EntityId entityId, String scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback) {
-        checkInternalEntity(entityId);
-        deleteAndNotifyInternal(tenantId, entityId, scope, keys, notifyDevice, callback);
-    }
-
-    @Override
-    public void deleteAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback) {
-        checkInternalEntity(entityId);
-        deleteAndNotifyInternal(tenantId, entityId, scope, keys, notifyDevice, callback);
-    }
-
-    @Override
-    public void deleteAndNotifyInternal(TenantId tenantId, EntityId entityId, String scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback) {
-        ListenableFuture<List<String>> deleteFuture = attrService.removeAll(tenantId, entityId, scope, keys);
-        addVoidCallback(deleteFuture, callback);
-        addWsCallback(deleteFuture, success -> onAttributesDelete(tenantId, entityId, scope, keys, notifyDevice));
-    }
-
-    @Override
-    public void deleteAndNotifyInternal(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback) {
-        ListenableFuture<List<String>> deleteFuture = attrService.removeAll(tenantId, entityId, scope, keys);
-        addVoidCallback(deleteFuture, callback);
-        addWsCallback(deleteFuture, success -> onAttributesDelete(tenantId, entityId, scope.name(), keys, notifyDevice));
-    }
-
-    @Override
-    public void deleteLatest(TenantId tenantId, EntityId entityId, List<String> keys, FutureCallback<Void> callback) {
-        checkInternalEntity(entityId);
-        deleteLatestInternal(tenantId, entityId, keys, callback);
-    }
-
-    @Override
-    public void deleteLatestInternal(TenantId tenantId, EntityId entityId, List<String> keys, FutureCallback<Void> callback) {
-        ListenableFuture<List<TsKvLatestRemovingResult>> deleteFuture = tsService.removeLatest(tenantId, entityId, keys);
-        addVoidCallback(deleteFuture, callback);
-    }
-
-    @Override
-    public void deleteAllLatest(TenantId tenantId, EntityId entityId, FutureCallback<Collection<String>> callback) {
-        ListenableFuture<Collection<String>> deleteFuture = tsService.removeAllLatest(tenantId, entityId);
-        Futures.addCallback(deleteFuture, new FutureCallback<Collection<String>>() {
-            @Override
-            public void onSuccess(@Nullable Collection<String> result) {
-                callback.onSuccess(result);
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                callback.onFailure(t);
-            }
-        }, tsCallBackExecutor);
-    }
-
-    @Override
-    public void deleteTimeseriesAndNotify(TenantId tenantId, EntityId entityId, List<String> keys, List<DeleteTsKvQuery> deleteTsKvQueries, FutureCallback<Void> callback) {
-        ListenableFuture<List<TsKvLatestRemovingResult>> deleteFuture = tsService.remove(tenantId, entityId, deleteTsKvQueries);
-        addVoidCallback(deleteFuture, callback);
-        addWsCallback(deleteFuture, list -> onTimeSeriesDelete(tenantId, entityId, keys, list));
-    }
-
-    @Override
-    public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, long value, FutureCallback<Void> callback) {
-        saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new LongDataEntry(key, value)
-                , System.currentTimeMillis())), callback);
-    }
-
-
-    @Override
-    public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, long value, FutureCallback<Void> callback) {
-        saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new LongDataEntry(key, value)
-                , System.currentTimeMillis())), callback);
-    }
-
-    @Override
-    public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, String value, FutureCallback<Void> callback) {
-        saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new StringDataEntry(key, value)
-                , System.currentTimeMillis())), callback);
-    }
-
-    @Override
-    public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, String value, FutureCallback<Void> callback) {
-        saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new StringDataEntry(key, value)
-                , System.currentTimeMillis())), callback);
-    }
-
-    @Override
-    public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, double value, FutureCallback<Void> callback) {
-        saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new DoubleDataEntry(key, value)
-                , System.currentTimeMillis())), callback);
-    }
-
-    @Override
-    public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, double value, FutureCallback<Void> callback) {
-        saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new DoubleDataEntry(key, value)
-                , System.currentTimeMillis())), callback);
-    }
-
-    @Override
-    public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, boolean value, FutureCallback<Void> callback) {
-        saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new BooleanDataEntry(key, value)
-                , System.currentTimeMillis())), callback);
-    }
-
-    @Override
-    public void saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, boolean value, FutureCallback<Void> callback) {
-        saveAndNotify(tenantId, entityId, scope, Collections.singletonList(new BaseAttributeKvEntry(new BooleanDataEntry(key, value)
-                , System.currentTimeMillis())), callback);
-    }
-
-    @Override
-    public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, long value) {
-        SettableFuture<Void> future = SettableFuture.create();
-        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
-        return future;
-    }
-
-    @Override
-    public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, long value) {
-        SettableFuture<Void> future = SettableFuture.create();
-        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
-        return future;
-    }
-
-    @Override
-    public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, String value) {
-        SettableFuture<Void> future = SettableFuture.create();
-        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
-        return future;
-    }
-
-    @Override
-    public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, String value) {
-        SettableFuture<Void> future = SettableFuture.create();
-        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
-        return future;
-    }
-
-    @Override
-    public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, double value) {
-        SettableFuture<Void> future = SettableFuture.create();
-        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
-        return future;
-    }
-
-    @Override
-    public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, double value) {
-        SettableFuture<Void> future = SettableFuture.create();
-        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
-        return future;
-    }
-
-    @Override
-    public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, String scope, String key, boolean value) {
-        SettableFuture<Void> future = SettableFuture.create();
-        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
-        return future;
-    }
-
-    @Override
-    public ListenableFuture<Void> saveAttrAndNotify(TenantId tenantId, EntityId entityId, AttributeScope scope, String key, boolean value) {
-        SettableFuture<Void> future = SettableFuture.create();
-        saveAttrAndNotify(tenantId, entityId, scope, key, value, new VoidFutureCallback(future));
-        return future;
-    }
-
     private void onAttributesUpdate(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, boolean notifyDevice) {
         forwardToSubscriptionManagerService(tenantId, entityId, subscriptionManagerService -> {
             subscriptionManagerService.onAttributesUpdate(tenantId, entityId, scope, attributes, notifyDevice, TbCallback.EMPTY);
@@ -509,33 +302,13 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
         });
     }
 
-    private <S> void addVoidCallback(ListenableFuture<S> saveFuture, final FutureCallback<Void> callback) {
+    private <S> void addMainCallback(ListenableFuture<S> saveFuture, final FutureCallback<Void> callback) {
         if (callback == null) return;
-        Futures.addCallback(saveFuture, new FutureCallback<S>() {
+        addMainCallback(saveFuture, result -> callback.onSuccess(null), callback::onFailure);
-            @Override
-            public void onSuccess(@Nullable S result) {
-                callback.onSuccess(null);
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                callback.onFailure(t);
-            }
-        }, tsCallBackExecutor);
     }
 
-    private <S> void addMainCallback(ListenableFuture<S> saveFuture, final FutureCallback<S> callback) {
+    private <S> void addMainCallback(ListenableFuture<S> saveFuture, Consumer<S> onSuccess, Consumer<Throwable> onFailure) {
-        Futures.addCallback(saveFuture, new FutureCallback<S>() {
+        DonAsynchron.withCallback(saveFuture, onSuccess, onFailure, tsCallBackExecutor);
-            @Override
-            public void onSuccess(@Nullable S result) {
-                callback.onSuccess(result);
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                callback.onFailure(t);
-            }
-        }, tsCallBackExecutor);
     }
 
     private void checkInternalEntity(EntityId entityId) {
@@ -544,22 +317,21 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
         }
     }
 
-    private static class VoidFutureCallback implements FutureCallback<Void> {
+    private FutureCallback<Integer> getApiUsageCallback(TenantId tenantId, CustomerId customerId, boolean sysTenant, FutureCallback<Void> callback) {
-        private final SettableFuture<Void> future;
+        return new FutureCallback<>() {
-
+            @Override
-        public VoidFutureCallback(SettableFuture<Void> future) {
+            public void onSuccess(Integer result) {
-            this.future = future;
+                if (!sysTenant && result != null && result > 0) {
-        }
+                    apiUsageClient.report(tenantId, customerId, ApiUsageRecordKey.STORAGE_DP_COUNT, result);
-
+                }
-        @Override
+                callback.onSuccess(null);
-        public void onSuccess(Void result) {
+            }
-            future.set(null);
-        }
 
-        @Override
+            @Override
-        public void onFailure(Throwable t) {
+            public void onFailure(Throwable t) {
-            future.setException(t);
+                callback.onFailure(t);
-        }
+            }
+        };
     }
 
 }

application/src/main/java/org/thingsboard/server/service/telemetry/InternalTelemetryService.java

@@ -15,37 +15,24 @@
  */
 package org.thingsboard.server.service.telemetry;
 
-import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.ListenableFuture;
+import org.thingsboard.rule.engine.api.AttributesDeleteRequest;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.rule.engine.api.RuleEngineTelemetryService;
-import org.thingsboard.server.common.data.AttributeScope;
+import org.thingsboard.rule.engine.api.TimeseriesDeleteRequest;
-import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.kv.AttributeKvEntry;
-import org.thingsboard.server.common.data.kv.TsKvEntry;
-
-import java.util.List;
 
 /**
  * Created by ashvayka on 27.03.18.
  */
 public interface InternalTelemetryService extends RuleEngineTelemetryService {
 
-    void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Integer> callback);
+    ListenableFuture<Integer> saveTimeseriesInternal(TimeseriesSaveRequest request);
-
-    void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, long ttl, FutureCallback<Integer> callback);
-
-    @Deprecated(since = "3.7.0")
-    void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback);
-
-    void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback);
-
-    void saveLatestAndNotifyInternal(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Void> callback);
 
-    @Deprecated(since = "3.7.0")
+    void saveAttributesInternal(AttributesSaveRequest request);
-    void deleteAndNotifyInternal(TenantId tenantId, EntityId entityId, String scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback);
 
-    void deleteAndNotifyInternal(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> keys, boolean notifyDevice, FutureCallback<Void> callback);
+    void deleteTimeseriesInternal(TimeseriesDeleteRequest request);
 
-    void deleteLatestInternal(TenantId tenantId, EntityId entityId, List<String> keys, FutureCallback<Void> callback);
+    void deleteAttributesInternal(AttributesDeleteRequest request);
 
 }

application/src/main/resources/thingsboard.yml

@@ -206,7 +206,7 @@ ui:
   # Help parameters
   help:
     # Base URL for UI help assets
-    base-url: "${UI_HELP_BASE_URL:https://raw.githubusercontent.com/thingsboard/thingsboard-ui-help/release-3.9}"
+    base-url: "${UI_HELP_BASE_URL:https://raw.githubusercontent.com/thingsboard/thingsboard-ui-help/release-4.0}"
 
 # Database telemetry parameters
 database:
@@ -1302,6 +1302,30 @@ coap:
     # - A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used
     # - A value that are > 4: MultiNodeConnectionIdGenerator is used
     connection_id_length: "${COAP_DTLS_CONNECTION_ID_LENGTH:}"
+    # Specify the MTU (Maximum Transmission Unit).
+    # Should be used if LAN MTU is not used, e.g. if IP tunnels are used or if the client uses a smaller value than the LAN MTU.
+    # Default = 1024
+    # Minimum value = 64
+    # If set to 0 - LAN MTU is used.
+    max_transmission_unit: "${COAP_DTLS_MAX_TRANSMISSION_UNIT:1024}"
+    # DTLS maximum fragment length (RFC 6066, Section 4).
+    # Default = 1024
+    # Possible values: 512, 1024, 2048, 4096.
+    # If set to 0, the default maximum fragment size of 2^14 bytes (16,384 bytes) is used.
+    # Without this extension, TLS specifies a fixed maximum plaintext fragment length of 2^14 bytes.
+    # It may be desirable for constrained clients to negotiate a smaller maximum fragment length due to memory limitations or bandwidth limitations.
+    # In order to negotiate smaller maximum fragment lengths,
+    # clients MAY include an extension of type "max_fragment_length" in the (extended) client hello.
+    # The "extension_data" field of this extension SHALL contain:
+    # enum {
+    #   2^9(1) == 512,
+    #   2^10(2) == 1024,
+    #   2^11(3) == 2048,
+    #   2^12(4) == 4096,
+    #   (255)
+    # } MaxFragmentLength;
+    # TLS already requires clients and servers to support fragmentation of handshake messages.
+    max_fragment_length: "${COAP_DTLS_MAX_FRAGMENT_LENGTH:1024}"
     # Server DTLS credentials
     credentials:
       # Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)

application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java

@@ -17,6 +17,7 @@ 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.node.ObjectNode;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -602,13 +603,14 @@ public class DashboardControllerTest extends AbstractControllerTest {
         dashboard.setTitle("My dashboard");
         dashboard.setConfiguration(JacksonUtil.newObjectNode()
                 .put("someImage", "tb-image;/api/images/tenant/" + imageInfo.getResourceKey())
-                .set("widgets", JacksonUtil.toJsonNode("""
+                .<ObjectNode>set("widgets", JacksonUtil.toJsonNode("""
                         {"xxx":
                         {"config":{"actions":{"elementClick":[
                         {"customResources":[{"url":{"entityType":"TB_RESOURCE","id":
                         "tb-resource;/api/resource/js_module/tenant/gateway-management-extension.js"},"isModule":true},
                         {"url":"tb-resource;/api/resource/js_module/tenant/gateway-management-extension.js","isModule":true}]}]}}}}
-                        """)));
+                        """))
+                .put("someResource", "tb-resource;/api/resource/js_module/tenant/gateway-management-extension.js"));
         dashboard = doPost("/api/dashboard", dashboard, Dashboard.class);
 
         Dashboard exportedDashboard = doGet("/api/dashboard/" + dashboard.getUuidId() + "?includeResources=true", Dashboard.class);
@@ -637,12 +639,18 @@ public class DashboardControllerTest extends AbstractControllerTest {
         doPost("/api/resource", resource, TbResourceInfo.class);
 
         Dashboard importedDashboard = doPost("/api/dashboard", exportedDashboard, Dashboard.class);
+        String newResourceKey = "gateway-management-extension_(1).js";
+
         imageRef = importedDashboard.getConfiguration().get("someImage").asText();
         assertThat(imageRef).isEqualTo("tb-image;/api/images/tenant/" + imageInfo.getResourceKey());
-        resourceRef = importedDashboard.getConfiguration().get("widgets").get("xxx").get("config")
+
-                .get("actions").get("elementClick").get(0).get("customResources").get(0).get("url").asText();
+        List<String> resourcesRefs = new ArrayList<>();
-        String newResourceKey = "gateway-management-extension_(1).js";
+        resourcesRefs.add(importedDashboard.getConfiguration().get("widgets").get("xxx").get("config")
-        assertThat(resourceRef).isEqualTo("tb-resource;/api/resource/js_module/tenant/" + newResourceKey);
+                .get("actions").get("elementClick").get(0).get("customResources").get(0).get("url").asText());
+        resourcesRefs.add(importedDashboard.getConfiguration().get("someResource").asText());
+        assertThat(resourcesRefs).allSatisfy(ref -> {
+            assertThat(ref).isEqualTo("tb-resource;/api/resource/js_module/tenant/" + newResourceKey);
+        });
 
         TbResourceInfo importedImageInfo = doGet("/api/images/tenant/" + imageInfo.getResourceKey() + "/info", TbResourceInfo.class);
         assertThat(importedImageInfo.getEtag()).isEqualTo(imageInfo.getEtag());

application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java

@@ -29,6 +29,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.TestPropertySource;
 import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
+import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
@@ -804,19 +806,24 @@ public class WebsocketApiTest extends AbstractControllerTest {
 
     private void sendTelemetry(Device device, List<TsKvEntry> tsData) throws InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
-        tsService.saveAndNotify(device.getTenantId(), null, device.getId(), tsData, 0, new FutureCallback<Void>() {
+        tsService.saveTimeseries(TimeseriesSaveRequest.builder()
-            @Override
+                .tenantId(device.getTenantId())
-            public void onSuccess(@Nullable Void result) {
+                .entityId(device.getId())
-                log.debug("sendTelemetry callback onSuccess");
+                .entries(tsData)
-                latch.countDown();
+                .callback(new FutureCallback<Void>() {
-            }
+                    @Override
-
+                    public void onSuccess(@Nullable Void result) {
-            @Override
+                        log.debug("sendTelemetry callback onSuccess");
-            public void onFailure(Throwable t) {
+                        latch.countDown();
-                log.error("Failed to send telemetry", t);
+                    }
-                latch.countDown();
+
-            }
+                    @Override
-        });
+                    public void onFailure(Throwable t) {
+                        log.error("Failed to send telemetry", t);
+                        latch.countDown();
+                    }
+                })
+                .build());
         assertThat(latch.await(TIMEOUT, TimeUnit.SECONDS)).as("await sendTelemetry callback");
     }
 
@@ -826,19 +833,26 @@ public class WebsocketApiTest extends AbstractControllerTest {
 
     private void sendAttributes(TenantId tenantId, EntityId entityId, TbAttributeSubscriptionScope scope, List<AttributeKvEntry> attrData) throws InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
-        tsService.saveAndNotify(tenantId, entityId, scope.getAttributeScope(), attrData, new FutureCallback<Void>() {
+        tsService.saveAttributes(AttributesSaveRequest.builder()
-            @Override
+                .tenantId(tenantId)
-            public void onSuccess(@Nullable Void result) {
+                .entityId(entityId)
-                log.debug("sendAttributes callback onSuccess");
+                .scope(scope.getAttributeScope())
-                latch.countDown();
+                .entries(attrData)
-            }
+                .callback(new FutureCallback<>() {
-
+                    @Override
-            @Override
+                    public void onSuccess(@Nullable Void result) {
-            public void onFailure(Throwable t) {
+                        log.debug("sendAttributes callback onSuccess");
-                log.error("Failed to sendAttributes", t);
+                        latch.countDown();
-                latch.countDown();
+                    }
-            }
+
-        });
+                    @Override
+                    public void onFailure(Throwable t) {
+                        log.error("Failed to sendAttributes", t);
+                        latch.countDown();
+                    }
+                })
+                .build());
         assertThat(latch.await(TIMEOUT, TimeUnit.SECONDS)).as("await sendAttributes callback").isTrue();
     }
+
 }

application/src/test/java/org/thingsboard/server/service/housekeeper/HousekeeperServiceTest.java

@@ -93,8 +93,12 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -103,6 +107,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.never;
@@ -113,7 +118,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @TestPropertySource(properties = {
         "queue.core.housekeeper.task-reprocessing-delay-ms=2000",
         "queue.core.housekeeper.poll-interval-ms=1000",
-        "queue.core.housekeeper.max-reprocessing-attempts=5"
+        "queue.core.housekeeper.max-reprocessing-attempts=5",
+        "queue.core.housekeeper.task-processing-timeout-ms=5000",
 })
 public class HousekeeperServiceTest extends AbstractControllerTest {
 
@@ -320,7 +326,7 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
 
     @Test
     public void whenTaskProcessingFails_thenReprocess() throws Exception {
-        TimeoutException error = new TimeoutException("Test timeout");
+        Exception error = new RuntimeException("Just a test");
         doThrow(error).when(tsHistoryDeletionTaskProcessor).process(any());
 
         Device device = createDevice("test", "test");
@@ -344,6 +350,54 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
         });
     }
 
+    @Test
+    public void whenTaskProcessingTimedOut_thenInterruptAndReprocess() throws Exception {
+        ExecutorService someExecutor = Executors.newSingleThreadExecutor();
+        AtomicBoolean taskInterrupted = new AtomicBoolean(false);
+        AtomicBoolean underlyingTaskInterrupted = new AtomicBoolean(false);
+        doAnswer(invocationOnMock -> {
+            Future<?> future = someExecutor.submit(() -> {
+                try {
+                    Thread.sleep(TimeUnit.HOURS.toMillis(24));
+                } catch (InterruptedException e) {
+                    underlyingTaskInterrupted.set(true);
+                }
+            });
+            try {
+                future.get();
+            } catch (InterruptedException e) {
+                taskInterrupted.set(true);
+                future.cancel(true);
+                throw e;
+            }
+            return null;
+        }).when(tsHistoryDeletionTaskProcessor).process(any());
+
+        Device device = createDevice("test", "test");
+        createRelatedData(device.getId());
+
+        doDelete("/api/device/" + device.getId()).andExpect(status().isOk());
+
+        int attempts = 2;
+        await().atMost(30, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS).untilAsserted(() -> {
+            for (int i = 0; i <= attempts; i++) {
+                int attempt = i;
+                verify(housekeeperReprocessingService).submitForReprocessing(argThat(getTaskMatcher(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY,
+                        task -> task.getAttempt() == attempt)), argThat(error -> error instanceof TimeoutException));
+            }
+        });
+        assertThat(taskInterrupted).isTrue();
+        assertThat(underlyingTaskInterrupted).isTrue();
+
+        assertThat(getTimeseriesHistory(device.getId())).isNotEmpty();
+        doCallRealMethod().when(tsHistoryDeletionTaskProcessor).process(any());
+        someExecutor.shutdown();
+
+        await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
+            assertThat(getTimeseriesHistory(device.getId())).isEmpty();
+        });
+    }
+
     @Test
     public void whenReprocessingAttemptsExceeded_thenDropTheTask() throws Exception {
         TimeoutException error = new TimeoutException("Test timeout");

application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java

@@ -27,6 +27,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.test.util.ReflectionTestUtils;
+import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Device;
@@ -72,7 +73,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.then;
@@ -82,6 +83,7 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.thingsboard.server.service.state.DefaultDeviceStateService.ACTIVITY_STATE;
@@ -208,9 +210,12 @@ public class DefaultDeviceStateServiceTest {
         service.onDeviceConnect(tenantId, deviceId, lastConnectTime);
 
         // THEN
-        then(telemetrySubscriptionService).should().saveAttrAndNotify(
+        then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
-                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(LAST_CONNECT_TIME), eq(lastConnectTime), any()
+                request.getTenantId().equals(TenantId.SYS_TENANT_ID) && request.getEntityId().equals(deviceId) &&
-        );
+                        request.getScope().equals(AttributeScope.SERVER_SCOPE) &&
+                        request.getEntries().get(0).getKey().equals(LAST_CONNECT_TIME) &&
+                        request.getEntries().get(0).getValue().equals(lastConnectTime)
+        ));
 
         var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         then(clusterService).should().pushMsgToRuleEngine(eq(tenantId), eq(deviceId), msgCaptor.capture(), any());
@@ -292,10 +297,12 @@ public class DefaultDeviceStateServiceTest {
         service.onDeviceDisconnect(tenantId, deviceId, lastDisconnectTime);
 
         // THEN
-        then(telemetrySubscriptionService).should().saveAttrAndNotify(
+        then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
-                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE),
+                request.getTenantId().equals(TenantId.SYS_TENANT_ID) && request.getEntityId().equals(deviceId) &&
-                eq(LAST_DISCONNECT_TIME), eq(lastDisconnectTime), any()
+                        request.getScope().equals(AttributeScope.SERVER_SCOPE) &&
-        );
+                        request.getEntries().get(0).getKey().equals(LAST_DISCONNECT_TIME) &&
+                        request.getEntries().get(0).getValue().equals(lastDisconnectTime)
+        ));
 
         var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         then(clusterService).should().pushMsgToRuleEngine(eq(tenantId), eq(deviceId), msgCaptor.capture(), any());
@@ -413,14 +420,18 @@ public class DefaultDeviceStateServiceTest {
         service.onDeviceInactivity(tenantId, deviceId, lastInactivityTime);
 
         // THEN
-        then(telemetrySubscriptionService).should().saveAttrAndNotify(
+        then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
-                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE),
+                request.getTenantId().equals(TenantId.SYS_TENANT_ID) && request.getEntityId().equals(deviceId) &&
-                eq(INACTIVITY_ALARM_TIME), eq(lastInactivityTime), any()
+                        request.getScope().equals(AttributeScope.SERVER_SCOPE) &&
-        );
+                        request.getEntries().get(0).getKey().equals(INACTIVITY_ALARM_TIME) &&
-        then(telemetrySubscriptionService).should().saveAttrAndNotify(
+                        request.getEntries().get(0).getValue().equals(lastInactivityTime)
-                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE),
+        ));
-                eq(ACTIVITY_STATE), eq(false), any()
+        then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
-        );
+                request.getTenantId().equals(TenantId.SYS_TENANT_ID) && request.getEntityId().equals(deviceId) &&
+                        request.getScope().equals(AttributeScope.SERVER_SCOPE) &&
+                        request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
+                        request.getEntries().get(0).getValue().equals(false)
+        ));
 
         var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         then(clusterService).should()
@@ -453,14 +464,17 @@ public class DefaultDeviceStateServiceTest {
         service.updateInactivityStateIfExpired(System.currentTimeMillis(), deviceId, deviceStateData);
 
         // THEN
-        then(telemetrySubscriptionService).should().saveAttrAndNotify(
+        then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
-                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE),
+                request.getTenantId().equals(TenantId.SYS_TENANT_ID) && request.getEntityId().equals(deviceId) &&
-                eq(INACTIVITY_ALARM_TIME), anyLong(), any()
+                        request.getScope().equals(AttributeScope.SERVER_SCOPE) &&
-        );
+                        request.getEntries().get(0).getKey().equals(INACTIVITY_ALARM_TIME)
-        then(telemetrySubscriptionService).should().saveAttrAndNotify(
+        ));
-                eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE),
+        then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
-                eq(ACTIVITY_STATE), eq(false), any()
+                request.getTenantId().equals(TenantId.SYS_TENANT_ID) && request.getEntityId().equals(deviceId) &&
-        );
+                        request.getScope().equals(AttributeScope.SERVER_SCOPE) &&
+                        request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
+                        request.getEntries().get(0).getValue().equals(false)
+        ));
 
         var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         then(clusterService).should()
@@ -612,7 +626,9 @@ public class DefaultDeviceStateServiceTest {
         long newTimeout = System.currentTimeMillis() - deviceState.getLastActivityTime() + increase;
 
         service.onDeviceInactivityTimeoutUpdate(tenantId, deviceId, newTimeout);
-        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), any(), any());
+        verify(telemetrySubscriptionService, never()).saveAttributes(argThat(request ->
+                request.getEntityId().equals(deviceId) && request.getEntries().get(0).getKey().equals(ACTIVITY_STATE)
+        ));
         Thread.sleep(defaultTimeout + increase);
         service.checkStates();
         activityVerify(false);
@@ -651,7 +667,9 @@ public class DefaultDeviceStateServiceTest {
 
         long newTimeout = 1;
         Thread.sleep(newTimeout);
-        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), any(), any());
+        verify(telemetrySubscriptionService, never()).saveAttributes(argThat(request ->
+                request.getEntityId().equals(deviceId) && request.getEntries().get(0).getKey().equals(ACTIVITY_STATE)
+        ));
     }
 
     @Test
@@ -672,8 +690,6 @@ public class DefaultDeviceStateServiceTest {
         service.onDeviceActivity(tenantId, deviceId, System.currentTimeMillis());
         activityVerify(true);
 
-        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), any(), any());
-
         long newTimeout = 1;
         Thread.sleep(newTimeout);
 
@@ -713,11 +729,17 @@ public class DefaultDeviceStateServiceTest {
         long newTimeout = 1;
 
         service.onDeviceInactivityTimeoutUpdate(tenantId, deviceId, newTimeout);
-        verify(telemetrySubscriptionService, never()).saveAttrAndNotify(any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), any(), any());
+        verify(telemetrySubscriptionService, never()).saveAttributes(argThat(request ->
+                request.getEntityId().equals(deviceId) && request.getEntries().get(0).getKey().equals(ACTIVITY_STATE)
+        ));
     }
 
     private void activityVerify(boolean isActive) {
-        verify(telemetrySubscriptionService).saveAttrAndNotify(any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), eq(isActive), any());
+        verify(telemetrySubscriptionService).saveAttributes(argThat(request ->
+                request.getEntityId().equals(deviceId) &&
+                        request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
+                        request.getEntries().get(0).getValue().equals(isActive)
+        ));
     }
 
     @Test
@@ -763,21 +785,27 @@ public class DefaultDeviceStateServiceTest {
         // THEN
         assertThat(deviceState.isActive()).isEqualTo(true);
         assertThat(deviceState.getLastActivityTime()).isEqualTo(lastReportedActivity);
-        then(telemetrySubscriptionService).should().saveAttrAndNotify(
+        then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
-                any(), eq(deviceId), any(AttributeScope.class), eq(LAST_ACTIVITY_TIME), eq(lastReportedActivity), any()
+                request.getEntityId().equals(deviceId) &&
-        );
+                        request.getEntries().get(0).getKey().equals(LAST_ACTIVITY_TIME) &&
+                        request.getEntries().get(0).getValue().equals(lastReportedActivity)
+        ));
 
         assertThat(deviceState.getLastInactivityAlarmTime()).isEqualTo(expectedInactivityAlarmTime);
         if (shouldSetInactivityAlarmTimeToZero) {
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(
+            then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
-                    any(), eq(deviceId), any(AttributeScope.class), eq(INACTIVITY_ALARM_TIME), eq(0L), any()
+                    request.getEntityId().equals(deviceId) &&
-            );
+                            request.getEntries().get(0).getKey().equals(INACTIVITY_ALARM_TIME) &&
+                            request.getEntries().get(0).getValue().equals(0L)
+            ));
         }
 
         if (shouldUpdateActivityStateToActive) {
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(
+            then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
-                    eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(ACTIVITY_STATE), eq(true), any()
+                    request.getEntityId().equals(deviceId) &&
-            );
+                            request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
+                            request.getEntries().get(0).getValue().equals(true)
+            ));
 
             var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
             then(clusterService).should().pushMsgToRuleEngine(eq(tenantId), eq(deviceId), msgCaptor.capture(), any());
@@ -796,28 +824,28 @@ public class DefaultDeviceStateServiceTest {
 
     private static Stream<Arguments> provideParametersForUpdateActivityState() {
         return Stream.of(
-                Arguments.of(true,  100, 120, 80,  80,  false, false),
+                Arguments.of(true, 100, 120, 80, 80, false, false),
 
-                Arguments.of(true,  100, 120, 100, 100, false, false),
+                Arguments.of(true, 100, 120, 100, 100, false, false),
 
                 Arguments.of(false, 100, 120, 110, 110, false, true),
 
 
-                Arguments.of(true,  100, 100, 80,  80,  false, false),
+                Arguments.of(true, 100, 100, 80, 80, false, false),
 
-                Arguments.of(true,  100, 100, 100, 100, false, false),
+                Arguments.of(true, 100, 100, 100, 100, false, false),
 
-                Arguments.of(false, 100, 100, 110, 0,   true,  true),
+                Arguments.of(false, 100, 100, 110, 0, true, true),
 
 
-                Arguments.of(false, 100, 110, 110, 0,   true,  true),
+                Arguments.of(false, 100, 110, 110, 0, true, true),
 
-                Arguments.of(false, 100, 110, 120, 0,   true,  true),
+                Arguments.of(false, 100, 110, 120, 0, true, true),
 
 
-                Arguments.of(true,  0,   0,   0,   0,   false, false),
+                Arguments.of(true, 0, 0, 0, 0, false, false),
 
-                Arguments.of(false, 0,   0,   0,   0,   true,  true)
+                Arguments.of(false, 0, 0, 0, 0, true, true)
         );
     }
 
@@ -857,9 +885,10 @@ public class DefaultDeviceStateServiceTest {
         assertThat(deviceState.getInactivityTimeout()).isEqualTo(newInactivityTimeout);
         assertThat(deviceState.isActive()).isEqualTo(expectedActivityState);
         if (activityState && !expectedActivityState) {
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(
+            then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
-                    any(), eq(deviceId), any(AttributeScope.class), eq(ACTIVITY_STATE), eq(false), any()
+                    request.getEntityId().equals(deviceId) && request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
-            );
+                            request.getEntries().get(0).getValue().equals(false)
+            ));
         }
     }
 
@@ -954,9 +983,10 @@ public class DefaultDeviceStateServiceTest {
         assertThat(state.getLastInactivityAlarmTime()).isEqualTo(expectedLastInactivityAlarmTime);
 
         if (shouldUpdateActivityStateToInactive) {
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(
+            then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
-                    eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(ACTIVITY_STATE), eq(false), any()
+                    request.getEntityId().equals(deviceId) && request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
-            );
+                            request.getEntries().get(0).getValue().equals(false)
+            ));
 
             var msgCaptor = ArgumentCaptor.forClass(TbMsg.class);
             then(clusterService).should().pushMsgToRuleEngine(eq(tenantId), eq(deviceId), msgCaptor.capture(), any());
@@ -971,72 +1001,74 @@ public class DefaultDeviceStateServiceTest {
             assertThat(actualNotification.getDeviceId()).isEqualTo(deviceId);
             assertThat(actualNotification.isActive()).isFalse();
 
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(
+            then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
-                    eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE),
+                    request.getTenantId().equals(TenantId.SYS_TENANT_ID) && request.getEntityId().equals(deviceId) &&
-                    eq(INACTIVITY_ALARM_TIME), eq(expectedLastInactivityAlarmTime), any()
+                            request.getScope().equals(AttributeScope.SERVER_SCOPE) &&
-            );
+                            request.getEntries().get(0).getKey().equals(INACTIVITY_ALARM_TIME) &&
+                            request.getEntries().get(0).getValue().equals(expectedLastInactivityAlarmTime)
+            ));
         }
     }
 
     private static Stream<Arguments> provideParametersForUpdateInactivityStateIfExpired() {
         return Stream.of(
-                Arguments.of(false, 100, 70,  90,  70,  60,  false, 90,  false),
+                Arguments.of(false, 100, 70, 90, 70, 60, false, 90, false),
 
-                Arguments.of(false, 100, 40,  50,  70,  10,  false, 50,  false),
+                Arguments.of(false, 100, 40, 50, 70, 10, false, 50, false),
 
-                Arguments.of(false, 100, 25,  60,  75,  25,  false, 60,  false),
+                Arguments.of(false, 100, 25, 60, 75, 25, false, 60, false),
 
-                Arguments.of(false, 100, 60,  70,  10,  50,  false, 70,  false),
+                Arguments.of(false, 100, 60, 70, 10, 50, false, 70, false),
 
-                Arguments.of(false, 100, 10,  15,  90,  10,  false, 15,  false),
+                Arguments.of(false, 100, 10, 15, 90, 10, false, 15, false),
 
-                Arguments.of(false, 100, 0,   40,  75,  0,   false, 40,  false),
+                Arguments.of(false, 100, 0, 40, 75, 0, false, 40, false),
 
-                Arguments.of(true,  100, 90,  80,  80,  50,  true,  80,  false),
+                Arguments.of(true, 100, 90, 80, 80, 50, true, 80, false),
 
-                Arguments.of(true,  100, 95,  90,  10,  50,  true,  90,  false),
+                Arguments.of(true, 100, 95, 90, 10, 50, true, 90, false),
 
-                Arguments.of(true,  100, 10,  10,  90,  10,  false, 100, true),
+                Arguments.of(true, 100, 10, 10, 90, 10, false, 100, true),
 
-                Arguments.of(true,  100, 10,  10,  90,  11,  true,  10,  false),
+                Arguments.of(true, 100, 10, 10, 90, 11, true, 10, false),
 
-                Arguments.of(true,  100, 15,  10,  85,  5,   false, 100, true),
+                Arguments.of(true, 100, 15, 10, 85, 5, false, 100, true),
 
-                Arguments.of(true,  100, 15,  10,  75,  5,   false, 100, true),
+                Arguments.of(true, 100, 15, 10, 75, 5, false, 100, true),
 
-                Arguments.of(true,  100, 95,  90,  5,   50,  false, 100, true),
+                Arguments.of(true, 100, 95, 90, 5, 50, false, 100, true),
 
-                Arguments.of(true,  100, 0,   0,   101, 0,   true,  0,   false),
+                Arguments.of(true, 100, 0, 0, 101, 0, true, 0, false),
 
-                Arguments.of(true,  100, 0,   0,   100, 0,   false, 100, true),
+                Arguments.of(true, 100, 0, 0, 100, 0, false, 100, true),
 
-                Arguments.of(true,  100, 0,   0,   99,  0,   false, 100, true),
+                Arguments.of(true, 100, 0, 0, 99, 0, false, 100, true),
 
-                Arguments.of(true,  100, 0,   0,   120, 10,  true,  0,   false),
+                Arguments.of(true, 100, 0, 0, 120, 10, true, 0, false),
 
-                Arguments.of(true,  100, 50,  0,   100, 0,   true,  0,   false),
+                Arguments.of(true, 100, 50, 0, 100, 0, true, 0, false),
 
-                Arguments.of(true,  100, 10,  0,   91,  0,   true,  0,   false),
+                Arguments.of(true, 100, 10, 0, 91, 0, true, 0, false),
 
-                Arguments.of(true,  100, 90,  0,   10,  0,   false, 100, true),
+                Arguments.of(true, 100, 90, 0, 10, 0, false, 100, true),
 
-                Arguments.of(true,  100, 100, 100, 1,   0,   true,  100, false),
+                Arguments.of(true, 100, 100, 100, 1, 0, true, 100, false),
 
-                Arguments.of(true,  100, 100, 100, 100, 100, true,  100, false),
+                Arguments.of(true, 100, 100, 100, 100, 100, true, 100, false),
 
-                Arguments.of(false, 100, 59,  60,  30,  10,  false, 60,  false),
+                Arguments.of(false, 100, 59, 60, 30, 10, false, 60, false),
 
-                Arguments.of(true,  100, 60,  60,  30,  10,  false, 100, true),
+                Arguments.of(true, 100, 60, 60, 30, 10, false, 100, true),
 
-                Arguments.of(true,  100, 61,  60,  30,  10,  false, 100, true),
+                Arguments.of(true, 100, 61, 60, 30, 10, false, 100, true),
 
-                Arguments.of(true,  0,   0,   0,   1,   0,   true,  0,   false),
+                Arguments.of(true, 0, 0, 0, 1, 0, true, 0, false),
 
-                Arguments.of(true,  0,   0,   0,   0,   0,   false, 0,   true),
+                Arguments.of(true, 0, 0, 0, 0, 0, false, 0, true),
 
-                Arguments.of(true,  100, 90,  80,  20,  70,  true,  80,  false),
+                Arguments.of(true, 100, 90, 80, 20, 70, true, 80, false),
 
-                Arguments.of(true,  100, 80,  90,  30,  70,  true,  90,  false)
+                Arguments.of(true, 100, 80, 90, 30, 70, true, 90, false)
         );
     }
 
@@ -1100,7 +1132,10 @@ public class DefaultDeviceStateServiceTest {
         // THEN
         await().atMost(1, TimeUnit.SECONDS).untilAsserted(() -> {
             assertThat(service.deviceStates.get(deviceId).getState().isActive()).isEqualTo(false);
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(ACTIVITY_STATE), eq(false), any());
+            then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                    request.getEntityId().equals(deviceId) && request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
+                            request.getEntries().get(0).getValue().equals(false)
+            ));
         });
     }
 
@@ -1127,10 +1162,31 @@ public class DefaultDeviceStateServiceTest {
         service.onDeviceActivity(tenantId, deviceId, currentTime);
 
         // THEN
+        ArgumentCaptor<AttributesSaveRequest> attributeRequestCaptor = ArgumentCaptor.forClass(AttributesSaveRequest.class);
+        then(telemetrySubscriptionService).should(times(2)).saveAttributes(attributeRequestCaptor.capture());
+
         await().atMost(1, TimeUnit.SECONDS).untilAsserted(() -> {
             assertThat(service.deviceStates.get(deviceId).getState().isActive()).isEqualTo(true);
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(LAST_ACTIVITY_TIME), eq(currentTime), any());
+
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(ACTIVITY_STATE), eq(true), any());
+            assertThat(attributeRequestCaptor.getAllValues()).hasSize(2)
+                    .anySatisfy(request -> {
+                        assertThat(request.getTenantId()).isEqualTo(TenantId.SYS_TENANT_ID);
+                        assertThat(request.getEntityId()).isEqualTo(deviceId);
+                        assertThat(request.getScope()).isEqualTo(AttributeScope.SERVER_SCOPE);
+                        assertThat(request.getEntries()).singleElement().satisfies(attributeKvEntry -> {
+                            assertThat(attributeKvEntry.getKey()).isEqualTo(LAST_ACTIVITY_TIME);
+                            assertThat(attributeKvEntry.getLongValue()).hasValue(currentTime);
+                        });
+                    })
+                    .anySatisfy(request -> {
+                        assertThat(request.getTenantId()).isEqualTo(TenantId.SYS_TENANT_ID);
+                        assertThat(request.getEntityId()).isEqualTo(deviceId);
+                        assertThat(request.getScope()).isEqualTo(AttributeScope.SERVER_SCOPE);
+                        assertThat(request.getEntries()).singleElement().satisfies(attributeKvEntry -> {
+                            assertThat(attributeKvEntry.getKey()).isEqualTo(ACTIVITY_STATE);
+                            assertThat(attributeKvEntry.getBooleanValue()).hasValue(true);
+                        });
+                    });
         });
     }
 
@@ -1174,7 +1230,10 @@ public class DefaultDeviceStateServiceTest {
         // THEN
         await().atMost(1, TimeUnit.SECONDS).untilAsserted(() -> {
             assertThat(service.deviceStates.get(deviceId).getState().isActive()).isEqualTo(true);
-            then(telemetrySubscriptionService).should().saveAttrAndNotify(eq(TenantId.SYS_TENANT_ID), eq(deviceId), eq(AttributeScope.SERVER_SCOPE), eq(ACTIVITY_STATE), eq(true), any());
+            then(telemetrySubscriptionService).should().saveAttributes(argThat(request ->
+                    request.getEntityId().equals(deviceId) && request.getEntries().get(0).getKey().equals(ACTIVITY_STATE) &&
+                            request.getEntries().get(0).getValue().equals(true)
+            ));
         });
     }
 

common/actor/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/cache/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/cluster-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/coap-server/pom.xml

@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSettings.java

@@ -21,6 +21,7 @@ import org.eclipse.californium.elements.config.Configuration;
 import org.eclipse.californium.elements.util.SslContextUtil;
 import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
 import org.eclipse.californium.scandium.dtls.CertificateType;
+import org.eclipse.californium.scandium.dtls.MaxFragmentLengthExtension.Length;
 import org.eclipse.californium.scandium.dtls.x509.SingleCertificateProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -44,6 +45,8 @@ import static org.eclipse.californium.elements.config.CertificateAuthenticationM
 import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_CLIENT_AUTHENTICATION_MODE;
 import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_CONNECTION_ID_LENGTH;
 import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_CONNECTION_ID_NODE_ID;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_MAX_FRAGMENT_LENGTH;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_MAX_TRANSMISSION_UNIT;
 import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_RETRANSMISSION_TIMEOUT;
 import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_ROLE;
 import static org.eclipse.californium.scandium.config.DtlsConfig.DtlsRole.SERVER_ONLY;
@@ -66,6 +69,12 @@ public class TbCoapDtlsSettings {
     @Value("${coap.dtls.connection_id_length:}")
     private Integer cIdLength;
 
+    @Value("${coap.dtls.max_transmission_unit:1024}")
+    private Integer maxTransmissionUnit;
+
+    @Value("${coap.dtls.max_fragment_length:1024}")
+    private Integer maxFragmentLength;
+
     @Bean
     @ConfigurationProperties(prefix = "coap.dtls.credentials")
     public SslCredentialsConfig coapDtlsCredentials() {
@@ -108,6 +117,15 @@ public class TbCoapDtlsSettings {
                 configBuilder.set(DTLS_CONNECTION_ID_NODE_ID, null);
             }
         }
+        if (maxTransmissionUnit > 0) {
+            configBuilder.set(DTLS_MAX_TRANSMISSION_UNIT, maxTransmissionUnit);
+        }
+        if (maxFragmentLength > 0) {
+            Length length = fromLength(maxFragmentLength);
+            if (length != null) {
+                configBuilder.set(DTLS_MAX_FRAGMENT_LENGTH, length);
+            }
+        }
         configBuilder.setAdvancedCertificateVerifier(
                 new TbCoapDtlsCertificateVerifier(
                         transportService,
@@ -127,4 +145,14 @@ public class TbCoapDtlsSettings {
         return new InetSocketAddress(addr, port);
     }
 
+
+    private static Length fromLength(int length) {
+        for (Length l : Length.values()) {
+            if (l.length() == length) {
+                return l;
+            }
+        }
+        return null;
+    }
 }
+

common/dao-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/dao-api/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java

@@ -37,16 +37,10 @@ public interface AttributesService {
 
     ListenableFuture<List<AttributeKvEntry>> findAll(TenantId tenantId, EntityId entityId, AttributeScope scope);
 
-    @Deprecated(since = "3.7.0")
-    ListenableFuture<List<Long>> save(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes);
-
     ListenableFuture<List<Long>> save(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes);
 
     ListenableFuture<Long> save(TenantId tenantId, EntityId entityId, AttributeScope scope, AttributeKvEntry attribute);
 
-    @Deprecated(since = "3.7.0")
-    ListenableFuture<List<String>> removeAll(TenantId tenantId, EntityId entityId, String scope, List<String> attributeKeys);
-
     ListenableFuture<List<String>> removeAll(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> attributeKeys);
 
     List<String> findAllKeysByDeviceProfileId(TenantId tenantId, DeviceProfileId deviceProfileId);

common/dao-api/src/main/java/org/thingsboard/server/dao/resource/ResourceService.java

@@ -80,13 +80,13 @@ public interface ResourceService extends EntityDaoService {
 
     TbResourceInfo findSystemOrTenantResourceByEtag(TenantId tenantId, ResourceType resourceType, String etag);
 
-    boolean updateResourcesUsage(Dashboard dashboard);
+    boolean updateResourcesUsage(TenantId tenantId, Dashboard dashboard);
 
-    boolean updateResourcesUsage(WidgetTypeDetails widgetTypeDetails);
+    boolean updateResourcesUsage(TenantId tenantId, WidgetTypeDetails widgetTypeDetails);
 
-    Collection<TbResourceInfo> getUsedResources(Dashboard dashboard);
+    Collection<TbResourceInfo> getUsedResources(TenantId tenantId, Dashboard dashboard);
 
-    Collection<TbResourceInfo> getUsedResources(WidgetTypeDetails widgetTypeDetails);
+    Collection<TbResourceInfo> getUsedResources(TenantId tenantId, WidgetTypeDetails widgetTypeDetails);
 
     TbResource createOrUpdateSystemResource(ResourceType resourceType, String resourceKey, byte[] data);
 

common/dao-api/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java

@@ -56,7 +56,7 @@ public interface TimeseriesService {
 
     ListenableFuture<List<TsKvLatestRemovingResult>> removeLatest(TenantId tenantId, EntityId entityId, Collection<String> keys);
 
-    ListenableFuture<Collection<String>> removeAllLatest(TenantId tenantId, EntityId entityId);
+    ListenableFuture<List<String>> removeAllLatest(TenantId tenantId, EntityId entityId);
 
     List<String> findAllKeysByDeviceProfileId(TenantId tenantId, DeviceProfileId deviceProfileId);
 

common/data/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetType.java

@@ -50,7 +50,8 @@ public class WidgetType extends BaseWidgetType {
 
     @JsonIgnore
     public JsonNode getDefaultConfig() {
-        return Optional.ofNullable(descriptor.get("defaultConfig"))
+        return Optional.ofNullable(descriptor)
+                .map(descriptor -> descriptor.get("defaultConfig"))
                 .filter(JsonNode::isTextual).map(JsonNode::asText)
                 .map(json -> {
                     try {

common/edge-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/message/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>common</artifactId>

common/proto/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/queue/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/script/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/script/remote-js-client/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>script</artifactId>
     </parent>
     <groupId>org.thingsboard.common.script</groupId>

common/script/script-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>script</artifactId>
     </parent>
     <groupId>org.thingsboard.common.script</groupId>

common/stats/pom.xml

@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/transport/coap/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>

common/transport/http/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>

common/transport/lwm2m/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>

common/transport/mqtt/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>

common/transport/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/transport/snmp/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
 

common/transport/transport-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>

common/util/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/version-control/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

dao/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>dao</artifactId>

dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java

@@ -101,14 +101,6 @@ public class BaseAttributesService implements AttributesService {
         return attributesDao.save(tenantId, entityId, scope, attribute);
     }
 
-    @Override
-    public ListenableFuture<List<Long>> save(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes) {
-        validate(entityId, scope);
-        AttributeUtils.validate(attributes, valueNoXssValidation);
-        List<ListenableFuture<Long>> saveFutures = attributes.stream().map(attribute -> attributesDao.save(tenantId, entityId, AttributeScope.valueOf(scope), attribute)).collect(Collectors.toList());
-        return Futures.allAsList(saveFutures);
-    }
-
     @Override
     public ListenableFuture<List<Long>> save(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes) {
         validate(entityId, scope);
@@ -117,12 +109,6 @@ public class BaseAttributesService implements AttributesService {
         return Futures.allAsList(saveFutures);
     }
 
-    @Override
-    public ListenableFuture<List<String>> removeAll(TenantId tenantId, EntityId entityId, String scope, List<String> attributeKeys) {
-        validate(entityId, scope);
-        return Futures.allAsList(attributesDao.removeAll(tenantId, entityId, AttributeScope.valueOf(scope), attributeKeys));
-    }
-
     @Override
     public ListenableFuture<List<String>> removeAll(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> attributeKeys) {
         validate(entityId, scope);

dao/src/main/java/org/thingsboard/server/dao/attributes/CachedAttributesService.java

@@ -222,11 +222,6 @@ public class CachedAttributesService implements AttributesService {
         return doSave(tenantId, entityId, scope, attribute);
     }
 
-    @Override
-    public ListenableFuture<List<Long>> save(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes) {
-        return save(tenantId, entityId, AttributeScope.valueOf(scope), attributes);
-    }
-
     @Override
     public ListenableFuture<List<Long>> save(TenantId tenantId, EntityId entityId, AttributeScope scope, List<AttributeKvEntry> attributes) {
         validate(entityId, scope);
@@ -255,11 +250,6 @@ public class CachedAttributesService implements AttributesService {
         log.trace("[{}][{}][{}] after cache put.", entityId, scope, key);
     }
 
-    @Override
-    public ListenableFuture<List<String>> removeAll(TenantId tenantId, EntityId entityId, String scope, List<String> attributeKeys) {
-        return removeAll(tenantId, entityId, AttributeScope.valueOf(scope), attributeKeys);
-    }
-
     @Override
     public ListenableFuture<List<String>> removeAll(TenantId tenantId, EntityId entityId, AttributeScope scope, List<String> attributeKeys) {
         validate(entityId, scope);

dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java

@@ -162,18 +162,19 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
             dashboardValidator.validate(dashboard, DashboardInfo::getTenantId);
         }
         try {
+            TenantId tenantId = dashboard.getTenantId();
             if (CollectionUtils.isNotEmpty(dashboard.getResources())) {
-                resourceService.importResources(dashboard.getTenantId(), dashboard.getResources());
+                resourceService.importResources(tenantId, dashboard.getResources());
             }
             imageService.updateImagesUsage(dashboard);
-            resourceService.updateResourcesUsage(dashboard);
+            resourceService.updateResourcesUsage(tenantId, dashboard);
 
-            var saved = dashboardDao.save(dashboard.getTenantId(), dashboard);
+            var saved = dashboardDao.save(tenantId, dashboard);
             publishEvictEvent(new DashboardTitleEvictEvent(saved.getId()));
-            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(saved.getTenantId())
+            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(tenantId)
                     .entityId(saved.getId()).created(dashboard.getId() == null).build());
             if (dashboard.getId() == null) {
-                countService.publishCountEntityEvictEvent(saved.getTenantId(), EntityType.DASHBOARD);
+                countService.publishCountEntityEvictEvent(tenantId, EntityType.DASHBOARD);
             }
             return saved;
         } catch (Exception e) {

dao/src/main/java/org/thingsboard/server/dao/domain/DomainServiceImpl.java

@@ -35,6 +35,7 @@ import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.oauth2.OAuth2ClientDao;
+import org.thingsboard.server.dao.service.validator.DomainDataValidator;
 
 import java.util.Comparator;
 import java.util.List;
@@ -53,11 +54,14 @@ public class DomainServiceImpl extends AbstractEntityService implements DomainSe
     private OAuth2ClientDao oauth2ClientDao;
     @Autowired
     private DomainDao domainDao;
+    @Autowired
+    private DomainDataValidator domainDataValidator;
 
     @Override
     public Domain saveDomain(TenantId tenantId, Domain domain) {
         log.trace("Executing saveDomain [{}]", domain);
         try {
+            domainDataValidator.validate(domain, Domain::getTenantId);
             Domain savedDomain = domainDao.save(tenantId, domain);
             eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(tenantId).entityId(savedDomain.getId()).entity(savedDomain).build());
             return savedDomain;

dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientServiceImpl.java

@@ -64,7 +64,7 @@ public class OAuth2ClientServiceImpl extends AbstractEntityService implements OA
 
     @Override
     public List<OAuth2ClientLoginInfo> findOAuth2ClientLoginInfosByMobilePkgNameAndPlatformType(String pkgName, PlatformType platformType) {
-        log.trace("Executing findOAuth2ClientLoginInfosByMobilePkgNameAndPlatformType pkgName=[{}] platformType=[{}]",pkgName, platformType);
+        log.trace("Executing findOAuth2ClientLoginInfosByMobilePkgNameAndPlatformType pkgName=[{}] platformType=[{}]", pkgName, platformType);
         return oauth2ClientDao.findEnabledByPkgNameAndPlatformType(pkgName, platformType)
                 .stream()
                 .map(OAuth2Utils::toClientLoginInfo)

dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java

@@ -57,6 +57,7 @@ import org.thingsboard.server.dao.service.Validator;
 import org.thingsboard.server.dao.service.validator.ResourceDataValidator;
 
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
@@ -401,18 +402,33 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
     }
 
     @Override
-    public boolean updateResourcesUsage(Dashboard dashboard) {
+    public boolean updateResourcesUsage(TenantId tenantId, Dashboard dashboard) {
+        if (dashboard.getConfiguration() == null) {
+            return false;
+        }
         Map<String, String> links = getResourcesLinks(dashboard.getResources());
-        return updateResourcesUsage(dashboard.getTenantId(), dashboard.getConfiguration(), DASHBOARD_RESOURCES_MAPPING, links);
+        return updateResourcesUsage(tenantId, List.of(dashboard.getConfiguration()), List.of(DASHBOARD_RESOURCES_MAPPING), links);
     }
 
     @Override
-    public boolean updateResourcesUsage(WidgetTypeDetails widgetTypeDetails) {
+    public boolean updateResourcesUsage(TenantId tenantId, WidgetTypeDetails widgetTypeDetails) {
         Map<String, String> links = getResourcesLinks(widgetTypeDetails.getResources());
-        boolean updated = updateResourcesUsage(widgetTypeDetails.getTenantId(), widgetTypeDetails.getDescriptor(), WIDGET_RESOURCES_MAPPING, links);
+        List<JsonNode> jsonNodes = new ArrayList<>(2);
+        List<Map<String, String>> mappings = new ArrayList<>(2);
+
+        if (widgetTypeDetails.getDescriptor() != null) {
+            jsonNodes.add(widgetTypeDetails.getDescriptor());
+            mappings.add(WIDGET_RESOURCES_MAPPING);
+        }
+
         JsonNode defaultConfig = widgetTypeDetails.getDefaultConfig();
         if (defaultConfig != null) {
-            updated |= updateResourcesUsage(widgetTypeDetails.getTenantId(), defaultConfig, WIDGET_DEFAULT_CONFIG_RESOURCES_MAPPING, links);
+            jsonNodes.add(defaultConfig);
+            mappings.add(WIDGET_DEFAULT_CONFIG_RESOURCES_MAPPING);
+        }
+
+        boolean updated = updateResourcesUsage(tenantId, jsonNodes, mappings, links);
+        if (defaultConfig != null) {
             widgetTypeDetails.setDefaultConfig(defaultConfig);
         }
         return updated;
@@ -433,8 +449,9 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
         return links;
     }
 
-    private boolean updateResourcesUsage(TenantId tenantId, JsonNode jsonNode, Map<String, String> mapping, Map<String, String> links) {
+    private boolean updateResourcesUsage(TenantId tenantId, List<JsonNode> jsonNodes, List<Map<String, String>> mappings, Map<String, String> links) {
-        return processResources(jsonNode, mapping, value -> {
+        log.trace("[{}] updateResourcesUsage (new links: {}) for {}", tenantId, links, jsonNodes);
+        return processResources(jsonNodes, mappings, value -> {
             String link = getResourceLink(value);
             if (link != null) {
                 String newLink = links.get(link);
@@ -462,23 +479,31 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
     }
 
     @Override
-    public Collection<TbResourceInfo> getUsedResources(Dashboard dashboard) {
+    public Collection<TbResourceInfo> getUsedResources(TenantId tenantId, Dashboard dashboard) {
-        return getUsedResources(dashboard.getTenantId(), dashboard.getConfiguration(), DASHBOARD_RESOURCES_MAPPING).values();
+        return getUsedResources(tenantId, List.of(dashboard.getConfiguration()), List.of(DASHBOARD_RESOURCES_MAPPING)).values();
     }
 
     @Override
-    public Collection<TbResourceInfo> getUsedResources(WidgetTypeDetails widgetTypeDetails) {
+    public Collection<TbResourceInfo> getUsedResources(TenantId tenantId, WidgetTypeDetails widgetTypeDetails) {
-        Map<TbResourceId, TbResourceInfo> resources = getUsedResources(widgetTypeDetails.getTenantId(), widgetTypeDetails.getDescriptor(), WIDGET_RESOURCES_MAPPING);
+        List<JsonNode> jsonNodes = new ArrayList<>(2);
+        List<Map<String, String>> mappings = new ArrayList<>(2);
+
+        jsonNodes.add(widgetTypeDetails.getDescriptor());
+        mappings.add(WIDGET_RESOURCES_MAPPING);
+
         JsonNode defaultConfig = widgetTypeDetails.getDefaultConfig();
         if (defaultConfig != null) {
-            resources.putAll(getUsedResources(widgetTypeDetails.getTenantId(), defaultConfig, WIDGET_DEFAULT_CONFIG_RESOURCES_MAPPING));
+            jsonNodes.add(defaultConfig);
+            mappings.add(WIDGET_DEFAULT_CONFIG_RESOURCES_MAPPING);
         }
-        return resources.values();
+
+        return getUsedResources(tenantId, jsonNodes, mappings).values();
     }
 
-    private Map<TbResourceId, TbResourceInfo> getUsedResources(TenantId tenantId, JsonNode jsonNode, Map<String, String> mapping) {
+    private Map<TbResourceId, TbResourceInfo> getUsedResources(TenantId tenantId, List<JsonNode> jsonNodes, List<Map<String, String>> mappings) {
         Map<TbResourceId, TbResourceInfo> resources = new HashMap<>();
-        processResources(jsonNode, mapping, value -> {
+        log.trace("[{}] getUsedResources for {}", tenantId, jsonNodes);
+        processResources(jsonNodes, mappings, value -> {
             String link = getResourceLink(value);
             if (link == null) {
                 return value;
@@ -517,32 +542,57 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
         }
     }
 
-    private boolean processResources(JsonNode jsonNode, Map<String, String> mapping, UnaryOperator<String> processor) {
+    private boolean processResources(List<JsonNode> jsonNodes, List<Map<String, String>> mappings, UnaryOperator<String> processor) {
         AtomicBoolean updated = new AtomicBoolean(false);
-        JacksonUtil.replaceByMapping(jsonNode, mapping, Collections.emptyMap(), (name, urlNode) -> {
-            String value = null;
-            if (urlNode.isTextual()) { // link is in the right place
-                value = urlNode.asText();
-            } else {
-                JsonNode id = urlNode.get("id"); // old structure is used
-                if (id != null && id.isTextual()) {
-                    value = id.asText();
-                }
-            }
 
-            if (StringUtils.isNotBlank(value)) {
+        for (int i = 0; i < jsonNodes.size(); i++) {
-                value = processor.apply(value);
+            JsonNode jsonNode = jsonNodes.get(i);
-            } else {
+            // processing by mappings first
-                value = "";
+            if (i <= mappings.size() - 1) {
-            }
+                JacksonUtil.replaceByMapping(jsonNode, mappings.get(i), Collections.emptyMap(), (name, urlNode) -> {
+                    String value = null;
+                    if (urlNode.isTextual()) { // link is in the right place
+                        value = urlNode.asText();
+                    } else {
+                        JsonNode id = urlNode.get("id"); // old structure is used
+                        if (id != null && id.isTextual()) {
+                            value = id.asText();
+                        }
+                    }
 
-            JsonNode newValue = new TextNode(value);
+                    if (StringUtils.isNotBlank(value)) {
-            if (!newValue.toString().equals(urlNode.toString())) {
+                        value = processor.apply(value);
-                updated.set(true);
+                    } else {
-                log.trace("Replaced '{}' with '{}'", urlNode, newValue);
+                        value = "";
+                    }
+
+                    JsonNode newValue = new TextNode(value);
+                    if (!newValue.toString().equals(urlNode.toString())) {
+                        updated.set(true);
+                        log.trace("Replaced by mapping '{}' ({}) with '{}'", value, name, newValue);
+                    }
+                    return newValue;
+                });
             }
-            return newValue;
+
-        });
+
+            // processing all
+            JacksonUtil.replaceAll(jsonNode, "", (name, value) -> {
+                if (!StringUtils.startsWith(value, DataConstants.TB_RESOURCE_PREFIX + "/api/resource/")) {
+                    return value;
+                }
+
+                String newValue = processor.apply(value);
+                if (StringUtils.equals(value, newValue)) {
+                    return value;
+                } else {
+                    updated.set(true);
+                    log.trace("Replaced '{}' ({}) with '{}'", value, name, newValue);
+                    return newValue;
+                }
+            });
+        }
+
         return updated.get();
     }
 
@@ -555,7 +605,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
                 importResources(dashboard.getTenantId(), dashboard.getResources());
             }
             imageService.updateImagesUsage(dashboard);
-            updateResourcesUsage(dashboard);
+            updateResourcesUsage(dashboard.getTenantId(), dashboard);
 
             data = JacksonUtil.writeValueAsBytes(dashboard);
         }

dao/src/main/java/org/thingsboard/server/dao/service/DataValidator.java

@@ -43,7 +43,10 @@ public abstract class DataValidator<D extends BaseData<?>> {
             Pattern.compile("^[A-Z0-9_!#$%&'*+/=?`{|}~^.-]+@[A-Z0-9.-]+\\.[A-Z]{2,}$", Pattern.CASE_INSENSITIVE);
 
     private static final Pattern QUEUE_PATTERN = Pattern.compile("^[a-zA-Z0-9_.\\-]+$");
-
+    private static final String DOMAIN_REGEX = "^(((?!-))(xn--|_)?[a-z0-9-]{0,61}[a-z0-9]{1,1}\\.)*(xn--)?([a-z0-9][a-z0-9\\-]{0,60}|[a-z0-9-]{1,30}\\.[a-z]{2,})$";
+    private static final Pattern DOMAIN_PATTERN = Pattern.compile(DOMAIN_REGEX);
+    private static final String LOCALHOST_REGEX = "^localhost(:\\d{1,5})?$";
+    private static final Pattern LOCALHOST_PATTERN = Pattern.compile(LOCALHOST_REGEX);
     private static final String NAME = "name";
     private static final String TOPIC = "topic";
 
@@ -171,4 +174,14 @@ public abstract class DataValidator<D extends BaseData<?>> {
         }
     }
 
+    public static boolean isValidDomain(String domainName) {
+        if (domainName == null) {
+            return false;
+        }
+        if (LOCALHOST_PATTERN.matcher(domainName).matches()) {
+            return true;
+        }
+        return DOMAIN_PATTERN.matcher(domainName).matches();
+    }
+
 }

dao/src/main/java/org/thingsboard/server/dao/service/validator/DomainDataValidator.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright © 2016-2024 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.dao.service.validator;
+
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.domain.Domain;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.exception.IncorrectParameterException;
+
+@Component
+public class DomainDataValidator extends AbstractHasOtaPackageValidator<Domain> {
+
+    @Override
+    protected void validateDataImpl(TenantId tenantId, Domain domain) {
+        if (!isValidDomain(domain.getName())) {
+            throw new IncorrectParameterException("Domain name " + domain.getName() + " is invalid");
+        }
+    }
+}

dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientDao.java

@@ -31,6 +31,7 @@ import org.thingsboard.server.dao.oauth2.OAuth2ClientDao;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
 import org.thingsboard.server.dao.util.SqlDao;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
@@ -65,8 +66,17 @@ public class JpaOAuth2ClientDao extends JpaAbstractDao<OAuth2ClientEntity, OAuth
 
     @Override
     public List<OAuth2Client> findEnabledByPkgNameAndPlatformType(String pkgName, PlatformType platformType) {
-        return DaoUtil.convertDataList(repository.findEnabledByPkgNameAndPlatformType(pkgName,
+        List<OAuth2ClientEntity> clientEntities;
-                platformType != null ? platformType.name() : null));
+        if (platformType != null) {
+            clientEntities = switch (platformType) {
+                case ANDROID -> repository.findEnabledByAndroidPkgNameAndPlatformType(pkgName, platformType.name());
+                case IOS -> repository.findEnabledByIosPkgNameAndPlatformType(pkgName, platformType.name());
+                default -> Collections.emptyList();
+            };
+        } else {
+            clientEntities = Collections.emptyList();
+        }
+        return DaoUtil.convertDataList(clientEntities);
     }
 
     @Override

dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/OAuth2ClientRepository.java

@@ -49,11 +49,21 @@ public interface OAuth2ClientRepository extends JpaRepository<OAuth2ClientEntity
             "FROM OAuth2ClientEntity c " +
             "LEFT JOIN MobileAppBundleOauth2ClientEntity ac ON c.id = ac.oauth2ClientId " +
             "LEFT JOIN MobileAppBundleEntity b ON ac.mobileAppBundleId = b.id " +
-            "LEFT JOIN MobileAppEntity andApp ON b.androidAppId = andApp.id LEFT JOIN MobileAppEntity iosApp ON b.iosAppID = iosApp.id " +
+            "LEFT JOIN MobileAppEntity andApp ON b.androidAppId = andApp.id " +
-            "WHERE andApp.pkgName = :pkgName OR iosApp.pkgName = :pkgName AND b.oauth2Enabled = true " +
+            "WHERE andApp.pkgName = :pkgName AND b.oauth2Enabled = true " +
             "AND (:platformFilter IS NULL OR c.platforms IS NULL OR c.platforms = '' OR ilike(c.platforms, CONCAT('%', :platformFilter, '%')) = true)")
-    List<OAuth2ClientEntity> findEnabledByPkgNameAndPlatformType(@Param("pkgName") String pkgName,
+    List<OAuth2ClientEntity> findEnabledByAndroidPkgNameAndPlatformType(@Param("pkgName") String pkgName,
-                                                                 @Param("platformFilter") String platformFilter);
+                                                                        @Param("platformFilter") String platformFilter);
+
+    @Query("SELECT c " +
+            "FROM OAuth2ClientEntity c " +
+            "LEFT JOIN MobileAppBundleOauth2ClientEntity ac ON c.id = ac.oauth2ClientId " +
+            "LEFT JOIN MobileAppBundleEntity b ON ac.mobileAppBundleId = b.id " +
+            "LEFT JOIN MobileAppEntity iosApp ON b.iosAppID = iosApp.id " +
+            "WHERE iosApp.pkgName = :pkgName AND b.oauth2Enabled = true " +
+            "AND (:platformFilter IS NULL OR c.platforms IS NULL OR c.platforms = '' OR ilike(c.platforms, CONCAT('%', :platformFilter, '%')) = true)")
+    List<OAuth2ClientEntity> findEnabledByIosPkgNameAndPlatformType(@Param("pkgName") String pkgName,
+                                                                    @Param("platformFilter") String platformFilter);
 
     @Query("SELECT c " +
             "FROM OAuth2ClientEntity c " +

dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java

@@ -254,11 +254,11 @@ public class BaseTimeseriesService implements TimeseriesService {
     }
 
     @Override
-    public ListenableFuture<Collection<String>> removeAllLatest(TenantId tenantId, EntityId entityId) {
+    public ListenableFuture<List<String>> removeAllLatest(TenantId tenantId, EntityId entityId) {
         validate(entityId);
         return Futures.transformAsync(this.findAllLatest(tenantId, entityId), latest -> {
             if (latest != null && !latest.isEmpty()) {
-                Collection<String> keys = latest.stream().map(TsKvEntry::getKey).collect(Collectors.toList());
+                List<String> keys = latest.stream().map(TsKvEntry::getKey).collect(Collectors.toList());
                 return Futures.transform(this.removeLatest(tenantId, entityId, keys), res -> keys, MoreExecutors.directExecutor());
             } else {
                 return Futures.immediateFuture(Collections.emptyList());

dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java

@@ -99,14 +99,15 @@ public class WidgetTypeServiceImpl implements WidgetTypeService {
         log.trace("Executing saveWidgetType [{}]", widgetTypeDetails);
         widgetTypeValidator.validate(widgetTypeDetails, WidgetType::getTenantId);
         try {
+            TenantId tenantId = widgetTypeDetails.getTenantId();
             if (CollectionUtils.isNotEmpty(widgetTypeDetails.getResources())) {
-                resourceService.importResources(widgetTypeDetails.getTenantId(), widgetTypeDetails.getResources());
+                resourceService.importResources(tenantId, widgetTypeDetails.getResources());
             }
             imageService.updateImagesUsage(widgetTypeDetails);
-            resourceService.updateResourcesUsage(widgetTypeDetails);
+            resourceService.updateResourcesUsage(tenantId, widgetTypeDetails);
 
-            WidgetTypeDetails result = widgetTypeDao.save(widgetTypeDetails.getTenantId(), widgetTypeDetails);
+            WidgetTypeDetails result = widgetTypeDao.save(tenantId, widgetTypeDetails);
-            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(result.getTenantId())
+            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(tenantId)
                     .entityId(result.getId()).created(widgetTypeDetails.getId() == null).build());
             return result;
         } catch (Exception t) {

dao/src/main/resources/sql/schema-entities.sql

@@ -896,7 +896,7 @@ CREATE TABLE IF NOT EXISTS queue_stats (
 );
 
 CREATE TABLE IF NOT EXISTS qr_code_settings (
-    id uuid NOT NULL CONSTRAINT mobile_app_settings_pkey PRIMARY KEY,
+    id uuid NOT NULL CONSTRAINT qr_code_settings_pkey PRIMARY KEY,
     created_time bigint NOT NULL,
     tenant_id uuid NOT NULL,
     use_default_app boolean,

dao/src/test/java/org/thingsboard/server/dao/service/DomainServiceTest.java

@@ -90,7 +90,7 @@ public class DomainServiceTest extends AbstractServiceTest {
     public void testGetTenantDomains() {
         List<Domain> domains = new ArrayList<>();
         for (int i = 0; i < 5; i++) {
-            Domain oAuth2Client = constructDomain(TenantId.SYS_TENANT_ID, StringUtils.randomAlphabetic(5), true, false);
+            Domain oAuth2Client = constructDomain(TenantId.SYS_TENANT_ID, StringUtils.randomAlphabetic(5).toLowerCase(), true, false);
             Domain savedOauth2Client = domainService.saveDomain(SYSTEM_TENANT_ID, oAuth2Client);
             domains.add(savedOauth2Client);
         }

docker/docker-upgrade-tb.sh

@@ -28,13 +28,7 @@ case $i in
 esac
 done
 
-if [[ -z "${FROM_VERSION// }" ]]; then
+fromVersion="${FROM_VERSION// }"
-    echo "--fromVersion parameter is invalid or unspecified!"
-    echo "Usage: docker-upgrade-tb.sh --fromVersion={VERSION}"
-    exit 1
-else
-    fromVersion="${FROM_VERSION// }"
-fi
 
 set -e
 

monitoring/pom.xml

@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
 

msa/black-box-tests/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.9.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>