Refactor relations export

application/src/main/java/org/thingsboard/server/service/sync/exporting/data/request/EntityExportSettings.java

@@ -25,6 +25,5 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Builder
 public class EntityExportSettings {
-    private boolean exportInboundRelations;
+    private boolean exportRelations;
-    private boolean exportOutboundRelations;
 }

application/src/main/java/org/thingsboard/server/service/sync/exporting/impl/DefaultEntityExportService.java

@@ -64,25 +64,23 @@ public class DefaultEntityExportService<I extends EntityId, E extends Exportable
     }
 
     protected void setAdditionalExportData(SecurityUser user, E entity, D exportData, EntityExportSettings exportSettings) throws ThingsboardException {
-        List<EntityRelation> relations = null;
+        if (exportSettings.isExportRelations()) {
-        if (exportSettings.isExportInboundRelations()) {
+            List<EntityRelation> relations = new ArrayList<>();
+
             List<EntityRelation> inboundRelations = relationService.findByTo(user.getTenantId(), entity.getId(), RelationTypeGroup.COMMON);
             for (EntityRelation relation : inboundRelations) {
                 exportableEntitiesService.checkPermission(user, relation.getFrom(), Operation.READ);
             }
-            relations = new ArrayList<>(inboundRelations);
+            relations.addAll(inboundRelations);
-        }
+
-        if (exportSettings.isExportOutboundRelations()) {
             List<EntityRelation> outboundRelations = relationService.findByFrom(user.getTenantId(), entity.getId(), RelationTypeGroup.COMMON);
             for (EntityRelation relation : outboundRelations) {
                 exportableEntitiesService.checkPermission(user, relation.getTo(), Operation.READ);
             }
-            if (relations == null) {
-                relations = new ArrayList<>();
-            }
             relations.addAll(outboundRelations);
+
+            exportData.setRelations(relations);
         }
-        exportData.setRelations(relations);
     }
 
     protected D newExportData() {

application/src/test/java/org/thingsboard/server/controller/sql/EntitiesExportImportControllerSqlTest.java

@@ -421,8 +421,7 @@ public class EntitiesExportImportControllerSqlTest extends BaseEntitiesExportImp
         EntityListExportRequest exportRequest = new EntityListExportRequest();
         exportRequest.setEntitiesIds(List.of(asset.getId(), device.getId()));
         exportRequest.setExportSettings(EntityExportSettings.builder()
-                .exportInboundRelations(true)
+                .exportRelations(true)
-                .exportOutboundRelations(false)
                 .build());
         List<EntityExportData<?>> exportDataList = exportEntities(exportRequest);
 
@@ -468,8 +467,7 @@ public class EntitiesExportImportControllerSqlTest extends BaseEntitiesExportImp
         EntityListExportRequest exportRequest = new EntityListExportRequest();
         exportRequest.setEntitiesIds(List.of(asset.getId(), device.getId()));
         exportRequest.setExportSettings(EntityExportSettings.builder()
-                .exportInboundRelations(true)
+                .exportRelations(true)
-                .exportOutboundRelations(true)
                 .build());
         List<EntityExportData<?>> exportDataList = exportEntities(exportRequest);
 
@@ -511,7 +509,7 @@ public class EntitiesExportImportControllerSqlTest extends BaseEntitiesExportImp
         SingleEntityExportRequest exportRequest = new SingleEntityExportRequest();
         exportRequest.setEntityId(asset.getId());
         exportRequest.setExportSettings(EntityExportSettings.builder()
-                .exportOutboundRelations(true)
+                .exportRelations(true)
                 .build());
         EntityExportData<Asset> assetExportData = (EntityExportData<Asset>) exportEntities(exportRequest).get(0);
         assertThat(assetExportData.getRelations()).size().isOne();
@@ -543,7 +541,7 @@ public class EntitiesExportImportControllerSqlTest extends BaseEntitiesExportImp
         SingleEntityExportRequest exportRequest = new SingleEntityExportRequest();
         exportRequest.setEntityId(device.getId());
         exportRequest.setExportSettings(EntityExportSettings.builder()
-                .exportInboundRelations(true)
+                .exportRelations(true)
                 .build());
         EntityExportData<?> deviceExportData = exportEntities(exportRequest).get(0);
         assertThat(deviceExportData.getRelations()).size().isOne();