eDRX cycle parameters on device level

@@ -136,7 +136,9 @@ public class LwM2mClient implements Serializable {
         builder.setDeviceName(device.getName());
         builder.setDeviceName(device.getName());
         deviceProfileOpt.ifPresent(deviceProfile -> updateSession(deviceProfile, builder));
         deviceProfileOpt.ifPresent(deviceProfile -> updateSession(deviceProfile, builder));
         this.session = builder.build();
         this.session = builder.build();
-        this.powerMode = ((Lwm2mDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration()).getPowerMode();
+        Lwm2mDeviceTransportConfiguration transportConfiguration = (Lwm2mDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration();
+        this.powerMode = transportConfiguration.getPowerMode();
+        this.edrxCycle = transportConfiguration.getEdrxCycle();
     }
     }
 
 
     public void onDeviceProfileUpdate(DeviceProfile deviceProfile) {
     public void onDeviceProfileUpdate(DeviceProfile deviceProfile) {

@@ -349,11 +349,15 @@ public class LwM2mClientContextImpl implements LwM2mClientContext {
 
 
     @Override
     @Override
     public Long getRequestTimeout(LwM2mClient client) {
     public Long getRequestTimeout(LwM2mClient client) {
-        var clientProfile = getProfile(client.getProfileId());
-        OtherConfiguration clientLwM2mSettings = clientProfile.getClientLwM2mSettings();
         Long timeout = null;
         Long timeout = null;
-        if (PowerMode.E_DRX.equals(clientLwM2mSettings.getPowerMode())) {
-            timeout = clientLwM2mSettings.getEdrxCycle();
+        if (PowerMode.E_DRX.equals(client.getPowerMode()) && client.getEdrxCycle() != null) {
+            timeout = client.getEdrxCycle();
+        } else {
+            var clientProfile = getProfile(client.getProfileId());
+            OtherConfiguration clientLwM2mSettings = clientProfile.getClientLwM2mSettings();
+            if (PowerMode.E_DRX.equals(clientLwM2mSettings.getPowerMode())) {
+                timeout = clientLwM2mSettings.getEdrxCycle();
+            }
         }
         }
         if (timeout == null || timeout == 0L) {
         if (timeout == null || timeout == 0L) {
             timeout = this.config.getTimeout();
             timeout = this.config.getTimeout();

@@ -1222,7 +1222,7 @@
             "drx": "Discontinuous Reception (DRX)",
             "drx": "Discontinuous Reception (DRX)",
             "edrx": "Extended Discontinuous Reception (eDRX)"
             "edrx": "Extended Discontinuous Reception (eDRX)"
         },
         },
-        "edrx-cycle": "eDRX cycle",
+        "edrx-cycle": "eDRX cycle in milliseconds",
         "edrx-cycle-required": "eDRX cycle is required.",
         "edrx-cycle-required": "eDRX cycle is required.",
         "edrx-cycle-pattern": "eDRX cycle must be a positive integer.",
         "edrx-cycle-pattern": "eDRX cycle must be a positive integer.",
         "lwm2m": {
         "lwm2m": {