Merge pull request #11568 from thingsboard/fix/edge

Fixes

application/src/main/java/org/thingsboard/server/service/entitiy/edge/DefaultTbEdgeService.java

@@ -54,7 +54,7 @@ public class DefaultTbEdgeService extends AbstractTbEntityService implements TbE
 
             if (ActionType.ADDED.equals(actionType)) {
                 ruleChainService.assignRuleChainToEdge(tenantId, edgeTemplateRootRuleChain.getId(), edgeId);
-                edgeService.setEdgeRootRuleChain(tenantId, savedEdge, edgeTemplateRootRuleChain.getId());
+                savedEdge = edgeService.setEdgeRootRuleChain(tenantId, savedEdge, edgeTemplateRootRuleChain.getId());
                 edgeService.assignDefaultRuleChainsToEdge(tenantId, edgeId);
             }
 

application/src/test/java/org/thingsboard/server/service/sync/vc/VersionControlTest.java

@@ -241,7 +241,7 @@ public class VersionControlTest extends AbstractControllerTest {
 
         checkImportedEntity(tenantId1, device, tenantId1, importedDevice);
         assertThat(importedDevice.getDeviceProfileId()).isEqualTo(device.getDeviceProfileId());
-        assertThat(findDeviceCredentials(device.getId())).isEqualTo(deviceCredentials);
+        assertThat(findDeviceCredentials(device.getId())).isEqualToIgnoringGivenFields(deviceCredentials, "version");
         assertThat(importedDevice.getFirmwareId()).isEqualTo(firmware.getId());
         assertThat(importedDevice.getSoftwareId()).isEqualTo(software.getId());
     }

common/cache/src/main/java/org/thingsboard/server/cache/edge/RelatedEdgesCacheValue.java

@@ -15,7 +15,9 @@
  */
 package org.thingsboard.server.cache.edge;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.page.PageData;
 
@@ -23,15 +25,13 @@ import java.io.Serial;
 import java.io.Serializable;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class RelatedEdgesCacheValue implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -2765080094748518572L;
 
-    private final PageData<EdgeId> pageData;
-
-    public RelatedEdgesCacheValue(PageData<EdgeId> pageData) {
-        this.pageData = pageData;
-    }
+    private PageData<EdgeId> pageData;
 
 }

common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java

@@ -75,9 +75,9 @@ public class Edge extends BaseDataWithAdditionalInfo<EdgeId> implements HasLabel
         this.tenantId = edge.getTenantId();
         this.customerId = edge.getCustomerId();
         this.rootRuleChainId = edge.getRootRuleChainId();
+        this.name = edge.getName();
         this.type = edge.getType();
         this.label = edge.getLabel();
-        this.name = edge.getName();
         this.routingKey = edge.getRoutingKey();
         this.secret = edge.getSecret();
         this.version = edge.getVersion();
@@ -87,9 +87,9 @@ public class Edge extends BaseDataWithAdditionalInfo<EdgeId> implements HasLabel
         this.tenantId = edge.getTenantId();
         this.customerId = edge.getCustomerId();
         this.rootRuleChainId = edge.getRootRuleChainId();
+        this.name = edge.getName();
         this.type = edge.getType();
         this.label = edge.getLabel();
-        this.name = edge.getName();
         this.routingKey = edge.getRoutingKey();
         this.secret = edge.getSecret();
         this.version = edge.getVersion();