lwm2m: fix bug of commits

application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java

@@ -67,6 +67,7 @@ import org.thingsboard.server.service.telemetry.cmd.v2.EntityDataCmd;
 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 org.thingsboard.server.transport.lwm2m.server.client.LwM2mClientContext;
 import org.thingsboard.server.transport.lwm2m.server.uplink.DefaultLwM2mUplinkMsgHandler;
 
 import java.io.IOException;
@@ -105,6 +106,9 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractWebsocketTest
     @SpyBean
     DefaultLwM2mUplinkMsgHandler defaultLwM2mUplinkMsgHandlerTest;
 
+    @Autowired
+    private LwM2mClientContext clientContextTest;
+
     //  Lwm2m Server
     public static final int port = 5685;
     public static final int securityPort = 5686;
@@ -299,7 +303,8 @@ public abstract class AbstractLwM2MIntegrationTest extends AbstractWebsocketTest
         this.clientDestroy();
         lwM2MTestClient = new LwM2MTestClient(this.executor, endpoint);
         int clientPort = SocketUtils.findAvailableUdpPort();
-        lwM2MTestClient.init(security, coapConfig, clientPort, isRpc, isBootstrap, this.shortServerId, this.shortServerIdBs, securityBs, this.defaultLwM2mUplinkMsgHandlerTest);
+        lwM2MTestClient.init(security, coapConfig, clientPort, isRpc, isBootstrap, this.shortServerId, this.shortServerIdBs,
+                securityBs, this.defaultLwM2mUplinkMsgHandlerTest, this.clientContextTest);
     }
 
     private void clientDestroy() {

application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2MTestClient.java

@@ -44,6 +44,7 @@ import org.eclipse.leshan.core.request.UpdateRequest;
 import org.junit.Assert;
 import org.mockito.Mockito;
 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.uplink.DefaultLwM2mUplinkMsgHandler;
 import org.thingsboard.server.transport.lwm2m.utils.LwM2mValueConverterImpl;
 
@@ -113,11 +114,15 @@ public class LwM2MTestClient {
     private LwM2MClientState clientState;
     private Set<LwM2MClientState> clientStates;
     private DefaultLwM2mUplinkMsgHandler defaultLwM2mUplinkMsgHandlerTest;
+    private LwM2mClientContext clientContext;
 
     public void init(Security security, Configuration coapConfig, int port, boolean isRpc, boolean isBootstrap,
-                     int shortServerId, int shortServerIdBs, Security securityBs, DefaultLwM2mUplinkMsgHandler defaultLwM2mUplinkMsgHandler) throws InvalidDDFFileException, IOException {
+                     int shortServerId, int shortServerIdBs, Security securityBs,
+                     DefaultLwM2mUplinkMsgHandler defaultLwM2mUplinkMsgHandler,
+                     LwM2mClientContext clientContext) throws InvalidDDFFileException, IOException {
         Assert.assertNull("client already initialized", leshanClient);
         this.defaultLwM2mUplinkMsgHandlerTest = defaultLwM2mUplinkMsgHandler;
+        this.clientContext = clientContext;
         List<ObjectModel> models = new ArrayList<>();
         for (String resourceName : resources) {
             models.addAll(ObjectLoader.loadDdfFile(LwM2MTestClient.class.getClassLoader().getResourceAsStream("lwm2m/" + resourceName), resourceName));
@@ -334,10 +339,9 @@ public class LwM2MTestClient {
     }
 
     private void awaitClientAfterStartConnectLw() {
-        LwM2mClient lwM2MClient = this.defaultLwM2mUplinkMsgHandlerTest.clientContext.getClientByEndpoint(endpoint);
+        LwM2mClient lwM2MClient = this.clientContext.getClientByEndpoint(endpoint);
         CountDownLatch latch = new CountDownLatch(1);
         Mockito.doAnswer(invocation -> {
-//            Object result = invocation.callRealMethod();
             latch.countDown();
             return null;
         }).when(defaultLwM2mUplinkMsgHandlerTest).initAttributes(lwM2MClient, true);

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java

@@ -375,14 +375,14 @@ public class LwM2mClientContextImpl implements LwM2mClientContext {
 
     private Lwm2mDeviceProfileTransportConfiguration doGetAndCache(UUID profileId) {
 
-        Lwm2mDeviceProfileTransportConfiguration result = profiles != null ? profiles.get(profileId) : null;
+        Lwm2mDeviceProfileTransportConfiguration result = profiles.get(profileId);
         if (result == null) {
             log.debug("Fetching profile [{}]", profileId);
-            DeviceProfile deviceProfile = deviceProfileCache != null ? deviceProfileCache.get(new DeviceProfileId(profileId)) : null;
+            DeviceProfile deviceProfile = deviceProfileCache.get(new DeviceProfileId(profileId));
             if (deviceProfile != null) {
                 result = profileUpdate(deviceProfile);
             } else {
-                log.error("Device profile was not found! Most probably device profile [{}] has been removed from the database.", profileId);
+                log.warn("Device profile was not found! Most probably device profile [{}] has been removed from the database.", profileId);
             }
         }
         return result;

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/DefaultLwM2mUplinkMsgHandler.java

@@ -150,7 +150,7 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
     private final LwM2MTelemetryLogService logService;
     private final LwM2mTransportServerHelper helper;
     private final TbLwM2MDtlsSessionStore sessionStore;
-    public final LwM2mClientContext clientContext;
+    private final LwM2mClientContext clientContext;
     private final LwM2mDownlinkMsgHandler defaultLwM2MDownlinkMsgHandler;
     private final LwM2mVersionedModelProvider modelProvider;
     private final RegistrationStore registrationStore;
@@ -487,8 +487,8 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
             latch.await();
         } catch (InterruptedException e) {
             log.error("[{}] Failed to await Read requests!", lwM2MClient.getEndpoint(), e);
-        } catch (Exception e1) {
-            log.error("[{}] Failed to process read requests!", lwM2MClient.getEndpoint(), e1);
+        } catch (Exception e) {
+            log.error("[{}] Failed to process read requests!", lwM2MClient.getEndpoint(), e);
             logService.log(lwM2MClient, "Failed to process read requests. Possible profile misconfiguration.");
         }
     }
@@ -505,8 +505,8 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
             latch.await();
         } catch (InterruptedException e) {
             log.error("[{}] Failed to await Observe requests!", lwM2MClient.getEndpoint(), e);
-        } catch (Exception e1) {
-            log.error("[{}] Failed to process observe requests!", lwM2MClient.getEndpoint(), e1);
+        } catch (Exception e) {
+            log.error("[{}] Failed to process observe requests!", lwM2MClient.getEndpoint(), e);
             logService.log(lwM2MClient, "Failed to process observe requests. Possible profile misconfiguration.");
         }
     }