Merge branch 'master' into events-cleanup-performance-improvement-for-big-data

# Conflicts: # application/src/main/data/upgrade/3.2.2/schema_update_event.sql

Merge branch 'master' into events-cleanup-performance-improvement-for-big-data
# Conflicts: # application/src/main/data/upgrade/3.2.2/schema_update_event.sql
Sergey Matvienko
2 parents 2853bbf6 cfa951c1
Showing 77 changed files with 2165 additions and 922 deletions
application/src/main/data/json/demo/dashboards/firmware.json
application/src/main/data/json/demo/dashboards/software.json
application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
application/src/main/java/org/thingsboard/server/actors/device/SessionInfo.java
application/src/main/java/org/thingsboard/server/controller/AuthController.java
application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponseHandler.java
application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
application/src/main/java/org/thingsboard/server/service/install/update/PaginatedUpdater.java
application/src/main/java/org/thingsboard/server/service/lwm2m/LwM2MServerSecurityInfoRepository.java
application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java
application/src/main/java/org/thingsboard/server/service/queue/TbTopicWithConsumerPerPartition.java
application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/AbstractOAuth2ClientMapper.java
application/src/main/resources/thingsboard.yml
application/src/test/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessorTest.java
application/src/test/java/org/thingsboard/server/controller/BaseUserControllerTest.java
application/src/test/java/org/thingsboard/server/service/mail/TestMailService.java
application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
application/src/test/java/org/thingsboard/server/transport/lwm2m/NoSecLwM2MIntegrationTest.java
application/src/test/java/org/thingsboard/server/transport/lwm2m/RpkLwM2MIntegrationTest.java
--- a/application/src/main/data/json/demo/dashboards/firmware.json
View file @dd9257f
+++ b/application/src/main/data/json/demo/dashboards/firmware.json
View file @dd9257f
@@ -33,15 +33,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": false,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -828,15 +828,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -1125,15 +1125,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -1422,15 +1422,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -1719,15 +1719,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
--- a/application/src/main/data/json/demo/dashboards/software.json
View file @dd9257f
+++ b/application/src/main/data/json/demo/dashboards/software.json
View file @dd9257f
@@ -33,15 +33,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": false,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -828,15 +828,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -1125,15 +1125,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -1422,15 +1422,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -1719,15 +1719,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
--- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
View file @dd9257f
+++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
View file @dd9257f
@@ -24,6 +24,7 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.common.util.LinkedHashMapRemoveEldest;
 import org.thingsboard.rule.engine.api.RpcError;
 import org.thingsboard.rule.engine.api.msg.DeviceAttributesEventNotificationMsg;
 import org.thingsboard.rule.engine.api.msg.DeviceCredentialsUpdateNotificationMsg;
@@ -96,6 +97,8 @@ import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.Consumer;
@@ -110,7 +113,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
     final TenantId tenantId;
     final DeviceId deviceId;
-    private final Map<UUID, SessionInfoMetaData> sessions;
+    final LinkedHashMapRemoveEldest<UUID, SessionInfoMetaData> sessions;
     private final Map<UUID, SessionInfo> attributeSubscriptions;
     private final Map<UUID, SessionInfo> rpcSubscriptions;
     private final Map<Integer, ToDeviceRpcRequestMetadata> toDeviceRpcPendingMap;
@@ -125,16 +128,16 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         super(systemContext);
         this.tenantId = tenantId;
         this.deviceId = deviceId;
-        this.sessions = new LinkedHashMap<>();
         this.attributeSubscriptions = new HashMap<>();
         this.rpcSubscriptions = new HashMap<>();
         this.toDeviceRpcPendingMap = new HashMap<>();
+        this.sessions = new LinkedHashMapRemoveEldest<>(systemContext.getMaxConcurrentSessionsPerDevice(), this::notifyTransportAboutClosedSessionMaxSessionsLimit);
         if (initAttributes()) {
             restoreSessions();
         }
     }
