Fix edge tests

Author: AndriiLandiak

application/src/test/java/org/thingsboard/server/client/DashboardApiClientTest.java

@@ -26,7 +26,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 @DaoSqlTest
 public class DashboardApiClientTest extends AbstractApiClientTest {
@@ -86,6 +85,8 @@ public void testDashboardLifecycle() throws Exception {
         PageDataDashboardInfo dashboardsAfterUnassign = client.getCustomerDashboards(customerId, 100, 0, null, null, null, null);
         assertEquals(0, dashboardsAfterUnassign.getData().size());
 
+        /*
+        // Edge: a dashboard can't be made public directly — the public customer is cloud-managed
         // make dashboard public and verify
         client.assignDashboardToPublicCustomer(dashboardId);
         DashboardInfo publicDashboard = client.getDashboardInfoById(dashboardId);
@@ -94,6 +95,7 @@ public void testDashboardLifecycle() throws Exception {
 
         // remove public access
         client.unassignDashboardFromPublicCustomer(dashboardId);
+        */
 
         // delete dashboard
         UUID dashboardToDeleteId = createdDashboards.get(0).getId().getId();

application/src/test/java/org/thingsboard/server/client/DeviceConnectivityApiClientTest.java

@@ -39,7 +39,10 @@ public void testGetDevicePublishTelemetryCommands() throws Exception {
         String deviceId = savedDevice.getId().getId().toString();
 
         JsonNode commands = client.getDevicePublishTelemetryCommands(deviceId);
-        assertEquals("curl -v -X POST http://localhost:8080/api/v1/" + token + "/telemetry --header Content-Type:application/json --data \"{temperature:25}\"", commands.get("http").get("http").asText());
+        // Edge: the HTTP publish command reflects the live request port (DeviceConnectivityServiceImpl
+        // overrides it with the base-URL port), not CE's configured 8080 — assert the dynamic test port.
+        // assertEquals("curl -v -X POST http://localhost:8080/api/v1/" + token + "/telemetry --header Content-Type:application/json --data \"{temperature:25}\"", commands.get("http").get("http").asText());
+        assertEquals("curl -v -X POST http://localhost:" + wsPort + "/api/v1/" + token + "/telemetry --header Content-Type:application/json --data \"{temperature:25}\"", commands.get("http").get("http").asText());
         assertEquals("mosquitto_pub -d -q 1 -h localhost -p 1883 -t v1/devices/me/telemetry -u \"" + token + "\" -m \"{temperature:25}\"", commands.get("mqtt").get("mqtt").asText());
         assertEquals("coap-client -v 6 -m POST -t \"application/json\" -e \"{temperature:25}\" coap://localhost:5683/api/v1/" + token + "/telemetry", commands.get("coap").get("coap").asText());
     }

application/src/test/java/org/thingsboard/server/controller/AlarmRuleControllerTest.java

@@ -105,7 +105,8 @@ public void testSaveAlarmRule() throws Exception {
         AlarmRuleDefinition updated = saveAlarmRule(saved);
 
         assertThat(updated.getName()).isEqualTo("Updated Alarm Rule");
-        assertThat(updated.getVersion()).isEqualTo(saved.getVersion() + 1);
+        // Edge: optimistic locking mechanism is not used, so the version should be null. See the 'doSave' method in the 'JpaAbstractDao' class for more details.
+        // assertThat(updated.getVersion()).isEqualTo(saved.getVersion() + 1);
 
         doDelete("/api/alarm/rule/" + saved.getId().getId())
                 .andExpect(status().isOk());

dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleChainDetailsDao.java

@@ -54,7 +54,11 @@ public RuleChainDetails findById(TenantId tenantId, UUID key) {
     @Override
     protected RuleChainDetailsEntity doSave(RuleChainDetailsEntity entity, boolean isNew, boolean flush) {
         try {
-            return super.doSave(entity, isNew, flush);
+            RuleChainDetailsEntity saved = super.doSave(entity, isNew, flush);
+            // Edge-only: base 'doSave' does not flush (Edge does not use JPA optimistic locking), so a DB constraint violation would otherwise surface at commit,
+            // outside this catch. Flush here so an oversized "notes" payload ("value too long") becomes DataValidationException (-> HTTP 400).
+            getRepository().flush();
+            return saved;
         } catch (Exception e) {
             String rootMsg = ExceptionUtils.getRootCauseMessage(e);
             if (StringUtils.contains(rootMsg, "value too long")) {

dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java

@@ -55,7 +55,6 @@
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static org.thingsboard.server.dao.DaoUtil.toUUIDs;
 import static org.thingsboard.server.dao.service.Validator.validateId;
-import static org.thingsboard.server.dao.service.Validator.validateIds;
 
 @Service("TenantDaoService")
 @Slf4j
@@ -142,7 +141,11 @@ public Tenant saveTenant(Tenant tenant, Consumer<TenantId> defaultEntitiesCreato
         }
         boolean create = tenant.getId() == null;
 
-        Tenant savedTenant = tenantDao.save(tenant.getId(), tenant);
+        // Edge-only: base 'doSave' does not flush (Edge does not use JPA optimistic locking). On create, flush eagerly so a non-existent tenantProfileId
+        // fails the FK constraint here (-> HTTP 400) instead of later during default-entity creation, where it gets re-wrapped as a generic 500.
+        Tenant savedTenant = create
+                ? tenantDao.saveAndFlush(TenantId.SYS_TENANT_ID, tenant)
+                : tenantDao.save(tenant.getId(), tenant);
         TenantId tenantId = savedTenant.getId();
         publishEvictEvent(new TenantEvictEvent(tenantId, create));
 
@@ -239,7 +242,7 @@ public List<Tenant> findTenantsByIds(TenantId callerId, List<TenantId> tenantIds
     public boolean tenantExists(TenantId tenantId) {
         // edge-only: we cannot properly evict cache, because it's only appear on tenant creation
         // return existsTenantCache.getAndPutInTransaction(tenantId, () -> tenantDao.existsById(tenantId, tenantId.getId()), false);
-       return tenantDao.existsById(tenantId, tenantId.getId());
+        return tenantDao.existsById(tenantId, tenantId.getId());
     }
 
     private final PaginatedRemover<TenantId, Tenant> tenantsRemover = new PaginatedRemover<>() {

msa/tb-edge-node/pom.xml

@@ -129,6 +129,7 @@
                             <workingDirectory>${project.build.directory}/docker-tb-edge-node</workingDirectory>
                             <arguments>
                                 <argument>build</argument>
+                                <argument>--load</argument>
                                 <argument>-t</argument>
                                 <argument>${docker.repo}/${docker.name}:latest</argument>
                                 <argument>.</argument>

msa/tb-edge/pom.xml

@@ -132,6 +132,7 @@
                             <workingDirectory>${project.build.directory}/docker-tb-edge</workingDirectory>
                             <arguments>
                                 <argument>build</argument>
+                                <argument>--load</argument>
                                 <argument>-t</argument>
                                 <argument>${docker.repo}/${docker.name}:latest</argument>
                                 <argument>.</argument>