From 3b8a9d94ecfffeb3813bcc75d203c568be4ab567 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 24 Jul 2023 22:57:52 +0200
Subject: [PATCH] Lwm2m transport - merge non-unique endpoints for models
 fetched from cache

---
 .../model/LwM2MModelConfigServiceImpl.java    |  8 +-
 .../LwM2MModelConfigServiceImplTest.java      | 73 +++++++++++++++++++
 2 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/model/LwM2MModelConfigServiceImplTest.java

diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/model/LwM2MModelConfigServiceImpl.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/model/LwM2MModelConfigServiceImpl.java
index 302bd20c8b..eef9a53024 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/model/LwM2MModelConfigServiceImpl.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/model/LwM2MModelConfigServiceImpl.java
@@ -52,7 +52,7 @@ import java.util.stream.Collectors;
 public class LwM2MModelConfigServiceImpl implements LwM2MModelConfigService {
 
     @Autowired
-    private TbLwM2MModelConfigStore modelStore;
+    TbLwM2MModelConfigStore modelStore;
 
     @Autowired
     @Lazy
@@ -67,14 +67,14 @@ public class LwM2MModelConfigServiceImpl implements LwM2MModelConfigService {
     @Autowired
     private LwM2MTelemetryLogService logService;
 
-    private ConcurrentMap<String, LwM2MModelConfig> currentModelConfigs;
+    ConcurrentMap<String, LwM2MModelConfig> currentModelConfigs;
 
     @AfterStartUp(order = AfterStartUp.BEFORE_TRANSPORT_SERVICE)
-    private void init() {
+    public void init() {
         List<LwM2MModelConfig> models = modelStore.getAll();
         log.debug("Fetched model configs: {}", models);
         currentModelConfigs = models.stream()
-                .collect(Collectors.toConcurrentMap(LwM2MModelConfig::getEndpoint, m -> m));
+                .collect(Collectors.toConcurrentMap(LwM2MModelConfig::getEndpoint, m -> m, (existing, replacement) -> existing));
     }
 
     @Override
diff --git a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/model/LwM2MModelConfigServiceImplTest.java b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/model/LwM2MModelConfigServiceImplTest.java
new file mode 100644
index 0000000000..fc54ca9e0b
--- /dev/null
+++ b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/model/LwM2MModelConfigServiceImplTest.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright © 2016-2023 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.model;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.thingsboard.server.transport.lwm2m.server.store.TbLwM2MModelConfigStore;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.willReturn;
+import static org.mockito.Mockito.mock;
+
+class LwM2MModelConfigServiceImplTest {
+
+    LwM2MModelConfigServiceImpl service;
+    TbLwM2MModelConfigStore modelStore;
+
+    @BeforeEach
+    void setUp() {
+        service = new LwM2MModelConfigServiceImpl();
+        modelStore = mock(TbLwM2MModelConfigStore.class);
+        service.modelStore = modelStore;
+    }
+
+    @Test
+    void testInitWithDuplicatedModels() {
+        LwM2MModelConfig config = new LwM2MModelConfig("urn:imei:951358811362976");
+        List<LwM2MModelConfig> models = List.of(config, config);
+        willReturn(models).given(modelStore).getAll();
+        service.init();
+        assertThat(service.currentModelConfigs).containsExactlyEntriesOf(Map.of(config.getEndpoint(), config));
+    }
+
+    @Test
+    void testInitWithNonUniqueEndpoints() {
+        LwM2MModelConfig configAlfa = new LwM2MModelConfig("urn:imei:951358811362976");
+        LwM2MModelConfig configBravo = new LwM2MModelConfig("urn:imei:151358811362976");
+        LwM2MModelConfig configDelta = new LwM2MModelConfig("urn:imei:151358811362976");
+        assertThat(configBravo.getEndpoint()).as("non-unique endpoints provided").isEqualTo(configDelta.getEndpoint());
+        List<LwM2MModelConfig> models = List.of(configAlfa, configBravo, configDelta);
+        willReturn(models).given(modelStore).getAll();
+        service.init();
+        assertThat(service.currentModelConfigs).containsExactlyInAnyOrderEntriesOf(Map.of(
+                configAlfa.getEndpoint(), configAlfa,
+                configBravo.getEndpoint(), configBravo
+        ));
+    }
+
+    @Test
+    void testInitWithEmptyModels() {
+        willReturn(Collections.emptyList()).given(modelStore).getAll();
+        service.init();
+        assertThat(service.currentModelConfigs).isEmpty();
+    }
+
+}