-    private boolean initAttributes() {
+    boolean initAttributes() {
         Device device = systemContext.getDeviceService().findDeviceById(tenantId, deviceId);
         if (device != null) {
             this.deviceName = device.getName();
@@ -552,18 +555,14 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
     private void processSessionStateMsgs(SessionInfoProto sessionInfo, SessionEventMsg msg) {
         UUID sessionId = getSessionId(sessionInfo);
+        Objects.requireNonNull(sessionId);
         if (msg.getEvent() == SessionEvent.OPEN) {
             if (sessions.containsKey(sessionId)) {
                 log.debug("[{}] Received duplicate session open event [{}]", deviceId, sessionId);
                 return;
             }
-            log.debug("[{}] Processing new session [{}]", deviceId, sessionId);
-            if (sessions.size() >= systemContext.getMaxConcurrentSessionsPerDevice()) {
-                UUID sessionIdToRemove = sessions.keySet().stream().findFirst().orElse(null);
-                if (sessionIdToRemove != null) {
-                    notifyTransportAboutClosedSession(sessionIdToRemove, sessions.remove(sessionIdToRemove), "max concurrent sessions limit reached per device!");
-                }
-            }
+            log.info("[{}] Processing new session [{}]. Current sessions size {}", deviceId, sessionId, sessions.size());
+
             sessions.put(sessionId, new SessionInfoMetaData(new SessionInfo(SessionType.ASYNC, sessionInfo.getNodeId())));
             if (sessions.size() == 1) {
                 reportSessionOpen();
@@ -584,8 +583,10 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
     private void handleSessionActivity(TbActorCtx context, SessionInfoProto sessionInfoProto, SubscriptionInfoProto subscriptionInfo) {
         UUID sessionId = getSessionId(sessionInfoProto);
+        Objects.requireNonNull(sessionId);
+
         SessionInfoMetaData sessionMD = sessions.computeIfAbsent(sessionId,
-                id -> new SessionInfoMetaData(new SessionInfo(SessionType.ASYNC, sessionInfoProto.getNodeId()), 0L));
+                id -> new SessionInfoMetaData(new SessionInfo(SessionType.ASYNC, sessionInfoProto.getNodeId()), subscriptionInfo.getLastActivityTime()));
         sessionMD.setLastActivityTime(subscriptionInfo.getLastActivityTime());
         sessionMD.setSubscribedToAttributes(subscriptionInfo.getAttributeSubscription());
@@ -615,6 +616,11 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         }
     }
+    private void notifyTransportAboutClosedSessionMaxSessionsLimit(UUID sessionId, SessionInfoMetaData sessionMd) {
+        notifyTransportAboutClosedSession(sessionId, sessionMd, "max concurrent sessions limit reached per device!");
+    }
+
+
     private void notifyTransportAboutClosedSession(UUID sessionId, SessionInfoMetaData sessionMd, String message) {
         SessionCloseNotificationProto sessionCloseNotificationProto = SessionCloseNotificationProto
                 .newBuilder()
@@ -761,7 +767,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         return builder.build();
     }
-    private void restoreSessions() {
+    void restoreSessions() {
         log.debug("[{}] Restoring sessions from cache", deviceId);
         DeviceSessionsCacheEntry sessionsDump = null;
         try {
@@ -774,6 +780,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
             log.debug("[{}] No session information found", deviceId);
             return;
         }
+        // TODO: Take latest max allowed sessions size from cache
         for (SessionSubscriptionInfoProto sessionSubscriptionInfoProto : sessionsDump.getSessionsList()) {
             SessionInfoProto sessionInfoProto = sessionSubscriptionInfoProto.getSessionInfo();
             UUID sessionId = getSessionId(sessionInfoProto);
@@ -843,6 +850,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
     }
     void checkSessionsTimeout() {
+        log.debug("[{}] checkSessionsTimeout started. Size before check {}", deviceId, sessions.size());
         long expTime = System.currentTimeMillis() - systemContext.getSessionInactivityTimeout();
         Map<UUID, SessionInfoMetaData> sessionsToRemove = sessions.entrySet().stream().filter(kv -> kv.getValue().getLastActivityTime() < expTime).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
         sessionsToRemove.forEach((sessionId, sessionMD) -> {
@@ -854,6 +862,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         if (!sessionsToRemove.isEmpty()) {
             dumpSessions();
         }
+        log.debug("[{}] checkSessionsTimeout finished. Size after check {}", deviceId, sessions.size());
     }
 }
--- a/application/src/main/java/org/thingsboard/server/actors/device/SessionInfo.java
View file @dd9257f
+++ b/application/src/main/java/org/thingsboard/server/actors/device/SessionInfo.java
View file @dd9257f
@@ -25,5 +25,4 @@ import org.thingsboard.server.gen.transport.TransportProtos.SessionType;
 public class SessionInfo {
     private final SessionType type;
     private final String nodeId;
-    private long lastActivityTime;
 }
--- a/application/src/main/java/org/thingsboard/server/controller/AuthController.java
View file @dd9257f
+++ b/application/src/main/java/org/thingsboard/server/controller/AuthController.java
View file @dd9257f
@@ -135,7 +135,7 @@ public class AuthController extends BaseController {
         }
     }
-    @RequestMapping(value = "/noauth/activate", params = { "activateToken" }, method = RequestMethod.GET)
+    @RequestMapping(value = "/noauth/activate", params = {"activateToken"}, method = RequestMethod.GET)
     public ResponseEntity<String> checkActivateToken(
             @RequestParam(value = "activateToken") String activateToken) {
         HttpHeaders headers = new HttpHeaders();
@@ -159,7 +159,7 @@ public class AuthController extends BaseController {
     @RequestMapping(value = "/noauth/resetPasswordByEmail", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
-    public void requestResetPasswordByEmail (
+    public void requestResetPasswordByEmail(
             @RequestBody JsonNode resetPasswordByEmailRequest,
             HttpServletRequest request) throws ThingsboardException {
         try {
@@ -170,13 +170,13 @@ public class AuthController extends BaseController {
             String resetUrl = String.format("%s/api/noauth/resetPassword?resetToken=%s", baseUrl,
                     userCredentials.getResetToken());
-            mailService.sendResetPasswordEmail(resetUrl, email);
+            mailService.sendResetPasswordEmailAsync(resetUrl, email);
         } catch (Exception e) {
-            throw handleException(e);
+            log.warn("Error occurred: {}", e.getMessage());
         }
     }
-    @RequestMapping(value = "/noauth/resetPassword", params = { "resetToken" }, method = RequestMethod.GET)
+    @RequestMapping(value = "/noauth/resetPassword", params = {"resetToken"}, method = RequestMethod.GET)
     public ResponseEntity<String> checkResetToken(
             @RequestParam(value = "resetToken") String resetToken) {
         HttpHeaders headers = new HttpHeaders();
--- a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponseHandler.java
View file @dd9257f
+++ b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponseHandler.java
View file @dd9257f
@@ -25,9 +25,12 @@ import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.web.access.AccessDeniedHandler;
-import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.msg.tools.TbRateLimitsException;
@@ -40,14 +43,15 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-@Component
 @Slf4j
-public class ThingsboardErrorResponseHandler implements AccessDeniedHandler {
+@RestControllerAdvice
+public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHandler implements AccessDeniedHandler {
     @Autowired
     private ObjectMapper mapper;
     @Override
+    @ExceptionHandler(AccessDeniedException.class)
     public void handle(HttpServletRequest request, HttpServletResponse response,
                        AccessDeniedException accessDeniedException) throws IOException,
             ServletException {
@@ -60,6 +64,7 @@ public class ThingsboardErrorResponseHandler implements AccessDeniedHandler {
         }
     }
+    @ExceptionHandler(Exception.class)
     public void handle(Exception exception, HttpServletResponse response) {
         log.debug("Processing exception {}", exception.getMessage(), exception);
         if (!response.isCommitted()) {
@@ -148,7 +153,7 @@ public class ThingsboardErrorResponseHandler implements AccessDeniedHandler {
     private void handleAuthenticationException(AuthenticationException authenticationException, HttpServletResponse response) throws IOException {
         response.setStatus(HttpStatus.UNAUTHORIZED.value());
-        if (authenticationException instanceof BadCredentialsException) {
+        if (authenticationException instanceof BadCredentialsException || authenticationException instanceof UsernameNotFoundException) {
             mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of("Invalid username or password", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
         } else if (authenticationException instanceof DisabledException) {
             mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of("User account is not active", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
@@ -159,7 +164,7 @@ public class ThingsboardErrorResponseHandler implements AccessDeniedHandler {
         } else if (authenticationException instanceof AuthMethodNotSupportedException) {
             mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of(authenticationException.getMessage(), ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
         } else if (authenticationException instanceof UserPasswordExpiredException) {
-            UserPasswordExpiredException expiredException = (UserPasswordExpiredException)authenticationException;
+            UserPasswordExpiredException expiredException = (UserPasswordExpiredException) authenticationException;
             String resetToken = expiredException.getResetToken();
             mapper.writeValue(response.getWriter(), ThingsboardCredentialsExpiredResponse.of(expiredException.getMessage(), resetToken));
         } else {
--- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
View file @dd9257f
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
View file @dd9257f
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.service.install.update;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -31,6 +32,7 @@ import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmQuery;
+import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.id.EntityViewId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.BaseReadTsKvQuery;
@@ -41,16 +43,21 @@ import org.thingsboard.server.common.data.oauth2.deprecated.OAuth2ClientsParams;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.common.data.query.DynamicValue;
+import org.thingsboard.server.common.data.query.FilterPredicateValue;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChainMetaData;
 import org.thingsboard.server.common.data.rule.RuleNode;
+import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.alarm.AlarmDao;
 import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.entity.EntityService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
+import org.thingsboard.server.dao.model.sql.DeviceProfileEntity;
 import org.thingsboard.server.dao.oauth2.OAuth2Service;
 import org.thingsboard.server.dao.oauth2.OAuth2Utils;
 import org.thingsboard.server.dao.rule.RuleChainService;
+import org.thingsboard.server.dao.sql.device.DeviceProfileRepository;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.service.install.InstallScripts;
@@ -93,6 +100,9 @@ public class DefaultDataUpdateService implements DataUpdateService {
     private AlarmDao alarmDao;
     @Autowired
+    private DeviceProfileRepository deviceProfileRepository;
+
+    @Autowired
     private OAuth2Service oAuth2Service;
     @Override
@@ -114,6 +124,7 @@ public class DefaultDataUpdateService implements DataUpdateService {
                 log.info("Updating data from version 3.2.2 to 3.3.0 ...");
                 tenantsDefaultEdgeRuleChainUpdater.updateEntities(null);
                 tenantsAlarmsCustomerUpdater.updateEntities(null);
+                deviceProfileEntityDynamicConditionsUpdater.updateEntities(null);
                 updateOAuth2Params();
                 break;
             default:
@@ -121,6 +132,45 @@ public class DefaultDataUpdateService implements DataUpdateService {
         }
     }
+    private final PaginatedUpdater<String, DeviceProfileEntity> deviceProfileEntityDynamicConditionsUpdater =
+            new PaginatedUpdater<>() {
+
+                @Override
+                protected String getName() {
+                    return "Device Profile Entity Dynamic Conditions Updater";
+                }
+
+                @Override
+                protected PageData<DeviceProfileEntity> findEntities(String id, PageLink pageLink) {
+                    return DaoUtil.pageToPageData(deviceProfileRepository.findAll(DaoUtil.toPageable(pageLink)));
+                }
+
+                @Override
+                protected void updateEntity(DeviceProfileEntity deviceProfile) {
+                    if (deviceProfile.getProfileData().has("alarms") &&
+                            !deviceProfile.getProfileData().get("alarms").isNull()) {
+                        boolean isUpdated = false;
+                        JsonNode array = deviceProfile.getProfileData().get("alarms");
+                        for (JsonNode node : array) {
+                            if (node.has("createRules")) {
+                                JsonNode createRules = node.get("createRules");
+                                for (AlarmSeverity severity : AlarmSeverity.values()) {
+                                    if (createRules.has(severity.name())) {
+                                        isUpdated = isUpdated || convertDeviceProfileAlarmRulesForVersion330(createRules.get(severity.name()).get("condition").get("spec"));
+                                    }
+                                }
+                            }
+                            if (node.has("clearRule") && !node.get("clearRule").isNull()) {
+                                isUpdated = isUpdated || convertDeviceProfileAlarmRulesForVersion330(node.get("clearRule").get("condition").get("spec"));
+                            }
+                        }
+                        if (isUpdated) {
+                            deviceProfileRepository.save(deviceProfile);
+                        }
+                    }
+                }
+            };
+
     private final PaginatedUpdater<String, Tenant> tenantsDefaultRuleChainUpdater =
             new PaginatedUpdater<>() {
@@ -370,6 +420,33 @@ public class DefaultDataUpdateService implements DataUpdateService {
         }
     }
+    private boolean convertDeviceProfileAlarmRulesForVersion330(JsonNode spec) {
+        if (spec != null) {
+            if (spec.has("type") && spec.get("type").asText().equals("DURATION")) {
+                if (spec.has("value")) {
+                    long value = spec.get("value").asLong();
+                    var predicate = new FilterPredicateValue<>(
+                            value, null, new DynamicValue<>(null, null, false)
+                    );
+                    ((ObjectNode) spec).remove("value");
+                    ((ObjectNode) spec).putPOJO("predicate", predicate);
+                    return true;
+                }
+            } else if (spec.has("type") && spec.get("type").asText().equals("REPEATING")) {
+                if (spec.has("count")) {
+                    int count = spec.get("count").asInt();
+                    var predicate = new FilterPredicateValue<>(
+                            count, null, new DynamicValue<>(null, null, false)
+                    );
+                    ((ObjectNode) spec).remove("count");
+                    ((ObjectNode) spec).putPOJO("predicate", predicate);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     private void updateOAuth2Params() {
         try {
             OAuth2ClientsParams oauth2ClientsParams = oAuth2Service.findOAuth2Params();
@@ -380,9 +457,8 @@ public class DefaultDataUpdateService implements DataUpdateService {
                 oAuth2Service.saveOAuth2Params(new OAuth2ClientsParams(false, Collections.emptyList()));
                 log.info("Successfully updated OAuth2 parameters!");
             }
-        }
-        catch (Exception e) {
-           log.error("Failed to update OAuth2 parameters", e);
+        } catch (Exception e) {
+            log.error("Failed to update OAuth2 parameters", e);
         }
     }
--- a/application/src/main/java/org/thingsboard/server/service/install/update/PaginatedUpdater.java
View file @dd9257f
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/PaginatedUpdater.java
View file @dd9257f
@@ -22,7 +22,7 @@ import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 @Slf4j
-public abstract class PaginatedUpdater<I, D extends SearchTextBased<? extends UUIDBased>> {
+public abstract class PaginatedUpdater<I, D> {
     private static final int DEFAULT_LIMIT = 100;
     private int updated = 0;
--- a/application/src/main/java/org/thingsboard/server/service/lwm2m/LwM2MServerSecurityInfoRepository.java
View file @dd9257f
+++ b/application/src/main/java/org/thingsboard/server/service/lwm2m/LwM2MServerSecurityInfoRepository.java
View file @dd9257f
@@ -30,8 +30,12 @@ import java.math.BigInteger;
 import java.security.AlgorithmParameters;
 import java.security.GeneralSecurityException;
 import java.security.KeyFactory;
+import java.security.KeyStore;
 import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
 import java.security.PublicKey;
+import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 import java.security.spec.ECGenParameterSpec;
@@ -62,49 +66,23 @@ public class LwM2MServerSecurityInfoRepository {
         bsServ.setPort(serverConfig.getPort());
         bsServ.setSecurityHost(serverConfig.getSecureHost());
         bsServ.setSecurityPort(serverConfig.getSecurePort());
-        bsServ.setServerPublicKey(getPublicKey(serverConfig.getCertificateAlias(), this.serverConfig.getPublicX(), this.serverConfig.getPublicY()));
+        bsServ.setServerPublicKey(getPublicKey(serverConfig));
         return bsServ;
     }
-    private String getPublicKey(String alias, String publicServerX, String publicServerY) {
-        String publicKey = getServerPublicKeyX509(alias);
-        return publicKey != null ? publicKey : getRPKPublicKey(publicServerX, publicServerY);
-    }
-
-    private String getServerPublicKeyX509(String alias) {
-        try {
-            X509Certificate serverCertificate = (X509Certificate) serverConfig.getKeyStoreValue().getCertificate(alias);
-            return Hex.encodeHexString(serverCertificate.getEncoded());
-        } catch (CertificateEncodingException | KeyStoreException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    private String getRPKPublicKey(String publicServerX, String publicServerY) {
+    private String getPublicKey(LwM2MSecureServerConfig config) {
         try {
-            /** Get Elliptic Curve Parameter spec for secp256r1 */
-            AlgorithmParameters algoParameters = AlgorithmParameters.getInstance("EC");
-            algoParameters.init(new ECGenParameterSpec("secp256r1"));
-            ECParameterSpec parameterSpec = algoParameters.getParameterSpec(ECParameterSpec.class);
-            if (publicServerX != null && !publicServerX.isEmpty() && publicServerY != null && !publicServerY.isEmpty()) {
-                /** Get point values */
-                byte[] publicX = Hex.decodeHex(publicServerX.toCharArray());
-                byte[] publicY = Hex.decodeHex(publicServerY.toCharArray());
-                /** Create key specs */
-                KeySpec publicKeySpec = new ECPublicKeySpec(new ECPoint(new BigInteger(publicX), new BigInteger(publicY)),
-                        parameterSpec);
-                /** Get keys */
-                PublicKey publicKey = KeyFactory.getInstance("EC").generatePublic(publicKeySpec);
-                if (publicKey != null && publicKey.getEncoded().length > 0) {
-                    return Hex.encodeHexString(publicKey.getEncoded());
-                }
+            KeyStore keyStore = serverConfig.getKeyStoreValue();
+            if (keyStore != null) {
+                X509Certificate serverCertificate = (X509Certificate) serverConfig.getKeyStoreValue().getCertificate(config.getCertificateAlias());
+                return Hex.encodeHexString(serverCertificate.getPublicKey().getEncoded());
             }
-        } catch (GeneralSecurityException | IllegalArgumentException e) {
-            log.error("[{}] Failed generate Server RPK for profile", e.getMessage());
-            throw new RuntimeException(e);
+        } catch (Exception e) {
+            log.trace("Failed to fetch public key from key store!", e);
+
         }
-        return null;
+        return "";
     }
+
 }
--- a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
View file @dd9257f
+++ b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
View file @dd9257f
@@ -24,6 +24,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.NestedRuntimeException;
+import org.springframework.core.io.InputStreamSource;
+import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Service;
@@ -45,8 +47,8 @@ import org.thingsboard.server.queue.usagestats.TbApiUsageClient;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import javax.annotation.PostConstruct;
-import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
+import java.io.ByteArrayInputStream;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -71,6 +73,9 @@ public class DefaultMailService implements MailService {
     @Autowired
     private TbApiUsageStateService apiUsageStateService;
+    @Autowired
+    private MailExecutorService mailExecutorService;
+
     private JavaMailSenderImpl mailSender;
     private String mailFrom;
@@ -220,6 +225,17 @@ public class DefaultMailService implements MailService {
     }
     @Override
+    public void sendResetPasswordEmailAsync(String passwordResetLink, String email) {
+        mailExecutorService.execute(() -> {
+            try {
+                this.sendResetPasswordEmail(passwordResetLink, email);
+            } catch (ThingsboardException e) {
+                log.error("Error occurred: {} ", e.getMessage());
+            }
+        });
+    }
+
+    @Override
     public void sendPasswordWasResetEmail(String loginLink, String email) throws ThingsboardException {
         String subject = messages.getMessage("password.was.reset.subject", null, Locale.US);
@@ -234,22 +250,47 @@ public class DefaultMailService implements MailService {
     }
     @Override
-    public void send(TenantId tenantId, CustomerId customerId, String from, String to, String cc, String bcc, String subject, String body) throws MessagingException {
+    public void send(TenantId tenantId, CustomerId customerId, String from, String to, String cc, String bcc, String subject, String body, boolean isHtml, Map<String, String> images) throws ThingsboardException {
+        sendMail(tenantId, customerId, from, to, cc, bcc, subject, body, isHtml, images, this.mailSender);
+    }
+
+    @Override
+    public void send(TenantId tenantId, CustomerId customerId, String from, String to, String cc, String bcc, String subject, String body, boolean isHtml, Map<String, String> images, JavaMailSender javaMailSender) throws ThingsboardException {
+        sendMail(tenantId, customerId, from, to, cc, bcc, subject, body, isHtml, images, javaMailSender);
+    }
+
+    private void sendMail(TenantId tenantId, CustomerId customerId, String from, String to, String cc, String bcc, String subject, String body, boolean isHtml, Map<String, String> images, JavaMailSender javaMailSender) throws ThingsboardException {
         if (apiUsageStateService.getApiUsageState(tenantId).isEmailSendEnabled()) {
-            MimeMessage mailMsg = mailSender.createMimeMessage();
-            MimeMessageHelper helper = new MimeMessageHelper(mailMsg, "UTF-8");
-            helper.setFrom(StringUtils.isBlank(from) ? mailFrom : from);
-            helper.setTo(to.split("\\s*,\\s*"));
-            if (!StringUtils.isBlank(cc)) {
-                helper.setCc(cc.split("\\s*,\\s*"));
+            try {
+                MimeMessage mailMsg = javaMailSender.createMimeMessage();
+                boolean multipart = (images != null && !images.isEmpty());
+                MimeMessageHelper helper = new MimeMessageHelper(mailMsg, multipart, "UTF-8");
+                helper.setFrom(StringUtils.isBlank(from) ? mailFrom : from);
+                helper.setTo(to.split("\\s*,\\s*"));
+                if (!StringUtils.isBlank(cc)) {
+                    helper.setCc(cc.split("\\s*,\\s*"));
+                }
+                if (!StringUtils.isBlank(bcc)) {
+                    helper.setBcc(bcc.split("\\s*,\\s*"));
+                }
+                helper.setSubject(subject);
+                helper.setText(body, isHtml);
+
+                if (multipart) {
+                    for (String imgId : images.keySet()) {
+                        String imgValue = images.get(imgId);
+                        String value = imgValue.replaceFirst("^data:image/[^;]*;base64,?", "");
+                        byte[] bytes = javax.xml.bind.DatatypeConverter.parseBase64Binary(value);
+                        String contentType = helper.getFileTypeMap().getContentType(imgId);
+                        InputStreamSource iss = () -> new ByteArrayInputStream(bytes);
+                        helper.addInline(imgId, iss, contentType);
+                    }
+                }
+                javaMailSender.send(helper.getMimeMessage());
+                apiUsageClient.report(tenantId, customerId, ApiUsageRecordKey.EMAIL_EXEC_COUNT, 1);
+            } catch (Exception e) {
+                throw handleException(e);
             }
-            if (!StringUtils.isBlank(bcc)) {
-                helper.setBcc(bcc.split("\\s*,\\s*"));
-            }
-            helper.setSubject(subject);
-            helper.setText(body);
-            mailSender.send(helper.getMimeMessage());
-            apiUsageClient.report(tenantId, customerId, ApiUsageRecordKey.EMAIL_EXEC_COUNT, 1);
         } else {
             throw new RuntimeException("Email sending is disabled due to API limits!");
         }
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java
View file @dd9257f
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java
View file @dd9257f
@@ -32,6 +32,7 @@ import org.thingsboard.server.common.msg.queue.ServiceQueue;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.msg.queue.TbMsgCallback;
+import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
 import org.thingsboard.server.common.stats.StatsFactory;
 import org.thingsboard.server.common.transport.util.DataDecodingEncodingService;
 import org.thingsboard.server.gen.transport.TransportProtos;
@@ -64,12 +65,14 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Queue;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 @Service
@@ -79,12 +82,15 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService<
     public static final String SUCCESSFUL_STATUS = "successful";
     public static final String FAILED_STATUS = "failed";
+    public static final String THREAD_TOPIC_SEPARATOR = " | ";
     @Value("${queue.rule-engine.poll-interval}")
     private long pollDuration;
     @Value("${queue.rule-engine.pack-processing-timeout}")
     private long packProcessingTimeout;
     @Value("${queue.rule-engine.stats.enabled:true}")
     private boolean statsEnabled;
+    @Value("${queue.rule-engine.prometheus-stats.enabled:false}")
+    boolean prometheusStatsEnabled;
     private final StatsFactory statsFactory;
     private final TbRuleEngineSubmitStrategyFactory submitStrategyFactory;
@@ -96,7 +102,9 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService<
     private final ConcurrentMap<String, TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>>> consumers = new ConcurrentHashMap<>();
     private final ConcurrentMap<String, TbRuleEngineQueueConfiguration> consumerConfigurations = new ConcurrentHashMap<>();
     private final ConcurrentMap<String, TbRuleEngineConsumerStats> consumerStats = new ConcurrentHashMap<>();
-    private ExecutorService submitExecutor;
+    private final ConcurrentMap<String, TbTopicWithConsumerPerPartition> topicsConsumerPerPartition = new ConcurrentHashMap<>();
+    final ExecutorService submitExecutor = Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("tb-rule-engine-consumer-service-submit-executor"));
+    final ScheduledExecutorService repartitionExecutor = Executors.newScheduledThreadPool(1, ThingsBoardThreadFactory.forName("tb-rule-engine-consumer-repartition-executor"));
     public DefaultTbRuleEngineConsumerService(TbRuleEngineProcessingStrategyFactory processingStrategyFactory,
                                               TbRuleEngineSubmitStrategyFactory submitStrategyFactory,
@@ -125,18 +133,19 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService<
         super.init("tb-rule-engine-consumer", "tb-rule-engine-notifications-consumer");
         for (TbRuleEngineQueueConfiguration configuration : ruleEngineSettings.getQueues()) {
             consumerConfigurations.putIfAbsent(configuration.getName(), configuration);
-            consumers.computeIfAbsent(configuration.getName(), queueName -> tbRuleEngineQueueFactory.createToRuleEngineMsgConsumer(configuration));
             consumerStats.put(configuration.getName(), new TbRuleEngineConsumerStats(configuration.getName(), statsFactory));
+            if (!configuration.isConsumerPerPartition()) {
+                consumers.computeIfAbsent(configuration.getName(), queueName -> tbRuleEngineQueueFactory.createToRuleEngineMsgConsumer(configuration));
+            } else {
+                topicsConsumerPerPartition.computeIfAbsent(configuration.getName(), TbTopicWithConsumerPerPartition::new);
+            }
         }
-        submitExecutor = Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName("tb-rule-engine-consumer-service-submit-executor"));
     }
     @PreDestroy
     public void stop() {
         super.destroy();
-        if (submitExecutor != null) {
-            submitExecutor.shutdownNow();
-        }
+        submitExecutor.shutdownNow();
         ruleEngineSettings.getQueues().forEach(config -> consumerConfigurations.put(config.getName(), config));
     }
@@ -145,96 +154,185 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService<
         if (event.getServiceType().equals(getServiceType())) {
             ServiceQueue serviceQueue = event.getServiceQueueKey().getServiceQueue();
             log.info("[{}] Subscribing to partitions: {}", serviceQueue.getQueue(), event.getPartitions());
-            consumers.get(serviceQueue.getQueue()).subscribe(event.getPartitions());
+            if (!consumerConfigurations.get(serviceQueue.getQueue()).isConsumerPerPartition()) {
+                consumers.get(serviceQueue.getQueue()).subscribe(event.getPartitions());
+            } else {
+                log.info("[{}] Subscribing consumer per partition: {}", serviceQueue.getQueue(), event.getPartitions());
+                subscribeConsumerPerPartition(serviceQueue.getQueue(), event.getPartitions());
+            }
+        }
+    }
+
+    void subscribeConsumerPerPartition(String queue, Set<TopicPartitionInfo> partitions) {
+        topicsConsumerPerPartition.get(queue).getSubscribeQueue().add(partitions);
+        scheduleTopicRepartition(queue);
+    }
+
+    private void scheduleTopicRepartition(String queue) {
+        repartitionExecutor.schedule(() -> repartitionTopicWithConsumerPerPartition(queue), 1, TimeUnit.SECONDS);
+    }
+
+    void repartitionTopicWithConsumerPerPartition(final String queueName) {
+        if (stopped) {
+            return;
+        }
+        TbTopicWithConsumerPerPartition tbTopicWithConsumerPerPartition = topicsConsumerPerPartition.get(queueName);
+        Queue<Set<TopicPartitionInfo>> subscribeQueue = tbTopicWithConsumerPerPartition.getSubscribeQueue();
+        if (subscribeQueue.isEmpty()) {
+            return;
         }
+        if (tbTopicWithConsumerPerPartition.getLock().tryLock()) {
+            try {
+                Set<TopicPartitionInfo> partitions = null;
+                while (!subscribeQueue.isEmpty()) {
+                    partitions = subscribeQueue.poll();
+                }
+                if (partitions == null) {
+                    return;
+                }
+
+                Set<TopicPartitionInfo> addedPartitions = new HashSet<>(partitions);
+                ConcurrentMap<TopicPartitionInfo, TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>>> consumers = tbTopicWithConsumerPerPartition.getConsumers();
+                addedPartitions.removeAll(consumers.keySet());
+                log.info("calculated addedPartitions {}", addedPartitions);
+
+                Set<TopicPartitionInfo> removedPartitions = new HashSet<>(consumers.keySet());
+                removedPartitions.removeAll(partitions);
+                log.info("calculated removedPartitions {}", removedPartitions);
+
+                removedPartitions.forEach((tpi) -> {
+                    removeConsumerForTopicByTpi(queueName, consumers, tpi);
+                });
+
+                addedPartitions.forEach((tpi) -> {
+                    log.info("[{}] Adding consumer for topic: {}", queueName, tpi);
+                    TbRuleEngineQueueConfiguration configuration = consumerConfigurations.get(queueName);
+                    TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>> consumer = tbRuleEngineQueueFactory.createToRuleEngineMsgConsumer(configuration);
+                    consumers.put(tpi, consumer);
+                    launchConsumer(consumer, consumerConfigurations.get(queueName), consumerStats.get(queueName), "" + queueName + "-" + tpi.getPartition().orElse(-999999));
+                    consumer.subscribe(Collections.singleton(tpi));
+                });
+
+            } finally {
+                tbTopicWithConsumerPerPartition.getLock().unlock();
+            }
+        } else {
+            scheduleTopicRepartition(queueName); //reschedule later
+        }
+
+    }
+
+    void removeConsumerForTopicByTpi(String queue, ConcurrentMap<TopicPartitionInfo, TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>>> consumers, TopicPartitionInfo tpi) {
+        log.info("[{}] Removing consumer for topic: {}", queue, tpi);
+        consumers.get(tpi).unsubscribe();
+        consumers.remove(tpi);
     }
     @Override
     protected void launchMainConsumers() {
-        consumers.forEach((queue, consumer) -> launchConsumer(consumer, consumerConfigurations.get(queue), consumerStats.get(queue)));
+        consumers.forEach((queue, consumer) -> launchConsumer(consumer, consumerConfigurations.get(queue), consumerStats.get(queue), queue));
     }
     @Override
     protected void stopMainConsumers() {
         consumers.values().forEach(TbQueueConsumer::unsubscribe);
+        topicsConsumerPerPartition.values().forEach(tbTopicWithConsumerPerPartition -> tbTopicWithConsumerPerPartition.getConsumers().keySet()
+                .forEach((tpi) -> removeConsumerForTopicByTpi(tbTopicWithConsumerPerPartition.getTopic(), tbTopicWithConsumerPerPartition.getConsumers(), tpi)));
+    }
+
+    void launchConsumer(TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>> consumer, TbRuleEngineQueueConfiguration configuration, TbRuleEngineConsumerStats stats, String threadSuffix) {
+        consumersExecutor.execute(() -> consumerLoop(consumer, configuration, stats, threadSuffix));
     }
-    private void launchConsumer(TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>> consumer, TbRuleEngineQueueConfiguration configuration, TbRuleEngineConsumerStats stats) {
-        consumersExecutor.execute(() -> {
-            Thread.currentThread().setName("" + Thread.currentThread().getName() + "-" + configuration.getName());
-            while (!stopped) {
-                try {
-                    List<TbProtoQueueMsg<ToRuleEngineMsg>> msgs = consumer.poll(pollDuration);
-                    if (msgs.isEmpty()) {
-                        continue;
+    void consumerLoop(TbQueueConsumer<TbProtoQueueMsg<ToRuleEngineMsg>> consumer, TbRuleEngineQueueConfiguration configuration, TbRuleEngineConsumerStats stats, String threadSuffix) {
+        updateCurrentThreadName(threadSuffix);
+        while (!stopped && !consumer.isStopped()) {
+            try {
+                List<TbProtoQueueMsg<ToRuleEngineMsg>> msgs = consumer.poll(pollDuration);
+                if (msgs.isEmpty()) {
+                    continue;
+                }
+                final TbRuleEngineSubmitStrategy submitStrategy = getSubmitStrategy(configuration);
+                final TbRuleEngineProcessingStrategy ackStrategy = getAckStrategy(configuration);
+                submitStrategy.init(msgs);
+                while (!stopped) {
+                    TbMsgPackProcessingContext ctx = new TbMsgPackProcessingContext(configuration.getName(), submitStrategy);
+                    submitStrategy.submitAttempt((id, msg) -> submitExecutor.submit(() -> submitMessage(configuration, stats, ctx, id, msg)));
+
+                    final boolean timeout = !ctx.await(configuration.getPackProcessingTimeout(), TimeUnit.MILLISECONDS);
+
+                    TbRuleEngineProcessingResult result = new TbRuleEngineProcessingResult(configuration.getName(), timeout, ctx);
+                    if (timeout) {
+                        printFirstOrAll(configuration, ctx, ctx.getPendingMap(), "Timeout");
                     }
-                    TbRuleEngineSubmitStrategy submitStrategy = submitStrategyFactory.newInstance(configuration.getName(), configuration.getSubmitStrategy());
-                    TbRuleEngineProcessingStrategy ackStrategy = processingStrategyFactory.newInstance(configuration.getName(), configuration.getProcessingStrategy());
-
-                    submitStrategy.init(msgs);
-
-                    while (!stopped) {
-                        TbMsgPackProcessingContext ctx = new TbMsgPackProcessingContext(configuration.getName(), submitStrategy);
-                        submitStrategy.submitAttempt((id, msg) -> submitExecutor.submit(() -> {
-                            log.trace("[{}] Creating callback for message: {}", id, msg.getValue());
-                            ToRuleEngineMsg toRuleEngineMsg = msg.getValue();
-                            TenantId tenantId = new TenantId(new UUID(toRuleEngineMsg.getTenantIdMSB(), toRuleEngineMsg.getTenantIdLSB()));
-                            TbMsgCallback callback = statsEnabled ?
-                                    new TbMsgPackCallback(id, tenantId, ctx, stats.getTimer(tenantId, SUCCESSFUL_STATUS), stats.getTimer(tenantId, FAILED_STATUS)) :
-                                    new TbMsgPackCallback(id, tenantId, ctx);
-                            try {
-                                if (!toRuleEngineMsg.getTbMsg().isEmpty()) {
-                                    forwardToRuleEngineActor(configuration.getName(), tenantId, toRuleEngineMsg, callback);
-                                } else {
-                                    callback.onSuccess();
-                                }
-                            } catch (Exception e) {
-                                callback.onFailure(new RuleEngineException(e.getMessage()));
-                            }
-                        }));
-
-                        boolean timeout = false;
-                        if (!ctx.await(configuration.getPackProcessingTimeout(), TimeUnit.MILLISECONDS)) {
-                            timeout = true;
-                        }
-
-                        TbRuleEngineProcessingResult result = new TbRuleEngineProcessingResult(configuration.getName(), timeout, ctx);
-                        if (timeout) {
-                            printFirstOrAll(configuration, ctx, ctx.getPendingMap(), "Timeout");
-                        }
-                        if (!ctx.getFailedMap().isEmpty()) {
-                            printFirstOrAll(configuration, ctx, ctx.getFailedMap(), "Failed");
-                        }
-                        ctx.printProfilerStats();
-
-                        TbRuleEngineProcessingDecision decision = ackStrategy.analyze(result);
-                        if (statsEnabled) {
-                            stats.log(result, decision.isCommit());
-                        }
-
-                        ctx.cleanup();
-
-                        if (decision.isCommit()) {
-                            submitStrategy.stop();
-                            break;
-                        } else {
-                            submitStrategy.update(decision.getReprocessMap());
-                        }
+                    if (!ctx.getFailedMap().isEmpty()) {
+                        printFirstOrAll(configuration, ctx, ctx.getFailedMap(), "Failed");
                     }
-                    consumer.commit();
-                } catch (Exception e) {
-                    if (!stopped) {
-                        log.warn("Failed to process messages from queue.", e);
-                        try {
-                            Thread.sleep(pollDuration);
-                        } catch (InterruptedException e2) {
-                            log.trace("Failed to wait until the server has capacity to handle new requests", e2);
-                        }
+                    ctx.printProfilerStats();
+
+                    TbRuleEngineProcessingDecision decision = ackStrategy.analyze(result);
+                    if (statsEnabled) {
+                        stats.log(result, decision.isCommit());
+                    }
+
+                    ctx.cleanup();
+
+                    if (decision.isCommit()) {
+                        submitStrategy.stop();
+                        break;
+                    } else {
+                        submitStrategy.update(decision.getReprocessMap());
+                    }
+                }
+                consumer.commit();
+            } catch (Exception e) {
+                if (!stopped) {
+                    log.warn("Failed to process messages from queue.", e);
+                    try {
+                        Thread.sleep(pollDuration);
+                    } catch (InterruptedException e2) {
+                        log.trace("Failed to wait until the server has capacity to handle new requests", e2);
                     }
                 }
             }
-            log.info("TB Rule Engine Consumer stopped.");
-        });
+        }
+        log.info("TB Rule Engine Consumer stopped.");
+    }
+
+    void updateCurrentThreadName(String threadSuffix) {
+        String name = Thread.currentThread().getName();
+        int spliteratorIndex = name.indexOf(THREAD_TOPIC_SEPARATOR);
+        if (spliteratorIndex > 0) {
+            name = name.substring(0, spliteratorIndex);
+        }
+        name = name + THREAD_TOPIC_SEPARATOR + threadSuffix;
+        Thread.currentThread().setName(name);
+    }
+
+    TbRuleEngineProcessingStrategy getAckStrategy(TbRuleEngineQueueConfiguration configuration) {
+        return processingStrategyFactory.newInstance(configuration.getName(), configuration.getProcessingStrategy());
+    }
+
+    TbRuleEngineSubmitStrategy getSubmitStrategy(TbRuleEngineQueueConfiguration configuration) {
+        return submitStrategyFactory.newInstance(configuration.getName(), configuration.getSubmitStrategy());
+    }
+
+    void submitMessage(TbRuleEngineQueueConfiguration configuration, TbRuleEngineConsumerStats stats, TbMsgPackProcessingContext ctx, UUID id, TbProtoQueueMsg<ToRuleEngineMsg> msg) {
+        log.trace("[{}] Creating callback for topic {} message: {}", id, configuration.getName(), msg.getValue());
+        ToRuleEngineMsg toRuleEngineMsg = msg.getValue();
+        TenantId tenantId = new TenantId(new UUID(toRuleEngineMsg.getTenantIdMSB(), toRuleEngineMsg.getTenantIdLSB()));
+        TbMsgCallback callback = prometheusStatsEnabled ?
+                new TbMsgPackCallback(id, tenantId, ctx, stats.getTimer(tenantId, SUCCESSFUL_STATUS), stats.getTimer(tenantId, FAILED_STATUS)) :
+                new TbMsgPackCallback(id, tenantId, ctx);
+        try {
+            if (toRuleEngineMsg.getTbMsg() != null && !toRuleEngineMsg.getTbMsg().isEmpty()) {
+                forwardToRuleEngineActor(configuration.getName(), tenantId, toRuleEngineMsg, callback);
+            } else {
+                callback.onSuccess();
+            }
+        } catch (Exception e) {
+            callback.onFailure(new RuleEngineException(e.getMessage()));
+        }
     }
     private void printFirstOrAll(TbRuleEngineQueueConfiguration configuration, TbMsgPackProcessingContext ctx, Map<UUID, TbProtoQueueMsg<ToRuleEngineMsg>> map, String prefix) {
--- a/application/src/main/java/org/thingsboard/server/service/queue/TbTopicWithConsumerPerPartition.java 0 → 100644
View file @dd9257f
+++ b/application/src/main/java/org/thingsboard/server/service/queue/TbTopicWithConsumerPerPartition.java 0 → 100644
View file @dd9257f
+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.queue;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
+import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.queue.TbQueueConsumer;
+import org.thingsboard.server.queue.common.TbProtoQueueMsg;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.locks.ReentrantLock;
+
+@RequiredArgsConstructor
+@Data
+public class TbTopicWithConsumerPerPartition {
+    private final String topic;
+    @Getter
+    private final ReentrantLock lock = new ReentrantLock(); //NonfairSync
+    private volatile Set<TopicPartitionInfo> partitions = Collections.emptySet();
+    private final ConcurrentMap<TopicPartitionInfo, TbQueueConsumer<TbProtoQueueMsg<TransportProtos.ToRuleEngineMsg>>> consumers = new ConcurrentHashMap<>();
+    private final Queue<Set<TopicPartitionInfo>> subscribeQueue = new ConcurrentLinkedQueue<>();
+}
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/AbstractOAuth2ClientMapper.java
View file @dd9257f
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/oauth2/AbstractOAuth2ClientMapper.java
View file @dd9257f
@@ -206,11 +206,7 @@ public abstract class AbstractOAuth2ClientMapper {
     }
     private Optional<DashboardId> getDashboardId(TenantId tenantId, String dashboardName) {
-        PageLink searchTextLink = new PageLink(1, 0, dashboardName);
-        PageData<DashboardInfo> dashboardsPage = dashboardService.findDashboardsByTenantId(tenantId, searchTextLink);
-        return dashboardsPage.getData().stream()
-                .findAny()
-                .map(IdBased::getId);
+        return Optional.ofNullable(dashboardService.findFirstDashboardInfoByTenantIdAndName(tenantId, dashboardName)).map(IdBased::getId);
     }
     private Optional<DashboardId> getDashboardId(TenantId tenantId, CustomerId customerId, String dashboardName) {
--- a/application/src/main/resources/thingsboard.yml
View file @dd9257f
+++ b/application/src/main/resources/thingsboard.yml
View file @dd9257f
@@ -518,7 +518,7 @@ audit-log:
     index_pattern: "${AUDIT_LOG_SINK_INDEX_PATTERN:@{TENANT}_AUDIT_LOG_@{DATE}}"
     # Date format. Details of the pattern could be found here:
     # https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html
-    date_format: "${AUDIT_LOG_SINK_DATE_FORMAT:YYYY.MM.DD}"
+    date_format: "${AUDIT_LOG_SINK_DATE_FORMAT:YYYY.MM.dd}"
     scheme_name: "${AUDIT_LOG_SINK_SCHEME_NAME:http}" # http or https
     host: "${AUDIT_LOG_SINK_HOST:localhost}"
     port: "${AUDIT_LOG_SINK_PORT:9200}"
@@ -595,6 +595,10 @@ transport:
     ssl:
       # Enable/disable SSL support
       enabled: "${MQTT_SSL_ENABLED:false}"
+      # MQTT SSL bind address
+      bind_address: "${MQTT_SSL_BIND_ADDRESS:0.0.0.0}"
+      # MQTT SSL bind port
+      bind_port: "${MQTT_SSL_BIND_PORT:8883}"
       # SSL protocol: See http://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#SSLContext
       protocol: "${MQTT_SSL_PROTOCOL:TLSv1.2}"
       # Path to the key store that holds the SSL certificate
@@ -621,8 +625,6 @@ transport:
       bind_address: "${COAP_DTLS_BIND_ADDRESS:0.0.0.0}"
       # CoAP DTLS bind port
       bind_port: "${COAP_DTLS_BIND_PORT:5684}"
-      # Secure mode. Allowed values: NO_AUTH, X509
-      mode: "${COAP_DTLS_SECURE_MODE:NO_AUTH}"
       # Path to the key store that holds the certificate
       key_store: "${COAP_DTLS_KEY_STORE:coapserver.jks}"
       # Password used to access the key store
@@ -645,48 +647,40 @@ transport:
       bind_address: "${LWM2M_BIND_ADDRESS:0.0.0.0}"
       bind_port: "${LWM2M_BIND_PORT:5685}"
       security:
-        bind_address: "${LWM2M_BIND_ADDRESS_SECURITY:0.0.0.0}"
-        bind_port: "${LWM2M_BIND_PORT_SECURITY:5686}"
-        # Only for RPK: Public & Private Key. If the keystore file is missing or not working
-        public_x: "${LWM2M_SERVER_PUBLIC_X:05064b9e6762dd8d8b8a52355d7b4d8b9a3d64e6d2ee277d76c248861353f358}"
-        public_y: "${LWM2M_SERVER_PUBLIC_Y:5eeb1838e4f9e37b31fa347aef5ce3431eb54e0a2506910c5e0298817445721b}"
-        private_encoded: "${LWM2M_SERVER_PRIVATE_ENCODED:308193020100301306072a8648ce3d020106082a8648ce3d030107047930770201010420dc774b309e547ceb48fee547e104ce201a9c48c449dc5414cd04e7f5cf05f67ba00a06082a8648ce3d030107a1440342000405064b9e6762dd8d8b8a52355d7b4d8b9a3d64e6d2ee277d76c248861353f3585eeb1838e4f9e37b31fa347aef5ce3431eb54e0a2506910c5e0298817445721b}"
+        bind_address: "${LWM2M_SECURITY_BIND_ADDRESS:0.0.0.0}"
+        bind_port: "${LWM2M_SECURITY_BIND_PORT:5686}"
         # Only Certificate_x509:
-        alias: "${LWM2M_KEYSTORE_ALIAS_SERVER:server}"
+        key_alias: "${LWM2M_SERVER_KEY_ALIAS:server}"
+        key_password: "${LWM2M_SERVER_KEY_PASSWORD:server_ks_password}"
         skip_validity_check_for_client_cert: "${TB_LWM2M_SERVER_SECURITY_SKIP_VALIDITY_CHECK_FOR_CLIENT_CERT:false}"
     bootstrap:
       enable: "${LWM2M_ENABLED_BS:true}"
       id: "${LWM2M_SERVER_ID_BS:111}"
-      bind_address: "${LWM2M_BIND_ADDRESS_BS:0.0.0.0}"
-      bind_port: "${LWM2M_BIND_PORT_BS:5687}"
+      bind_address: "${LWM2M_BS_BIND_ADDRESS:0.0.0.0}"
+      bind_port: "${LWM2M_BS_BIND_PORT:5687}"
       security:
-        bind_address: "${LWM2M_BIND_ADDRESS_SECURITY_BS:0.0.0.0}"
-        bind_port: "${LWM2M_BIND_PORT_SECURITY_BS:5688}"
-        #  Only for RPK: Public & Private Key. If the keystore file is missing or not working
-        public_x: "${LWM2M_SERVER_PUBLIC_X_BS:5017c87a1c1768264656b3b355434b0def6edb8b9bf166a4762d9930cd730f91}"
-        public_y: "${LWM2M_SERVER_PUBLIC_Y_BS:3fc4e61bcd8901ec27c424114c3e887ed372497f0c2cf85839b8443e76988b34}"
-        private_encoded: "${LWM2M_SERVER_PRIVATE_ENCODED_BS:308193020100301306072a8648ce3d020106082a8648ce3d0301070479307702010104205ecafd90caa7be45c42e1f3f32571632b8409e6e6249d7124f4ba56fab3c8083a00a06082a8648ce3d030107a144034200045017c87a1c1768264656b3b355434b0def6edb8b9bf166a4762d9930cd730f913fc4e61bcd8901ec27c424114c3e887ed372497f0c2cf85839b8443e76988b34}"
+        bind_address: "${LWM2M_BS_SECURITY_BIND_ADDRESS:0.0.0.0}"
+        bind_port: "${LWM2M_BS_SECURITY_BIND_PORT:5688}"
         # Only Certificate_x509:
-        alias: "${LWM2M_KEYSTORE_ALIAS_BS:bootstrap}"
+        key_alias: "${LWM2M_BS_KEY_ALIAS:bootstrap}"
+        key_password: "${LWM2M_BS_KEY_PASSWORD:server_ks_password}"
     security:
       # Certificate_x509:
       # To get helps about files format and how to generate it, see: https://github.com/eclipse/leshan/wiki/Credential-files-format
       # Create new X509 Certificates: common/transport/lwm2m/src/main/resources/credentials/shell/lwM2M_credentials.sh
       key_store_type: "${LWM2M_KEYSTORE_TYPE:JKS}"
       # key_store_path_file: "${KEY_STORE_PATH_FILE:/common/transport/lwm2m/src/main/resources/credentials/serverKeyStore.jks"
-      key_store: "${LWM2M_KEY_STORE:lwm2mserver.jks}"
-      key_store_password: "${LWM2M_KEY_STORE_PASSWORD:server_ks_password}"
-      root_alias: "${LWM2M_SERVER_ROOT_CA:rootca}"
-      enable_gen_new_key_psk_rpk: "${ENABLE_GEN_NEW_KEY_PSK_RPK:false}"
+      key_store: "${LWM2M_KEYSTORE:lwm2mserver.jks}"
+      key_store_password: "${LWM2M_KEYSTORE_PASSWORD:server_ks_password}"
+      root_alias: "${LWM2M_SERVER_ROOT_CA_ALIAS:rootca}"
+      recommended_ciphers: "${LWM2M_RECOMMENDED_CIPHERS:false}"
+      recommended_supported_groups: "${LWM2M_RECOMMENDED_SUPPORTED_GROUPS:true}"
     timeout: "${LWM2M_TIMEOUT:120000}"
-    recommended_ciphers: "${LWM2M_RECOMMENDED_CIPHERS:false}"
-    recommended_supported_groups: "${LWM2M_RECOMMENDED_SUPPORTED_GROUPS:true}"
     uplink_pool_size: "${LWM2M_UPLINK_POOL_SIZE:10}"
     downlink_pool_size: "${LWM2M_DOWNLINK_POOL_SIZE:10}"
     ota_pool_size: "${LWM2M_OTA_POOL_SIZE:10}"
-    registration_store_pool_size: "${LWM2M_REGISTRATION_STORE_POOL_SIZE:100}"
     clean_period_in_sec: "${LWM2M_CLEAN_PERIOD_IN_SEC:2}"
-    log_max_length: "${LWM2M_LOG_MAX_LENGTH:100}"
+    log_max_length: "${LWM2M_LOG_MAX_LENGTH:1024}"
     # Use redis for Security and Registration stores
     redis.enabled: "${LWM2M_REDIS_ENABLED:false}"
   snmp:
@@ -872,6 +866,7 @@ queue:
         topic: "${TB_QUEUE_RE_MAIN_TOPIC:tb_rule_engine.main}"
         poll-interval: "${TB_QUEUE_RE_MAIN_POLL_INTERVAL_MS:25}"
         partitions: "${TB_QUEUE_RE_MAIN_PARTITIONS:10}"
+        consumer-per-partition: "${TB_QUEUE_RE_MAIN_CONSUMER_PER_PARTITION:true}"
         pack-processing-timeout: "${TB_QUEUE_RE_MAIN_PACK_PROCESSING_TIMEOUT_MS:2000}"
         submit-strategy:
           type: "${TB_QUEUE_RE_MAIN_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
@@ -888,6 +883,7 @@ queue:
         topic: "${TB_QUEUE_RE_HP_TOPIC:tb_rule_engine.hp}"
         poll-interval: "${TB_QUEUE_RE_HP_POLL_INTERVAL_MS:25}"
         partitions: "${TB_QUEUE_RE_HP_PARTITIONS:10}"
+        consumer-per-partition: "${TB_QUEUE_RE_HP_CONSUMER_PER_PARTITION:true}"
         pack-processing-timeout: "${TB_QUEUE_RE_HP_PACK_PROCESSING_TIMEOUT_MS:2000}"
         submit-strategy:
           type: "${TB_QUEUE_RE_HP_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
@@ -904,6 +900,7 @@ queue:
         topic: "${TB_QUEUE_RE_SQ_TOPIC:tb_rule_engine.sq}"
         poll-interval: "${TB_QUEUE_RE_SQ_POLL_INTERVAL_MS:25}"
         partitions: "${TB_QUEUE_RE_SQ_PARTITIONS:10}"
+        consumer-per-partition: "${TB_QUEUE_RE_SQ_CONSUMER_PER_PARTITION:true}"
         pack-processing-timeout: "${TB_QUEUE_RE_SQ_PACK_PROCESSING_TIMEOUT_MS:2000}"
         submit-strategy:
           type: "${TB_QUEUE_RE_SQ_SUBMIT_STRATEGY_TYPE:SEQUENTIAL_BY_ORIGINATOR}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
--- a/application/src/test/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessorTest.java 0 → 100644
View file @dd9257f
+++ b/application/src/test/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessorTest.java 0 → 100644
View file @dd9257f
+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.actors.device;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.common.util.LinkedHashMapRemoveEldest;
+import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.device.DeviceService;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.BDDMockito.willReturn;
+import static org.mockito.Mockito.mock;
+
+public class DeviceActorMessageProcessorTest {
+
+    public static final long MAX_CONCURRENT_SESSIONS_PER_DEVICE = 10L;
+    ActorSystemContext systemContext;
+    DeviceService deviceService;
+    TenantId tenantId = TenantId.SYS_TENANT_ID;
+    DeviceId deviceId = DeviceId.fromString("78bf9b26-74ef-4af2-9cfb-ad6cf24ad2ec");
+
+    DeviceActorMessageProcessor processor;
+
+    @Before
+    public void setUp() {
+        systemContext = mock(ActorSystemContext.class);
+        deviceService = mock(DeviceService.class);
+        willReturn(MAX_CONCURRENT_SESSIONS_PER_DEVICE).given(systemContext).getMaxConcurrentSessionsPerDevice();
+        willReturn(deviceService).given(systemContext).getDeviceService();
+        processor = new DeviceActorMessageProcessor(systemContext, tenantId, deviceId);
+    }
+
+    @Test
+    public void givenSystemContext_whenNewInstance_thenVerifySessionMapMaxSize() {
+        assertThat(processor.sessions, instanceOf(LinkedHashMapRemoveEldest.class));
+        assertThat(processor.sessions.getMaxEntries(), is(MAX_CONCURRENT_SESSIONS_PER_DEVICE));
+        assertThat(processor.sessions.getRemovalConsumer(), notNullValue());
+    }
+}
--- a/application/src/test/java/org/thingsboard/server/controller/BaseUserControllerTest.java
View file @dd9257f
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseUserControllerTest.java
View file @dd9257f
@@ -155,6 +155,7 @@ public abstract class BaseUserControllerTest extends AbstractControllerTest {
         doPost("/api/noauth/resetPasswordByEmail", resetPasswordByEmailRequest)
                 .andExpect(status().isOk());
+        Thread.sleep(1000);
         doGet("/api/noauth/resetPassword?resetToken={resetToken}", TestMailService.currentResetPasswordToken)
                 .andExpect(status().isSeeOther())
                 .andExpect(header().string(HttpHeaders.LOCATION, "/login/resetPassword?resetToken=" + TestMailService.currentResetPasswordToken));
--- a/application/src/test/java/org/thingsboard/server/service/mail/TestMailService.java
View file @dd9257f
+++ b/application/src/test/java/org/thingsboard/server/service/mail/TestMailService.java
View file @dd9257f
@@ -51,7 +51,7 @@ public class TestMailService {
                 currentResetPasswordToken = passwordResetLink.split("=")[1];
                 return null;
             }
-        }).when(mailService).sendResetPasswordEmail(Mockito.anyString(), Mockito.anyString());
+        }).when(mailService).sendResetPasswordEmailAsync(Mockito.anyString(), Mockito.anyString());
         return mailService;
     }
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
View file @dd9257f
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
View file @dd9257f
@@ -20,7 +20,6 @@ import org.apache.commons.io.IOUtils;
 import org.eclipse.californium.core.network.config.NetworkConfig;
 import org.eclipse.leshan.client.object.Security;
 import org.eclipse.leshan.core.util.Hex;
-import org.jetbrains.annotations.NotNull;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -85,6 +84,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import static org.eclipse.leshan.client.object.Security.noSec;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE;
+import static org.thingsboard.server.common.data.ota.OtaPackageType.SOFTWARE;
 @DaoSqlTest
 public class AbstractLwM2MIntegrationTest extends AbstractWebsocketTest {
@@ -264,7 +264,7 @@ public class AbstractLwM2MIntegrationTest extends AbstractWebsocketTest {
         executor = Executors.newScheduledThreadPool(10);
         loginTenantAdmin();
-        String[] resources = new String[]{"1.xml", "2.xml", "3.xml"};
+        String[] resources = new String[]{"1.xml", "2.xml", "3.xml", "5.xml", "9.xml"};
         for (String resourceName : resources) {
             TbResource lwModel = new TbResource();
             lwModel.setResourceType(ResourceType.LWM2M_MODEL);
@@ -300,7 +300,6 @@ public class AbstractLwM2MIntegrationTest extends AbstractWebsocketTest {
         Assert.assertNotNull(deviceProfile);
     }
-    @NotNull
     protected Device createDevice(LwM2MClientCredentials clientCredentials) throws Exception {
         Device device = new Device();
         device.setName("Device A");
@@ -340,6 +339,22 @@ public class AbstractLwM2MIntegrationTest extends AbstractWebsocketTest {
         return savaData("/api/otaPackage/" + savedFirmwareInfo.getId().getId().toString() + "?checksum={checksum}&checksumAlgorithm={checksumAlgorithm}", testData, CHECKSUM, "SHA256");
     }
+    protected OtaPackageInfo createSoftware() throws Exception {
+        String CHECKSUM = "4bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a";
+
+        OtaPackageInfo swInfo = new OtaPackageInfo();
+        swInfo.setDeviceProfileId(deviceProfile.getId());
+        swInfo.setType(SOFTWARE);
+        swInfo.setTitle("My sw");
+        swInfo.setVersion("v1.0");
+
+        OtaPackageInfo savedFirmwareInfo = doPost("/api/otaPackage", swInfo, OtaPackageInfo.class);
+
+        MockMultipartFile testData = new MockMultipartFile("file", "filename.txt", "text/plain", new byte[]{1});
+
+        return savaData("/api/otaPackage/" + savedFirmwareInfo.getId().getId().toString() + "?checksum={checksum}&checksumAlgorithm={checksumAlgorithm}", testData, CHECKSUM, "SHA256");
+    }
+
     protected OtaPackageInfo savaData(String urlTemplate, MockMultipartFile content, String... params) throws Exception {
         MockMultipartHttpServletRequestBuilder postRequest = MockMvcRequestBuilders.multipart(urlTemplate, params);
         postRequest.file(content);
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/NoSecLwM2MIntegrationTest.java
View file @dd9257f
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/NoSecLwM2MIntegrationTest.java
View file @dd9257f
@@ -15,11 +15,15 @@
  */
 package org.thingsboard.server.transport.lwm2m;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.Assert;
 import org.junit.Test;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.OtaPackageInfo;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.NoSecClientCredentials;
+import org.thingsboard.server.common.data.kv.KvEntry;
+import org.thingsboard.server.common.data.kv.TsKvEntry;
+import org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus;
 import org.thingsboard.server.common.data.query.EntityData;
 import org.thingsboard.server.common.data.query.EntityDataPageLink;
 import org.thingsboard.server.common.data.query.EntityDataQuery;
@@ -32,11 +36,99 @@ import org.thingsboard.server.service.telemetry.cmd.v2.EntityDataUpdate;
 import org.thingsboard.server.service.telemetry.cmd.v2.LatestValueCmd;
 import org.thingsboard.server.transport.lwm2m.client.LwM2MTestClient;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.thingsboard.rest.client.utils.RestJsonConverter.toTimeseries;
+import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.DOWNLOADED;
+import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.DOWNLOADING;
+import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.INITIATED;
+import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.QUEUED;
+import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.UPDATED;
+import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.UPDATING;
+import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.VERIFIED;
 public class NoSecLwM2MIntegrationTest extends AbstractLwM2MIntegrationTest {
+    private final String OTA_TRANSPORT_CONFIGURATION = "{\n" +
+            "  \"observeAttr\": {\n" +
+            "    \"keyName\": {\n" +
+            "      \"/5_1.0/0/3\": \"state\",\n" +
+            "      \"/5_1.0/0/5\": \"updateResult\",\n" +
+            "      \"/5_1.0/0/6\": \"pkgname\",\n" +
+            "      \"/5_1.0/0/7\": \"pkgversion\",\n" +
+            "      \"/5_1.0/0/9\": \"firmwareUpdateDeliveryMethod\",\n" +
+            "      \"/9_1.0/0/0\": \"pkgname\",\n" +
+            "      \"/9_1.0/0/1\": \"pkgversion\",\n" +
+            "      \"/9_1.0/0/7\": \"updateState\",\n" +
+            "      \"/9_1.0/0/9\": \"updateResult\"\n" +
+            "    },\n" +
+            "    \"observe\": [\n" +
+            "      \"/5_1.0/0/3\",\n" +
+            "      \"/5_1.0/0/5\",\n" +
+            "      \"/5_1.0/0/6\",\n" +
+            "      \"/5_1.0/0/7\",\n" +
+            "      \"/5_1.0/0/9\",\n" +
+            "      \"/9_1.0/0/0\",\n" +
+            "      \"/9_1.0/0/1\",\n" +
+            "      \"/9_1.0/0/7\",\n" +
+            "      \"/9_1.0/0/9\"\n" +
+            "    ],\n" +
+            "    \"attribute\": [],\n" +
+            "    \"telemetry\": [\n" +
+            "      \"/5_1.0/0/3\",\n" +
+            "      \"/5_1.0/0/5\",\n" +
+            "      \"/5_1.0/0/6\",\n" +
+            "      \"/5_1.0/0/7\",\n" +
+            "      \"/5_1.0/0/9\",\n" +
+            "      \"/9_1.0/0/0\",\n" +
+            "      \"/9_1.0/0/1\",\n" +
+            "      \"/9_1.0/0/7\",\n" +
+            "      \"/9_1.0/0/9\"\n" +
+            "    ],\n" +
+            "    \"attributeLwm2m\": {}\n" +
+            "  },\n" +
+            "  \"bootstrap\": {\n" +
+            "    \"servers\": {\n" +
+            "      \"binding\": \"UQ\",\n" +
+            "      \"shortId\": 123,\n" +
+            "      \"lifetime\": 300,\n" +
+            "      \"notifIfDisabled\": true,\n" +
+            "      \"defaultMinPeriod\": 1\n" +
+            "    },\n" +
+            "    \"lwm2mServer\": {\n" +
+            "      \"host\": \"localhost\",\n" +
+            "      \"port\": 5685,\n" +
+            "      \"serverId\": 123,\n" +
+            "      \"securityMode\": \"NO_SEC\",\n" +
+            "      \"serverPublicKey\": \"\",\n" +
+            "      \"clientHoldOffTime\": 1,\n" +
+            "      \"bootstrapServerAccountTimeout\": 0\n" +
+            "    },\n" +
+            "    \"bootstrapServer\": {\n" +
+            "      \"host\": \"localhost\",\n" +
+            "      \"port\": 5687,\n" +
+            "      \"serverId\": 111,\n" +
+            "      \"securityMode\": \"NO_SEC\",\n" +
+            "      \"serverPublicKey\": \"\",\n" +
+            "      \"clientHoldOffTime\": 1,\n" +
+            "      \"bootstrapServerAccountTimeout\": 0\n" +
+            "    }\n" +
+            "  },\n" +
+            "  \"clientLwM2mSettings\": {\n" +
+            "    \"fwUpdateStrategy\": 1,\n" +
+            "    \"swUpdateStrategy\": 1,\n" +
+            "    \"clientOnlyObserveAfterConnect\": 1,\n" +
+            "    \"powerMode\": \"PSM\",\n" +
+            "    \"fwUpdateResource\": \"\",\n" +
+            "    \"swUpdateResource\": \"\",\n" +
+            "    \"compositeOperationsSupport\": false\n" +
+            "  },\n" +
+            "  \"type\": \"LWM2M\"\n" +
+            "}";
+
     @Test
     public void testConnectAndObserveTelemetry() throws Exception {
         NoSecClientCredentials clientCredentials = new NoSecClientCredentials();
@@ -94,4 +186,68 @@ public class NoSecLwM2MIntegrationTest extends AbstractLwM2MIntegrationTest {
         client.destroy();
     }
+    @Test
+    public void testFirmwareUpdateByObject5() throws Exception {
+        createDeviceProfile(OTA_TRANSPORT_CONFIGURATION);
+        NoSecClientCredentials clientCredentials = new NoSecClientCredentials();
+        clientCredentials.setEndpoint("OTA_" + ENDPOINT);
+        Device device = createDevice(clientCredentials);
+
+        OtaPackageInfo firmware = createFirmware();
+
+        LwM2MTestClient client = new LwM2MTestClient(executor, "OTA_" + ENDPOINT);
+        client.init(SECURITY, COAP_CONFIG);
+
+        Thread.sleep(1000);
+
+        device.setFirmwareId(firmware.getId());
+
+        device = doPost("/api/device", device, Device.class);
+
+        Thread.sleep(4000);
+
+        List<TsKvEntry> ts = toTimeseries(doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + device.getId().getId() + "/values/timeseries?orderBy=ASC&keys=fw_state&startTs=0&endTs=" + System.currentTimeMillis(), new TypeReference<>() {
+        }));
+
+        List<OtaPackageUpdateStatus> statuses = ts.stream().map(KvEntry::getValueAsString).map(OtaPackageUpdateStatus::valueOf).collect(Collectors.toList());
+
+        List<OtaPackageUpdateStatus> expectedStatuses = Arrays.asList(QUEUED, INITIATED, DOWNLOADING, DOWNLOADED, UPDATING, UPDATED);
+
+        Assert.assertEquals(expectedStatuses, statuses);
+
+        client.destroy();
+    }
+
+    @Test
+    public void testSoftwareUpdateByObject9() throws Exception {
+        createDeviceProfile(OTA_TRANSPORT_CONFIGURATION);
+        NoSecClientCredentials clientCredentials = new NoSecClientCredentials();
+        clientCredentials.setEndpoint("OTA_" + ENDPOINT);
+        Device device = createDevice(clientCredentials);
+
+        OtaPackageInfo software = createSoftware();
+
+        LwM2MTestClient client = new LwM2MTestClient(executor, "OTA_" + ENDPOINT);
+        client.init(SECURITY, COAP_CONFIG);
+
+        Thread.sleep(1000);
+
+        device.setSoftwareId(software.getId());
+
+        device = doPost("/api/device", device, Device.class);
+
+        Thread.sleep(4000);
+
+        List<TsKvEntry> ts = toTimeseries(doGetAsyncTyped("/api/plugins/telemetry/DEVICE/" + device.getId().getId() + "/values/timeseries?orderBy=ASC&keys=sw_state&startTs=0&endTs=" + System.currentTimeMillis(), new TypeReference<>() {
+        }));
+
+        List<OtaPackageUpdateStatus> statuses = ts.stream().map(KvEntry::getValueAsString).map(OtaPackageUpdateStatus::valueOf).collect(Collectors.toList());
+
+        List<OtaPackageUpdateStatus> expectedStatuses = Arrays.asList(QUEUED, INITIATED, DOWNLOADING, DOWNLOADING, DOWNLOADING, DOWNLOADED, VERIFIED, UPDATED);
+
+        Assert.assertEquals(expectedStatuses, statuses);
+
+        client.destroy();
+    }
+
 }
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/RpkLwM2MIntegrationTest.java
View file @dd9257f
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/RpkLwM2MIntegrationTest.java
View file @dd9257f
@@ -23,6 +23,7 @@ import org.thingsboard.server.common.data.device.credentials.lwm2m.RPKClientCred
 import static org.eclipse.leshan.client.object.Security.rpk;
 public class RpkLwM2MIntegrationTest extends AbstractLwM2MIntegrationTest {
+
     @Test
     public void testConnectWithRPKAndObserveTelemetry() throws Exception {
         RPKClientCredentials rpkClientCredentials = new RPKClientCredentials();
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/FwLwM2MDevice.java 0 → 100644
View file @dd9257f
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/FwLwM2MDevice.java 0 → 100644
View file @dd9257f
+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.transport.lwm2m.client;
+
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
+import org.eclipse.leshan.client.servers.ServerIdentity;
+import org.eclipse.leshan.core.model.ObjectModel;
+import org.eclipse.leshan.core.node.LwM2mResource;
+import org.eclipse.leshan.core.response.ExecuteResponse;
+import org.eclipse.leshan.core.response.ReadResponse;
+import org.eclipse.leshan.core.response.WriteResponse;
+
+import javax.security.auth.Destroyable;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Slf4j
+public class FwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
+
+    private static final List<Integer> supportedResources = Arrays.asList(0, 1, 2, 3, 5, 6, 7, 9);
+
+    private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
+
+    private final AtomicInteger state = new AtomicInteger(0);
+
+    private final AtomicInteger updateResult = new AtomicInteger(0);
+
+    @Override
+    public ReadResponse read(ServerIdentity identity, int resourceId) {
+        if (!identity.isSystem())
+            log.info("Read on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
+        switch (resourceId) {
+            case 3:
+                return ReadResponse.success(resourceId, getState());
+            case 5:
+                return ReadResponse.success(resourceId, getUpdateResult());
+            case 6:
+                return ReadResponse.success(resourceId, getPkgName());
+            case 7:
+                return ReadResponse.success(resourceId, getPkgVersion());
+            case 9:
+                return ReadResponse.success(resourceId, getFirmwareUpdateDeliveryMethod());
+            default:
+                return super.read(identity, resourceId);
+        }
+    }
+
+    @Override
+    public ExecuteResponse execute(ServerIdentity identity, int resourceId, String params) {
+        String withParams = null;
+        if (params != null && params.length() != 0) {
+            withParams = " with params " + params;
+        }
+        log.info("Execute on Device resource /{}/{}/{} {}", getModel().id, getId(), resourceId, withParams != null ? withParams : "");
+
+        switch (resourceId) {
+            case 2:
+                startUpdating();
+                return ExecuteResponse.success();
+            default:
+                return super.execute(identity, resourceId, params);
+        }
+    }
+
+    @Override
+    public WriteResponse write(ServerIdentity identity, boolean replace, int resourceId, LwM2mResource value) {
+        log.info("Write on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
+
+        switch (resourceId) {
+            case 0:
+                startDownloading();
+                return WriteResponse.success();
+            case 1:
+                startDownloading();
+                return WriteResponse.success();
+            default:
+                return super.write(identity, replace, resourceId, value);
+        }
+    }
+
+    private int getState() {
+        return state.get();
+    }
+
+    private int getUpdateResult() {
+        return updateResult.get();
+    }
+
+    private String getPkgName() {
+        return "firmware";
+    }
+
+    private String getPkgVersion() {
+        return "1.0.0";
+    }
+
+    private int getFirmwareUpdateDeliveryMethod() {
+        return 1;
+    }
+
+    @Override
+    public List<Integer> getAvailableResourceIds(ObjectModel model) {
+        return supportedResources;
+    }
+
+    @Override
+    public void destroy() {
+        scheduler.shutdownNow();
+    }
+
+    private void startDownloading() {
+        scheduler.schedule(() -> {
+            state.set(1);
+            fireResourcesChange(3);
+            state.set(2);
+            fireResourcesChange(3);
+        }, 100, TimeUnit.MILLISECONDS);
+    }
+
+    private void startUpdating() {
+        scheduler.schedule(() -> {
+            try {
+                state.set(3);
+                fireResourcesChange(3);
+                Thread.sleep(100);
+                updateResult.set(1);
+                fireResourcesChange(5);
+            } catch (Exception e) {
+
+            }
+        }, 100, TimeUnit.MILLISECONDS);
+    }
+
+}
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2MTestClient.java
View file @dd9257f
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2MTestClient.java
View file @dd9257f
@@ -53,8 +53,10 @@ import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
 import static org.eclipse.leshan.core.LwM2mId.DEVICE;
+import static org.eclipse.leshan.core.LwM2mId.FIRMWARE;
 import static org.eclipse.leshan.core.LwM2mId.SECURITY;
 import static org.eclipse.leshan.core.LwM2mId.SERVER;
+import static org.eclipse.leshan.core.LwM2mId.SOFTWARE_MANAGEMENT;
 @Slf4j
 @Data
@@ -65,7 +67,7 @@ public class LwM2MTestClient {
     private LeshanClient client;
     public void init(Security security, NetworkConfig coapConfig) throws InvalidDDFFileException, IOException {
-        String[] resources = new String[]{"0.xml", "1.xml", "2.xml", "3.xml"};
+        String[] resources = new String[]{"0.xml", "1.xml", "2.xml", "3.xml", "5.xml", "9.xml"};
         List<ObjectModel> models = new ArrayList<>();
         for (String resourceName : resources) {
             models.addAll(ObjectLoader.loadDdfFile(LwM2MTestClient.class.getClassLoader().getResourceAsStream("lwm2m/" + resourceName), resourceName));
@@ -75,6 +77,8 @@ public class LwM2MTestClient {
         initializer.setInstancesForObject(SECURITY, security);
         initializer.setInstancesForObject(SERVER, new Server(123, 300));
         initializer.setInstancesForObject(DEVICE, new SimpleLwM2MDevice());
+        initializer.setInstancesForObject(FIRMWARE, new FwLwM2MDevice());
+        initializer.setInstancesForObject(SOFTWARE_MANAGEMENT, new SwLwM2MDevice());
         initializer.setClassForObject(LwM2mId.ACCESS_CONTROL, DummyInstanceEnabler.class);
         DtlsConnectorConfig.Builder dtlsConfig = new DtlsConnectorConfig.Builder();
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/SimpleLwM2MDevice.java
View file @dd9257f
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/SimpleLwM2MDevice.java
View file @dd9257f
@@ -45,74 +45,74 @@ public class SimpleLwM2MDevice extends BaseInstanceEnabler implements Destroyabl
     );
     @Override
-    public ReadResponse read(ServerIdentity identity, int resourceid) {
+    public ReadResponse read(ServerIdentity identity, int resourceId) {
         if (!identity.isSystem())
-            log.info("Read on Device resource /{}/{}/{}", getModel().id, getId(), resourceid);
-        switch (resourceid) {
+            log.info("Read on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
+        switch (resourceId) {
             case 0:
-                return ReadResponse.success(resourceid, getManufacturer());
+                return ReadResponse.success(resourceId, getManufacturer());
             case 1:
-                return ReadResponse.success(resourceid, getModelNumber());
+                return ReadResponse.success(resourceId, getModelNumber());
             case 2:
-                return ReadResponse.success(resourceid, getSerialNumber());
+                return ReadResponse.success(resourceId, getSerialNumber());
             case 3:
-                return ReadResponse.success(resourceid, getFirmwareVersion());
+                return ReadResponse.success(resourceId, getFirmwareVersion());
             case 9:
-                return ReadResponse.success(resourceid, getBatteryLevel());
+                return ReadResponse.success(resourceId, getBatteryLevel());
             case 10:
-                return ReadResponse.success(resourceid, getMemoryFree());
+                return ReadResponse.success(resourceId, getMemoryFree());
             case 11:
                 Map<Integer, Long> errorCodes = new HashMap<>();
                 errorCodes.put(0, getErrorCode());
-                return ReadResponse.success(resourceid, errorCodes, ResourceModel.Type.INTEGER);
+                return ReadResponse.success(resourceId, errorCodes, ResourceModel.Type.INTEGER);
             case 14:
-                return ReadResponse.success(resourceid, getUtcOffset());
+                return ReadResponse.success(resourceId, getUtcOffset());
             case 15:
-                return ReadResponse.success(resourceid, getTimezone());
+                return ReadResponse.success(resourceId, getTimezone());
             case 16:
-                return ReadResponse.success(resourceid, getSupportedBinding());
+                return ReadResponse.success(resourceId, getSupportedBinding());
             case 17:
-                return ReadResponse.success(resourceid, getDeviceType());
+                return ReadResponse.success(resourceId, getDeviceType());
             case 18:
-                return ReadResponse.success(resourceid, getHardwareVersion());
+                return ReadResponse.success(resourceId, getHardwareVersion());
             case 19:
-                return ReadResponse.success(resourceid, getSoftwareVersion());
+                return ReadResponse.success(resourceId, getSoftwareVersion());
             case 20:
-                return ReadResponse.success(resourceid, getBatteryStatus());
+                return ReadResponse.success(resourceId, getBatteryStatus());
             case 21:
-                return ReadResponse.success(resourceid, getMemoryTotal());
+                return ReadResponse.success(resourceId, getMemoryTotal());
             default:
-                return super.read(identity, resourceid);
+                return super.read(identity, resourceId);
         }
     }
     @Override
-    public ExecuteResponse execute(ServerIdentity identity, int resourceid, String params) {
+    public ExecuteResponse execute(ServerIdentity identity, int resourceId, String params) {
         String withParams = null;
         if (params != null && params.length() != 0) {
             withParams = " with params " + params;
         }
-        log.info("Execute on Device resource /{}/{}/{} {}", getModel().id, getId(), resourceid, withParams != null ? withParams : "");
+        log.info("Execute on Device resource /{}/{}/{} {}", getModel().id, getId(), resourceId, withParams != null ? withParams : "");
         return ExecuteResponse.success();
     }
     @Override
-    public WriteResponse write(ServerIdentity identity, boolean replace, int resourceid, LwM2mResource value) {
-        log.info("Write on Device resource /{}/{}/{}", getModel().id, getId(), resourceid);
+    public WriteResponse write(ServerIdentity identity, boolean replace, int resourceId, LwM2mResource value) {
+        log.info("Write on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
-        switch (resourceid) {
+        switch (resourceId) {
             case 13:
                 return WriteResponse.notFound();
             case 14:
                 setUtcOffset((String) value.getValue());
-                fireResourcesChange(resourceid);
+                fireResourcesChange(resourceId);
                 return WriteResponse.success();
             case 15:
                 setTimezone((String) value.getValue());
-                fireResourcesChange(resourceid);
+                fireResourcesChange(resourceId);
                 return WriteResponse.success();
             default:
-                return super.write(identity, replace, resourceid, value);
+                return super.write(identity, replace, resourceId, value);
         }
     }
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/SwLwM2MDevice.java 0 → 100644
View file @dd9257f
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/client/SwLwM2MDevice.java 0 → 100644
View file @dd9257f
+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.transport.lwm2m.client;
+
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
+import org.eclipse.leshan.client.servers.ServerIdentity;
+import org.eclipse.leshan.core.model.ObjectModel;
+import org.eclipse.leshan.core.node.LwM2mResource;
+import org.eclipse.leshan.core.response.ExecuteResponse;
+import org.eclipse.leshan.core.response.ReadResponse;
+import org.eclipse.leshan.core.response.WriteResponse;
+
+import javax.security.auth.Destroyable;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Slf4j
+public class SwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
+
+    private static final List<Integer> supportedResources = Arrays.asList(0, 1, 2, 3, 4, 6, 7, 9);
+
+    private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
+
+    private final AtomicInteger state = new AtomicInteger(0);
+
+    private final AtomicInteger updateResult = new AtomicInteger(0);
+
+    @Override
+    public ReadResponse read(ServerIdentity identity, int resourceId) {
+        if (!identity.isSystem())
+            log.info("Read on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
+        switch (resourceId) {
+            case 0:
+                return ReadResponse.success(resourceId, getPkgName());
+            case 1:
+                return ReadResponse.success(resourceId, getPkgVersion());
+            case 7:
+                return ReadResponse.success(resourceId, getUpdateState());
+            case 9:
+                return ReadResponse.success(resourceId, getUpdateResult());
+            default:
+                return super.read(identity, resourceId);
+        }
+    }
+
+    @Override
+    public ExecuteResponse execute(ServerIdentity identity, int resourceId, String params) {
+        String withParams = null;
+        if (params != null && params.length() != 0) {
+            withParams = " with params " + params;
+        }
+        log.info("Execute on Device resource /{}/{}/{} {}", getModel().id, getId(), resourceId, withParams != null ? withParams : "");
+
+        switch (resourceId) {
+            case 4:
+                startUpdating();
+                return ExecuteResponse.success();
+            case 6:
+                return ExecuteResponse.success();
+            default:
+                return super.execute(identity, resourceId, params);
+        }
+    }
+
+    @Override
+    public WriteResponse write(ServerIdentity identity, boolean replace, int resourceId, LwM2mResource value) {
+        log.info("Write on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
+
+        switch (resourceId) {
+            case 2:
+                startDownloading();
+                return WriteResponse.success();
+            case 3:
+                startDownloading();
+                return WriteResponse.success();
+            default:
+                return super.write(identity, replace, resourceId, value);
+        }
+    }
+
+    private int getUpdateState() {
+        return state.get();
+    }
+
+    private int getUpdateResult() {
+        return updateResult.get();
+    }
+
+    private String getPkgName() {
+        return "software";
+    }
+
+    private String getPkgVersion() {
+        return "1.0.0";
+    }
+
+    @Override
+    public List<Integer> getAvailableResourceIds(ObjectModel model) {
+        return supportedResources;
+    }
+
+    @Override
+    public void destroy() {
+        scheduler.shutdownNow();
+    }
+
+    private void startDownloading() {
+        scheduler.schedule(() -> {
+            try {
+                state.set(1);
+                updateResult.set(1);
+                fireResourcesChange(7, 9);
+                Thread.sleep(100);
+                state.set(2);
+                fireResourcesChange(7);
+                Thread.sleep(100);
+                state.set(3);
+                fireResourcesChange(7);
+                Thread.sleep(100);
+                updateResult.set(3);
+                fireResourcesChange(9);
+            } catch (Exception e) {
+
+            }
+        }, 100, TimeUnit.MILLISECONDS);
+    }
+
+    private void startUpdating() {
+        scheduler.schedule(() -> {
+            state.set(4);
+            updateResult.set(2);
+            fireResourcesChange(7, 9);
+        }, 100, TimeUnit.MILLISECONDS);
+    }
+
+}
--- a/application/src/test/resources/application-test.properties
View file @dd9257f
+++ b/application/src/test/resources/application-test.properties
View file @dd9257f
 transport.lwm2m.security.key_store=lwm2m/credentials/serverKeyStore.jks
 transport.lwm2m.security.key_store_password=server
 edges.enabled=true
-transport.lwm2m.bootstrap.security.alias=server
+transport.lwm2m.server.security.key_alias=server
+transport.lwm2m.server.security.key_password=server
+transport.lwm2m.bootstrap.security.key_alias=server
+transport.lwm2m.bootstrap.security.key_password=server
--- a/application/src/test/resources/lwm2m/5.xml 0 → 100644
View file @dd9257f
+++ b/application/src/test/resources/lwm2m/5.xml 0 → 100644
View file @dd9257f
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+FILE INFORMATION
+
+OMA Permanent Document
+   File: OMA-SUP-XML_LWM2M_Firmware_Update-V1_0_3-20190617-A
+   Type: xml
+   Date: 2019-Jun-17
+
+Public Reachable Information
+   Path: http://www.openmobilealliance.org/tech/profiles
+   Name: LWM2M_Firmware_Update-v1_0_3.xml
+
+NORMATIVE INFORMATION
+
+  Information about this file can be found in the latest revision of
+
+    OMA-TS-LightweightM2M-V1_0_2
+    OMA-TS-LightweightM2M_Core-V1_1_1
+
+  This is available at http://www.openmobilealliance.org/
+
+  Send comments to https://github.com/OpenMobileAlliance/OMA_LwM2M_for_Developers/issues
+
+LEGAL DISCLAIMER
+
+  Copyright 2019 Open Mobile Alliance.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+  3. Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+  The above license is used as a license under copyright only.  Please
+  reference the OMA IPR Policy for patent licensing terms:
+  https://www.omaspecworks.org/about/intellectual-property-rights/
+
+-->
+
+<LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>Firmware Update V_1_0</Name>
+		<Description1><![CDATA[This LwM2M Object enables management of firmware which is to be updated. This Object includes installing a firmware package, updating firmware, and performing actions after updating firmware. The firmware update MAY require to reboot the device; it will depend on a number of factors, such as the operating system architecture and the extent of the updated software.
+The envisioned functionality is to allow a LwM2M Client to connect to any LwM2M Server to obtain a firmware image using the object and resource structure defined in this section experiencing communication security protection using TLS/DTLS. There are, however, other design decisions that need to be taken into account to allow a manufacturer of a device to securely install firmware on a device. Examples for such design decisions are how to manage the firmware update repository at the server side (which may include user interface considerations), the techniques to provide additional application layer security protection of the firmware image, how many versions of firmware images to store on the device, and how to execute the firmware update process considering the hardware specific details of a given IoT hardware product. These aspects are considered to be outside the scope of this version of the specification.
+A LwM2M Server may also instruct a LwM2M Client to fetch a firmware image from a dedicated server (instead of pushing firmware images to the LwM2M Client). The Package URI resource is contained in the Firmware object and can be used for this purpose.
+A LwM2M Client MUST support block-wise transfer [CoAP_Blockwise] if it implements the Firmware Update object.
+A LwM2M Server MUST support block-wise transfer. Other protocols, such as HTTP/HTTPs, MAY also be used for downloading firmware updates (via the Package URI resource). For constrained devices it is, however, RECOMMENDED to use CoAP for firmware downloads to avoid the need for additional protocol implementations.]]></Description1>
+		<ObjectID>5</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:oma:5</ObjectURN>
+		<LWM2MVersion>1.0</LWM2MVersion>
+		<ObjectVersion>1.0</ObjectVersion>
+		<MultipleInstances>Single</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0">
+				<Name>Package</Name>
+        <Operations>W</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Opaque</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Firmware package]]></Description>
+			</Item>
+			<Item ID="1">
+				<Name>Package URI</Name>
+        <Operations>RW</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0..255</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[URI from where the device can download the firmware package by an alternative mechanism. As soon the device has received the Package URI it performs the download at the next practical opportunity.
+The URI format is defined in RFC 3986. For example, coaps://example.org/firmware is a syntactically valid URI. The URI scheme determines the protocol to be used. For CoAP this endpoint MAY be a LwM2M Server but does not necessarily need to be. A CoAP server implementing block-wise transfer is sufficient as a server hosting a firmware repository and the expectation is that this server merely serves as a separate file server making firmware images available to LwM2M Clients.]]></Description>
+			</Item>
+			<Item ID="2">
+				<Name>Update</Name>
+        <Operations>E</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Updates firmware by using the firmware package stored in Package, or, by using the firmware downloaded from the Package URI.
+This Resource is only executable when the value of the State Resource is Downloaded.]]></Description>
+			</Item>
+			<Item ID="3">
+				<Name>State</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..3</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Indicates current state with respect to this firmware update. This value is set by the LwM2M Client.
+0: Idle (before downloading or after successful updating)
+1: Downloading (The data sequence is on the way)
+2: Downloaded
+3: Updating
+If writing the firmware package to Package Resource has completed, or, if the device has downloaded the firmware package from the Package URI the state changes to Downloaded.
+Writing an empty string to Package URI Resource or setting the Package Resource to NULL (‘\0’), resets the Firmware Update State Machine: the State Resource value is set to Idle and the Update Result Resource value is set to 0.
+When in Downloaded state, and the executable Resource Update is triggered, the state changes to Updating.
+If the Update Resource failed, the state returns at Downloaded.
+If performing the Update Resource was successful, the state changes from Updating to Idle.
+The firmware update state machine is illustrated in Figure 29 of the LwM2M version 1.0 specification (and also in Figure E.6.1-1 of this specification).]]></Description>
+			</Item>
+			<Item ID="5">
+				<Name>Update Result</Name>
+        <Operations>R</Operations>
+        <MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..9</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains the result of downloading or updating the firmware
+0: Initial value. Once the updating process is initiated (Download /Update), this Resource MUST be reset to Initial value.
+1: Firmware updated successfully.
+2: Not enough flash memory for the new firmware package.
+3: Out of RAM during downloading process.
+4: Connection lost during downloading process.
+5: Integrity check failure for new downloaded package.
+6: Unsupported package type.
+7: Invalid URI.
+8: Firmware update failed.
+9: Unsupported protocol. A LwM2M client indicates the failure to retrieve the firmware image using the URI provided in the Package URI resource by writing the value 9 to the /5/0/5 (Update Result resource) when the URI contained a URI scheme unsupported by the client. Consequently, the LwM2M Client is unable to retrieve the firmware image using the URI provided by the LwM2M Server in the Package URI when it refers to an unsupported protocol.]]></Description>
+			</Item>
+			<Item ID="6">
+				<Name>PkgName</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0..255</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Name of the Firmware Package]]></Description>
+			</Item>
+			<Item ID="7">
+				<Name>PkgVersion</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0..255</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Version of the Firmware package]]></Description>
+			</Item>
+			<Item ID="8">
+				<Name>Firmware Update Protocol Support</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..5</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This resource indicates what protocols the LwM2M Client implements to retrieve firmware images. The LwM2M server uses this information to decide what URI to include in the Package URI. A LwM2M Server MUST NOT include a URI in the Package URI object that uses a protocol that is unsupported by the LwM2M client.
+For example, if a LwM2M client indicates that it supports CoAP and CoAPS then a LwM2M Server must not provide an HTTP URI in the Packet URI.
+The following values are defined by this version of the specification:
+0: CoAP (as defined in RFC 7252) with the additional support for block-wise transfer. CoAP is the default setting.
+1: CoAPS (as defined in RFC 7252) with the additional support for block-wise transfer
+2: HTTP 1.1 (as defined in RFC 7230)
+3: HTTPS 1.1 (as defined in RFC 7230)
+4: CoAP over TCP (as defined in RFC 8323)
+5: CoAP over TLS (as defined in RFC 8323)
+Additional values MAY be defined in the future. Any value not understood by the LwM2M Server MUST be ignored.]]></Description>
+			</Item>
+			<Item ID="9">
+				<Name>Firmware Update Delivery Method</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..2</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[The LwM2M Client uses this resource to indicate its support for transferring firmware images to the client either via the Package Resource (=push) or via the Package URI Resource (=pull) mechanism.
+0: Pull only
+1: Push only
+2: Both. In this case the LwM2M Server MAY choose the preferred mechanism for conveying the firmware image to the LwM2M Client.]]></Description>
+			</Item>
+    </Resources>
+		<Description2><![CDATA[]]></Description2>
+	</Object>
+</LWM2M>
--- a/application/src/test/resources/lwm2m/9.xml 0 → 100644
View file @dd9257f
+++ b/application/src/test/resources/lwm2m/9.xml 0 → 100644
View file @dd9257f
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+FILE INFORMATION
+
+OMA Permanent Document
+   File: OMA-SUP-XML_9-V1_0_2-20210119-A.xml
+   Path: http://www.openmobilealliance.org/release/LWM2M_SWMGMT
+
+OMNA LwM2M Registry
+   Path: https://github.com/OpenMobileAlliance/lwm2m-registry
+   Name: 9.xml
+
+NORMATIVE INFORMATION
+
+  Information about this file can be found in the latest revision of
+
+    OMA-TS-LightweightM2M-V1_0
+
+  This is available at http://www.openmobilealliance.org/release/LightweightM2M/
+
+  Send comments to https://github.com/OpenMobileAlliance/OMA_LwM2M_for_Developers/issues
+
+LEGAL DISCLAIMER
+
+  Copyright 2021 Open Mobile Alliance.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+  1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+  3. Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+  The above license is used as a license under copyright only.  Please
+  reference the OMA IPR Policy for patent licensing terms:
+  https://www.omaspecworks.org/about/intellectual-property-rights/
+
+-->
+
+<LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://openmobilealliance.org/tech/profiles/LWM2M.xsd">
+	<Object ObjectType="MODefinition">
+		<Name>LWM2M Software Management</Name>
+		<Description1><![CDATA[This LwM2M objects provides the resources needed to perform software management on the device. Each software component is managed via a dedicated Software Management Object instance.]]></Description1>
+		<ObjectID>9</ObjectID>
+		<ObjectURN>urn:oma:lwm2m:oma:9</ObjectURN>
+		<LWM2MVersion>1.0</LWM2MVersion>
+		<ObjectVersion>1.0</ObjectVersion>
+		<MultipleInstances>Multiple</MultipleInstances>
+		<Mandatory>Optional</Mandatory>
+		<Resources>
+			<Item ID="0">
+				<Name>PkgName</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0..255 bytes</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Name of the software package]]></Description>
+			</Item>
+			<Item ID="1">
+				<Name>PkgVersion</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0..255 bytes</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Version of the software package]]></Description>
+			</Item>
+			<Item ID="2">
+				<Name>Package</Name>
+				<Operations>W</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Opaque</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Software package
+The package can be in one single software component, or any delivery material used by the Device to determine the software component(s) and proceed to their installation.
+Can be archive file, executable, manifest. This resource to be used when it is single block of delivery.
+]]>				</Description>
+			</Item>
+			<Item ID="3">
+				<Name>Package URI</Name>
+				<Operations>W</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0..255 bytes</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[URI from where the device can download the software package by an alternative mechanism. As soon the device has received the Package URI it performs the download at the next practical opportunity.
+Can be direct link to a single software component or link to archive file, executable, or manifest, used by the Device to determine, then access to the software component(s). This resource to be used when it is single block of delivery.
+]]>				</Description>
+			</Item>
+
+			<Item ID="4">
+				<Name>Install</Name>
+				<Operations>E</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Installs software from the package either stored in Package resource, or, downloaded from the Package URI. This Resource is only executable when the value of the State Resource is DELIVERED.]]></Description>
+			</Item>
+			<Item ID="5">
+				<Name>Checkpoint</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Link to a "Checkpoint" object which allows to specify conditions/dependencies for a software update. E.g. power connected, sufficient memory, target system.]]></Description>
+			</Item>
+			<Item ID="6">
+				<Name>Uninstall</Name>
+				<Operations>E</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Uninstalls the software package.
+This executable resource may have one argument.
+If used with no argument or argument is 0, the Package is removed i from the Device. If the argument is 1 ("ForUpdate"), the Client MUST prepare itself for receiving a Package used to upgrade the Software already in place. Update State is set back to INITIAL state.
+]]>				</Description>
+			</Item>
+			<Item ID="7">
+				<Name>Update State</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..4</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Indicates current state with respect to this software update. This value is set by the LwM2M Client.
+0: INITIAL
+Before downloading.
+(see 5.1.2.1)
+1: DOWNLOAD STARTED
+The downloading process has started and is on-going.
+(see 5.1.2.2)
+2: DOWNLOADED
+The package has been completely downloaded 
+(see 5.1.2.3)
+3: DELIVERED
+In that state, the package has been correctly downloaded and is ready to be installed. 
+(see 5.1.2.4)
+If executing the Install Resource failed, the state remains at DELIVERED.
+If executing the Install Resource was successful, the state changes from DELIVERED to INSTALLED.
+After executing the UnInstall Resource, the state changes to INITIAL.
+4: INSTALLED
+In that state the software is correctly installed and can be activated or deactivated according to the Activation State Machine.
+(see 5.1.2.5)
+]]>				</Description>
+			</Item>
+			<Item ID="8">
+				<Name>Update Supported Objects</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[If this value is true, the LwM2M Client MUST inform the registered LwM2M Servers of Objects and Object Instances parameter by sending an Update or Registration message after the software update operation at the next practical opportunity if supported Objects in the LwM2M Client have changed, in order for the LwM2M Servers to promptly manage newly installed Objects. 
+If false, Objects and Object Instances parameter MUST be reported at the next periodic Update message.
+The default value is false.
+]]>				</Description>
+			</Item>
+			<Item ID="9">
+				<Name>Update Result</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..200</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains the result of downloading or installing/uninstalling the software
+0: Initial value. Prior to download any new package in the Device, Update Result MUST be reset to this initial value. One side effect of executing the Uninstall resource is to reset Update Result to this initial value "0".
+1: Downloading. The package downloading process is on-going.
+2: Software successfully installed.
+3: Successfully Downloaded and package integrity verified
+(( 4-49, for expansion, of other scenarios))
+50: Not enough storage for the new software package.
+51: Out of memory during downloading process.
+52: Connection lost during downloading process.
+53: Package integrity check failure.
+54: Unsupported package type.
+56: Invalid URI
+57: Device defined update error
+58: Software installation failure
+59: Uninstallation Failure during forUpdate(arg=0)
+60-200 : (for expansion, selection to be in blocks depending on new introduction of features)
+This Resource MAY be reported by sending Observe operation.
+]]>				</Description>
+			</Item>
+			<Item ID="10">
+				<Name>Activate</Name>
+				<Operations>E</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This action activates the software previously successfully installed (the Package Installation State Machine is currently in the INSTALLED state)]]></Description>
+			</Item>
+			<Item ID="11">
+				<Name>Deactivate</Name>
+				<Operations>E</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type></Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[This action deactivates softwareif the Package Installation State Machine is currently in the INSTALLED state.]]></Description>
+			</Item>
+			<Item ID="12">
+				<Name>Activation State</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Mandatory</Mandatory>
+				<Type>Boolean</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Indicates the current activation state of this software:
+0: DISABLED
+Activation State is DISABLED if the Software Activation State Machine is in the INACTIVE state or not alive.
+1: ENABLED
+Activation State is ENABLED only if the Software Activation State Machine is in the ACTIVE state
+]]>				</Description>
+			</Item>
+			<Item ID="13">
+				<Name>Package Settings</Name>
+				<Operations>RW</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Link to "Package Settings" object which allows to modify at any time software configuration settings. This is an application specific object. 
+Note: OMA might provide a template for a Package Settings object in a future release of this specification.
+]]>				</Description>
+			</Item>
+			<Item ID="14">
+				<Name>User Name</Name>
+				<Operations>W</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0..255 bytes</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[User Name for access to SW Update Package in pull mode.
+Key based mechanism can alternatively use for talking to the component server instead of user name and password combination.
+]]>				</Description>
+			</Item>
+			<Item ID="15">
+				<Name>Password</Name>
+				<Operations>W</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration>0..255 bytes</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Password for access to SW Update Package in pull mode.]]></Description>
+			</Item>
+			<Item ID="16">
+				<Name>Status Reason</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>String</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Contains the status of the actions done by the client on the SW Component(s) referred by the present SW Update Package. The status is defined in Appendix B.]]></Description>
+			</Item>
+			<Item ID="17">
+				<Name>Software Component Link</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Multiple</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Objlnk</Type>
+				<RangeEnumeration></RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Reference to SW Components downloaded and installed in scope of the present SW Update Package Note: When resource 17 objlink exist, resources 2, 3 and 12 in this table are ignored.]]></Description>
+			</Item>
+			<Item ID="18">
+				<Name>Software Component tree length</Name>
+				<Operations>R</Operations>
+				<MultipleInstances>Single</MultipleInstances>
+				<Mandatory>Optional</Mandatory>
+				<Type>Integer</Type>
+				<RangeEnumeration>0..255</RangeEnumeration>
+				<Units></Units>
+				<Description><![CDATA[Software Component tree length indicates the number of instances existing for this software package in the Software Component Object.]]></Description>
+			</Item>
+		</Resources>
+		<Description2><![CDATA[]]></Description2>
+	</Object>
+</LWM2M>
--- a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/DefaultCoapServerService.java
View file @dd9257f
+++ b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/DefaultCoapServerService.java
View file @dd9257f
@@ -117,11 +117,9 @@ public class DefaultCoapServerService implements CoapServerService {
             dtlsCoapEndpointBuilder.setConnector(connector);
             CoapEndpoint dtlsCoapEndpoint = dtlsCoapEndpointBuilder.build();
             server.addEndpoint(dtlsCoapEndpoint);
-            if (dtlsConnectorConfig.isClientAuthenticationRequired()) {
-                tbDtlsCertificateVerifier = (TbCoapDtlsCertificateVerifier) dtlsConnectorConfig.getAdvancedCertificateVerifier();
-                dtlsSessionsExecutor = Executors.newSingleThreadScheduledExecutor();
-                dtlsSessionsExecutor.scheduleAtFixedRate(this::evictTimeoutSessions, new Random().nextInt((int) getDtlsSessionReportTimeout()), getDtlsSessionReportTimeout(), TimeUnit.MILLISECONDS);
-            }
+            tbDtlsCertificateVerifier = (TbCoapDtlsCertificateVerifier) dtlsConnectorConfig.getAdvancedCertificateVerifier();
+            dtlsSessionsExecutor = Executors.newSingleThreadScheduledExecutor();
+            dtlsSessionsExecutor.scheduleAtFixedRate(this::evictTimeoutSessions, new Random().nextInt((int) getDtlsSessionReportTimeout()), getDtlsSessionReportTimeout(), TimeUnit.MILLISECONDS);
         }
         Resource root = server.getRoot();
         TbCoapServerMessageDeliverer messageDeliverer = new TbCoapServerMessageDeliverer(root);
--- a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsCertificateVerifier.java
View file @dd9257f
+++ b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsCertificateVerifier.java
View file @dd9257f
@@ -78,7 +78,6 @@ public class TbCoapDtlsCertificateVerifier implements NewAdvancedCertificateVeri
     @Override
     public CertificateVerificationResult verifyCertificate(ConnectionId cid, ServerNames serverName, Boolean clientUsage, boolean truncateCertificatePath, CertificateMessage message, DTLSSession session) {
         try {
-            String credentialsBody = null;
             CertPath certpath = message.getCertificateChain();
             X509Certificate[] chain = certpath.getCertificates().toArray(new X509Certificate[0]);
             for (X509Certificate cert : chain) {
@@ -110,7 +109,6 @@ public class TbCoapDtlsCertificateVerifier implements NewAdvancedCertificateVeri
                     latch.await(10, TimeUnit.SECONDS);
                     ValidateDeviceCredentialsResponse msg = deviceCredentialsResponse[0];
                     if (msg != null && strCert.equals(msg.getCredentials())) {
-                        credentialsBody = msg.getCredentials();
                         DeviceProfile deviceProfile = msg.getDeviceProfile();
                         if (msg.hasDeviceInfo() && deviceProfile != null) {
                             TransportProtos.SessionInfoProto sessionInfoProto = SessionInfoCreator.create(msg, serviceInfoProvider.getServiceId(), UUID.randomUUID());
@@ -123,15 +121,12 @@ public class TbCoapDtlsCertificateVerifier implements NewAdvancedCertificateVeri
                         CertificateExpiredException |
                         CertificateNotYetValidException e) {
                     log.error(e.getMessage(), e);
+                    AlertMessage alert = new AlertMessage(AlertMessage.AlertLevel.FATAL, AlertMessage.AlertDescription.BAD_CERTIFICATE,
+                            session.getPeer());
+                    throw new HandshakeException("Certificate chain could not be validated", alert);
                 }
             }
-            if (credentialsBody == null) {
-                AlertMessage alert = new AlertMessage(AlertMessage.AlertLevel.FATAL, AlertMessage.AlertDescription.BAD_CERTIFICATE,
-                        session.getPeer());
-                throw new HandshakeException("Certificate chain could not be validated", alert);
-            } else {
-                return new CertificateVerificationResult(cid, certpath, null);
-            }
+            return new CertificateVerificationResult(cid, certpath, null);
         } catch (HandshakeException e) {
             log.trace("Certificate validation failed!", e);
             return new CertificateVerificationResult(cid, e, null);
@@ -158,4 +153,4 @@ public class TbCoapDtlsCertificateVerifier implements NewAdvancedCertificateVeri
     public long getDtlsSessionReportTimeout() {
         return tbCoapDtlsSessionInMemoryStorage.getDtlsSessionReportTimeout();
     }
-}
+}
--- a/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSettings.java
View file @dd9257f
+++ b/common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSettings.java
View file @dd9257f
@@ -15,15 +15,12 @@
  */
 package org.thingsboard.server.coapserver;
-import com.google.common.io.Resources;
 import lombok.extern.slf4j.Slf4j;
 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.x509.StaticNewAdvancedCertificateVerifier;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.ResourceUtils;
@@ -35,9 +32,7 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.security.GeneralSecurityException;
-import java.security.cert.Certificate;
 import java.util.Collections;
-import java.util.Optional;
 @Slf4j
 @ConditionalOnProperty(prefix = "transport.coap.dtls", value = "enabled", havingValue = "true", matchIfMissing = false)
@@ -50,9 +45,6 @@ public class TbCoapDtlsSettings {
     @Value("${transport.coap.dtls.bind_port}")
     private Integer port;
-    @Value("${transport.coap.dtls.mode:NO_AUTH}")
-    private String mode;
-
     @Value("${transport.coap.dtls.key_store}")
     private String keyStoreFile;
@@ -81,34 +73,25 @@ public class TbCoapDtlsSettings {
     private TbServiceInfoProvider serviceInfoProvider;
     public DtlsConnectorConfig dtlsConnectorConfig() throws UnknownHostException {
-        Optional<SecurityMode> securityModeOpt = SecurityMode.parse(mode);
-        if (securityModeOpt.isEmpty()) {
-            log.warn("Incorrect configuration of securityMode {}", mode);
-            throw new RuntimeException("Failed to parse mode property: " + mode + "!");
-        } else {
-            DtlsConnectorConfig.Builder configBuilder = new DtlsConnectorConfig.Builder();
-            configBuilder.setAddress(getInetSocketAddress());
-            String keyStoreFilePath = ResourceUtils.getUri(this, keyStoreFile);
-            SslContextUtil.Credentials serverCredentials = loadServerCredentials(keyStoreFilePath);
-            SecurityMode securityMode = securityModeOpt.get();
-            if (securityMode.equals(SecurityMode.NO_AUTH)) {
-                configBuilder.setClientAuthenticationRequired(false);
-                configBuilder.setServerOnly(true);
-            } else {
-                configBuilder.setAdvancedCertificateVerifier(
-                        new TbCoapDtlsCertificateVerifier(
-                                transportService,
-                                serviceInfoProvider,
-                                dtlsSessionInactivityTimeout,
-                                dtlsSessionReportTimeout,
-                                skipValidityCheckForClientCert
-                        )
-                );
-            }
-            configBuilder.setIdentity(serverCredentials.getPrivateKey(), serverCredentials.getCertificateChain(),
-                    Collections.singletonList(CertificateType.X_509));
-            return configBuilder.build();
-        }
+        DtlsConnectorConfig.Builder configBuilder = new DtlsConnectorConfig.Builder();
+        configBuilder.setAddress(getInetSocketAddress());
+        String keyStoreFilePath = ResourceUtils.getUri(this, keyStoreFile);
+        SslContextUtil.Credentials serverCredentials = loadServerCredentials(keyStoreFilePath);
+        configBuilder.setServerOnly(true);
+        configBuilder.setClientAuthenticationRequired(false);
+        configBuilder.setClientAuthenticationWanted(true);
+        configBuilder.setAdvancedCertificateVerifier(
+                new TbCoapDtlsCertificateVerifier(
+                        transportService,
+                        serviceInfoProvider,
+                        dtlsSessionInactivityTimeout,
+                        dtlsSessionReportTimeout,
+                        skipValidityCheckForClientCert
+                )
+        );
+        configBuilder.setIdentity(serverCredentials.getPrivateKey(), serverCredentials.getCertificateChain(),
+                Collections.singletonList(CertificateType.X_509));
+        return configBuilder.build();
     }
     private SslContextUtil.Credentials loadServerCredentials(String keyStoreFilePath) {
@@ -120,43 +103,9 @@ public class TbCoapDtlsSettings {
         }
     }
-    private void loadTrustedCertificates(DtlsConnectorConfig.Builder config, String keyStoreFilePath) {
-        StaticNewAdvancedCertificateVerifier.Builder trustBuilder = StaticNewAdvancedCertificateVerifier.builder();
-        try {
-            Certificate[] trustedCertificates = SslContextUtil.loadTrustedCertificates(
-                    keyStoreFilePath, keyAlias,
-                    keyStorePassword.toCharArray());
-            trustBuilder.setTrustedCertificates(trustedCertificates);
-            if (trustBuilder.hasTrusts()) {
-                config.setAdvancedCertificateVerifier(trustBuilder.build());
-            }
-        } catch (GeneralSecurityException | IOException e) {
-            throw new RuntimeException("Failed to load trusted certificates due to: ", e);
-        }
-    }
-
     private InetSocketAddress getInetSocketAddress() throws UnknownHostException {
         InetAddress addr = InetAddress.getByName(host);
         return new InetSocketAddress(addr, port);
     }
-    private enum SecurityMode {
-        X509,
-        NO_AUTH;
-
-        static Optional<SecurityMode> parse(String name) {
-            SecurityMode mode = null;
-            if (name != null) {
-                for (SecurityMode securityMode : SecurityMode.values()) {
-                    if (securityMode.name().equalsIgnoreCase(name)) {
-                        mode = securityMode;
-                        break;
-                    }
-                }
-            }
-            return Optional.ofNullable(mode);
-        }
-
-    }
-
-}
+}
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/dashboard/DashboardService.java
View file @dd9257f
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/dashboard/DashboardService.java
View file @dd9257f
@@ -58,4 +58,6 @@ public interface DashboardService {
     Dashboard unassignDashboardFromEdge(TenantId tenantId, DashboardId dashboardId, EdgeId edgeId);
     PageData<DashboardInfo> findDashboardsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink);
+
+    DashboardInfo findFirstDashboardInfoByTenantIdAndName(TenantId tenantId, String name);
 }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/lwm2m/OtherConfiguration.java
View file @dd9257f
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/lwm2m/OtherConfiguration.java
View file @dd9257f
@@ -15,10 +15,12 @@
  */
 package org.thingsboard.server.common.data.device.data.lwm2m;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 import org.thingsboard.server.common.data.device.data.PowerMode;
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class OtherConfiguration {
     private Integer fwUpdateStrategy;
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java
View file @dd9257f
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java
View file @dd9257f
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.device.profile;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
+import org.thingsboard.server.common.data.query.FilterPredicateValue;
 import java.util.concurrent.TimeUnit;
@@ -25,7 +26,7 @@ import java.util.concurrent.TimeUnit;
 public class DurationAlarmConditionSpec implements AlarmConditionSpec {
     private TimeUnit unit;
-    private long value;
+    private FilterPredicateValue<Long> predicate;
     @Override
     public AlarmConditionSpecType getType() {
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/RepeatingAlarmConditionSpec.java
View file @dd9257f
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/RepeatingAlarmConditionSpec.java
View file @dd9257f
@@ -17,14 +17,13 @@ package org.thingsboard.server.common.data.device.profile;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
-
-import java.util.concurrent.TimeUnit;
+import org.thingsboard.server.common.data.query.FilterPredicateValue;
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class RepeatingAlarmConditionSpec implements AlarmConditionSpec {
-    private int count;
+    private FilterPredicateValue<Integer> predicate;
     @Override
     public AlarmConditionSpecType getType() {
--- a/common/queue/src/main/java/org/thingsboard/server/queue/TbQueueConsumer.java
View file @dd9257f
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/TbQueueConsumer.java
View file @dd9257f
@@ -34,4 +34,6 @@ public interface TbQueueConsumer<T extends TbQueueMsg> {
     void commit();
+    boolean isStopped();
+
 }
--- a/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java
View file @dd9257f
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java
View file @dd9257f
@@ -172,6 +172,11 @@ public abstract class AbstractTbQueueConsumerTemplate<R, T extends TbQueueMsg> i
         }
     }
+    @Override
+    public boolean isStopped() {
+        return stopped;
+    }
+
     abstract protected List<R> doPoll(long durationInMillis);
     abstract protected T decode(R record) throws IOException;
--- a/common/queue/src/main/java/org/thingsboard/server/queue/memory/InMemoryTbQueueConsumer.java
View file @dd9257f
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/memory/InMemoryTbQueueConsumer.java
View file @dd9257f
@@ -96,4 +96,10 @@ public class InMemoryTbQueueConsumer<T extends TbQueueMsg> implements TbQueueCon
     @Override
     public void commit() {
     }
+
+    @Override
+    public boolean isStopped() {
+        return stopped;
+    }
+
 }
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaMonolithQueueFactory.java
View file @dd9257f
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaMonolithQueueFactory.java
View file @dd9257f
@@ -54,6 +54,7 @@ import org.thingsboard.server.queue.settings.TbRuleEngineQueueConfiguration;
 import javax.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
+import java.util.concurrent.atomic.AtomicLong;
 @Component
 @ConditionalOnExpression("'${queue.type:null}'=='kafka' && '${service.type:null}'=='monolith'")
@@ -75,6 +76,7 @@ public class KafkaMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngi
     private final TbQueueAdmin transportApiAdmin;
     private final TbQueueAdmin notificationAdmin;
     private final TbQueueAdmin fwUpdatesAdmin;
+    private final AtomicLong consumerCount = new AtomicLong();
     public KafkaMonolithQueueFactory(PartitionService partitionService, TbKafkaSettings kafkaSettings,
                                      TbServiceInfoProvider serviceInfoProvider,
@@ -159,7 +161,7 @@ public class KafkaMonolithQueueFactory implements TbCoreQueueFactory, TbRuleEngi
         TbKafkaConsumerTemplate.TbKafkaConsumerTemplateBuilder<TbProtoQueueMsg<ToRuleEngineMsg>> consumerBuilder = TbKafkaConsumerTemplate.builder();
         consumerBuilder.settings(kafkaSettings);
         consumerBuilder.topic(ruleEngineSettings.getTopic());
-        consumerBuilder.clientId("re-" + queueName + "-consumer-" + serviceInfoProvider.getServiceId());
+        consumerBuilder.clientId("re-" + queueName + "-consumer-" + serviceInfoProvider.getServiceId() + "-" + consumerCount.incrementAndGet());
         consumerBuilder.groupId("re-" + queueName + "-consumer");
         consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineMsg.parseFrom(msg.getData()), msg.getHeaders()));
         consumerBuilder.admin(ruleEngineAdmin);
--- a/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbRuleEngineQueueFactory.java
View file @dd9257f
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/provider/KafkaTbRuleEngineQueueFactory.java
View file @dd9257f
@@ -49,6 +49,7 @@ import org.thingsboard.server.queue.settings.TbRuleEngineQueueConfiguration;
 import javax.annotation.PreDestroy;
 import java.nio.charset.StandardCharsets;
+import java.util.concurrent.atomic.AtomicLong;
 @Component
 @ConditionalOnExpression("'${queue.type:null}'=='kafka' && '${service.type:null}'=='tb-rule-engine'")
@@ -66,6 +67,7 @@ public class KafkaTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory {
     private final TbQueueAdmin ruleEngineAdmin;
     private final TbQueueAdmin jsExecutorAdmin;
     private final TbQueueAdmin notificationAdmin;
+    private final AtomicLong consumerCount = new AtomicLong();
     public KafkaTbRuleEngineQueueFactory(PartitionService partitionService, TbKafkaSettings kafkaSettings,
                                          TbServiceInfoProvider serviceInfoProvider,
@@ -145,7 +147,7 @@ public class KafkaTbRuleEngineQueueFactory implements TbRuleEngineQueueFactory {
         TbKafkaConsumerTemplate.TbKafkaConsumerTemplateBuilder<TbProtoQueueMsg<ToRuleEngineMsg>> consumerBuilder = TbKafkaConsumerTemplate.builder();
         consumerBuilder.settings(kafkaSettings);
         consumerBuilder.topic(ruleEngineSettings.getTopic());
-        consumerBuilder.clientId("re-" + queueName + "-consumer-" + serviceInfoProvider.getServiceId());
+        consumerBuilder.clientId("re-" + queueName + "-consumer-" + serviceInfoProvider.getServiceId() + "-" + consumerCount.incrementAndGet());
         consumerBuilder.groupId("re-" + queueName + "-consumer");
         consumerBuilder.decoder(msg -> new TbProtoQueueMsg<>(msg.getKey(), ToRuleEngineMsg.parseFrom(msg.getData()), msg.getHeaders()));
         consumerBuilder.admin(ruleEngineAdmin);
--- a/common/queue/src/main/java/org/thingsboard/server/queue/settings/TbRuleEngineQueueConfiguration.java
View file @dd9257f
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/settings/TbRuleEngineQueueConfiguration.java
View file @dd9257f
@@ -24,6 +24,7 @@ public class TbRuleEngineQueueConfiguration {
     private String topic;
     private int pollInterval;
     private int partitions;
+    private boolean consumerPerPartition;
     private long packProcessingTimeout;
     private TbRuleEngineQueueSubmitStrategyConfiguration submitStrategy;
     private TbRuleEngineQueueAckStrategyConfiguration processingStrategy;
--- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java
View file @dd9257f
+++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java
View file @dd9257f
@@ -223,18 +223,14 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
         Request request = advanced.getRequest();
         String dtlsSessionIdStr = request.getSourceContext().get(DTLS_SESSION_ID_KEY);
-        if (StringUtils.isNotEmpty(dtlsSessionIdStr)) {
-            if (dtlsSessionIdMap != null) {
-                TbCoapDtlsSessionInfo tbCoapDtlsSessionInfo = dtlsSessionIdMap
-                        .computeIfPresent(dtlsSessionIdStr, (dtlsSessionId, dtlsSessionInfo) -> {
-                            dtlsSessionInfo.setLastActivityTime(System.currentTimeMillis());
-                            return dtlsSessionInfo;
-                        });
-                if (tbCoapDtlsSessionInfo != null) {
-                    processRequest(exchange, type, request, tbCoapDtlsSessionInfo.getSessionInfoProto(), tbCoapDtlsSessionInfo.getDeviceProfile());
-                } else {
-                    exchange.respond(CoAP.ResponseCode.UNAUTHORIZED);
-                }
+        if (dtlsSessionIdMap != null && StringUtils.isNotEmpty(dtlsSessionIdStr)) {
+            TbCoapDtlsSessionInfo tbCoapDtlsSessionInfo = dtlsSessionIdMap
+                    .computeIfPresent(dtlsSessionIdStr, (dtlsSessionId, dtlsSessionInfo) -> {
+                        dtlsSessionInfo.setLastActivityTime(System.currentTimeMillis());
+                        return dtlsSessionInfo;
+                    });
+            if (tbCoapDtlsSessionInfo != null) {
+                processRequest(exchange, type, request, tbCoapDtlsSessionInfo.getSessionInfoProto(), tbCoapDtlsSessionInfo.getDeviceProfile());
             } else {
                 processAccessTokenRequest(exchange, type, request);
             }
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java
View file @dd9257f
@@ -17,58 +17,35 @@ package org.thingsboard.server.transport.lwm2m.bootstrap;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.californium.elements.util.SslContextUtil;
 import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
-import org.eclipse.leshan.core.util.Hex;
 import org.eclipse.leshan.server.bootstrap.BootstrapSessionManager;
 import org.eclipse.leshan.server.californium.bootstrap.LeshanBootstrapServer;
 import org.eclipse.leshan.server.californium.bootstrap.LeshanBootstrapServerBuilder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.transport.lwm2m.bootstrap.secure.LwM2MBootstrapSecurityStore;
 import org.thingsboard.server.transport.lwm2m.bootstrap.secure.LwM2MInMemoryBootstrapConfigStore;
 import org.thingsboard.server.transport.lwm2m.bootstrap.secure.LwM2mDefaultBootstrapSessionManager;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportBootstrapConfig;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
-import org.thingsboard.server.transport.lwm2m.secure.LWM2MGenerationPSkRPkECC;
+import org.thingsboard.server.transport.lwm2m.server.DefaultLwM2mTransportService;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import java.math.BigInteger;
-import java.security.AlgorithmParameters;
-import java.security.KeyFactory;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
-import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
-import java.security.interfaces.ECPublicKey;
-import java.security.spec.ECGenParameterSpec;
-import java.security.spec.ECParameterSpec;
-import java.security.spec.ECPoint;
-import java.security.spec.ECPublicKeySpec;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.InvalidParameterSpecException;
-import java.security.spec.KeySpec;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
-import static org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256;
-import static org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8;
-import static org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_PSK_WITH_AES_128_CBC_SHA256;
-import static org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_PSK_WITH_AES_128_CCM_8;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mNetworkConfig.getCoapConfig;
 @Slf4j
 @Component
 @ConditionalOnExpression("('${service.type:null}'=='tb-transport' && '${transport.lwm2m.enabled:false}'=='true' && '${transport.lwm2m.bootstrap.enable:false}'=='true') || ('${service.type:null}'=='monolith' && '${transport.lwm2m.enabled:false}'=='true'&& '${transport.lwm2m.bootstrap.enable:false}'=='true')")
 @RequiredArgsConstructor
-//TODO: @ybondarenko please refactor this to be similar to DefaultLwM2mTransportService
 public class LwM2MTransportBootstrapService {
-    private PublicKey publicKey;
-    private PrivateKey privateKey;
     private boolean pskMode = false;
     private final LwM2MTransportServerConfig serverConfig;
@@ -80,9 +57,6 @@ public class LwM2MTransportBootstrapService {
     @PostConstruct
     public void init() {
-        if (serverConfig.getEnableGenNewKeyPskRpk()) {
-            new LWM2MGenerationPSkRPkECC();
-        }
         log.info("Starting LwM2M transport bootstrap server...");
         this.server = getLhBootstrapServer();
         this.server.start();
@@ -101,44 +75,34 @@ public class LwM2MTransportBootstrapService {
         builder.setLocalAddress(bootstrapConfig.getHost(), bootstrapConfig.getPort());
         builder.setLocalSecureAddress(bootstrapConfig.getSecureHost(), bootstrapConfig.getSecurePort());
-        /** Create CoAP Config */
+        /* Create CoAP Config */
         builder.setCoapConfig(getCoapConfig(bootstrapConfig.getPort(), bootstrapConfig.getSecurePort(), serverConfig));
-        /** Define model provider (Create Models )*/
+        /* Define model provider (Create Models )*/
-        /**  Create credentials */
+        /*  Create credentials */
         this.setServerWithCredentials(builder);
 //        /** Set securityStore with new ConfigStore */
 //        builder.setConfigStore(lwM2MInMemoryBootstrapConfigStore);
-        /** SecurityStore */
+        /* SecurityStore */
         builder.setSecurityStore(lwM2MBootstrapSecurityStore);
-        /** Create and Set DTLS Config */
+        /* Create and Set DTLS Config */
         DtlsConnectorConfig.Builder dtlsConfig = new DtlsConnectorConfig.Builder();
         dtlsConfig.setRecommendedSupportedGroupsOnly(serverConfig.isRecommendedSupportedGroups());
         dtlsConfig.setRecommendedCipherSuitesOnly(serverConfig.isRecommendedCiphers());
-        if (this.pskMode) {
-            dtlsConfig.setSupportedCipherSuites(
-                    TLS_PSK_WITH_AES_128_CCM_8,
-                    TLS_PSK_WITH_AES_128_CBC_SHA256);
-        } else {
-            dtlsConfig.setSupportedCipherSuites(
-                    TLS_PSK_WITH_AES_128_CCM_8,
-                    TLS_PSK_WITH_AES_128_CBC_SHA256,
-                    TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8,
-                    TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256);
-        }
+        dtlsConfig.setSupportedCipherSuites(this.pskMode ? DefaultLwM2mTransportService.PSK_CIPHER_SUITES : DefaultLwM2mTransportService.RPK_OR_X509_CIPHER_SUITES);
-        /** Set DTLS Config */
+        /* Set DTLS Config */
         builder.setDtlsConfig(dtlsConfig);
         BootstrapSessionManager sessionManager = new LwM2mDefaultBootstrapSessionManager(lwM2MBootstrapSecurityStore);
         builder.setSessionManager(sessionManager);
-        /** Create BootstrapServer */
+        /* Create BootstrapServer */
         return builder.build();
     }
@@ -153,19 +117,15 @@ public class LwM2MTransportBootstrapService {
                         trustedCertificates[0] = rootCAX509Cert;
                         builder.setTrustedCertificates(trustedCertificates);
                     } else {
-                        /** by default trust all */
+                        /* by default trust all */
                         builder.setTrustedCertificates(new X509Certificate[0]);
                     }
                 }
-            } else if (this.setServerRPK(builder)) {
-                this.infoPramsUri("RPK");
-                this.infoParamsBootstrapServerKey(this.publicKey, this.privateKey);
             } else {
-                /** by default trust all */
+                /* by default trust all */
                 builder.setTrustedCertificates(new X509Certificate[0]);
                 log.info("Unable to load X509 files for BootStrapServer");
                 this.pskMode = true;
-                this.infoPramsUri("PSK");
             }
         } catch (KeyStoreException ex) {
             log.error("[{}] Unable to load X509 files server", ex.getMessage());
@@ -173,19 +133,15 @@ public class LwM2MTransportBootstrapService {
     }
     private boolean setBuilderX509(LeshanBootstrapServerBuilder builder) {
-        /**
-         * For deb => KeyStorePathFile == yml or commandline: KEY_STORE_PATH_FILE
-         * For idea => KeyStorePathResource == common/transport/lwm2m/src/main/resources/credentials: in LwM2MTransportContextServer: credentials/serverKeyStore.jks
-         */
         try {
-            X509Certificate serverCertificate = (X509Certificate) serverConfig.getKeyStoreValue().getCertificate(this.bootstrapConfig.getCertificateAlias());
-            PrivateKey privateKey = (PrivateKey) serverConfig.getKeyStoreValue().getKey(this.bootstrapConfig.getCertificateAlias(), serverConfig.getKeyStorePassword() == null ? null : serverConfig.getKeyStorePassword().toCharArray());
+            X509Certificate[] certificateChain = SslContextUtil.asX509Certificates(serverConfig.getKeyStoreValue().getCertificateChain(this.bootstrapConfig.getCertificateAlias()));
+            X509Certificate serverCertificate = certificateChain[0];
+            PrivateKey privateKey = (PrivateKey) serverConfig.getKeyStoreValue().getKey(this.bootstrapConfig.getCertificateAlias(), serverConfig.getCertificatePassword() == null ? null : serverConfig.getCertificatePassword().toCharArray());
             PublicKey publicKey = serverCertificate.getPublicKey();
             if (privateKey != null && privateKey.getEncoded().length > 0 && publicKey != null && publicKey.getEncoded().length > 0) {
                 builder.setPublicKey(serverCertificate.getPublicKey());
                 builder.setPrivateKey(privateKey);
-                builder.setCertificateChain(new X509Certificate[]{serverCertificate});
-                this.infoParamsServerX509(serverCertificate, publicKey, privateKey);
+                builder.setCertificateChain(certificateChain);
                 return true;
             } else {
                 return false;
@@ -196,105 +152,4 @@ public class LwM2MTransportBootstrapService {
         }
     }
-    private void infoParamsServerX509(X509Certificate certificate, PublicKey publicKey, PrivateKey privateKey) {
-        try {
-            this.infoPramsUri("X509");
-            log.info("\n- X509 Certificate (Hex): [{}]",
-                    Hex.encodeHexString(certificate.getEncoded()));
-            this.infoParamsBootstrapServerKey(publicKey, privateKey);
-        } catch (CertificateEncodingException e) {
-            log.error("", e);
-        }
-    }
-
-    private void infoPramsUri(String mode) {
-        log.info("Bootstrap Server uses [{}]: serverNoSecureURI : [{}:{}], serverSecureURI : [{}:{}]",
-                mode,
-                this.bootstrapConfig.getHost(),
-                this.bootstrapConfig.getPort(),
-                this.bootstrapConfig.getSecureHost(),
-                this.bootstrapConfig.getSecurePort());
-    }
-
-
-    private boolean setServerRPK(LeshanBootstrapServerBuilder builder) {
-        try {
-            this.generateKeyForBootstrapRPK();
-            if (this.publicKey != null && this.publicKey.getEncoded().length > 0 &&
-                    this.privateKey != null && this.privateKey.getEncoded().length > 0) {
-                builder.setPublicKey(this.publicKey);
-//                builder.setCertificateChain(new X509Certificate[] { serverCertificate });
-                /// Trust all certificates.
-                builder.setTrustedCertificates(new X509Certificate[0]);
-                builder.setPrivateKey(this.privateKey);
-                return true;
-            }
-        } catch (NoSuchAlgorithmException | InvalidParameterSpecException | InvalidKeySpecException e) {
-            log.error("Fail create Bootstrap Server with RPK", e);
-        }
-        return false;
-    }
-
-
-    /**
-     * From yml: bootstrap
-     * public_x: "${LWM2M_SERVER_PUBLIC_X_BS:993ef2b698c6a9c0c1d8be78b13a9383c0854c7c7c7a504d289b403794648183}"
-     * public_y: "${LWM2M_SERVER_PUBLIC_Y_BS:267412d5fc4e5ceb2257cb7fd7f76ebdac2fa9aa100afb162e990074cc0bfaa2}"
-     * private_encoded: "${LWM2M_SERVER_PRIVATE_ENCODED_BS:9dbdbb073fc63570693a9aaf1013414e261c571f27e27fc6a8c1c2ad9347875a}"
-     */
-    private void generateKeyForBootstrapRPK() throws NoSuchAlgorithmException, InvalidParameterSpecException, InvalidKeySpecException {
-        /** Get Elliptic Curve Parameter spec for secp256r1 */
-        AlgorithmParameters algoParameters = AlgorithmParameters.getInstance("EC");
-        algoParameters.init(new ECGenParameterSpec("secp256r1"));
-        ECParameterSpec parameterSpec = algoParameters.getParameterSpec(ECParameterSpec.class);
-        LwM2MTransportBootstrapConfig serverConfig = this.bootstrapConfig;
-        if (StringUtils.isNotEmpty(serverConfig.getPublicX()) && StringUtils.isNotEmpty(serverConfig.getPublicY())) {
-            /** Get point values */
-            byte[] publicX = Hex.decodeHex(serverConfig.getPublicX().toCharArray());
-            byte[] publicY = Hex.decodeHex(serverConfig.getPublicY().toCharArray());
-            /** Create key specs */
-            KeySpec publicKeySpec = new ECPublicKeySpec(new ECPoint(new BigInteger(publicX), new BigInteger(publicY)),
-                    parameterSpec);
-            /** Get public key */
-            this.publicKey = KeyFactory.getInstance("EC").generatePublic(publicKeySpec);
-        }
-        String privateEncodedKey = serverConfig.getPrivateEncoded();
-        if (StringUtils.isNotEmpty(privateEncodedKey)) {
-            /** Get private key */
-            byte[] privateS = Hex.decodeHex(privateEncodedKey.toCharArray());
-            try {
-                this.privateKey = KeyFactory.getInstance("EC").generatePrivate(new PKCS8EncodedKeySpec(privateS));
-            } catch (InvalidKeySpecException ignore2) {
-                log.error("Invalid Bootstrap Server rpk.PrivateKey.getEncoded () [{}}]. PrivateKey has no EC algorithm", privateEncodedKey);
-            }
-        }
-    }
-
-    private void infoParamsBootstrapServerKey(PublicKey publicKey, PrivateKey privateKey) {
-        /** Get x coordinate */
-        byte[] x = ((ECPublicKey) publicKey).getW().getAffineX().toByteArray();
-        if (x[0] == 0)
-            x = Arrays.copyOfRange(x, 1, x.length);
-
-        /** Get Y coordinate */
-        byte[] y = ((ECPublicKey) publicKey).getW().getAffineY().toByteArray();
-        if (y[0] == 0)
-            y = Arrays.copyOfRange(y, 1, y.length);
-
-        /** Get Curves params */
-        String params = ((ECPublicKey) publicKey).getParams().toString();
-        String privHex = Hex.encodeHexString(privateKey.getEncoded());
-        log.info("\n- Public Key (Hex): [{}] \n" +
-                        "- Private Key (Hex): [{}], \n" +
-                        "public_x: \"${LWM2M_SERVER_PUBLIC_X_BS:{}}\" \n" +
-                        "public_y: \"${LWM2M_SERVER_PUBLIC_Y_BS:{}}\" \n" +
-                        "private_encoded: \"${LWM2M_SERVER_PRIVATE_ENCODED_BS:{}}\" \n" +
-                        "- Elliptic Curve parameters  : [{}]",
-                Hex.encodeHexString(publicKey.getEncoded()),
-                privHex,
-                Hex.encodeHexString(x),
-                Hex.encodeHexString(y),
-                privHex,
-                params);
-    }
 }
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MSecureServerConfig.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MSecureServerConfig.java
View file @dd9257f
@@ -27,12 +27,8 @@ public interface LwM2MSecureServerConfig {
     Integer getSecurePort();
-    String getPublicX();
-
-    String getPublicY();
-
-    String getPrivateEncoded();
-
     String getCertificateAlias();
+    String getCertificatePassword();
+
 }
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportBootstrapConfig.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportBootstrapConfig.java
View file @dd9257f
@@ -47,19 +47,11 @@ public class LwM2MTransportBootstrapConfig implements LwM2MSecureServerConfig {
     private Integer securePort;
     @Getter
-    @Value("${transport.lwm2m.bootstrap.security.public_x:}")
-    private String publicX;
-
-    @Getter
-    @Value("${transport.lwm2m.bootstrap.security.public_y:}")
-    private String publicY;
-
-    @Getter
-    @Value("${transport.lwm2m.bootstrap.security.private_encoded:}")
-    private String privateEncoded;
+    @Value("${transport.lwm2m.bootstrap.security.key_alias:}")
+    private String certificateAlias;
     @Getter
-    @Value("${transport.lwm2m.bootstrap.security.alias:}")
-    private String certificateAlias;
+    @Value("${transport.lwm2m.bootstrap.security.key_password:}")
+    private String certificatePassword;
 }
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java
View file @dd9257f
@@ -53,11 +53,11 @@ public class LwM2MTransportServerConfig implements LwM2MSecureServerConfig {
     private long sessionReportTimeout;
     @Getter
-    @Value("${transport.lwm2m.recommended_ciphers:}")
+    @Value("${transport.lwm2m.security.recommended_ciphers:}")
     private boolean recommendedCiphers;
     @Getter
-    @Value("${transport.lwm2m.recommended_supported_groups:}")
+    @Value("${transport.lwm2m.security.recommended_supported_groups:}")
     private boolean recommendedSupportedGroups;
     @Getter
@@ -97,10 +97,6 @@ public class LwM2MTransportServerConfig implements LwM2MSecureServerConfig {
     private String rootCertificateAlias;
     @Getter
-    @Value("${transport.lwm2m.security.enable_gen_new_key_psk_rpk:}")
-    private Boolean enableGenNewKeyPskRpk;
-
-    @Getter
     @Value("${transport.lwm2m.server.id:}")
     private Integer id;
@@ -121,20 +117,12 @@ public class LwM2MTransportServerConfig implements LwM2MSecureServerConfig {
     private Integer securePort;
     @Getter
-    @Value("${transport.lwm2m.server.security.public_x:}")
-    private String publicX;
-
-    @Getter
-    @Value("${transport.lwm2m.server.security.public_y:}")
-    private String publicY;
-
-    @Getter
-    @Value("${transport.lwm2m.server.security.private_encoded:}")
-    private String privateEncoded;
+    @Value("${transport.lwm2m.server.security.key_alias:}")
+    private String certificateAlias;
     @Getter
-    @Value("${transport.lwm2m.server.security.alias:}")
-    private String certificateAlias;
+    @Value("${transport.lwm2m.server.security.key_password:}")
+    private String certificatePassword;
     @Getter
     @Value("${transport.lwm2m.log_max_length:}")
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2mVersion.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2mVersion.java
View file @dd9257f
@@ -20,8 +20,8 @@ import org.eclipse.leshan.core.LwM2m.Version;
 import org.eclipse.leshan.core.request.ContentFormat;
 public enum LwM2mVersion {
-    VERSION_1_0(0, Version.V1_0, ContentFormat.TLV),
-    VERSION_1_1(1, Version.V1_1, ContentFormat.TEXT);
+    VERSION_1_0(0, Version.V1_0, ContentFormat.TLV, false),
+    VERSION_1_1(1, Version.V1_1, ContentFormat.TEXT, true);
     @Getter
     private final int code;
@@ -29,11 +29,14 @@ public enum LwM2mVersion {
     private final Version version;
     @Getter
     private final ContentFormat contentFormat;
+    @Getter
+    private final boolean composite;
-    LwM2mVersion(int code, Version version, ContentFormat contentFormat) {
+    LwM2mVersion(int code, Version version, ContentFormat contentFormat, boolean composite) {
         this.code = code;
         this.version = version;
         this.contentFormat = contentFormat;
+        this.composite = composite;
     }
     public static LwM2mVersion fromVersion(Version version) {
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/LWM2MGenerationPSkRPkECC.java deleted 100644 → 0
View file @2853bbf
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/LWM2MGenerationPSkRPkECC.java deleted 100644 → 0
View file @2853bbf
-/**
- * Copyright © 2016-2021 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.transport.lwm2m.secure;
-
-import lombok.extern.slf4j.Slf4j;
-import org.eclipse.leshan.core.util.Hex;
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.interfaces.ECPublicKey;
-import java.security.spec.ECGenParameterSpec;
-import java.util.Arrays;
-
-@Slf4j
-public class LWM2MGenerationPSkRPkECC {
-
-    public LWM2MGenerationPSkRPkECC() {
-        generationPSkKey();
-        generationRPKECCKey();
-    }
-
-    private void generationPSkKey() {
-        /* PSK */
-        int lenPSkKey = 32;
-        /* Start PSK
-          Clients and Servers MUST support PSK keys of up to 64 bytes in length, as required by [RFC7925]
-          SecureRandom object must be unpredictable, and all SecureRandom output sequences must be cryptographically strong, as described in [RFC4086]
-          */
-        SecureRandom randomPSK = new SecureRandom();
-        byte[] bytesPSK = new byte[lenPSkKey];
-        randomPSK.nextBytes(bytesPSK);
-        log.info("\nCreating new PSK: \n for the next start PSK -> security key: [{}]", Hex.encodeHexString(bytesPSK));
-    }
-
-    private void generationRPKECCKey() {
-        /* RPK */
-        String algorithm = "EC";
-        String provider = "SunEC";
-        String nameParameterSpec = "secp256r1";
-
-        /* Start RPK
-          Elliptic Curve parameters  : [secp256r1 [NIST P-256, X9.62 prime256v1] (1.2.840.10045.3.1.7)]
-          */
-        KeyPairGenerator kpg = null;
-        try {
-            kpg = KeyPairGenerator.getInstance(algorithm, provider);
-        } catch (NoSuchAlgorithmException | NoSuchProviderException e) {
-            log.error("", e);
-        }
-        ECGenParameterSpec ecsp = new ECGenParameterSpec(nameParameterSpec);
-        try {
-            kpg.initialize(ecsp);
-        } catch (InvalidAlgorithmParameterException e) {
-            log.error("", e);
-        }
-
-        KeyPair kp = kpg.genKeyPair();
-        PrivateKey privKey = kp.getPrivate();
-        PublicKey pubKey = kp.getPublic();
-
-        if (pubKey instanceof ECPublicKey) {
-            ECPublicKey ecPublicKey = (ECPublicKey) pubKey;
-            /* Get x coordinate */
-            byte[] x = ecPublicKey.getW().getAffineX().toByteArray();
-            if (x[0] == 0)
-                x = Arrays.copyOfRange(x, 1, x.length);
-
-            /* Get Y coordinate */
-            byte[] y = ecPublicKey.getW().getAffineY().toByteArray();
-            if (y[0] == 0)
-                y = Arrays.copyOfRange(y, 1, y.length);
-
-            /* Get Curves params */
-            String privHex = Hex.encodeHexString(privKey.getEncoded());
-            log.info("\nCreating new RPK for the next start... \n" +
-                            " Public Key (Hex): [{}]\n" +
-                            " Private Key (Hex): [{}]" +
-                            " public_x :  [{}] \n" +
-                            " public_y :  [{}] \n" +
-                            " private_encode : [{}] \n" +
-                            " Elliptic Curve parameters  : [{}] \n",
-                    Hex.encodeHexString(pubKey.getEncoded()),
-                    privHex,
-                    Hex.encodeHexString(x),
-                    Hex.encodeHexString(y),
-                    privHex,
-                    ecPublicKey.getParams().toString());
-        }
-    }
-}
-
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportService.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2mTransportService.java
View file @dd9257f
@@ -17,21 +17,19 @@ package org.thingsboard.server.transport.lwm2m.server;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.californium.elements.util.SslContextUtil;
 import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
 import org.eclipse.californium.scandium.dtls.cipher.CipherSuite;
 import org.eclipse.leshan.core.node.codec.DefaultLwM2mNodeDecoder;
 import org.eclipse.leshan.core.node.codec.DefaultLwM2mNodeEncoder;
-import org.eclipse.leshan.core.util.Hex;
 import org.eclipse.leshan.server.californium.LeshanServer;
 import org.eclipse.leshan.server.californium.LeshanServerBuilder;
 import org.eclipse.leshan.server.californium.registration.CaliforniumRegistrationStore;
 import org.eclipse.leshan.server.model.LwM2mModelProvider;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.cache.ota.OtaPackageDataCache;
-import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
-import org.thingsboard.server.transport.lwm2m.secure.LWM2MGenerationPSkRPkECC;
 import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MAuthorizer;
 import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MDtlsCertificateVerifier;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClientContext;
@@ -41,24 +39,9 @@ import org.thingsboard.server.transport.lwm2m.utils.LwM2mValueConverterImpl;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import java.math.BigInteger;
-import java.security.AlgorithmParameters;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
-import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
-import java.security.interfaces.ECPublicKey;
-import java.security.spec.ECGenParameterSpec;
-import java.security.spec.ECParameterSpec;
-import java.security.spec.ECPoint;
-import java.security.spec.ECPublicKeySpec;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.InvalidParameterSpecException;
-import java.security.spec.KeySpec;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
 import static org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256;
 import static org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8;
@@ -75,8 +58,6 @@ public class DefaultLwM2mTransportService implements LwM2MTransportService {
     public static final CipherSuite[] RPK_OR_X509_CIPHER_SUITES = {TLS_PSK_WITH_AES_128_CCM_8, TLS_PSK_WITH_AES_128_CBC_SHA256, TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256};
     public static final CipherSuite[] PSK_CIPHER_SUITES = {TLS_PSK_WITH_AES_128_CCM_8, TLS_PSK_WITH_AES_128_CBC_SHA256};
-    private PublicKey publicKey;
-    private PrivateKey privateKey;
     private final LwM2mTransportContext context;
     private final LwM2MTransportServerConfig config;
@@ -93,18 +74,14 @@ public class DefaultLwM2mTransportService implements LwM2MTransportService {
     @PostConstruct
     public void init() {
-        if (config.getEnableGenNewKeyPskRpk()) {
-            new LWM2MGenerationPSkRPkECC();
-        }
         this.server = getLhServer();
-        /**
+        /*
          * Add a resource to the server.
          * CoapResource ->
          * path = FW_PACKAGE or SW_PACKAGE
          * nameFile = "BC68JAR01A09_TO_BC68JAR01A10.bin"
          * "coap://host:port/{path}/{token}/{nameFile}"
          */
-
         LwM2mTransportCoapResource otaCoapResource = new LwM2mTransportCoapResource(otaPackageDataCache, FIRMWARE_UPDATE_COAP_RESOURCE);
         this.server.coap().getServer().add(otaCoapResource);
         this.startLhServer();
@@ -170,29 +147,24 @@ public class DefaultLwM2mTransportService implements LwM2MTransportService {
             dtlsConfig.setAdvancedCertificateVerifier(certificateVerifier);
             builder.setAuthorizer(authorizer);
             dtlsConfig.setSupportedCipherSuites(RPK_OR_X509_CIPHER_SUITES);
-        } else if (this.setServerRPK(builder)) {
-            this.infoPramsUri("RPK");
-            this.infoParamsServerKey(this.publicKey, this.privateKey);
-            dtlsConfig.setSupportedCipherSuites(RPK_OR_X509_CIPHER_SUITES);
         } else {
             /* by default trust all */
             builder.setTrustedCertificates(new X509Certificate[0]);
             log.info("Unable to load X509 files for LWM2MServer");
             dtlsConfig.setSupportedCipherSuites(PSK_CIPHER_SUITES);
-            this.infoPramsUri("PSK");
         }
     }
     private boolean setBuilderX509(LeshanServerBuilder builder) {
         try {
-            X509Certificate serverCertificate = (X509Certificate) config.getKeyStoreValue().getCertificate(config.getCertificateAlias());
-            PrivateKey privateKey = (PrivateKey) config.getKeyStoreValue().getKey(config.getCertificateAlias(), config.getKeyStorePassword() == null ? null : config.getKeyStorePassword().toCharArray());
+            X509Certificate[] certificateChain = SslContextUtil.asX509Certificates(config.getKeyStoreValue().getCertificateChain(config.getCertificateAlias()));
+            X509Certificate serverCertificate = certificateChain[0];
+            PrivateKey privateKey = (PrivateKey) config.getKeyStoreValue().getKey(config.getCertificateAlias(), config.getCertificatePassword() == null ? null : config.getCertificatePassword().toCharArray());
             PublicKey publicKey = serverCertificate.getPublicKey();
             if (privateKey != null && privateKey.getEncoded().length > 0 && publicKey != null && publicKey.getEncoded().length > 0) {
                 builder.setPublicKey(serverCertificate.getPublicKey());
                 builder.setPrivateKey(privateKey);
-                builder.setCertificateChain(new X509Certificate[]{serverCertificate});
-                this.infoParamsServerX509(serverCertificate, publicKey, privateKey);
+                builder.setCertificateChain(certificateChain);
                 return true;
             } else {
                 return false;
@@ -203,93 +175,6 @@ public class DefaultLwM2mTransportService implements LwM2MTransportService {
         }
     }
-    private void infoParamsServerX509(X509Certificate certificate, PublicKey publicKey, PrivateKey privateKey) {
-        try {
-            infoPramsUri("X509");
-            log.info("\n- X509 Certificate (Hex): [{}]",
-                    Hex.encodeHexString(certificate.getEncoded()));
-            this.infoParamsServerKey(publicKey, privateKey);
-        } catch (CertificateEncodingException e) {
-            log.error("", e);
-        }
-    }
-
-    private void infoPramsUri(String mode) {
-        LwM2MTransportServerConfig lwM2MTransportServerConfig = config;
-        log.info("Server uses [{}]: serverNoSecureURI : [{}:{}], serverSecureURI : [{}:{}]", mode,
-                lwM2MTransportServerConfig.getHost(),
-                lwM2MTransportServerConfig.getPort(),
-                lwM2MTransportServerConfig.getSecureHost(),
-                lwM2MTransportServerConfig.getSecurePort());
-    }
-
-    private boolean setServerRPK(LeshanServerBuilder builder) {
-        try {
-            this.loadOrGenerateRPKKeys();
-            if (this.publicKey != null && this.publicKey.getEncoded().length > 0 &&
-                    this.privateKey != null && this.privateKey.getEncoded().length > 0) {
-                builder.setPublicKey(this.publicKey);
-                builder.setPrivateKey(this.privateKey);
-                return true;
-            }
-        } catch (NoSuchAlgorithmException | InvalidParameterSpecException | InvalidKeySpecException e) {
-            log.error("Fail create Server with RPK", e);
-        }
-        return false;
-    }
-
-    private void loadOrGenerateRPKKeys() throws NoSuchAlgorithmException, InvalidParameterSpecException, InvalidKeySpecException {
-        /* Get Elliptic Curve Parameter spec for secp256r1 */
-        AlgorithmParameters algoParameters = AlgorithmParameters.getInstance("EC");
-        algoParameters.init(new ECGenParameterSpec("secp256r1"));
-        ECParameterSpec parameterSpec = algoParameters.getParameterSpec(ECParameterSpec.class);
-        LwM2MTransportServerConfig serverConfig = config;
-        if (StringUtils.isNotEmpty(serverConfig.getPublicX()) && StringUtils.isNotEmpty(serverConfig.getPublicY())) {
-            byte[] publicX = Hex.decodeHex(serverConfig.getPublicX().toCharArray());
-            byte[] publicY = Hex.decodeHex(serverConfig.getPublicY().toCharArray());
-            KeySpec publicKeySpec = new ECPublicKeySpec(new ECPoint(new BigInteger(publicX), new BigInteger(publicY)),
-                    parameterSpec);
-            this.publicKey = KeyFactory.getInstance("EC").generatePublic(publicKeySpec);
-        }
-        String privateEncodedKey = serverConfig.getPrivateEncoded();
-        if (StringUtils.isNotEmpty(privateEncodedKey)) {
-            byte[] privateS = Hex.decodeHex(privateEncodedKey.toCharArray());
-            try {
-                this.privateKey = KeyFactory.getInstance("EC").generatePrivate(new PKCS8EncodedKeySpec(privateS));
-            } catch (InvalidKeySpecException ignore2) {
-                log.error("Invalid Server rpk.PrivateKey.getEncoded () [{}}]. PrivateKey has no EC algorithm", privateEncodedKey);
-            }
-        }
-    }
-
-    private void infoParamsServerKey(PublicKey publicKey, PrivateKey privateKey) {
-        /* Get x coordinate */
-        byte[] x = ((ECPublicKey) publicKey).getW().getAffineX().toByteArray();
-        if (x[0] == 0)
-            x = Arrays.copyOfRange(x, 1, x.length);
-
-        /* Get Y coordinate */
-        byte[] y = ((ECPublicKey) publicKey).getW().getAffineY().toByteArray();
-        if (y[0] == 0)
-            y = Arrays.copyOfRange(y, 1, y.length);
-
-        /* Get Curves params */
-        String params = ((ECPublicKey) publicKey).getParams().toString();
-        String privHex = Hex.encodeHexString(privateKey.getEncoded());
-        log.info(" \n- Public Key (Hex): [{}] \n" +
-                        "- Private Key (Hex): [{}], \n" +
-                        "public_x: \"${LWM2M_SERVER_PUBLIC_X:{}}\" \n" +
-                        "public_y: \"${LWM2M_SERVER_PUBLIC_Y:{}}\" \n" +
-                        "private_encoded: \"${LWM2M_SERVER_PRIVATE_ENCODED:{}}\" \n" +
-                        "- Elliptic Curve parameters  : [{}]",
-                Hex.encodeHexString(publicKey.getEncoded()),
-                privHex,
-                Hex.encodeHexString(x),
-                Hex.encodeHexString(y),
-                privHex,
-                params);
-    }
-
     @Override
     public String getName() {
         return "LWM2M";
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportUtil.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportUtil.java
View file @dd9257f
@@ -22,8 +22,10 @@ import org.eclipse.leshan.core.attributes.Attribute;
 import org.eclipse.leshan.core.attributes.AttributeSet;
 import org.eclipse.leshan.core.model.ObjectModel;
 import org.eclipse.leshan.core.model.ResourceModel;
+import org.eclipse.leshan.core.node.LwM2mMultipleResource;
 import org.eclipse.leshan.core.node.LwM2mPath;
 import org.eclipse.leshan.core.node.LwM2mResource;
+import org.eclipse.leshan.core.node.LwM2mSingleResource;
 import org.eclipse.leshan.core.node.codec.CodecException;
 import org.eclipse.leshan.core.request.SimpleDownlinkRequest;
 import org.eclipse.leshan.core.request.WriteAttributesRequest;
@@ -48,6 +50,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import static org.eclipse.leshan.core.attributes.Attribute.DIMENSION;
@@ -371,4 +374,80 @@ public class LwM2mTransportUtil {
         return lwm2mResourceValue;
     }
+    public static Optional<String> contentToString(Object content) {
+        try {
+            String value = null;
+            LwM2mResource resource = null;
+            String key = null;
+            if (content instanceof Map) {
+                Map<Object, Object> contentAsMap = (Map<Object, Object>) content;
+                if (contentAsMap.size() == 1) {
+                    for (Map.Entry<Object, Object> kv : contentAsMap.entrySet()) {
+                        if (kv.getValue() instanceof LwM2mResource) {
+                            key = kv.getKey().toString();
+                            resource = (LwM2mResource) kv.getValue();
+                        }
+                    }
+                }
+            } else if (content instanceof LwM2mResource) {
+                resource = (LwM2mResource) content;
+            }
+            if (resource != null && resource.getType() == OPAQUE) {
+                value = opaqueResourceToString(resource, key);
+            }
+            value = value == null ? content.toString() : value;
+            return Optional.of(value);
+        } catch (Exception e) {
+            log.debug("Failed to convert content " + content + " to string", e);
+            return Optional.ofNullable(content != null ? content.toString() : null);
+        }
+    }
+
+    private static String opaqueResourceToString(LwM2mResource resource, String key) {
+        String value = null;
+        StringBuilder builder = new StringBuilder();
+        if (resource instanceof LwM2mSingleResource) {
+            builder.append("LwM2mSingleResource");
+            if (key == null) {
+                builder.append(" id=").append(String.valueOf(resource.getId()));
+            } else {
+                builder.append(" key=").append(key);
+            }
+            builder.append(" value=").append(opaqueToString((byte[]) resource.getValue()));
+            builder.append(" type=").append(OPAQUE.toString());
+            value = builder.toString();
+        } else if (resource instanceof LwM2mMultipleResource) {
+            builder.append("LwM2mMultipleResource");
+            if (key == null) {
+                builder.append(" id=").append(String.valueOf(resource.getId()));
+            } else {
+                builder.append(" key=").append(key);
+            }
+            builder.append(" values={");
+            if (resource.getInstances().size() > 0) {
+                builder.append(multiInstanceOpaqueToString((LwM2mMultipleResource) resource));
+            }
+            builder.append("}");
+            builder.append(" type=").append(OPAQUE.toString());
+            value = builder.toString();
+        }
+        return value;
+    }
+
+    private static String multiInstanceOpaqueToString(LwM2mMultipleResource resource) {
+        StringBuilder builder = new StringBuilder();
+        resource.getInstances().values()
+                .forEach(v -> builder.append(" id=").append(v.getId()).append(" value=").append(Hex.encodeHexString((byte[]) v.getValue())).append(", "));
+        int startInd = builder.lastIndexOf(", ");
+        if (startInd > 0) {
+            builder.delete(startInd, startInd + 2);
+        }
+        return builder.toString();
+    }
+
+    private static String opaqueToString(byte[] value) {
+        String opaque = Hex.encodeHexString(value);
+        return opaque.length() > 1024 ? opaque.substring(0, 1024) : opaque;
+    }
+
 }
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
View file @dd9257f
@@ -21,13 +21,13 @@ import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.leshan.core.model.ObjectModel;
 import org.eclipse.leshan.core.model.ResourceModel;
-import org.eclipse.leshan.core.node.LwM2mObject;
-import org.eclipse.leshan.core.node.LwM2mObjectInstance;
+import org.eclipse.leshan.core.node.LwM2mMultipleResource;
 import org.eclipse.leshan.core.node.LwM2mPath;
 import org.eclipse.leshan.core.node.LwM2mResource;
 import org.eclipse.leshan.core.node.LwM2mSingleResource;
 import org.eclipse.leshan.core.node.codec.LwM2mValueConverter;
 import org.eclipse.leshan.core.request.ContentFormat;
+import org.eclipse.leshan.core.util.Hex;
 import org.eclipse.leshan.server.model.LwM2mModelProvider;
 import org.eclipse.leshan.server.registration.Registration;
 import org.thingsboard.server.common.data.Device;
@@ -44,6 +44,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -53,6 +54,7 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
+import static org.eclipse.leshan.core.model.ResourceModel.Type.OPAQUE;
 import static org.thingsboard.server.common.data.lwm2m.LwM2mConstants.LWM2M_SEPARATOR_PATH;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.LWM2M_OBJECT_VERSION_DEFAULT;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.convertObjectIdToVersionedId;
@@ -156,7 +158,6 @@ public class LwM2mClient implements Serializable {
         this.session = builder.build();
     }
-
     private SessionInfoProto createSession(String nodeId, UUID sessionId, ValidateDeviceCredentialsResponse msg) {
         return SessionInfoProto.newBuilder()
                 .setNodeId(nodeId)
@@ -241,37 +242,7 @@ public class LwM2mClient implements Serializable {
                 .getObjectModel(pathIds.getObjectId()) : null;
     }
-    public String objectToString(LwM2mObject lwM2mObject) {
-        StringBuilder builder = new StringBuilder();
-        builder.append("LwM2mObject [id=").append(lwM2mObject.getId()).append(", instances={");
-        lwM2mObject.getInstances().forEach((instId, inst) -> {
-            builder.append(instId).append("=").append(this.instanceToString(inst)).append(", ");
-        });
-        int startInd = builder.lastIndexOf(", ");
-        if (startInd > 0) {
-            builder.delete(startInd, startInd + 2);
-        }
-        builder.append("}]");
-        return builder.toString();
-    }
-    public String instanceToString(LwM2mObjectInstance objectInstance) {
-        StringBuilder builder = new StringBuilder();
-        builder.append("LwM2mObjectInstance [id=").append(objectInstance.getId()).append(", resources={");
-        objectInstance.getResources().forEach((resId, res) -> {
-            builder.append(resId).append("=").append(this.resourceToString(res)).append(", ");
-        });
-        int startInd = builder.lastIndexOf(", ");
-        if (startInd > 0) {
-            builder.delete(startInd, startInd + 2);
-        }
-        builder.append("}]");
-        return builder.toString();
-    }
-
-    public String resourceToString(LwM2mResource lwM2mResource) {
-        return lwM2mResource.isMultiInstances() ? lwM2mResource.getInstances().toString() : lwM2mResource.getValue().toString();
-    }
     public Collection<LwM2mResource> getNewResourceForInstance(String pathRezIdVer, Object params, LwM2mModelProvider modelProvider,
                                                                LwM2mValueConverter converter) {
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContext.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContext.java
View file @dd9257f
@@ -60,4 +60,6 @@ public interface LwM2mClientContext {
     void removeCredentials(TransportProtos.SessionInfoProto sessionInfo);
     void sendMsgsAfterSleeping(LwM2mClient lwM2MClient);
+
+    boolean isComposite(LwM2mClient client);
 }
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java
View file @dd9257f
@@ -35,6 +35,7 @@ import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.util.AfterStartUp;
 import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
+import org.thingsboard.server.transport.lwm2m.config.LwM2mVersion;
 import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MSecurityInfo;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportContext;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil;
@@ -339,6 +340,12 @@ public class LwM2mClientContextImpl implements LwM2mClientContext {
         return lwM2mClientsByRegistrationId.values().stream().filter(e -> deviceId.equals(e.getDeviceId())).findFirst().orElse(null);
     }
+    @Override
+    public boolean isComposite(LwM2mClient client) {
+        return LwM2mVersion.fromVersionStr(client.getRegistration().getLwM2mVersion()).isComposite() &
+                getProfile(client.getProfileId()).getClientLwM2mSettings().isCompositeOperationsSupport();
+    }
+
     private boolean validateResourceInModel(LwM2mClient lwM2mClient, String pathIdVer, boolean isWritableNotOptional) {
         ResourceModel resourceModel = lwM2mClient.getResourceModel(pathIdVer, this.config
                 .getModelProvider());
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/ResourceValue.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/ResourceValue.java
View file @dd9257f
@@ -21,6 +21,7 @@ import org.eclipse.leshan.core.node.LwM2mResource;
 import org.eclipse.leshan.core.node.LwM2mResourceInstance;
 import java.io.Serializable;
+import java.util.stream.Collectors;
 @Data
 public class ResourceValue implements Serializable {
@@ -45,9 +46,14 @@ public class ResourceValue implements Serializable {
     private static TbLwM2MResource toTbLwM2MResource(LwM2mResource lwM2mResource) {
         if (lwM2mResource.isMultiInstances()) {
-            TbLwM2MResourceInstance[] instances = (TbLwM2MResourceInstance[]) lwM2mResource.getInstances().values().stream().map(ResourceValue::toTbLwM2MResourceInstance).toArray();
-            return new TbLwM2MMultipleResource(lwM2mResource.getId(), lwM2mResource.getType(), instances);
-        } else {
+            if ( lwM2mResource.getInstances().values().size() > 0) {
+                TbLwM2MResourceInstance [] instances =  lwM2mResource.getInstances().values().stream().map(ResourceValue::toTbLwM2MResourceInstance).collect(Collectors.toSet()).toArray(new TbLwM2MResourceInstance[0]);
+                return new TbLwM2MMultipleResource(lwM2mResource.getId(), lwM2mResource.getType(), instances);
+            }
+            else {
+                return new TbLwM2MMultipleResource(lwM2mResource.getId(), lwM2mResource.getType(), new TbLwM2MResourceInstance[0]);
+            }
+        } else  {
             return new TbLwM2MSingleResource(lwM2mResource.getId(), lwM2mResource.getValue(), lwM2mResource.getType());
         }
     }
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
View file @dd9257f
@@ -61,9 +61,8 @@ import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportContext;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
 import org.thingsboard.server.transport.lwm2m.server.common.LwM2MExecutorAwareService;
 import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MReadCompositeRequest;
-import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MWriteResponseCompositeCallback;
 import org.thingsboard.server.transport.lwm2m.server.log.LwM2MTelemetryLogService;
-import org.thingsboard.server.transport.lwm2m.server.uplink.DefaultLwM2MUplinkMsgHandler;
+import org.thingsboard.server.transport.lwm2m.server.rpc.composite.RpcWriteCompositeRequest;
 import org.thingsboard.server.transport.lwm2m.utils.LwM2mValueConverterImpl;
 import javax.annotation.PostConstruct;
@@ -73,7 +72,6 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -137,19 +135,6 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
     }
     @Override
-    public void sendWriteCompositeRequest(LwM2mClient client, Map<String, Object> nodes, DefaultLwM2MUplinkMsgHandler handler) {
-//        ResourceModel resourceModelWrite = client.getResourceModel(request.getVersionedId(), this.config.getModelProvider());
-        TbLwM2MWriteResponseCompositeCallback callback = new TbLwM2MWriteResponseCompositeCallback(handler, logService, client, null);
-        ContentFormat contentFormat = ContentFormat.SENML_JSON;
-        try {
-            WriteCompositeRequest downlink = new WriteCompositeRequest(contentFormat, nodes);
-            sendWriteCompositeRequest(client, downlink, this.config.getTimeout(), callback);
-        } catch (Exception e) {
-            callback.onError(JacksonUtil.toString(nodes), e);
-        }
-    }
-
-    @Override
     public void sendObserveRequest(LwM2mClient client, TbLwM2MObserveRequest request, DownlinkRequestCallback<ObserveRequest, ObserveResponse> callback) {
         validateVersionedId(client, request);
         LwM2mPath resultIds = new LwM2mPath(request.getObjectId());
@@ -259,6 +244,17 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
     }
     @Override
+    public void sendWriteCompositeRequest(LwM2mClient client, RpcWriteCompositeRequest rpcWriteCompositeRequest, DownlinkRequestCallback<WriteCompositeRequest, WriteCompositeResponse> callback) {
+        ContentFormat contentFormat = ContentFormat.SENML_JSON;
+        try {
+            WriteCompositeRequest downlink = new WriteCompositeRequest(contentFormat, rpcWriteCompositeRequest.getNodes());
+            sendWriteCompositeRequest(client, downlink, this.config.getTimeout(), callback);
+        } catch (Exception e) {
+            callback.onError(JacksonUtil.toString(rpcWriteCompositeRequest), e);
+        }
+    }
+
+    @Override
     public void sendWriteUpdateRequest(LwM2mClient client, TbLwM2MWriteUpdateRequest request, DownlinkRequestCallback<WriteRequest, WriteResponse> callback) {
         LwM2mPath resultIds = new LwM2mPath(request.getObjectId());
         if (resultIds.isResource()) {
@@ -330,7 +326,11 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
             context.getServer().send(registration, request, timeoutInMs, response -> {
                 executor.submit(() -> {
                     try {
-                        callback.onSuccess(request, response);
+                        if (response.isSuccess()) {
+                            callback.onSuccess(request, response);
+                        } else {
+                            callback.onValidationError(request.getNodes().values().toString(), response.getErrorMessage());
+                        }
                     } catch (Exception e) {
                         log.error("[{}] failed to process successful response [{}] ", registration.getEndpoint(), response, e);
                     }
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/LwM2mDownlinkMsgHandler.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/LwM2mDownlinkMsgHandler.java
View file @dd9257f
@@ -23,6 +23,7 @@ import org.eclipse.leshan.core.request.ObserveRequest;
 import org.eclipse.leshan.core.request.ReadCompositeRequest;
 import org.eclipse.leshan.core.request.ReadRequest;
 import org.eclipse.leshan.core.request.WriteAttributesRequest;
+import org.eclipse.leshan.core.request.WriteCompositeRequest;
 import org.eclipse.leshan.core.request.WriteRequest;
 import org.eclipse.leshan.core.response.DeleteResponse;
 import org.eclipse.leshan.core.response.DiscoverResponse;
@@ -31,13 +32,13 @@ import org.eclipse.leshan.core.response.ObserveResponse;
 import org.eclipse.leshan.core.response.ReadCompositeResponse;
 import org.eclipse.leshan.core.response.ReadResponse;
 import org.eclipse.leshan.core.response.WriteAttributesResponse;
+import org.eclipse.leshan.core.response.WriteCompositeResponse;
 import org.eclipse.leshan.core.response.WriteResponse;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
 import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MReadCompositeRequest;
-import org.thingsboard.server.transport.lwm2m.server.uplink.DefaultLwM2MUplinkMsgHandler;
+import org.thingsboard.server.transport.lwm2m.server.rpc.composite.RpcWriteCompositeRequest;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 public interface LwM2mDownlinkMsgHandler {
@@ -66,7 +67,7 @@ public interface LwM2mDownlinkMsgHandler {
     void sendWriteReplaceRequest(LwM2mClient client, TbLwM2MWriteReplaceRequest request, DownlinkRequestCallback<WriteRequest, WriteResponse> callback);
-    void sendWriteCompositeRequest(LwM2mClient client, Map<String, Object> nodes, DefaultLwM2MUplinkMsgHandler handler);
+    void sendWriteCompositeRequest(LwM2mClient client, RpcWriteCompositeRequest nodes, DownlinkRequestCallback<WriteCompositeRequest, WriteCompositeResponse> callback);
     void sendWriteUpdateRequest(LwM2mClient client, TbLwM2MWriteUpdateRequest request, DownlinkRequestCallback<WriteRequest, WriteResponse> callback);
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java
View file @dd9257f
@@ -337,7 +337,7 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
         SoftwareUpdateResult result = SoftwareUpdateResult.fromUpdateResultSwByCode(code.intValue());
         Optional<OtaPackageUpdateStatus> status = toOtaPackageUpdateStatus(result);
         status.ifPresent(otaStatus -> sendStateUpdateToTelemetry(client, swInfo,
-                otaStatus, "Firmware Update Result: " + result.name()));
+                otaStatus, "Software Update Result: " + result.name()));
         if (result.isAgain() && swInfo.getRetryAttempts() <= 2) {
             swInfo.setRetryAttempts(swInfo.getRetryAttempts() + 1);
             startSoftwareUpdateIfNeeded(client, swInfo);
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/DefaultLwM2MRpcRequestHandler.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/DefaultLwM2MRpcRequestHandler.java
View file @dd9257f
@@ -52,6 +52,7 @@ import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MWriteRespon
 import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MWriteUpdateRequest;
 import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MReadCompositeCallback;
 import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MReadCompositeRequest;
+import org.thingsboard.server.transport.lwm2m.server.downlink.composite.TbLwM2MWriteResponseCompositeCallback;
 import org.thingsboard.server.transport.lwm2m.server.log.LwM2MTelemetryLogService;
 import org.thingsboard.server.transport.lwm2m.server.rpc.composite.RpcReadCompositeRequest;
 import org.thingsboard.server.transport.lwm2m.server.rpc.composite.RpcReadResponseCompositeCallback;
@@ -131,15 +132,20 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
                             throw new IllegalArgumentException("Unsupported operation: " + operationType.name());
                     }
                 } else if (operationType.isComposite()) {
-                    switch (operationType) {
-                        case READ_COMPOSITE:
-                            sendReadCompositeRequest(client, rpcRequst);
-                            break;
-                        case WRITE_COMPOSITE:
-                            sendWriteCompositeRequest(client, rpcRequst);
-                            break;
-                        default:
-                            throw new IllegalArgumentException("Unsupported operation: " + operationType.name());
+                    if (clientContext.isComposite(client)) {
+                        switch (operationType) {
+                            case READ_COMPOSITE:
+                                sendReadCompositeRequest(client, rpcRequst);
+                                break;
+                            case WRITE_COMPOSITE:
+                                sendWriteCompositeRequest(client, rpcRequst);
+                                break;
+                            default:
+                                throw new IllegalArgumentException("Unsupported operation: " + operationType.name());
+                        }
+                    } else {
+                        this.sendErrorRpcResponse(sessionInfo, rpcRequst.getRequestId(),
+                                ResponseCode.INTERNAL_SERVER_ERROR.getName(), "This device does not support Composite Operation");
                     }
                 } else {
                     switch (operationType) {
@@ -239,14 +245,19 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
         downlinkHandler.sendWriteReplaceRequest(client, request, rpcCallback);
     }
+    /**
+     * WriteComposite {"nodes":{"/3/0/14":"+04", "/1/0/2":100, "/5/0/1":"coap://localhost:5685"}}
+     * {"result":"CHANGED"}
+     * Map<String, Object> nodes = new HashMap<>();
+     * nodes.put("/3/0/14", "+02");
+     * nodes.put("/1/0/2", 100);
+     * nodes.put("/5/0/1", "coap://localhost:5685");
+     */
     private void sendWriteCompositeRequest(LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg) {
-        RpcWriteCompositeRequest nodes = JacksonUtil.fromString(requestMsg.getParams(), RpcWriteCompositeRequest.class);
-//        TbLwM2MWriteReplaceRequest request = TbLwM2MWriteReplaceRequest.builder().versionedId(versionedId)
-//                .value(requestBody.getValue())
-//                .timeout(this.config.getTimeout()).build();
-//        var mainCallback = new TbLwM2MWriteResponseCallback(uplinkHandler, logService, client, versionedId);
-//        var rpcCallback = new RpcEmptyResponseCallback<>(transportService, client, requestMsg, mainCallback);
-//        downlinkHandler.sendWriteReplaceRequest(client, request, rpcCallback);
+        RpcWriteCompositeRequest rpcWriteCompositeRequest = JacksonUtil.fromString(requestMsg.getParams(), RpcWriteCompositeRequest.class);
+        var mainCallback = new TbLwM2MWriteResponseCompositeCallback(uplinkHandler, logService, client, null);
+        var rpcCallback = new RpcEmptyResponseCallback<>(transportService, client, requestMsg, mainCallback);
+        downlinkHandler.sendWriteCompositeRequest(client, rpcWriteCompositeRequest, rpcCallback);
     }
     private void sendCancelObserveRequest(LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg, String versionedId) {
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/RpcReadResponseCallback.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/RpcReadResponseCallback.java
View file @dd9257f
@@ -15,9 +15,6 @@
  */
 package org.thingsboard.server.transport.lwm2m.server.rpc;
-import org.eclipse.leshan.core.node.LwM2mObject;
-import org.eclipse.leshan.core.node.LwM2mObjectInstance;
-import org.eclipse.leshan.core.node.LwM2mResource;
 import org.eclipse.leshan.core.request.LwM2mRequest;
 import org.eclipse.leshan.core.response.ReadResponse;
 import org.thingsboard.server.common.transport.TransportService;
@@ -27,6 +24,8 @@ import org.thingsboard.server.transport.lwm2m.server.downlink.DownlinkRequestCal
 import java.util.Optional;
+import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.contentToString;
+
 public class RpcReadResponseCallback<R extends LwM2mRequest<T>, T extends ReadResponse> extends RpcLwM2MDownlinkCallback<R, T> {
     public RpcReadResponseCallback(TransportService transportService, LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg, DownlinkRequestCallback<R, T> callback) {
@@ -35,14 +34,6 @@ public class RpcReadResponseCallback<R extends LwM2mRequest<T>, T extends ReadRe
     @Override
     protected Optional<String> serializeSuccessfulResponse(T response) {
-        Object value = null;
-        if (response.getContent() instanceof LwM2mObject) {
-            value = client.objectToString((LwM2mObject) response.getContent());
-        } else if (response.getContent() instanceof LwM2mObjectInstance) {
-            value = client.instanceToString((LwM2mObjectInstance) response.getContent());
-        } else if (response.getContent() instanceof LwM2mResource) {
-            value = client.resourceToString((LwM2mResource) response.getContent());
-        }
-        return Optional.of(String.format("%s", value));
+        return contentToString(response.getContent());
     }
 }
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/composite/RpcReadResponseCompositeCallback.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/composite/RpcReadResponseCompositeCallback.java
View file @dd9257f
@@ -16,7 +16,6 @@
 package org.thingsboard.server.transport.lwm2m.server.rpc.composite;
 import org.eclipse.leshan.core.request.LwM2mRequest;
-import org.eclipse.leshan.core.request.ReadCompositeRequest;
 import org.eclipse.leshan.core.response.ReadCompositeResponse;
 import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.gen.transport.TransportProtos;
@@ -26,6 +25,8 @@ import org.thingsboard.server.transport.lwm2m.server.rpc.RpcLwM2MDownlinkCallbac
 import java.util.Optional;
+import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.contentToString;
+
 public class RpcReadResponseCompositeCallback<R extends LwM2mRequest<T>, T extends ReadCompositeResponse> extends RpcLwM2MDownlinkCallback<R, T> {
     public RpcReadResponseCompositeCallback(TransportService transportService, LwM2mClient client, TransportProtos.ToDeviceRpcRequestMsg requestMsg, DownlinkRequestCallback<R, T> callback) {
@@ -34,6 +35,6 @@ public class RpcReadResponseCompositeCallback<R extends LwM2mRequest<T>, T exten
     @Override
     protected Optional<String> serializeSuccessfulResponse(T response) {
-        return Optional.of(String.format("%s", response.getContent().toString()));
+        return contentToString(response.getContent());
     }
 }
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2MClientOtaInfoStore.java
View file @dd9257f
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2MClientOtaInfoStore.java
View file @dd9257f
@@ -15,8 +15,6 @@
  */
 package org.thingsboard.server.transport.lwm2m.server.store;
-import org.thingsboard.server.common.data.ota.OtaPackageType;
-import org.thingsboard.server.transport.lwm2m.server.ota.LwM2MClientOtaInfo;
 import org.thingsboard.server.transport.lwm2m.server.ota.firmware.LwM2MClientFwOtaInfo;
 import org.thingsboard.server.transport.lwm2m.server.ota.software.LwM2MClientSwOtaInfo;
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttSslHandlerProvider.java
View file @dd9257f
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttSslHandlerProvider.java
View file @dd9257f
@@ -15,12 +15,10 @@
  */
 package org.thingsboard.server.transport.mqtt;
-import com.google.common.io.Resources;
 import io.netty.handler.ssl.SslHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
@@ -30,8 +28,8 @@ import org.thingsboard.server.common.msg.EncryptionUtil;
 import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.TransportServiceCallback;
 import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsResponse;
-import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.common.transport.util.SslUtil;
+import org.thingsboard.server.gen.transport.TransportProtos;
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
@@ -40,10 +38,7 @@ import javax.net.ssl.SSLEngine;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.InputStream;
-import java.net.URL;
 import java.security.KeyStore;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
@@ -73,7 +68,23 @@ public class MqttSslHandlerProvider {
     @Autowired
     private TransportService transportService;
+    private SSLContext sslContext;
+
     public SslHandler getSslHandler() {
+        if (sslContext == null) {
+            sslContext = createSslContext();
+        }
+        SSLEngine sslEngine = sslContext.createSSLEngine();
+        sslEngine.setUseClientMode(false);
+        sslEngine.setNeedClientAuth(false);
+        sslEngine.setWantClientAuth(true);
+        sslEngine.setEnabledProtocols(sslEngine.getSupportedProtocols());
+        sslEngine.setEnabledCipherSuites(sslEngine.getSupportedCipherSuites());
+        sslEngine.setEnableSessionCreation(true);
+        return new SslHandler(sslEngine);
+    }
+
+    private SSLContext createSslContext() {
         try {
             TrustManagerFactory tmFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
             KeyStore trustStore = KeyStore.getInstance(keyStoreType);
@@ -97,17 +108,10 @@ public class MqttSslHandlerProvider {
             }
             SSLContext sslContext = SSLContext.getInstance(sslProtocol);
             sslContext.init(km, tm, null);
-            SSLEngine sslEngine = sslContext.createSSLEngine();
-            sslEngine.setUseClientMode(false);
-            sslEngine.setNeedClientAuth(false);
-            sslEngine.setWantClientAuth(true);
-            sslEngine.setEnabledProtocols(sslEngine.getSupportedProtocols());
-            sslEngine.setEnabledCipherSuites(sslEngine.getSupportedCipherSuites());
-            sslEngine.setEnableSessionCreation(true);
-            return new SslHandler(sslEngine);
+            return sslContext;
         } catch (Exception e) {
             log.error("Unable to set up SSL context. Reason: " + e.getMessage(), e);
-            throw new RuntimeException("Failed to get SSL handler", e);
+            throw new RuntimeException("Failed to get SSL context", e);
         }
     }
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportServerInitializer.java
View file @dd9257f
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportServerInitializer.java
View file @dd9257f
@@ -28,16 +28,18 @@ import io.netty.handler.ssl.SslHandler;
 public class MqttTransportServerInitializer extends ChannelInitializer<SocketChannel> {
     private final MqttTransportContext context;
+    private final boolean sslEnabled;
-    public MqttTransportServerInitializer(MqttTransportContext context) {
+    public MqttTransportServerInitializer(MqttTransportContext context, boolean sslEnabled) {
         this.context = context;
+        this.sslEnabled = sslEnabled;
     }
     @Override
     public void initChannel(SocketChannel ch) {
         ChannelPipeline pipeline = ch.pipeline();
         SslHandler sslHandler = null;
-        if (context.getSslHandlerProvider() != null) {
+        if (sslEnabled && context.getSslHandlerProvider() != null) {
             sslHandler = context.getSslHandlerProvider().getSslHandler();
             pipeline.addLast(sslHandler);
         }
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java
View file @dd9257f
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java
View file @dd9257f
@@ -46,6 +46,14 @@ public class MqttTransportService implements TbTransportService {
     @Value("${transport.mqtt.bind_port}")
     private Integer port;
+    @Value("${transport.mqtt.ssl.enabled}")
+    private boolean sslEnabled;
+
+    @Value("${transport.mqtt.ssl.bind_address}")
+    private String sslHost;
+    @Value("${transport.mqtt.ssl.bind_port}")
+    private Integer sslPort;
+
     @Value("${transport.mqtt.netty.leak_detector_level}")
     private String leakDetectorLevel;
     @Value("${transport.mqtt.netty.boss_group_thread_count}")
@@ -59,6 +67,7 @@ public class MqttTransportService implements TbTransportService {
     private MqttTransportContext context;
     private Channel serverChannel;
+    private Channel sslServerChannel;
     private EventLoopGroup bossGroup;
     private EventLoopGroup workerGroup;
@@ -73,10 +82,18 @@ public class MqttTransportService implements TbTransportService {
         ServerBootstrap b = new ServerBootstrap();
         b.group(bossGroup, workerGroup)
                 .channel(NioServerSocketChannel.class)
-                .childHandler(new MqttTransportServerInitializer(context))
+                .childHandler(new MqttTransportServerInitializer(context, false))
                 .childOption(ChannelOption.SO_KEEPALIVE, keepAlive);
         serverChannel = b.bind(host, port).sync().channel();
+        if (sslEnabled) {
+            b = new ServerBootstrap();
+            b.group(bossGroup, workerGroup)
+                    .channel(NioServerSocketChannel.class)
+                    .childHandler(new MqttTransportServerInitializer(context, true))
+                    .childOption(ChannelOption.SO_KEEPALIVE, keepAlive);
+            sslServerChannel = b.bind(sslHost, sslPort).sync().channel();
+        }
         log.info("Mqtt transport started!");
     }
@@ -85,6 +102,9 @@ public class MqttTransportService implements TbTransportService {
         log.info("Stopping MQTT transport!");
         try {
             serverChannel.close().sync();
+            if (sslEnabled) {
+                sslServerChannel.close().sync();
+            }
         } finally {
             workerGroup.shutdownGracefully();
             bossGroup.shutdownGracefully();
--- a/common/util/pom.xml
View file @dd9257f
+++ b/common/util/pom.xml
View file @dd9257f
@@ -75,6 +75,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
--- a/common/util/src/main/java/org/thingsboard/common/util/LinkedHashMapRemoveEldest.java 0 → 100644
View file @dd9257f
+++ b/common/util/src/main/java/org/thingsboard/common/util/LinkedHashMapRemoveEldest.java 0 → 100644
View file @dd9257f
+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.common.util;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.BiConsumer;
+
+/**
+ * LinkedHashMap that removed eldest entries (by insert order)
+ * It guaranteed that size is not greater then maxEntries parameter. And remove time is constant O(1).
+ * Example:
+ *   LinkedHashMapRemoveEldest<Long, String> map =
+ *                 new LinkedHashMapRemoveEldest<>(MAX_ENTRIES, this::removeConsumer);
+ * */
+@Getter
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class LinkedHashMapRemoveEldest<K, V> extends LinkedHashMap<K, V> {
+    final long maxEntries;
+    final BiConsumer<K, V> removalConsumer;
+
+    public LinkedHashMapRemoveEldest(long maxEntries, BiConsumer<K, V> removalConsumer) {
+        this.maxEntries = maxEntries;
+        this.removalConsumer = removalConsumer;
+    }
+
+    @Override
+    protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
+        if (size() <= maxEntries) {
+            return false;
+        }
+        removalConsumer.accept(eldest.getKey(), eldest.getValue());
+        return true;
+    }
+}
--- a/common/util/src/test/java/org/thingsboard/common/util/LinkedHashMapRemoveEldestTest.java 0 → 100644
View file @dd9257f
+++ b/common/util/src/test/java/org/thingsboard/common/util/LinkedHashMapRemoveEldestTest.java 0 → 100644
View file @dd9257f
+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.common.util;
+
+import org.hamcrest.Matchers;
+import org.junit.Test;
+
+import java.util.LinkedHashMap;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class LinkedHashMapRemoveEldestTest {
+
+    public static final long MAX_ENTRIES = 10L;
+    long removeCount = 0;
+
+    void removalConsumer(Long id, String name) {
+        removeCount++;
+        assertThat(id, is(Matchers.lessThan(MAX_ENTRIES)));
+        assertThat(name, is(id.toString()));
+    }
+
+    @Test
+    public void givenMap_whenOverSized_thenVerifyRemovedEldest() {
+        //given
+        LinkedHashMapRemoveEldest<Long, String> map =
+                new LinkedHashMapRemoveEldest<>(MAX_ENTRIES, this::removalConsumer);
+
+        assertThat(map.getMaxEntries(), is(MAX_ENTRIES));
+        assertThat(map.getRemovalConsumer(), notNullValue());
+        assertThat(map, instanceOf(LinkedHashMap.class));
+        assertThat(map, instanceOf(LinkedHashMapRemoveEldest.class));
+        assertThat(map.size(), is(0));
+
+        //when
+        for (long i = 0; i < MAX_ENTRIES * 2; i++) {
+            map.put(i, String.valueOf(i));
+        }
+
+        //then
+        assertThat((long) map.size(), is(MAX_ENTRIES));
+        assertThat(removeCount, is(MAX_ENTRIES));
+        for (long i = MAX_ENTRIES; i < MAX_ENTRIES * 2; i++) {
+            assertThat(map.get(i), is(String.valueOf(i)));
+        }
+    }
+
+}
--- a/dao/src/main/java/org/thingsboard/server/dao/attributes/CachedAttributesService.java
View file @dd9257f
+++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/CachedAttributesService.java
View file @dd9257f
@@ -19,10 +19,12 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cache.Cache;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -34,6 +36,7 @@ import org.thingsboard.server.common.stats.StatsFactory;
 import org.thingsboard.server.dao.cache.CacheExecutorService;
 import org.thingsboard.server.dao.service.Validator;
+import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -43,6 +46,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
 import static org.thingsboard.server.dao.attributes.AttributeUtils.validate;
@@ -53,12 +57,17 @@ import static org.thingsboard.server.dao.attributes.AttributeUtils.validate;
 @Slf4j
 public class CachedAttributesService implements AttributesService {
     private static final String STATS_NAME = "attributes.cache";
+    public static final String LOCAL_CACHE_TYPE = "caffeine";
     private final AttributesDao attributesDao;
     private final AttributesCacheWrapper cacheWrapper;
+    private final CacheExecutorService cacheExecutorService;
     private final DefaultCounter hitCounter;
     private final DefaultCounter missCounter;
-    private final CacheExecutorService cacheExecutorService;
+    private Executor cacheExecutor;
+
+    @Value("${cache.type}")
+    private String cacheType;
     public CachedAttributesService(AttributesDao attributesDao,
                                    AttributesCacheWrapper cacheWrapper,
@@ -72,6 +81,25 @@ public class CachedAttributesService implements AttributesService {
         this.missCounter = statsFactory.createDefaultCounter(STATS_NAME, "result", "miss");
     }
+    @PostConstruct
+    public void init() {
+        this.cacheExecutor = getExecutor(cacheType, cacheExecutorService);
+    }
+
+    /**
+     * Will return:
+     *   - for the <b>local</b> cache type (cache.type="coffeine"): directExecutor (run callback immediately in the same thread)
+     *   - for the <b>remote</b> cache: dedicated thread pool for the cache IO calls to unblock any caller thread
+     * */
+    Executor getExecutor(String cacheType, CacheExecutorService cacheExecutorService) {
+        if (StringUtils.isEmpty(cacheType) || LOCAL_CACHE_TYPE.equals(cacheType)) {
+            log.info("Going to use directExecutor for the local cache type {}", cacheType);
+            return MoreExecutors.directExecutor();
+        }
+        log.info("Going to use cacheExecutorService for the remote cache type {}", cacheType);
+        return cacheExecutorService;
+    }
+
     @Override
     public ListenableFuture<Optional<AttributeKvEntry>> find(TenantId tenantId, EntityId entityId, String scope, String attributeKey) {
         validate(entityId, scope);
@@ -90,7 +118,7 @@ public class CachedAttributesService implements AttributesService {
                 // TODO: think if it's a good idea to store 'empty' attributes
                 cacheWrapper.put(attributeCacheKey, foundAttrKvEntry.orElse(null));
                 return foundAttrKvEntry;
-            }, cacheExecutorService);
+            }, cacheExecutor);
         }
     }
@@ -113,7 +141,7 @@ public class CachedAttributesService implements AttributesService {
         notFoundAttributeKeys.removeAll(wrappedCachedAttributes.keySet());
         ListenableFuture<List<AttributeKvEntry>> result = attributesDao.find(tenantId, entityId, scope, notFoundAttributeKeys);
-        return Futures.transform(result, foundInDbAttributes -> mergeDbAndCacheAttributes(entityId, scope, cachedAttributes, notFoundAttributeKeys, foundInDbAttributes), cacheExecutorService);
+        return Futures.transform(result, foundInDbAttributes -> mergeDbAndCacheAttributes(entityId, scope, cachedAttributes, notFoundAttributeKeys, foundInDbAttributes), cacheExecutor);
     }
@@ -171,7 +199,7 @@ public class CachedAttributesService implements AttributesService {
         // TODO: can do if (attributesCache.get() != null) attributesCache.put() instead, but will be more twice more requests to cache
         List<String> attributeKeys = attributes.stream().map(KvEntry::getKey).collect(Collectors.toList());
-        future.addListener(() -> evictAttributesFromCache(tenantId, entityId, scope, attributeKeys), cacheExecutorService);
+        future.addListener(() -> evictAttributesFromCache(tenantId, entityId, scope, attributeKeys), cacheExecutor);
         return future;
     }
@@ -179,7 +207,7 @@ public class CachedAttributesService implements AttributesService {
     public ListenableFuture<List<Void>> removeAll(TenantId tenantId, EntityId entityId, String scope, List<String> attributeKeys) {
         validate(entityId, scope);
         ListenableFuture<List<Void>> future = attributesDao.removeAll(tenantId, entityId, scope, attributeKeys);
-        future.addListener(() -> evictAttributesFromCache(tenantId, entityId, scope, attributeKeys), cacheExecutorService);
+        future.addListener(() -> evictAttributesFromCache(tenantId, entityId, scope, attributeKeys), cacheExecutor);
         return future;
     }
--- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardInfoDao.java
View file @dd9257f
+++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardInfoDao.java
View file @dd9257f
@@ -56,4 +56,6 @@ public interface DashboardInfoDao extends Dao<DashboardInfo> {
      */
     PageData<DashboardInfo> findDashboardsByTenantIdAndEdgeId(UUID tenantId, UUID edgeId, PageLink pageLink);
+    DashboardInfo findFirstByTenantIdAndName(UUID tenantId, String name);
+
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
View file @dd9257f
+++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
View file @dd9257f
@@ -34,7 +34,6 @@ import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
-import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
 import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
@@ -269,6 +268,11 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
         return dashboardInfoDao.findDashboardsByTenantIdAndEdgeId(tenantId.getId(), edgeId.getId(), pageLink);
     }
+    @Override
+    public DashboardInfo findFirstDashboardInfoByTenantIdAndName(TenantId tenantId, String name) {
+        return dashboardInfoDao.findFirstByTenantIdAndName(tenantId.getId(), name);
+    }
+
     private DataValidator<Dashboard> dashboardValidator =
             new DataValidator<Dashboard>() {
                 @Override
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
View file @dd9257f
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
View file @dd9257f
@@ -27,6 +27,7 @@ import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.cache.annotation.Caching;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -147,6 +148,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe
         return deviceDao.findDeviceInfoById(tenantId, deviceId.getId());
     }
+    @Cacheable(cacheNames = DEVICE_CACHE, key = "{#tenantId, #deviceId}")
     @Override
     public Device findDeviceById(TenantId tenantId, DeviceId deviceId) {
         log.trace("Executing findDeviceById [{}]", deviceId);
@@ -178,13 +180,19 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe
         return deviceOpt.orElse(null);
     }
-    @CacheEvict(cacheNames = DEVICE_CACHE, key = "{#device.tenantId, #device.name}")
+    @Caching(evict= {
+            @CacheEvict(cacheNames = DEVICE_CACHE, key = "{#device.tenantId, #device.name}"),
+            @CacheEvict(cacheNames = DEVICE_CACHE, key = "{#device.tenantId, #device.id}")
+    })
     @Override
     public Device saveDeviceWithAccessToken(Device device, String accessToken) {
         return doSaveDevice(device, accessToken);
     }
-    @CacheEvict(cacheNames = DEVICE_CACHE, key = "{#device.tenantId, #device.name}")
+    @Caching(evict= {
+            @CacheEvict(cacheNames = DEVICE_CACHE, key = "{#device.tenantId, #device.name}"),
+            @CacheEvict(cacheNames = DEVICE_CACHE, key = "{#device.tenantId, #device.id}")
+    })
     @Override
     public Device saveDevice(Device device) {
         return doSaveDevice(device, null);
@@ -250,6 +258,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe
             if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("device_name_unq_key")) {
                 // remove device from cache in case null value cached in the distributed redis.
                 removeDeviceFromCacheByName(device.getTenantId(), device.getName());
+                removeDeviceFromCacheById(device.getTenantId(), device.getId());
                 throw new DataValidationException("Device with such name already exists!");
             } else {
                 throw t;
@@ -327,6 +336,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe
         deleteEntityRelations(tenantId, deviceId);
         removeDeviceFromCacheByName(tenantId, device.getName());
+        removeDeviceFromCacheById(tenantId, device.getId());
         deviceDao.removeById(tenantId, deviceId.getId());
     }
@@ -336,6 +346,14 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe
         cache.evict(Arrays.asList(tenantId, name));
     }
+    private void removeDeviceFromCacheById(TenantId tenantId, DeviceId deviceId) {
+        if (deviceId == null) {
+            return;
+        }
+        Cache cache = cacheManager.getCache(DEVICE_CACHE);
+        cache.evict(Arrays.asList(tenantId, deviceId));
+    }
+
     @Override
     public PageData<Device> findDevicesByTenantId(TenantId tenantId, PageLink pageLink) {
         log.trace("Executing findDevicesByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
@@ -521,7 +539,10 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe
     }
     @Transactional
-    @CacheEvict(cacheNames = DEVICE_CACHE, key = "{#device.tenantId, #device.name}")
+    @Caching(evict= {
+            @CacheEvict(cacheNames = DEVICE_CACHE, key = "{#device.tenantId, #device.name}"),
+            @CacheEvict(cacheNames = DEVICE_CACHE, key = "{#device.tenantId, #device.id}")
+    })
     @Override
     public Device assignDeviceToTenant(TenantId tenantId, Device device) {
         log.trace("Executing assignDeviceToTenant [{}][{}]", tenantId, device);
@@ -588,6 +609,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe
                 throw new ProvisionFailedException(ProvisionResponseStatus.FAILURE.name());
             }
         }
+        removeDeviceFromCacheById(savedDevice.getTenantId(), savedDevice.getId());
         return savedDevice;
     }
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java
View file @dd9257f
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java
View file @dd9257f
@@ -29,6 +29,8 @@ import java.util.UUID;
  */
 public interface DashboardInfoRepository extends PagingAndSortingRepository<DashboardInfoEntity, UUID> {
+    DashboardInfoEntity findFirstByTenantIdAndTitle(UUID tenantId, String title);
+
     @Query("SELECT di FROM DashboardInfoEntity di WHERE di.tenantId = :tenantId " +
             "AND LOWER(di.searchText) LIKE LOWER(CONCAT(:searchText, '%'))")
     Page<DashboardInfoEntity> findByTenantId(@Param("tenantId") UUID tenantId,
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java
View file @dd9257f
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java
View file @dd9257f
@@ -83,4 +83,9 @@ public class JpaDashboardInfoDao extends JpaAbstractSearchTextDao<DashboardInfoE
                         Objects.toString(pageLink.getTextSearch(), ""),
                         DaoUtil.toPageable(pageLink)));
     }
+
+    @Override
+    public DashboardInfo findFirstByTenantIdAndName(UUID tenantId, String name) {
+        return DaoUtil.getData(dashboardInfoRepository.findFirstByTenantIdAndTitle(tenantId, name));
+    }
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/resource/TbResourceInfoRepository.java
View file @dd9257f
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/resource/TbResourceInfoRepository.java
View file @dd9257f
@@ -27,7 +27,7 @@ import java.util.UUID;
 public interface TbResourceInfoRepository extends CrudRepository<TbResourceInfoEntity, UUID> {
     @Query("SELECT tr FROM TbResourceInfoEntity tr WHERE " +
-            "LOWER(tr.searchText) LIKE LOWER(CONCAT(:searchText, '%'))" +
+            "LOWER(tr.title) LIKE LOWER(CONCAT('%', :searchText, '%'))" +
             "AND (tr.tenantId = :tenantId " +
             "OR (tr.tenantId = :systemAdminId " +
             "AND NOT EXISTS " +
@@ -42,7 +42,7 @@ public interface TbResourceInfoRepository extends CrudRepository<TbResourceInfoE
     @Query("SELECT ri FROM TbResourceInfoEntity ri WHERE " +
             "ri.tenantId = :tenantId " +
-            "AND LOWER(ri.searchText) LIKE LOWER(CONCAT(:searchText, '%'))")
+            "AND LOWER(ri.title) LIKE LOWER(CONCAT('%', :searchText, '%'))")
     Page<TbResourceInfoEntity> findTenantResourcesByTenantId(@Param("tenantId") UUID tenantId,
                                                              @Param("searchText") String searchText,
                                                              Pageable pageable);
--- a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
View file @dd9257f
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
View file @dd9257f
@@ -25,7 +25,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.security.authentication.DisabledException;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.Tenant;
@@ -49,7 +52,6 @@ import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.dao.tenant.TenantDao;
-import org.thingsboard.common.util.JacksonUtil;
 import java.util.HashMap;
 import java.util.Map;
@@ -194,11 +196,11 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
         DataValidator.validateEmail(email);
         User user = userDao.findByEmail(tenantId, email);
         if (user == null) {
-            throw new IncorrectParameterException(String.format("Unable to find user by email [%s]", email));
+            throw new UsernameNotFoundException(String.format("Unable to find user by email [%s]", email));
         }
         UserCredentials userCredentials = userCredentialsDao.findByUserId(tenantId, user.getUuidId());
         if (!userCredentials.isEnabled()) {
-            throw new IncorrectParameterException("Unable to reset password for inactive user");
+            throw new DisabledException(String.format("User credentials not enabled [%s]", email));
         }
         userCredentials.setResetToken(RandomStringUtils.randomAlphanumeric(DEFAULT_TOKEN_LENGTH));
         return saveUserCredentials(tenantId, userCredentials);
@@ -365,7 +367,8 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic
         JsonNode userPasswordHistoryJson;
         if (additionalInfo.has(USER_PASSWORD_HISTORY)) {
             userPasswordHistoryJson = additionalInfo.get(USER_PASSWORD_HISTORY);
-            userPasswordHistoryMap = JacksonUtil.convertValue(userPasswordHistoryJson, new TypeReference<>(){});
+            userPasswordHistoryMap = JacksonUtil.convertValue(userPasswordHistoryJson, new TypeReference<>() {
+            });
         }
         if (userPasswordHistoryMap != null) {
             userPasswordHistoryMap.put(Long.toString(System.currentTimeMillis()), userCredentials.getPassword());
--- a/dao/src/main/resources/sql/schema-entities-idx.sql
View file @dd9257f
+++ b/dao/src/main/resources/sql/schema-entities-idx.sql
View file @dd9257f
@@ -45,3 +45,19 @@ CREATE INDEX IF NOT EXISTS idx_attribute_kv_by_key_and_last_update_ts ON attribu
 CREATE INDEX IF NOT EXISTS idx_audit_log_tenant_id_and_created_time ON audit_log(tenant_id, created_time);
 CREATE INDEX IF NOT EXISTS idx_rpc_tenant_id_device_id ON rpc(tenant_id, device_id);
+
+CREATE INDEX IF NOT EXISTS idx_event_ts
+    ON public.event USING btree
+    (ts DESC NULLS LAST)
+    WITH (FILLFACTOR=95);
+
+COMMENT ON INDEX public.idx_event_ts
+    IS 'This index helps to delete events by TTL using timestamp';
+
+CREATE INDEX IF NOT EXISTS idx_event_tenant_entity_type_entity_event_type_created_time_des
+    ON public.event USING btree
+    (tenant_id ASC NULLS LAST, entity_type ASC NULLS LAST, entity_id ASC NULLS LAST, event_type ASC NULLS LAST, created_time DESC NULLS LAST)
+    WITH (FILLFACTOR=95);
+
+COMMENT ON INDEX public.idx_event_tenant_entity_type_entity_event_type_created_time_des
+    IS 'This index helps to open latest events on UI fast';
--- a/dao/src/test/java/org/thingsboard/server/dao/attributes/CachedAttributesServiceTest.java 0 → 100644
View file @dd9257f
+++ b/dao/src/test/java/org/thingsboard/server/dao/attributes/CachedAttributesServiceTest.java 0 → 100644
View file @dd9257f
+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.attributes;
+
+import com.google.common.util.concurrent.MoreExecutors;
+import org.junit.Test;
+import org.thingsboard.server.dao.cache.CacheExecutorService;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.BDDMockito.willCallRealMethod;
+import static org.mockito.Mockito.mock;
+
+public class CachedAttributesServiceTest {
+
+    public static final String REDIS = "redis";
+
+    @Test
+    public void givenLocalCacheTypeName_whenEquals_thenOK() {
+        assertThat(CachedAttributesService.LOCAL_CACHE_TYPE, is("caffeine"));
+    }
+
+    @Test
+    public void givenCacheType_whenGetExecutor_thenDirectExecutor() {
+        CachedAttributesService cachedAttributesService = mock(CachedAttributesService.class);
+        CacheExecutorService cacheExecutorService = mock(CacheExecutorService.class);
+        willCallRealMethod().given(cachedAttributesService).getExecutor(any(), any());
+
+        assertThat(cachedAttributesService.getExecutor(null, cacheExecutorService), is(MoreExecutors.directExecutor()));
+
+        assertThat(cachedAttributesService.getExecutor("", cacheExecutorService), is(MoreExecutors.directExecutor()));
+
+        assertThat(cachedAttributesService.getExecutor(CachedAttributesService.LOCAL_CACHE_TYPE, cacheExecutorService), is(MoreExecutors.directExecutor()));
+
+    }
+
+    @Test
+    public void givenCacheType_whenGetExecutor_thenReturnCacheExecutorService() {
+        CachedAttributesService cachedAttributesService = mock(CachedAttributesService.class);
+        CacheExecutorService cacheExecutorService = mock(CacheExecutorService.class);
+        willCallRealMethod().given(cachedAttributesService).getExecutor(any(String.class), any(CacheExecutorService.class));
+
+        assertThat(cachedAttributesService.getExecutor(REDIS, cacheExecutorService), is(cacheExecutorService));
+
+        assertThat(cachedAttributesService.getExecutor("unknownCacheType", cacheExecutorService), is(cacheExecutorService));
+
+    }
+
+}
--- a/pom.xml
View file @dd9257f
+++ b/pom.xml
View file @dd9257f
@@ -80,7 +80,7 @@
         <lombok.version>1.18.18</lombok.version>
         <paho.client.version>1.2.4</paho.client.version>
         <netty.version>4.1.60.Final</netty.version>
-        <os-maven-plugin.version>1.5.0</os-maven-plugin.version>
+        <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
         <rabbitmq.version>4.8.0</rabbitmq.version>
         <surfire.version>2.19.1</surfire.version>
         <jar-plugin.version>3.0.2</jar-plugin.version>
@@ -580,7 +580,7 @@
             <extension>
                 <groupId>kr.motd.maven</groupId>
                 <artifactId>os-maven-plugin</artifactId>
-                <version>1.5.0.Final</version>
+                <version>${os-maven-plugin.version}</version>
             </extension>
         </extensions>
         <pluginManagement>