LWM2M: merge with master

@@ -29,12 +29,11 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.device.data.lwm2m.BootstrapConfiguration;
 import org.thingsboard.server.common.data.device.data.lwm2m.BootstrapConfiguration;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MSecurityInfo;
 import org.thingsboard.server.transport.lwm2m.secure.LwM2mCredentialsSecurityInfoValidator;
 import org.thingsboard.server.transport.lwm2m.secure.LwM2mCredentialsSecurityInfoValidator;
+import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MSecurityInfo;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mSessionMsgListener;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mSessionMsgListener;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportContext;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportContext;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportServerHelper;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportServerHelper;
-import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.GeneralSecurityException;
@@ -46,6 +45,7 @@ import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.L
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.LOG_LWM2M_INFO;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.LOG_LWM2M_INFO;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.LOG_LWM2M_TELEMETRY;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.LOG_LWM2M_TELEMETRY;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.getBootstrapParametersFromThingsboard;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.getBootstrapParametersFromThingsboard;
+import static org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mTypeServer.BOOTSTRAP;
 
 
 @Slf4j
 @Slf4j
 @Service("LwM2MBootstrapSecurityStore")
 @Service("LwM2MBootstrapSecurityStore")
@@ -68,7 +68,7 @@ public class LwM2MBootstrapSecurityStore implements BootstrapSecurityStore {
 
 
     @Override
     @Override
     public Iterator<SecurityInfo> getAllByEndpoint(String endPoint) {
     public Iterator<SecurityInfo> getAllByEndpoint(String endPoint) {
-        TbLwM2MSecurityInfo store = lwM2MCredentialsSecurityInfoValidator.getEndpointSecurityInfoByCredentialsId(endPoint, LwM2mTransportUtil.LwM2mTypeServer.BOOTSTRAP);
+        TbLwM2MSecurityInfo store = lwM2MCredentialsSecurityInfoValidator.getEndpointSecurityInfoByCredentialsId(endPoint, BOOTSTRAP);
         if (store.getBootstrapCredentialConfig() != null && store.getSecurityMode() != null) {
         if (store.getBootstrapCredentialConfig() != null && store.getSecurityMode() != null) {
             /* add value to store  from BootstrapJson */
             /* add value to store  from BootstrapJson */
             this.setBootstrapConfigScurityInfo(store);
             this.setBootstrapConfigScurityInfo(store);
@@ -92,7 +92,7 @@ public class LwM2MBootstrapSecurityStore implements BootstrapSecurityStore {
 
 
     @Override
     @Override
     public SecurityInfo getByIdentity(String identity) {
     public SecurityInfo getByIdentity(String identity) {
-        TbLwM2MSecurityInfo store = lwM2MCredentialsSecurityInfoValidator.getEndpointSecurityInfoByCredentialsId(identity, LwM2mTransportUtil.LwM2mTypeServer.BOOTSTRAP);
+        TbLwM2MSecurityInfo store = lwM2MCredentialsSecurityInfoValidator.getEndpointSecurityInfoByCredentialsId(identity, BOOTSTRAP);
         if (store.getBootstrapCredentialConfig() != null && store.getSecurityMode() != null) {
         if (store.getBootstrapCredentialConfig() != null && store.getSecurityMode() != null) {
             /* add value to store  from BootstrapJson */
             /* add value to store  from BootstrapJson */
             this.setBootstrapConfigScurityInfo(store);
             this.setBootstrapConfigScurityInfo(store);

@@ -33,7 +33,7 @@ import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
 import org.thingsboard.server.transport.lwm2m.secure.credentials.LwM2MCredentials;
 import org.thingsboard.server.transport.lwm2m.secure.credentials.LwM2MCredentials;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportContext;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportContext;
-import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil;
+import org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mTypeServer;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.GeneralSecurityException;
@@ -45,6 +45,7 @@ import static org.eclipse.leshan.core.SecurityMode.NO_SEC;
 import static org.eclipse.leshan.core.SecurityMode.PSK;
 import static org.eclipse.leshan.core.SecurityMode.PSK;
 import static org.eclipse.leshan.core.SecurityMode.RPK;
 import static org.eclipse.leshan.core.SecurityMode.RPK;
 import static org.eclipse.leshan.core.SecurityMode.X509;
 import static org.eclipse.leshan.core.SecurityMode.X509;
+import static org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mTypeServer.BOOTSTRAP;
 
 
 @Slf4j
 @Slf4j
 @Component
 @Component
@@ -55,7 +56,7 @@ public class LwM2mCredentialsSecurityInfoValidator {
     private final LwM2mTransportContext context;
     private final LwM2mTransportContext context;
     private final LwM2MTransportServerConfig config;
     private final LwM2MTransportServerConfig config;
 
 
-    public TbLwM2MSecurityInfo getEndpointSecurityInfoByCredentialsId(String credentialsId, LwM2mTransportUtil.LwM2mTypeServer keyValue) {
+    public TbLwM2MSecurityInfo getEndpointSecurityInfoByCredentialsId(String credentialsId, LwM2mTypeServer keyValue) {
         CountDownLatch latch = new CountDownLatch(1);
         CountDownLatch latch = new CountDownLatch(1);
         final TbLwM2MSecurityInfo[] resultSecurityStore = new TbLwM2MSecurityInfo[1];
         final TbLwM2MSecurityInfo[] resultSecurityStore = new TbLwM2MSecurityInfo[1];
         log.warn("001) [{}]", credentialsId);
         log.warn("001) [{}]", credentialsId);
@@ -94,11 +95,11 @@ public class LwM2mCredentialsSecurityInfoValidator {
      * @param keyValue -
      * @param keyValue -
      * @return SecurityInfo
      * @return SecurityInfo
      */
      */
-    private TbLwM2MSecurityInfo createSecurityInfo(String endpoint, String jsonStr, LwM2mTransportUtil.LwM2mTypeServer keyValue) {
+    private TbLwM2MSecurityInfo createSecurityInfo(String endpoint, String jsonStr, LwM2mTypeServer keyValue) {
         TbLwM2MSecurityInfo result = new TbLwM2MSecurityInfo();
         TbLwM2MSecurityInfo result = new TbLwM2MSecurityInfo();
         LwM2MCredentials credentials = JacksonUtil.fromString(jsonStr, LwM2MCredentials.class);
         LwM2MCredentials credentials = JacksonUtil.fromString(jsonStr, LwM2MCredentials.class);
         if (credentials != null) {
         if (credentials != null) {
-            if (keyValue.equals(LwM2mTransportUtil.LwM2mTypeServer.BOOTSTRAP)) {
+            if (keyValue.equals(BOOTSTRAP)) {
                 result.setBootstrapCredentialConfig(credentials.getBootstrap());
                 result.setBootstrapCredentialConfig(credentials.getBootstrap());
                 if (LwM2MSecurityMode.PSK.equals(credentials.getClient().getSecurityConfigClientMode())) {
                 if (LwM2MSecurityMode.PSK.equals(credentials.getClient().getSecurityConfigClientMode())) {
                     PSKClientCredentials pskClientConfig = (PSKClientCredentials) credentials.getClient();
                     PSKClientCredentials pskClientConfig = (PSKClientCredentials) credentials.getClient();

@@ -42,7 +42,6 @@ import org.thingsboard.server.common.transport.util.SslUtil;
 import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
 import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
 import org.thingsboard.server.transport.lwm2m.secure.credentials.LwM2MCredentials;
 import org.thingsboard.server.transport.lwm2m.secure.credentials.LwM2MCredentials;
-import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil;
 import org.thingsboard.server.transport.lwm2m.server.store.TbEditableSecurityStore;
 import org.thingsboard.server.transport.lwm2m.server.store.TbEditableSecurityStore;
 import org.thingsboard.server.transport.lwm2m.server.store.TbLwM2MDtlsSessionStore;
 import org.thingsboard.server.transport.lwm2m.server.store.TbLwM2MDtlsSessionStore;
 
 
@@ -57,6 +56,8 @@ import java.security.cert.X509Certificate;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.List;
 import java.util.List;
 
 
+import static org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mTypeServer.CLIENT;
+
 @Slf4j
 @Slf4j
 @Component
 @Component
 @TbLwM2mTransportComponent
 @TbLwM2mTransportComponent
@@ -117,7 +118,7 @@ public class TbLwM2MDtlsCertificateVerifier implements NewAdvancedCertificateVer
 
 
                         String strCert = SslUtil.getCertificateString(cert);
                         String strCert = SslUtil.getCertificateString(cert);
                         String sha3Hash = EncryptionUtil.getSha3Hash(strCert);
                         String sha3Hash = EncryptionUtil.getSha3Hash(strCert);
-                        TbLwM2MSecurityInfo securityInfo = securityInfoValidator.getEndpointSecurityInfoByCredentialsId(sha3Hash, LwM2mTransportUtil.LwM2mTypeServer.CLIENT);
+                        TbLwM2MSecurityInfo securityInfo = securityInfoValidator.getEndpointSecurityInfoByCredentialsId(sha3Hash, CLIENT);
                         ValidateDeviceCredentialsResponse msg = securityInfo != null ? securityInfo.getMsg() : null;
                         ValidateDeviceCredentialsResponse msg = securityInfo != null ? securityInfo.getMsg() : null;
                         if (msg != null && org.thingsboard.server.common.data.StringUtils.isNotEmpty(msg.getCredentials())) {
                         if (msg != null && org.thingsboard.server.common.data.StringUtils.isNotEmpty(msg.getCredentials())) {
                             LwM2MCredentials credentials = JacksonUtil.fromString(msg.getCredentials(), LwM2MCredentials.class);
                             LwM2MCredentials credentials = JacksonUtil.fromString(msg.getCredentials(), LwM2MCredentials.class);

@@ -65,7 +65,7 @@ import static org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_ECDHE
 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_CBC_SHA256;
 import static org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_PSK_WITH_AES_128_CCM_8;
 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;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mNetworkConfig.getCoapConfig;
-import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FIRMWARE_UPDATE_COAP_RECOURSE;
+import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.FIRMWARE_UPDATE_COAP_RECOURSE;
 
 
 @Slf4j
 @Slf4j
 @Component
 @Component

@@ -31,8 +31,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicInteger;
 
 
-import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FIRMWARE_UPDATE_COAP_RECOURSE;
-import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.SOFTWARE_UPDATE_COAP_RECOURSE;
+import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.FIRMWARE_UPDATE_COAP_RECOURSE;
+import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.SOFTWARE_UPDATE_COAP_RECOURSE;
 
 
 @Slf4j
 @Slf4j
 public class LwM2mTransportCoapResource extends AbstractLwM2mTransportResource {
 public class LwM2mTransportCoapResource extends AbstractLwM2mTransportResource {

@@ -43,13 +43,13 @@ import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.device.data.lwm2m.BootstrapConfiguration;
 import org.thingsboard.server.common.data.device.data.lwm2m.BootstrapConfiguration;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
-import org.thingsboard.server.common.data.ota.OtaPackageKey;
-import org.thingsboard.server.common.data.ota.OtaPackageType;
-import org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus;
-import org.thingsboard.server.common.data.ota.OtaPackageUtil;
 import org.thingsboard.server.common.transport.TransportServiceCallback;
 import org.thingsboard.server.common.transport.TransportServiceCallback;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
 import org.thingsboard.server.transport.lwm2m.server.client.ResourceValue;
 import org.thingsboard.server.transport.lwm2m.server.client.ResourceValue;
+import org.thingsboard.server.transport.lwm2m.server.ota.firmware.UpdateResultFw;
+import org.thingsboard.server.transport.lwm2m.server.ota.firmware.UpdateStateFw;
+import org.thingsboard.server.transport.lwm2m.server.ota.software.UpdateResultSw;
+import org.thingsboard.server.transport.lwm2m.server.ota.software.UpdateStateSw;
 import org.thingsboard.server.transport.lwm2m.server.uplink.DefaultLwM2MUplinkMsgHandler;
 import org.thingsboard.server.transport.lwm2m.server.uplink.DefaultLwM2MUplinkMsgHandler;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -77,277 +77,20 @@ import static org.eclipse.leshan.core.model.ResourceModel.Type.STRING;
 import static org.eclipse.leshan.core.model.ResourceModel.Type.TIME;
 import static org.eclipse.leshan.core.model.ResourceModel.Type.TIME;
 import static org.thingsboard.server.common.data.lwm2m.LwM2mConstants.LWM2M_SEPARATOR_KEY;
 import static org.thingsboard.server.common.data.lwm2m.LwM2mConstants.LWM2M_SEPARATOR_KEY;
 import static org.thingsboard.server.common.data.lwm2m.LwM2mConstants.LWM2M_SEPARATOR_PATH;
 import static org.thingsboard.server.common.data.lwm2m.LwM2mConstants.LWM2M_SEPARATOR_PATH;
-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.FAILED;
-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;
+import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.FW_RESULT_ID;
+import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.FW_STATE_ID;
+import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.SW_RESULT_ID;
+import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.SW_UPDATE_STATE_ID;
 
 
 @Slf4j
 @Slf4j
 public class LwM2mTransportUtil {
 public class LwM2mTransportUtil {
 
 
-    public static final String EVENT_AWAKE = "AWAKE";
-    public static final String RESPONSE_REQUEST_CHANNEL = "RESP_REQ";
-    public static final String RESPONSE_CHANNEL = "RESP";
-    public static final String OBSERVE_CHANNEL = "OBSERVE";
-
-    public static final String TRANSPORT_DEFAULT_LWM2M_VERSION = "1.0";
-    public static final String CLIENT_LWM2M_SETTINGS = "clientLwM2mSettings";
-    public static final String BOOTSTRAP = "bootstrap";
-    public static final String SERVERS = "servers";
-    public static final String LWM2M_SERVER = "lwm2mServer";
-    public static final String BOOTSTRAP_SERVER = "bootstrapServer";
-    public static final String OBSERVE_ATTRIBUTE_TELEMETRY = "observeAttr";
-    public static final String ATTRIBUTE = "attribute";
-    public static final String TELEMETRY = "telemetry";
-    public static final String KEY_NAME = "keyName";
-    public static final String OBSERVE_LWM2M = "observe";
-    public static final String ATTRIBUTE_LWM2M = "attributeLwm2m";
-
-    private static final String REQUEST = "/request";
-    private static final String ATTRIBUTES = "/" + ATTRIBUTE;
-    public static final String TELEMETRIES = "/" + TELEMETRY;
-    public static final String ATTRIBUTES_REQUEST = ATTRIBUTES + REQUEST;
-    public static final String DEVICE_ATTRIBUTES_REQUEST = ATTRIBUTES_REQUEST + "/";
-
-    public static final long DEFAULT_TIMEOUT = 2 * 60 * 1000L; // 2min in ms
+    public static final String LWM2M_VERSION_DEFAULT = "1.0";
 
 
     public static final String LOG_LWM2M_TELEMETRY = "logLwm2m";
     public static final String LOG_LWM2M_TELEMETRY = "logLwm2m";
     public static final String LOG_LWM2M_INFO = "info";
     public static final String LOG_LWM2M_INFO = "info";
     public static final String LOG_LWM2M_ERROR = "error";
     public static final String LOG_LWM2M_ERROR = "error";
     public static final String LOG_LWM2M_WARN = "warn";
     public static final String LOG_LWM2M_WARN = "warn";
-    public static final String LOG_LWM2M_VALUE = "value";
-
-    public static final String CLIENT_NOT_AUTHORIZED = "Client not authorized";
-    public static final String LWM2M_VERSION_DEFAULT = "1.0";
-
-    // Firmware
-    public static final String FIRMWARE_UPDATE_COAP_RECOURSE = "tbfw";
-    public static final String FW_UPDATE = "Firmware update";
-    public static final Integer FW_5_ID = 5;
-    public static final Integer FW_19_ID = 19;
-
-    // Package W
-    public static final String FW_PACKAGE_5_ID = "/5/0/0";
-    public static final String FW_PACKAGE_19_ID = "/19/0/0";
-    // Package URI
-    public static final String FW_PACKAGE_URI_ID = "/5/0/1";
-    // State R
-    public static final String FW_STATE_ID = "/5/0/3";
-    // Update Result R
-    public static final String FW_RESULT_ID = "/5/0/5";
-
-    public static final String FW_DELIVERY_METHOD = "/5/0/9";
-
-    // PkgName R
-    public static final String FW_NAME_ID = "/5/0/6";
-    // PkgVersion R
-    public static final String FW_5_VER_ID = "/5/0/7";
-
-    /**
-     * Quectel@Hi15RM1-HLB_V1.0@BC68JAR01A10,V150R100C20B300SP7,V150R100C20B300SP7@8
-     * BC68JAR01A10
-     * # Request prodct type number
-     * ATI
-     * Quectel
-     * BC68
-     * Revision:BC68JAR01A10
-     */
-    public static final String FW_3_VER_ID = "/3/0/3";
-    // Update E
-    public static final String FW_UPDATE_ID = "/5/0/2";
-
-    // Software
-    public static final String SOFTWARE_UPDATE_COAP_RECOURSE = "softwareUpdateCoapRecourse";
-    public static final String SW_UPDATE = "Software update";
-    public static final Integer SW_ID = 9;
-    // Package W
-    public static final String SW_PACKAGE_ID = "/9/0/2";
-    // Package URI
-    public static final String SW_PACKAGE_URI_ID = "/9/0/3";
-    // Update State R
-    public static final String SW_UPDATE_STATE_ID = "/9/0/7";
-    // Update Result R
-    public static final String SW_RESULT_ID = "/9/0/9";
-    // PkgName R
-    public static final String SW_NAME_ID = "/9/0/0";
-    // PkgVersion R
-    public static final String SW_VER_ID = "/9/0/1";
-    // Install E
-    public static final String SW_INSTALL_ID = "/9/0/4";
-    // Uninstall E
-    public static final String SW_UN_INSTALL_ID = "/9/0/6";
-
-    public enum LwM2mTypeServer {
-        BOOTSTRAP(0, "bootstrap"),
-        CLIENT(1, "client");
-
-        public int code;
-        public String type;
-
-        LwM2mTypeServer(int code, String type) {
-            this.code = code;
-            this.type = type;
-        }
-
-        public static LwM2mTypeServer fromLwM2mTypeServer(String type) {
-            for (LwM2mTypeServer sm : LwM2mTypeServer.values()) {
-                if (sm.type.equals(type)) {
-                    return sm;
-                }
-            }
-            throw new IllegalArgumentException(String.format("Unsupported typeServer type : %d", type));
-        }
-    }
-
-    public static Optional<OtaPackageUpdateStatus> toOtaPackageUpdateStatus(UpdateResultFw updateResultFw) {
-        switch (updateResultFw) {
-            case INITIAL:
-                return Optional.empty();
-            case UPDATE_SUCCESSFULLY:
-                return Optional.of(UPDATED);
-            case NOT_ENOUGH:
-            case OUT_OFF_MEMORY:
-            case CONNECTION_LOST:
-            case INTEGRITY_CHECK_FAILURE:
-            case UNSUPPORTED_TYPE:
-            case INVALID_URI:
-            case UPDATE_FAILED:
-            case UNSUPPORTED_PROTOCOL:
-                return Optional.of(FAILED);
-            default:
-                throw new CodecException("Invalid value stateFw %s for FirmwareUpdateStatus.", updateResultFw.name());
-        }
-    }
-
-    public static Optional<OtaPackageUpdateStatus> toOtaPackageUpdateStatus(UpdateStateFw updateStateFw) {
-        switch (updateStateFw) {
-            case IDLE:
-                return Optional.empty();
-            case DOWNLOADING:
-                return Optional.of(DOWNLOADING);
-            case DOWNLOADED:
-                return Optional.of(DOWNLOADED);
-            case UPDATING:
-                return Optional.of(UPDATING);
-            default:
-                throw new CodecException("Invalid value stateFw %d for FirmwareUpdateStatus.", updateStateFw);
-        }
-    }
-
-    /**
-     * SW Update State R
-     * 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
-     */
-    public enum UpdateStateSw {
-        INITIAL(0, "Initial"),
-        DOWNLOAD_STARTED(1, "DownloadStarted"),
-        DOWNLOADED(2, "Downloaded"),
-        DELIVERED(3, "Delivered"),
-        INSTALLED(4, "Installed");
-
-        public int code;
-        public String type;
-
-        UpdateStateSw(int code, String type) {
-            this.code = code;
-            this.type = type;
-        }
-
-        public static UpdateStateSw fromUpdateStateSwByType(String type) {
-            for (UpdateStateSw to : UpdateStateSw.values()) {
-                if (to.type.equals(type)) {
-                    return to;
-                }
-            }
-            throw new IllegalArgumentException(String.format("Unsupported SW State type  : %s", type));
-        }
-
-        public static UpdateStateSw fromUpdateStateSwByCode(int code) {
-            for (UpdateStateSw to : UpdateStateSw.values()) {
-                if (to.code == code) {
-                    return to;
-                }
-            }
-            throw new IllegalArgumentException(String.format("Unsupported SW State type  : %s", code));
-        }
-    }
-
-    /**
-     * SW Update Result
-     * 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))
-     * ** Failed
-     * 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.
-     */
-    public enum UpdateResultSw {
-        INITIAL(0, "Initial value", false),
-        DOWNLOADING(1, "Downloading", false),
-        SUCCESSFULLY_INSTALLED(2, "Software successfully installed", false),
-        SUCCESSFULLY_DOWNLOADED_VERIFIED(3, "Successfully Downloaded and package integrity verified", false),
-        NOT_ENOUGH_STORAGE(50, "Not enough storage for the new software package", true),
-        OUT_OFF_MEMORY(51, "Out of memory during downloading process", true),
-        CONNECTION_LOST(52, "Connection lost during downloading process", false),
-        PACKAGE_CHECK_FAILURE(53, "Package integrity check failure.", false),
-        UNSUPPORTED_PACKAGE_TYPE(54, "Unsupported package type", false),
-        INVALID_URI(56, "Invalid URI", true),
-        UPDATE_ERROR(57, "Device defined update error", true),
-        INSTALL_FAILURE(58, "Software installation failure", true),
-        UN_INSTALL_FAILURE(59, "Uninstallation Failure during forUpdate(arg=0)", true);
-
-        public int code;
-        public String type;
-        public boolean isAgain;
-
-        UpdateResultSw(int code, String type, boolean isAgain) {
-            this.code = code;
-            this.type = type;
-            this.isAgain = isAgain;
-        }
-
-        public static UpdateResultSw fromUpdateResultSwByType(String type) {
-            for (UpdateResultSw to : UpdateResultSw.values()) {
-                if (to.type.equals(type)) {
-                    return to;
-                }
-            }
-            throw new IllegalArgumentException(String.format("Unsupported SW Update Result type  : %s", type));
-        }
-
-        public static UpdateResultSw fromUpdateResultSwByCode(int code) {
-            for (UpdateResultSw to : UpdateResultSw.values()) {
-                if (to.code == code) {
-                    return to;
-                }
-            }
-            throw new IllegalArgumentException(String.format("Unsupported SW Update Result code  : %s", code));
-        }
-    }
 
 
     public enum LwM2MClientStrategy {
     public enum LwM2MClientStrategy {
         CLIENT_STRATEGY_1(1, "Read only resources marked as observation"),
         CLIENT_STRATEGY_1(1, "Read only resources marked as observation"),
@@ -380,45 +123,7 @@ public class LwM2mTransportUtil {
         }
         }
     }
     }
 
 
-    /**
-     * FirmwareUpdateStatus {
-     * DOWNLOADING, DOWNLOADED, VERIFIED, UPDATING, UPDATED, FAILED
-     */
-    public static OtaPackageUpdateStatus EqualsSwSateToFirmwareUpdateStatus(UpdateStateSw updateStateSw, UpdateResultSw updateResultSw) {
-        switch (updateResultSw) {
-            case INITIAL:
-                switch (updateStateSw) {
-                    case INITIAL:
-                    case DOWNLOAD_STARTED:
-                        return DOWNLOADING;
-                    case DOWNLOADED:
-                        return DOWNLOADED;
-                    case DELIVERED:
-                        return VERIFIED;
-                }
-            case DOWNLOADING:
-                return DOWNLOADING;
-            case SUCCESSFULLY_INSTALLED:
-                return UPDATED;
-            case SUCCESSFULLY_DOWNLOADED_VERIFIED:
-                return VERIFIED;
-            case NOT_ENOUGH_STORAGE:
-            case OUT_OFF_MEMORY:
-            case CONNECTION_LOST:
-            case PACKAGE_CHECK_FAILURE:
-            case UNSUPPORTED_PACKAGE_TYPE:
-            case INVALID_URI:
-            case UPDATE_ERROR:
-            case INSTALL_FAILURE:
-            case UN_INSTALL_FAILURE:
-                return FAILED;
-            default:
-                throw new CodecException("Invalid value stateFw %s   %s for FirmwareUpdateStatus.", updateStateSw.name(), updateResultSw.name());
-        }
-    }
-
-
-    public static boolean equalsResourceValue(Object valueOld, Object valueNew, ResourceModel.Type type, LwM2mPath
+     public static boolean equalsResourceValue(Object valueOld, Object valueNew, ResourceModel.Type type, LwM2mPath
             resourcePath) throws CodecException {
             resourcePath) throws CodecException {
         switch (type) {
         switch (type) {
             case BOOLEAN:
             case BOOLEAN:
@@ -477,18 +182,6 @@ public class LwM2mTransportUtil {
         return null;
         return null;
     }
     }
 
 
-//    public static LwM2mClientProfile getNewProfileParameters(JsonObject profilesConfigData, TenantId tenantId) {
-//        LwM2mClientProfile lwM2MClientProfile = new LwM2mClientProfile();
-//        lwM2MClientProfile.setTenantId(tenantId);
-//        lwM2MClientProfile.setPostClientLwM2mSettings(profilesConfigData.get(CLIENT_LWM2M_SETTINGS).getAsJsonObject());
-//        lwM2MClientProfile.setPostKeyNameProfile(profilesConfigData.get(OBSERVE_ATTRIBUTE_TELEMETRY).getAsJsonObject().get(KEY_NAME).getAsJsonObject());
-//        lwM2MClientProfile.setPostAttributeProfile(profilesConfigData.get(OBSERVE_ATTRIBUTE_TELEMETRY).getAsJsonObject().get(ATTRIBUTE).getAsJsonArray());
-//        lwM2MClientProfile.setPostTelemetryProfile(profilesConfigData.get(OBSERVE_ATTRIBUTE_TELEMETRY).getAsJsonObject().get(TELEMETRY).getAsJsonArray());
-//        lwM2MClientProfile.setPostObserveProfile(profilesConfigData.get(OBSERVE_ATTRIBUTE_TELEMETRY).getAsJsonObject().get(OBSERVE_LWM2M).getAsJsonArray());
-//        lwM2MClientProfile.setPostAttributeLwm2mProfile(profilesConfigData.get(OBSERVE_ATTRIBUTE_TELEMETRY).getAsJsonObject().get(ATTRIBUTE_LWM2M).getAsJsonObject());
-//        return lwM2MClientProfile;
-//    }
-
     public static Lwm2mDeviceProfileTransportConfiguration toLwM2MClientProfile(DeviceProfile deviceProfile) {
     public static Lwm2mDeviceProfileTransportConfiguration toLwM2MClientProfile(DeviceProfile deviceProfile) {
         DeviceProfileTransportConfiguration transportConfiguration = deviceProfile.getProfileData().getTransportConfiguration();
         DeviceProfileTransportConfiguration transportConfiguration = deviceProfile.getProfileData().getTransportConfiguration();
         if (transportConfiguration.getType().equals(DeviceTransportType.LWM2M)) {
         if (transportConfiguration.getType().equals(DeviceTransportType.LWM2M)) {
@@ -603,7 +296,6 @@ public class LwM2mTransportUtil {
             if (keyArray.length > 1 && keyArray[1].split(LWM2M_SEPARATOR_KEY).length == 2) {
             if (keyArray.length > 1 && keyArray[1].split(LWM2M_SEPARATOR_KEY).length == 2) {
                 return pathIdVer;
                 return pathIdVer;
             } else {
             } else {
-                LwM2mPath pathObjId = new LwM2mPath(pathIdVer);
                 return convertObjectIdToVersionedId(pathIdVer, registration);
                 return convertObjectIdToVersionedId(pathIdVer, registration);
             }
             }
         }
         }
@@ -743,18 +435,18 @@ public class LwM2mTransportUtil {
         }
         }
     }
     }
 
 
-    public static boolean isFwSwWords(String pathName) {
-        return OtaPackageUtil.getAttributeKey(OtaPackageType.FIRMWARE, OtaPackageKey.VERSION).equals(pathName)
-                || OtaPackageUtil.getAttributeKey(OtaPackageType.FIRMWARE, OtaPackageKey.TITLE).equals(pathName)
-                || OtaPackageUtil.getAttributeKey(OtaPackageType.FIRMWARE, OtaPackageKey.CHECKSUM).equals(pathName)
-                || OtaPackageUtil.getAttributeKey(OtaPackageType.FIRMWARE, OtaPackageKey.CHECKSUM_ALGORITHM).equals(pathName)
-                || OtaPackageUtil.getAttributeKey(OtaPackageType.FIRMWARE, OtaPackageKey.SIZE).equals(pathName)
-                || OtaPackageUtil.getAttributeKey(OtaPackageType.SOFTWARE, OtaPackageKey.VERSION).equals(pathName)
-                || OtaPackageUtil.getAttributeKey(OtaPackageType.SOFTWARE, OtaPackageKey.TITLE).equals(pathName)
-                || OtaPackageUtil.getAttributeKey(OtaPackageType.SOFTWARE, OtaPackageKey.CHECKSUM).equals(pathName)
-                || OtaPackageUtil.getAttributeKey(OtaPackageType.SOFTWARE, OtaPackageKey.CHECKSUM_ALGORITHM).equals(pathName)
-                || OtaPackageUtil.getAttributeKey(OtaPackageType.SOFTWARE, OtaPackageKey.SIZE).equals(pathName);
-    }
+//    public static boolean isFwSwWords(String pathName) {
+//        return OtaPackageUtil.getAttributeKey(OtaPackageType.FIRMWARE, OtaPackageKey.VERSION).equals(pathName)
+//                || OtaPackageUtil.getAttributeKey(OtaPackageType.FIRMWARE, OtaPackageKey.TITLE).equals(pathName)
+//                || OtaPackageUtil.getAttributeKey(OtaPackageType.FIRMWARE, OtaPackageKey.CHECKSUM).equals(pathName)
+//                || OtaPackageUtil.getAttributeKey(OtaPackageType.FIRMWARE, OtaPackageKey.CHECKSUM_ALGORITHM).equals(pathName)
+//                || OtaPackageUtil.getAttributeKey(OtaPackageType.FIRMWARE, OtaPackageKey.SIZE).equals(pathName)
+//                || OtaPackageUtil.getAttributeKey(OtaPackageType.SOFTWARE, OtaPackageKey.VERSION).equals(pathName)
+//                || OtaPackageUtil.getAttributeKey(OtaPackageType.SOFTWARE, OtaPackageKey.TITLE).equals(pathName)
+//                || OtaPackageUtil.getAttributeKey(OtaPackageType.SOFTWARE, OtaPackageKey.CHECKSUM).equals(pathName)
+//                || OtaPackageUtil.getAttributeKey(OtaPackageType.SOFTWARE, OtaPackageKey.CHECKSUM_ALGORITHM).equals(pathName)
+//                || OtaPackageUtil.getAttributeKey(OtaPackageType.SOFTWARE, OtaPackageKey.SIZE).equals(pathName);
+//    }
 
 
     /**
     /**
      * @param lwM2MClient -
      * @param lwM2MClient -

@@ -33,12 +33,10 @@ import org.eclipse.leshan.server.security.SecurityInfo;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsResponse;
 import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsResponse;
 import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto;
 import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TsKvProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TsKvProto;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mQueuedRequest;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mQueuedRequest;
-import org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mUplinkMsgHandler;
 
 
 import java.util.Collection;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Map;
@@ -53,7 +51,7 @@ import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 import static org.thingsboard.server.common.data.lwm2m.LwM2mConstants.LWM2M_SEPARATOR_PATH;
 import static org.thingsboard.server.common.data.lwm2m.LwM2mConstants.LWM2M_SEPARATOR_PATH;
-import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.TRANSPORT_DEFAULT_LWM2M_VERSION;
+import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.LWM2M_VERSION_DEFAULT;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.convertObjectIdToVersionedId;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.convertObjectIdToVersionedId;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.equalsResourceTypeGetSimpleName;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.equalsResourceTypeGetSimpleName;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.fromVersionedIdToObjectId;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.fromVersionedIdToObjectId;
@@ -307,7 +305,7 @@ public class LwM2mClient implements Cloneable {
         LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(path));
         LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(path));
         String verSupportedObject = registration.getSupportedObject().get(pathIds.getObjectId());
         String verSupportedObject = registration.getSupportedObject().get(pathIds.getObjectId());
         String verRez = getVerFromPathIdVerOrId(path);
         String verRez = getVerFromPathIdVerOrId(path);
-        return verRez == null ? TRANSPORT_DEFAULT_LWM2M_VERSION.equals(verSupportedObject) : verRez.equals(verSupportedObject);
+        return verRez == null ? LWM2M_VERSION_DEFAULT.equals(verSupportedObject) : verRez.equals(verSupportedObject);
     }
     }
 
 
     /**
     /**

@@ -17,6 +17,7 @@ package org.thingsboard.server.transport.lwm2m.server.ota;
 
 
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.leshan.core.node.codec.CodecException;
 import org.eclipse.leshan.core.request.ContentFormat;
 import org.eclipse.leshan.core.request.ContentFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Lazy;
@@ -32,12 +33,7 @@ import org.thingsboard.server.common.transport.TransportServiceCallback;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
 import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
-import org.thingsboard.server.transport.lwm2m.server.LwM2MFirmwareUpdateStrategy;
-import org.thingsboard.server.transport.lwm2m.server.LwM2MSoftwareUpdateStrategy;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportServerHelper;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportServerHelper;
-import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil;
-import org.thingsboard.server.transport.lwm2m.server.UpdateResultFw;
-import org.thingsboard.server.transport.lwm2m.server.UpdateStateFw;
 import org.thingsboard.server.transport.lwm2m.server.attributes.LwM2MAttributesService;
 import org.thingsboard.server.transport.lwm2m.server.attributes.LwM2MAttributesService;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClientContext;
 import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClientContext;
@@ -48,6 +44,13 @@ import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MExecuteRequ
 import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MWriteReplaceRequest;
 import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MWriteReplaceRequest;
 import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MWriteResponseCallback;
 import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MWriteResponseCallback;
 import org.thingsboard.server.transport.lwm2m.server.log.LwM2MTelemetryLogService;
 import org.thingsboard.server.transport.lwm2m.server.log.LwM2MTelemetryLogService;
+import org.thingsboard.server.transport.lwm2m.server.ota.firmware.LwM2MFirmwareUpdateStrategy;
+import org.thingsboard.server.transport.lwm2m.server.ota.firmware.UpdateDeliveryFw;
+import org.thingsboard.server.transport.lwm2m.server.ota.firmware.UpdateResultFw;
+import org.thingsboard.server.transport.lwm2m.server.ota.firmware.UpdateStateFw;
+import org.thingsboard.server.transport.lwm2m.server.ota.software.LwM2MSoftwareUpdateStrategy;
+import org.thingsboard.server.transport.lwm2m.server.ota.software.UpdateResultSw;
+import org.thingsboard.server.transport.lwm2m.server.ota.software.UpdateStateSw;
 import org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mUplinkMsgHandler;
 import org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mUplinkMsgHandler;
 
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PostConstruct;
@@ -60,8 +63,13 @@ import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
 
 import static org.thingsboard.server.common.data.ota.OtaPackageKey.STATE;
 import static org.thingsboard.server.common.data.ota.OtaPackageKey.STATE;
+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.FAILED;
+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;
 import static org.thingsboard.server.common.data.ota.OtaPackageUtil.getAttributeKey;
 import static org.thingsboard.server.common.data.ota.OtaPackageUtil.getAttributeKey;
-import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FIRMWARE_UPDATE_COAP_RECOURSE;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.LOG_LWM2M_TELEMETRY;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.LOG_LWM2M_TELEMETRY;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.convertObjectIdToVersionedId;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.convertObjectIdToVersionedId;
 
 
@@ -78,13 +86,30 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
     public static final String SOFTWARE_TITLE = getAttributeKey(OtaPackageType.SOFTWARE, OtaPackageKey.TITLE);
     public static final String SOFTWARE_TITLE = getAttributeKey(OtaPackageType.SOFTWARE, OtaPackageKey.TITLE);
     public static final String SOFTWARE_URL = getAttributeKey(OtaPackageType.SOFTWARE, OtaPackageKey.URL);
     public static final String SOFTWARE_URL = getAttributeKey(OtaPackageType.SOFTWARE, OtaPackageKey.URL);
 
 
+    public static final String FIRMWARE_UPDATE_COAP_RECOURSE = "tbfw";
+    public static final String SOFTWARE_UPDATE_COAP_RECOURSE = "tbsw";
     private static final String FW_PACKAGE_5_ID = "/5/0/0";
     private static final String FW_PACKAGE_5_ID = "/5/0/0";
     private static final String FW_URL_ID = "/5/0/1";
     private static final String FW_URL_ID = "/5/0/1";
     private static final String FW_EXECUTE_ID = "/5/0/2";
     private static final String FW_EXECUTE_ID = "/5/0/2";
-    private static final String FW_NAME_ID = "/5/0/6";
-    private static final String FW_VER_ID = "/5/0/7";
+    public static final String FW_STATE_ID = "/5/0/3";
+    public static final String FW_RESULT_ID = "/5/0/5";
+    public static final String FW_NAME_ID = "/5/0/6";
+    public static final String FW_5_VER_ID = "/5/0/7";
+    /**
+     * Quectel@Hi15RM1-HLB_V1.0@BC68JAR01A10,V150R100C20B300SP7,V150R100C20B300SP7@8
+     * Revision:BC68JAR01A10
+     */
+    public static final String FW_3_VER_ID = "/3/0/3";
+    public static final String FW_DELIVERY_METHOD = "/5/0/9";
+
     private static final String SW_NAME_ID = "/9/0/0";
     private static final String SW_NAME_ID = "/9/0/0";
     private static final String SW_VER_ID = "/9/0/1";
     private static final String SW_VER_ID = "/9/0/1";
+    public static final String SW_PACKAGE_ID = "/9/0/2";
+    public static final String SW_PACKAGE_URI_ID = "/9/0/3";
+    public static final String SW_INSTALL_ID = "/9/0/4";
+    public static final String SW_UPDATE_STATE_ID = "/9/0/7";
+    public static final String SW_RESULT_ID = "/9/0/9";
+    public static final String SW_UN_INSTALL_ID = "/9/0/6";
 
 
     private final Map<String, LwM2MClientOtaInfo> fwStates = new ConcurrentHashMap<>();
     private final Map<String, LwM2MClientOtaInfo> fwStates = new ConcurrentHashMap<>();
     private final Map<String, LwM2MClientOtaInfo> swStates = new ConcurrentHashMap<>();
     private final Map<String, LwM2MClientOtaInfo> swStates = new ConcurrentHashMap<>();
@@ -216,7 +241,7 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
             executeFwUpdate(client);
             executeFwUpdate(client);
         }
         }
         fwInfo.setUpdateState(state);
         fwInfo.setUpdateState(state);
-        Optional<OtaPackageUpdateStatus> status = LwM2mTransportUtil.toOtaPackageUpdateStatus(state);
+        Optional<OtaPackageUpdateStatus> status = this.toOtaPackageUpdateStatus(state);
         status.ifPresent(otaStatus -> sendStateUpdateToTelemetry(client, fwInfo,
         status.ifPresent(otaStatus -> sendStateUpdateToTelemetry(client, fwInfo,
                 otaStatus, "Firmware Update State: " + state.name()));
                 otaStatus, "Firmware Update State: " + state.name()));
     }
     }
@@ -226,7 +251,7 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
         log.debug("[{}] Current fw result: {}", client.getEndpoint(), code);
         log.debug("[{}] Current fw result: {}", client.getEndpoint(), code);
         LwM2MClientOtaInfo fwInfo = getOrInitFwInfo(client);
         LwM2MClientOtaInfo fwInfo = getOrInitFwInfo(client);
         UpdateResultFw result = UpdateResultFw.fromUpdateResultFwByCode(code.intValue());
         UpdateResultFw result = UpdateResultFw.fromUpdateResultFwByCode(code.intValue());
-        Optional<OtaPackageUpdateStatus> status = LwM2mTransportUtil.toOtaPackageUpdateStatus(result);
+        Optional<OtaPackageUpdateStatus> status = this.toOtaPackageUpdateStatus(result);
         status.ifPresent(otaStatus -> sendStateUpdateToTelemetry(client, fwInfo,
         status.ifPresent(otaStatus -> sendStateUpdateToTelemetry(client, fwInfo,
                 otaStatus, "Firmware Update Result: " + result.name()));
                 otaStatus, "Firmware Update Result: " + result.name()));
         if (result.isAgain() && fwInfo.getRetryAttempts() <= 2) {
         if (result.isAgain() && fwInfo.getRetryAttempts() <= 2) {
@@ -299,10 +324,10 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
         if (TransportProtos.ResponseStatus.SUCCESS.equals(response.getResponseStatus())) {
         if (TransportProtos.ResponseStatus.SUCCESS.equals(response.getResponseStatus())) {
             UUID otaPackageId = new UUID(response.getOtaPackageIdMSB(), response.getOtaPackageIdLSB());
             UUID otaPackageId = new UUID(response.getOtaPackageIdMSB(), response.getOtaPackageIdLSB());
             LwM2MFirmwareUpdateStrategy strategy;
             LwM2MFirmwareUpdateStrategy strategy;
-            if (fwInfo.getDeliveryMethod() == null || fwInfo.getDeliveryMethod() == 2) {
+            if (fwInfo.getDeliveryMethod() == null || fwInfo.getDeliveryMethod() == UpdateDeliveryFw.BOTH.code) {
                 strategy = fwInfo.getFwStrategy();
                 strategy = fwInfo.getFwStrategy();
             } else {
             } else {
-                strategy = fwInfo.getDeliveryMethod() == 0 ? LwM2MFirmwareUpdateStrategy.OBJ_5_TEMP_URL : LwM2MFirmwareUpdateStrategy.OBJ_5_BINARY;
+                strategy = fwInfo.getDeliveryMethod() == UpdateDeliveryFw.PULL.code ? LwM2MFirmwareUpdateStrategy.OBJ_5_TEMP_URL : LwM2MFirmwareUpdateStrategy.OBJ_5_BINARY;
             }
             }
             switch (strategy) {
             switch (strategy) {
                 case OBJ_5_BINARY:
                 case OBJ_5_BINARY:
@@ -380,4 +405,78 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
         helper.sendParametersOnThingsboardTelemetry(result, client.getSession());
         helper.sendParametersOnThingsboardTelemetry(result, client.getSession());
     }
     }
 
 
+    private static Optional<OtaPackageUpdateStatus> toOtaPackageUpdateStatus(UpdateResultFw updateResultFw) {
+        switch (updateResultFw) {
+            case INITIAL:
+                return Optional.empty();
+            case UPDATE_SUCCESSFULLY:
+                return Optional.of(UPDATED);
+            case NOT_ENOUGH:
+            case OUT_OFF_MEMORY:
+            case CONNECTION_LOST:
+            case INTEGRITY_CHECK_FAILURE:
+            case UNSUPPORTED_TYPE:
+            case INVALID_URI:
+            case UPDATE_FAILED:
+            case UNSUPPORTED_PROTOCOL:
+                return Optional.of(FAILED);
+            default:
+                throw new CodecException("Invalid value stateFw %s for FirmwareUpdateStatus.", updateResultFw.name());
+        }
+    }
+
+    private static Optional<OtaPackageUpdateStatus> toOtaPackageUpdateStatus(UpdateStateFw updateStateFw) {
+        switch (updateStateFw) {
+            case IDLE:
+                return Optional.empty();
+            case DOWNLOADING:
+                return Optional.of(DOWNLOADING);
+            case DOWNLOADED:
+                return Optional.of(DOWNLOADED);
+            case UPDATING:
+                return Optional.of(UPDATING);
+            default:
+                throw new CodecException("Invalid value stateFw %d for FirmwareUpdateStatus.", updateStateFw);
+        }
+    }
+
+    /**
+     * FirmwareUpdateStatus {
+     * DOWNLOADING, DOWNLOADED, VERIFIED, UPDATING, UPDATED, FAILED
+     */
+    public static Optional<OtaPackageUpdateStatus> toSwSateResultUpdateStatus(UpdateStateSw updateStateSw, UpdateResultSw updateResultSw) {
+        switch (updateResultSw) {
+            case INITIAL:
+                switch (updateStateSw) {
+                    case INITIAL:
+                    case DOWNLOAD_STARTED:
+                        return Optional.of(DOWNLOADING);
+                    case DOWNLOADED:
+                        return Optional.of(DOWNLOADED);
+                    case DELIVERED:
+                        return Optional.of(VERIFIED);
+                }
+            case DOWNLOADING:
+                return Optional.of(DOWNLOADING);
+            case SUCCESSFULLY_INSTALLED:
+                return Optional.of(UPDATED);
+            case SUCCESSFULLY_DOWNLOADED_VERIFIED:
+                return Optional.of(VERIFIED);
+            case NOT_ENOUGH_STORAGE:
+            case OUT_OFF_MEMORY:
+            case CONNECTION_LOST:
+            case PACKAGE_CHECK_FAILURE:
+            case UNSUPPORTED_PACKAGE_TYPE:
+            case INVALID_URI:
+            case UPDATE_ERROR:
+            case INSTALL_FAILURE:
+            case UN_INSTALL_FAILURE:
+                return Optional.of(FAILED);
+            default:
+                throw new CodecException("Invalid value stateFw %s   %s for FirmwareUpdateStatus.", updateStateSw.name(), updateResultSw.name());
+        }
+    }
+
+
+
 }
 }

@@ -18,10 +18,10 @@ package org.thingsboard.server.transport.lwm2m.server.ota;
 import lombok.Data;
 import lombok.Data;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.ota.OtaPackageType;
-import org.thingsboard.server.transport.lwm2m.server.LwM2MFirmwareUpdateStrategy;
-import org.thingsboard.server.transport.lwm2m.server.LwM2MSoftwareUpdateStrategy;
-import org.thingsboard.server.transport.lwm2m.server.UpdateResultFw;
-import org.thingsboard.server.transport.lwm2m.server.UpdateStateFw;
+import org.thingsboard.server.transport.lwm2m.server.ota.firmware.LwM2MFirmwareUpdateStrategy;
+import org.thingsboard.server.transport.lwm2m.server.ota.firmware.UpdateResultFw;
+import org.thingsboard.server.transport.lwm2m.server.ota.firmware.UpdateStateFw;
+import org.thingsboard.server.transport.lwm2m.server.ota.software.LwM2MSoftwareUpdateStrategy;
 
 
 import java.util.Optional;
 import java.util.Optional;
 
 

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.lwm2m.server;
+package org.thingsboard.server.transport.lwm2m.server.ota.firmware;
 
 
 public enum LwM2MFirmwareUpdateStrategy {
 public enum LwM2MFirmwareUpdateStrategy {
     OBJ_5_BINARY(1, "ObjectId 5, Binary"),
     OBJ_5_BINARY(1, "ObjectId 5, Binary"),

+/**
+ * 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.server.ota.firmware;
+
+/**
+ * /** Delivery Method R
+ * 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.
+ */
+public enum UpdateDeliveryFw {
+    PULL(0, "Pull only"),
+    PUSH(1, "Push only"),
+    BOTH(2, "Push or Push");
+
+    public int code;
+    public String type;
+
+    UpdateDeliveryFw(int code, String type) {
+        this.code = code;
+        this.type = type;
+    }
+
+    public static UpdateDeliveryFw fromStateFwByType(String type) {
+        for (UpdateDeliveryFw to : UpdateDeliveryFw.values()) {
+            if (to.type.equals(type)) {
+                return to;
+            }
+        }
+        throw new IllegalArgumentException(String.format("Unsupported FW delivery type  : %s", type));
+    }
+
+    public static UpdateDeliveryFw fromStateFwByCode(int code) {
+        for (UpdateDeliveryFw to : UpdateDeliveryFw.values()) {
+            if (to.code == code) {
+                return to;
+            }
+        }
+        throw new IllegalArgumentException(String.format("Unsupported FW delivery code : %s", code));
+    }
+}

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.lwm2m.server;
+package org.thingsboard.server.transport.lwm2m.server.ota.firmware;
 
 
 import lombok.Getter;
 import lombok.Getter;
 
 

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.lwm2m.server;
+package org.thingsboard.server.transport.lwm2m.server.ota.firmware;
 
 
 /**
 /**
  * /** State R
  * /** State R

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.thingsboard.server.transport.lwm2m.server;
+package org.thingsboard.server.transport.lwm2m.server.ota.software;
 
 
 public enum LwM2MSoftwareUpdateStrategy {
 public enum LwM2MSoftwareUpdateStrategy {
     BINARY(1, "ObjectId 9, Binary"),
     BINARY(1, "ObjectId 9, Binary"),

+/**
+ * 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.server.ota.software;
+
+/**
+ * SW Update Result
+ * 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))
+ * ** Failed
+ * 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.
+ */
+public enum UpdateResultSw {
+    INITIAL(0, "Initial value", false),
+    DOWNLOADING(1, "Downloading", false),
+    SUCCESSFULLY_INSTALLED(2, "Software successfully installed", false),
+    SUCCESSFULLY_DOWNLOADED_VERIFIED(3, "Successfully Downloaded and package integrity verified", false),
+    NOT_ENOUGH_STORAGE(50, "Not enough storage for the new software package", true),
+    OUT_OFF_MEMORY(51, "Out of memory during downloading process", true),
+    CONNECTION_LOST(52, "Connection lost during downloading process", false),
+    PACKAGE_CHECK_FAILURE(53, "Package integrity check failure.", false),
+    UNSUPPORTED_PACKAGE_TYPE(54, "Unsupported package type", false),
+    INVALID_URI(56, "Invalid URI", true),
+    UPDATE_ERROR(57, "Device defined update error", true),
+    INSTALL_FAILURE(58, "Software installation failure", true),
+    UN_INSTALL_FAILURE(59, "Uninstallation Failure during forUpdate(arg=0)", true);
+
+    public int code;
+    public String type;
+    public boolean isAgain;
+
+    UpdateResultSw(int code, String type, boolean isAgain) {
+        this.code = code;
+        this.type = type;
+        this.isAgain = isAgain;
+    }
+
+    public static UpdateResultSw fromUpdateResultSwByType(String type) {
+        for (UpdateResultSw to : UpdateResultSw.values()) {
+            if (to.type.equals(type)) {
+                return to;
+            }
+        }
+        throw new IllegalArgumentException(String.format("Unsupported SW Update Result type  : %s", type));
+    }
+
+    public static UpdateResultSw fromUpdateResultSwByCode(int code) {
+        for (UpdateResultSw to : UpdateResultSw.values()) {
+            if (to.code == code) {
+                return to;
+            }
+        }
+        throw new IllegalArgumentException(String.format("Unsupported SW Update Result code  : %s", code));
+    }
+}

+/**
+ * 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.server.ota.software;
+
+/**
+ * SW Update State R
+ * 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
+ */
+public enum UpdateStateSw {
+    INITIAL(0, "Initial"),
+    DOWNLOAD_STARTED(1, "DownloadStarted"),
+    DOWNLOADED(2, "Downloaded"),
+    DELIVERED(3, "Delivered"),
+    INSTALLED(4, "Installed");
+
+    public int code;
+    public String type;
+
+    UpdateStateSw(int code, String type) {
+        this.code = code;
+        this.type = type;
+    }
+
+    public static UpdateStateSw fromUpdateStateSwByType(String type) {
+        for (UpdateStateSw to : UpdateStateSw.values()) {
+            if (to.type.equals(type)) {
+                return to;
+            }
+        }
+        throw new IllegalArgumentException(String.format("Unsupported SW State type  : %s", type));
+    }
+
+    public static UpdateStateSw fromUpdateStateSwByCode(int code) {
+        for (UpdateStateSw to : UpdateStateSw.values()) {
+            if (to.code == code) {
+                return to;
+            }
+        }
+        throw new IllegalArgumentException(String.format("Unsupported SW State type  : %s", code));
+    }
+}
+

@@ -16,20 +16,13 @@
 package org.thingsboard.server.transport.lwm2m.server.store;
 package org.thingsboard.server.transport.lwm2m.server.store;
 
 
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.leshan.server.security.EditableSecurityStore;
 import org.eclipse.leshan.server.security.NonUniqueSecurityInfoException;
 import org.eclipse.leshan.server.security.NonUniqueSecurityInfoException;
 import org.eclipse.leshan.server.security.SecurityInfo;
 import org.eclipse.leshan.server.security.SecurityInfo;
-import org.eclipse.leshan.server.security.SecurityStore;
-import org.eclipse.leshan.server.security.SecurityStoreListener;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
 import org.thingsboard.server.transport.lwm2m.secure.LwM2mCredentialsSecurityInfoValidator;
 import org.thingsboard.server.transport.lwm2m.secure.LwM2mCredentialsSecurityInfoValidator;
 import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MSecurityInfo;
 import org.thingsboard.server.transport.lwm2m.secure.TbLwM2MSecurityInfo;
-import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil;
-import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClientContext;
 
 
-import java.util.Collection;
+import static org.thingsboard.server.transport.lwm2m.server.uplink.LwM2mTypeServer.CLIENT;
 
 
 @Slf4j
 @Slf4j
 public class TbLwM2mSecurityStore implements TbEditableSecurityStore {
 public class TbLwM2mSecurityStore implements TbEditableSecurityStore {
@@ -67,7 +60,7 @@ public class TbLwM2mSecurityStore implements TbEditableSecurityStore {
 
 
     @Nullable
     @Nullable
     public SecurityInfo fetchAndPutSecurityInfo(String credentialsId) {
     public SecurityInfo fetchAndPutSecurityInfo(String credentialsId) {
-        TbLwM2MSecurityInfo securityInfo = validator.getEndpointSecurityInfoByCredentialsId(credentialsId, LwM2mTransportUtil.LwM2mTypeServer.CLIENT);
+        TbLwM2MSecurityInfo securityInfo = validator.getEndpointSecurityInfoByCredentialsId(credentialsId, CLIENT);
         try {
         try {
             if (securityInfo != null) {
             if (securityInfo != null) {
                 securityStore.put(securityInfo);
                 securityStore.put(securityInfo);

@@ -52,8 +52,6 @@ import org.thingsboard.server.gen.transport.TransportProtos.SessionEvent;
 import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto;
 import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto;
 import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
 import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
-import org.thingsboard.server.transport.lwm2m.server.LwM2MFirmwareUpdateStrategy;
-import org.thingsboard.server.transport.lwm2m.server.LwM2MSoftwareUpdateStrategy;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mOtaConvert;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mOtaConvert;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mQueuedRequest;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mQueuedRequest;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mSessionMsgListener;
 import org.thingsboard.server.transport.lwm2m.server.LwM2mSessionMsgListener;
@@ -83,6 +81,8 @@ import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MWriteAttrib
 import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MWriteAttributesRequest;
 import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MWriteAttributesRequest;
 import org.thingsboard.server.transport.lwm2m.server.log.LwM2MTelemetryLogService;
 import org.thingsboard.server.transport.lwm2m.server.log.LwM2MTelemetryLogService;
 import org.thingsboard.server.transport.lwm2m.server.ota.LwM2MOtaUpdateService;
 import org.thingsboard.server.transport.lwm2m.server.ota.LwM2MOtaUpdateService;
+import org.thingsboard.server.transport.lwm2m.server.ota.firmware.LwM2MFirmwareUpdateStrategy;
+import org.thingsboard.server.transport.lwm2m.server.ota.software.LwM2MSoftwareUpdateStrategy;
 import org.thingsboard.server.transport.lwm2m.server.rpc.LwM2MRpcRequestHandler;
 import org.thingsboard.server.transport.lwm2m.server.rpc.LwM2MRpcRequestHandler;
 import org.thingsboard.server.transport.lwm2m.server.store.TbLwM2MDtlsSessionStore;
 import org.thingsboard.server.transport.lwm2m.server.store.TbLwM2MDtlsSessionStore;
 import org.thingsboard.server.transport.lwm2m.utils.LwM2mValueConverterImpl;
 import org.thingsboard.server.transport.lwm2m.utils.LwM2mValueConverterImpl;
@@ -105,18 +105,18 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 import static org.thingsboard.server.common.data.lwm2m.LwM2mConstants.LWM2M_SEPARATOR_PATH;
 import static org.thingsboard.server.common.data.lwm2m.LwM2mConstants.LWM2M_SEPARATOR_PATH;
-import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FW_3_VER_ID;
-import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FW_5_VER_ID;
-import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FW_DELIVERY_METHOD;
-import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FW_NAME_ID;
-import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FW_RESULT_ID;
-import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.FW_STATE_ID;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.LOG_LWM2M_ERROR;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.LOG_LWM2M_ERROR;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.LOG_LWM2M_INFO;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.LOG_LWM2M_INFO;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.LOG_LWM2M_WARN;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.LOG_LWM2M_WARN;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.convertObjectIdToVersionedId;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.convertObjectIdToVersionedId;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.convertOtaUpdateValueToString;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.convertOtaUpdateValueToString;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.fromVersionedIdToObjectId;
 import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportUtil.fromVersionedIdToObjectId;
+import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.FW_3_VER_ID;
+import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.FW_5_VER_ID;
+import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.FW_DELIVERY_METHOD;
+import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.FW_NAME_ID;
+import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.FW_RESULT_ID;
+import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.FW_STATE_ID;
 
 
 
 
 @Slf4j
 @Slf4j

+/**
+ * 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.server.uplink;
+
+public enum LwM2mTypeServer {
+    BOOTSTRAP(0, "bootstrap"),
+    CLIENT(1, "client");
+
+    public int code;
+    public String type;
+
+    LwM2mTypeServer(int code, String type) {
+        this.code = code;
+        this.type = type;
+    }
+
+    public static LwM2mTypeServer fromLwM2mTypeServer(String type) {
+        for (LwM2mTypeServer sm : LwM2mTypeServer.values()) {
+            if (sm.type.equals(type)) {
+                return sm;
+            }
+        }
+        throw new IllegalArgumentException(String.format("Unsupported typeServer type : %d", type));
+    }
+}
+