Save relations after all other entities are saved on import; refactoring

5 years ago · 1b48a98fa0
18 changed files with 169 additions and 143 deletions
--- a/application/src/main/java/org/thingsboard/server/controller/EntitiesExportImportController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntitiesExportImportController.java
@ -46,16 +46,13 @@ import org.thingsboard.server.service.sync.exporting.data.request.EntityQueryExp
 import org.thingsboard.server.service.sync.exporting.data.request.EntityTypeExportRequest;
 import org.thingsboard.server.service.sync.exporting.data.request.ExportRequest;
 import org.thingsboard.server.service.sync.exporting.data.request.SingleEntityExportRequest;
-import org.thingsboard.server.service.sync.importing.EntityImportResult;
+import org.thingsboard.server.service.sync.importing.data.EntityImportResult;
 import org.thingsboard.server.service.sync.importing.data.request.ImportRequest;

 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.UUID;
-import java.util.function.Function;
 import java.util.stream.Collectors;

 import static org.thingsboard.server.dao.sql.query.EntityKeyMapping.CREATED_TIME;
@ -163,15 +160,7 @@ public class EntitiesExportImportController extends BaseController {
    public List<EntityImportResult<ExportableEntity<EntityId>>> importEntities(@RequestBody ImportRequest importRequest) throws ThingsboardException {
        SecurityUser user = getCurrentUser();
        try {
-            List<EntityImportResult<ExportableEntity<EntityId>>> importResults = exportImportService.importEntities(user,
-                    importRequest.getExportDataList(), importRequest.getImportSettings());
-
-            for (EntityImportResult<ExportableEntity<EntityId>> entityImportResult : importResults) {
-                if (entityImportResult.getCallback() != null) {
-                    entityImportResult.getCallback().run();
-                }
-            }
-            return importResults;
+            return exportImportService.importEntities(user, importRequest.getExportDataList(), importRequest.getImportSettings());
        } catch (Exception e) {
            throw handleException(e);
        }
--- a/application/src/main/java/org/thingsboard/server/service/sync/DefaultEntitiesExportImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/DefaultEntitiesExportImportService.java
@ -16,6 +16,7 @@
 package org.thingsboard.server.service.sync;

 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@ -35,12 +36,13 @@ import org.thingsboard.server.service.security.permission.AccessControlService;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 import org.thingsboard.server.service.sync.exporting.EntityExportService;
-import org.thingsboard.server.service.sync.exporting.data.request.EntityExportSettings;
 import org.thingsboard.server.service.sync.exporting.ExportableEntitiesService;
 import org.thingsboard.server.service.sync.exporting.data.EntityExportData;
-import org.thingsboard.server.service.sync.importing.EntityImportResult;
+import org.thingsboard.server.service.sync.exporting.data.request.EntityExportSettings;
 import org.thingsboard.server.service.sync.importing.EntityImportService;
-import org.thingsboard.server.service.sync.importing.EntityImportSettings;
+import org.thingsboard.server.service.sync.importing.data.EntityImportResult;
+import org.thingsboard.server.service.sync.importing.data.EntityImportSettings;
+import org.thingsboard.server.utils.ThrowingRunnable;

 import java.util.ArrayList;
 import java.util.Collection;
@ -48,10 +50,13 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;

@Service
@TbCoreComponent
@RequiredArgsConstructor
+@Slf4j
 public class DefaultEntitiesExportImportService implements EntitiesExportImportService, ExportableEntitiesService {

    private final Map<EntityType, EntityExportService<?, ?, ?>> exportServices = new HashMap<>();
@ -77,7 +82,37 @@ public class DefaultEntitiesExportImportService implements EntitiesExportImportS

    @Transactional(rollbackFor = Exception.class)
    @Override
-    public <E extends ExportableEntity<I>, I extends EntityId> EntityImportResult<E> importEntity(SecurityUser user, EntityExportData<E> exportData, EntityImportSettings importSettings) throws ThingsboardException {
+    public List<EntityImportResult<ExportableEntity<EntityId>>> importEntities(SecurityUser user, List<EntityExportData<ExportableEntity<EntityId>>> exportDataList, EntityImportSettings importSettings) throws ThingsboardException {
+        exportDataList.sort(Comparator.comparing(exportData -> SUPPORTED_ENTITY_TYPES.indexOf(exportData.getEntityType())));
+        List<EntityImportResult<ExportableEntity<EntityId>>> importResults = new ArrayList<>();
+
+        for (EntityExportData<ExportableEntity<EntityId>> exportData : exportDataList) {
+            EntityImportResult<ExportableEntity<EntityId>> importResult = importEntity(user, exportData, importSettings);
+            importResults.add(importResult);
+        }
+
+        for (ThrowingRunnable saveReferencesCallback : importResults.stream()
+                .map(EntityImportResult::getSaveReferencesCallback)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList())) {
+            saveReferencesCallback.run();
+        }
+
+        importResults.stream()
+                .map(EntityImportResult::getPushEventsCallback)
+                .filter(Objects::nonNull)
+                .forEach(pushEventsCallback -> {
+                    try {
+                        pushEventsCallback.run();
+                    } catch (Exception e) {
+                        log.error("Failed to send event for entity", e);
+                    }
+                });
+
+        return importResults;
+    }
+
+    private <E extends ExportableEntity<I>, I extends EntityId> EntityImportResult<E> importEntity(SecurityUser user, EntityExportData<E> exportData, EntityImportSettings importSettings) throws ThingsboardException {
        if (exportData.getEntity() == null || exportData.getEntity().getId() == null) {
            throw new DataValidationException("Invalid entity data");
        }
@ -85,22 +120,9 @@ public class DefaultEntitiesExportImportService implements EntitiesExportImportS
        EntityType entityType = exportData.getEntityType();
        EntityImportService<I, E, EntityExportData<E>> importService = getImportService(entityType);

-        // TODO [viacheslav]: might throw DataIntegrityViolationException with cause of ConstraintViolationException: need to give normal error
        return importService.importEntity(user, exportData, importSettings);
    }

-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public List<EntityImportResult<ExportableEntity<EntityId>>> importEntities(SecurityUser user, List<EntityExportData<ExportableEntity<EntityId>>> exportDataList, EntityImportSettings importSettings) throws ThingsboardException {
-        exportDataList.sort(Comparator.comparing(exportData -> SUPPORTED_ENTITY_TYPES.indexOf(exportData.getEntityType())));
-
-        List<EntityImportResult<ExportableEntity<EntityId>>> importResults = new ArrayList<>();
-        for (EntityExportData<ExportableEntity<EntityId>> exportData : exportDataList) {
-            importResults.add(importEntity(user, exportData, importSettings));
-        }
-        return importResults;
-    }
-

    @Override
    public <E extends ExportableEntity<I>, I extends EntityId> E findEntityByTenantIdAndExternalId(TenantId tenantId, I externalId) {
--- a/application/src/main/java/org/thingsboard/server/service/sync/EntitiesExportImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/EntitiesExportImportService.java
@ -19,10 +19,10 @@ import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.service.security.model.SecurityUser;
-import org.thingsboard.server.service.sync.exporting.data.request.EntityExportSettings;
 import org.thingsboard.server.service.sync.exporting.data.EntityExportData;
-import org.thingsboard.server.service.sync.importing.EntityImportResult;
-import org.thingsboard.server.service.sync.importing.EntityImportSettings;
+import org.thingsboard.server.service.sync.exporting.data.request.EntityExportSettings;
+import org.thingsboard.server.service.sync.importing.data.EntityImportResult;
+import org.thingsboard.server.service.sync.importing.data.EntityImportSettings;

 import java.util.List;

@ -30,8 +30,6 @@ public interface EntitiesExportImportService {

    <E extends ExportableEntity<I>, I extends EntityId> EntityExportData<E> exportEntity(SecurityUser user, I entityId, EntityExportSettings exportSettings) throws ThingsboardException;

-    <E extends ExportableEntity<I>, I extends EntityId> EntityImportResult<E> importEntity(SecurityUser user, EntityExportData<E> exportData, EntityImportSettings importSettings) throws ThingsboardException;
-
    List<EntityImportResult<ExportableEntity<EntityId>>> importEntities(SecurityUser user, List<EntityExportData<ExportableEntity<EntityId>>> exportDataList, EntityImportSettings importSettings) throws ThingsboardException;

 }
--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/EntityImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/EntityImportService.java
@ -21,6 +21,8 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.sync.exporting.data.EntityExportData;
+import org.thingsboard.server.service.sync.importing.data.EntityImportResult;
+import org.thingsboard.server.service.sync.importing.data.EntityImportSettings;

 public interface EntityImportService<I extends EntityId, E extends ExportableEntity<I>, D extends EntityExportData<E>> {

--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/data/EntityImportResult.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/data/EntityImportResult.java
@ -13,19 +13,32 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.thingsboard.server.service.sync.importing;
+package org.thingsboard.server.service.sync.importing.data;

 import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.utils.ThrowingRunnable;

-@Data
 public class EntityImportResult<E extends ExportableEntity<? extends EntityId>> {
+    @Getter @Setter
    private E savedEntity;
+    @Getter @Setter
    private E oldEntity;
-    @JsonIgnore
-    private transient ThrowingRunnable callback; // to call when entity is successfully saved and transaction is committed
+
+    @Getter @JsonIgnore
+    private ThrowingRunnable saveReferencesCallback = () -> {};
+    @Getter @JsonIgnore
+    private ThrowingRunnable pushEventsCallback = () -> {};
+
+    public void addSaveReferencesCallback(ThrowingRunnable callback) {
+        this.saveReferencesCallback = this.saveReferencesCallback.andThen(callback);
+    }
+
+    public void addPushEventsCallback(ThrowingRunnable callback) {
+        this.pushEventsCallback = this.pushEventsCallback.andThen(callback);
+    }
+
 }
--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/data/EntityImportSettings.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/data/EntityImportSettings.java
@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.thingsboard.server.service.sync.importing;
+package org.thingsboard.server.service.sync.importing.data;

 import lombok.AllArgsConstructor;
 import lombok.Builder;
--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/data/request/ImportRequest.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/data/request/ImportRequest.java
@ -19,7 +19,7 @@ import lombok.Data;
 import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.service.sync.exporting.data.EntityExportData;
-import org.thingsboard.server.service.sync.importing.EntityImportSettings;
+import org.thingsboard.server.service.sync.importing.data.EntityImportSettings;

 import java.util.List;

--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/AssetImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/AssetImportService.java
@ -26,7 +26,6 @@ import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.sync.exporting.data.AssetExportData;
-import org.thingsboard.server.utils.ThrowingRunnable;

@Service
@TbCoreComponent
@ -47,12 +46,11 @@ public class AssetImportService extends BaseEntityImportService<AssetId, Asset,
    }

    @Override
-    protected ThrowingRunnable getCallback(SecurityUser user, Asset savedAsset, Asset oldAsset) {
-        return super.getCallback(user, savedAsset, oldAsset).andThen(() -> {
-            if (oldAsset != null) {
-                entityActionService.sendEntityNotificationMsgToEdgeService(user.getTenantId(), savedAsset.getId(), EdgeEventActionType.UPDATED);
-            }
-        });
+    protected void onEntitySaved(SecurityUser user, Asset savedAsset, Asset oldAsset) {
+        super.onEntitySaved(user, savedAsset, oldAsset);
+        if (oldAsset != null) {
+            entityActionService.sendEntityNotificationMsgToEdgeService(user.getTenantId(), savedAsset.getId(), EdgeEventActionType.UPDATED);
+        }
    }

    @Override
--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/BaseEntityImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/BaseEntityImportService.java
@ -37,10 +37,9 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.sync.exporting.ExportableEntitiesService;
 import org.thingsboard.server.service.sync.exporting.data.EntityExportData;
-import org.thingsboard.server.service.sync.importing.EntityImportResult;
 import org.thingsboard.server.service.sync.importing.EntityImportService;
-import org.thingsboard.server.service.sync.importing.EntityImportSettings;
-import org.thingsboard.server.utils.ThrowingRunnable;
+import org.thingsboard.server.service.sync.importing.data.EntityImportResult;
+import org.thingsboard.server.service.sync.importing.data.EntityImportSettings;

 import java.util.Collections;
 import java.util.LinkedList;
@ -81,12 +80,13 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo
        }

        E savedEntity = prepareAndSave(user.getTenantId(), entity, exportData, idProvider);
-        ThrowingRunnable callback = processAfterSavedAndGetCallback(user, savedEntity, existingEntity, exportData, importSettings, idProvider);

        EntityImportResult<E> importResult = new EntityImportResult<>();
        importResult.setSavedEntity(savedEntity);
        importResult.setOldEntity(existingEntity);
-        importResult.setCallback(callback);
+
+        processAfterSaved(user, importResult, exportData, idProvider, importSettings);
+
        return importResult;
    }

@ -94,60 +94,66 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo

    protected abstract E prepareAndSave(TenantId tenantId, E entity, D exportData, NewIdProvider idProvider);

-    protected ThrowingRunnable processAfterSavedAndGetCallback(SecurityUser user, E savedEntity, E oldEntity, D exportData,
-                                                               EntityImportSettings importSettings, NewIdProvider idProvider) throws ThingsboardException {
-        List<EntityRelation> newRelations = new LinkedList<>();
+    protected void processAfterSaved(SecurityUser user, EntityImportResult<E> importResult, D exportData,
+                                     NewIdProvider idProvider, EntityImportSettings importSettings) throws ThingsboardException {
+        E savedEntity = importResult.getSavedEntity();
+        E oldEntity = importResult.getOldEntity();

-        if (importSettings.isImportInboundRelations() && CollectionUtils.isNotEmpty(exportData.getInboundRelations())) {
-            newRelations.addAll(exportData.getInboundRelations().stream()
-                    .peek(relation -> relation.setTo(savedEntity.getId()))
-                    .collect(Collectors.toList()));
+        importResult.addSaveReferencesCallback(() -> {
+            List<EntityRelation> newRelations = new LinkedList<>();

-            if (importSettings.isRemoveExistingRelations() && oldEntity != null) {
-                for (EntityRelation existingRelation : relationService.findByTo(user.getTenantId(), savedEntity.getId(), RelationTypeGroup.COMMON)) {
-                    exportableEntitiesService.checkPermission(user, existingRelation.getFrom(), Operation.WRITE);
-                    relationService.deleteRelation(user.getTenantId(), existingRelation);
+            if (importSettings.isImportInboundRelations() && CollectionUtils.isNotEmpty(exportData.getInboundRelations())) {
+                newRelations.addAll(exportData.getInboundRelations().stream()
+                        .peek(relation -> relation.setTo(savedEntity.getId()))
+                        .collect(Collectors.toList()));
+
+                if (importSettings.isRemoveExistingRelations() && oldEntity != null) {
+                    for (EntityRelation existingRelation : relationService.findByTo(user.getTenantId(), savedEntity.getId(), RelationTypeGroup.COMMON)) {
+                        exportableEntitiesService.checkPermission(user, existingRelation.getFrom(), Operation.WRITE);
+                        relationService.deleteRelation(user.getTenantId(), existingRelation);
+                    }
                }
            }
-        }
-        if (importSettings.isImportOutboundRelations() && CollectionUtils.isNotEmpty(exportData.getOutboundRelations())) {
-            newRelations.addAll(exportData.getOutboundRelations().stream()
-                    .peek(relation -> relation.setFrom(savedEntity.getId()))
-                    .collect(Collectors.toList()));
-
-            if (importSettings.isRemoveExistingRelations() && oldEntity != null) {
-                for (EntityRelation existingRelation : relationService.findByFrom(user.getTenantId(), savedEntity.getId(), RelationTypeGroup.COMMON)) {
-                    exportableEntitiesService.checkPermission(user, existingRelation.getTo(), Operation.WRITE);
-                    relationService.deleteRelation(user.getTenantId(), existingRelation);
+            if (importSettings.isImportOutboundRelations() && CollectionUtils.isNotEmpty(exportData.getOutboundRelations())) {
+                newRelations.addAll(exportData.getOutboundRelations().stream()
+                        .peek(relation -> relation.setFrom(savedEntity.getId()))
+                        .collect(Collectors.toList()));
+
+                if (importSettings.isRemoveExistingRelations() && oldEntity != null) {
+                    for (EntityRelation existingRelation : relationService.findByFrom(user.getTenantId(), savedEntity.getId(), RelationTypeGroup.COMMON)) {
+                        exportableEntitiesService.checkPermission(user, existingRelation.getTo(), Operation.WRITE);
+                        relationService.deleteRelation(user.getTenantId(), existingRelation);
+                    }
                }
            }
-        }

-        for (EntityRelation relation : newRelations) {
-            HasId<EntityId> otherEntity = null;
-            if (!relation.getTo().equals(savedEntity.getId())) {
-                otherEntity = findInternalEntity(user.getTenantId(), relation.getTo());
-                relation.setTo(otherEntity.getId());
-            }
-            if (!relation.getFrom().equals(savedEntity.getId())) {
-                otherEntity = findInternalEntity(user.getTenantId(), relation.getFrom());
-                relation.setFrom(otherEntity.getId());
-            }
-            if (otherEntity != null) {
-                exportableEntitiesService.checkPermission(user, otherEntity, otherEntity.getId().getEntityType(), Operation.WRITE);
-            }
+            for (EntityRelation relation : newRelations) {
+                HasId<EntityId> otherEntity = null;
+                if (!relation.getTo().equals(savedEntity.getId())) {
+                    otherEntity = findInternalEntity(user.getTenantId(), relation.getTo());
+                    relation.setTo(otherEntity.getId());
+                }
+                if (!relation.getFrom().equals(savedEntity.getId())) {
+                    otherEntity = findInternalEntity(user.getTenantId(), relation.getFrom());
+                    relation.setFrom(otherEntity.getId());
+                }
+                if (otherEntity != null) {
+                    exportableEntitiesService.checkPermission(user, otherEntity, otherEntity.getId().getEntityType(), Operation.WRITE);
+                }

-            relationService.saveRelation(user.getTenantId(), relation);
-        }
+                relationService.saveRelation(user.getTenantId(), relation);
+            }
+        });

-        return getCallback(user, savedEntity, oldEntity);
+        importResult.addPushEventsCallback(() -> {
+            onEntitySaved(user, savedEntity, oldEntity);
+        });
    }

-    protected ThrowingRunnable getCallback(SecurityUser user, E savedEntity, E oldEntity) {
-        return () -> {
-            entityActionService.logEntityAction(user, savedEntity.getId(), savedEntity, savedEntity instanceof HasCustomerId ? ((HasCustomerId) savedEntity).getCustomerId() : user.getCustomerId(),
-                    oldEntity == null ? ActionType.ADDED : ActionType.UPDATED, null);
-        };
+    protected void onEntitySaved(SecurityUser user, E savedEntity, E oldEntity) {
+        entityActionService.logEntityAction(user, savedEntity.getId(), savedEntity,
+                savedEntity instanceof HasCustomerId ? ((HasCustomerId) savedEntity).getCustomerId() : user.getCustomerId(),
+                oldEntity == null ? ActionType.ADDED : ActionType.UPDATED, null);
    }


--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/CustomerImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/CustomerImportService.java
@ -20,15 +20,12 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
-import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.sync.exporting.data.CustomerExportData;
-import org.thingsboard.server.service.sync.importing.EntityImportSettings;
-import org.thingsboard.server.utils.ThrowingRunnable;

@Service
@TbCoreComponent
@ -48,12 +45,11 @@ public class CustomerImportService extends BaseEntityImportService<CustomerId, C
    }

    @Override
-    protected ThrowingRunnable getCallback(SecurityUser user, Customer savedCustomer, Customer oldCustomer) {
-        return super.getCallback(user, savedCustomer, oldCustomer).andThen(() -> {
-            if (oldCustomer != null) {
-                entityActionService.sendEntityNotificationMsgToEdgeService(user.getTenantId(), savedCustomer.getId(), EdgeEventActionType.UPDATED);
-            }
-        });
+    protected void onEntitySaved(SecurityUser user, Customer savedCustomer, Customer oldCustomer) {
+        super.onEntitySaved(user, savedCustomer, oldCustomer);
+        if (oldCustomer != null) {
+            entityActionService.sendEntityNotificationMsgToEdgeService(user.getTenantId(), savedCustomer.getId(), EdgeEventActionType.UPDATED);
+        }
    }

    @Override
--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DashboardImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DashboardImportService.java
@ -35,7 +35,6 @@ import org.thingsboard.server.dao.sql.query.DefaultEntityQueryRepository;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.sync.exporting.data.DashboardExportData;
-import org.thingsboard.server.utils.ThrowingRunnable;

 import java.util.Collections;
 import java.util.HashSet;
@ -111,12 +110,11 @@ public class DashboardImportService extends BaseEntityImportService<DashboardId,
    }

    @Override
-    protected ThrowingRunnable getCallback(SecurityUser user, Dashboard savedDashboard, Dashboard oldDashboard) {
-        return super.getCallback(user, savedDashboard, oldDashboard).andThen(() -> {
-            if (oldDashboard != null) {
-                entityActionService.sendEntityNotificationMsgToEdgeService(user.getTenantId(), savedDashboard.getId(), EdgeEventActionType.UPDATED);
-            }
-        });
+    protected void onEntitySaved(SecurityUser user, Dashboard savedDashboard, Dashboard oldDashboard) {
+        super.onEntitySaved(user, savedDashboard, oldDashboard);
+        if (oldDashboard != null) {
+            entityActionService.sendEntityNotificationMsgToEdgeService(user.getTenantId(), savedDashboard.getId(), EdgeEventActionType.UPDATED);
+        }
    }

    @Override
--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DeviceImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DeviceImportService.java
@ -25,7 +25,6 @@ import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.sync.exporting.data.DeviceExportData;
-import org.thingsboard.server.utils.ThrowingRunnable;

@Service
@TbCoreComponent
@ -55,10 +54,9 @@ public class DeviceImportService extends BaseEntityImportService<DeviceId, Devic
    }

    @Override
-    protected ThrowingRunnable getCallback(SecurityUser user, Device savedDevice, Device oldDevice) {
-        return super.getCallback(user, savedDevice, oldDevice).andThen(() -> {
-            clusterService.onDeviceUpdated(savedDevice, oldDevice);
-        });
+    protected void onEntitySaved(SecurityUser user, Device savedDevice, Device oldDevice) {
+        super.onEntitySaved(user, savedDevice, oldDevice);
+        clusterService.onDeviceUpdated(savedDevice, oldDevice);
    }

    @Override
--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DeviceProfileImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DeviceProfileImportService.java
@ -28,7 +28,6 @@ import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.ota.OtaPackageStateService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.sync.exporting.data.DeviceProfileExportData;
-import org.thingsboard.server.utils.ThrowingRunnable;

 import java.util.Objects;

@ -55,17 +54,16 @@ public class DeviceProfileImportService extends BaseEntityImportService<DevicePr
    }

    @Override
-    protected ThrowingRunnable getCallback(SecurityUser user, DeviceProfile savedDeviceProfile, DeviceProfile oldDeviceProfile) {
-        return super.getCallback(user, savedDeviceProfile, oldDeviceProfile).andThen(() -> {
-            clusterService.onDeviceProfileChange(savedDeviceProfile, null);
-            clusterService.broadcastEntityStateChangeEvent(user.getTenantId(), savedDeviceProfile.getId(),
-                    oldDeviceProfile == null ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
-            entityActionService.sendEntityNotificationMsgToEdgeService(user.getTenantId(), savedDeviceProfile.getId(),
-                    oldDeviceProfile == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
-            otaPackageStateService.update(savedDeviceProfile,
-                    oldDeviceProfile != null && !Objects.equals(oldDeviceProfile.getFirmwareId(), savedDeviceProfile.getFirmwareId()),
-                    oldDeviceProfile != null && !Objects.equals(oldDeviceProfile.getSoftwareId(), savedDeviceProfile.getSoftwareId()));
-        });
+    protected void onEntitySaved(SecurityUser user, DeviceProfile savedDeviceProfile, DeviceProfile oldDeviceProfile) {
+        super.onEntitySaved(user, savedDeviceProfile, oldDeviceProfile);
+        clusterService.onDeviceProfileChange(savedDeviceProfile, null);
+        clusterService.broadcastEntityStateChangeEvent(user.getTenantId(), savedDeviceProfile.getId(),
+                oldDeviceProfile == null ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
+        entityActionService.sendEntityNotificationMsgToEdgeService(user.getTenantId(), savedDeviceProfile.getId(),
+                oldDeviceProfile == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
+        otaPackageStateService.update(savedDeviceProfile,
+                oldDeviceProfile != null && !Objects.equals(oldDeviceProfile.getFirmwareId(), savedDeviceProfile.getFirmwareId()),
+                oldDeviceProfile != null && !Objects.equals(oldDeviceProfile.getSoftwareId(), savedDeviceProfile.getSoftwareId()));
    }

    @Override
--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/RuleChainImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/RuleChainImportService.java
@ -32,7 +32,6 @@ import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.sync.exporting.data.RuleChainExportData;
-import org.thingsboard.server.utils.ThrowingRunnable;

 import java.util.Collections;
 import java.util.Optional;
@ -85,15 +84,14 @@ public class RuleChainImportService extends BaseEntityImportService<RuleChainId,
    }

    @Override
-    protected ThrowingRunnable getCallback(SecurityUser user, RuleChain savedRuleChain, RuleChain oldRuleChain) {
-        return super.getCallback(user, savedRuleChain, oldRuleChain).andThen(() -> {
-            if (savedRuleChain.getType() == RuleChainType.CORE) {
-                clusterService.broadcastEntityStateChangeEvent(user.getTenantId(), savedRuleChain.getId(),
-                        oldRuleChain == null ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
-            } else if (savedRuleChain.getType() == RuleChainType.EDGE && oldRuleChain != null) {
-                entityActionService.sendEntityNotificationMsgToEdgeService(user.getTenantId(), savedRuleChain.getId(), EdgeEventActionType.UPDATED);
-            }
-        });
+    protected void onEntitySaved(SecurityUser user, RuleChain savedRuleChain, RuleChain oldRuleChain) {
+        super.onEntitySaved(user, savedRuleChain, oldRuleChain);
+        if (savedRuleChain.getType() == RuleChainType.CORE) {
+            clusterService.broadcastEntityStateChangeEvent(user.getTenantId(), savedRuleChain.getId(),
+                    oldRuleChain == null ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
+        } else if (savedRuleChain.getType() == RuleChainType.EDGE && oldRuleChain != null) {
+            entityActionService.sendEntityNotificationMsgToEdgeService(user.getTenantId(), savedRuleChain.getId(), EdgeEventActionType.UPDATED);
+        }
    }

    @Override
--- a/application/src/test/java/org/thingsboard/server/controller/sql/EntitiesExportImportControllerSqlTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/sql/EntitiesExportImportControllerSqlTest.java
@ -48,7 +48,7 @@ import org.thingsboard.server.service.sync.exporting.ExportableEntitiesService;
 import org.thingsboard.server.service.sync.exporting.data.DeviceExportData;
 import org.thingsboard.server.service.sync.exporting.data.EntityExportData;
 import org.thingsboard.server.service.sync.exporting.data.RuleChainExportData;
-import org.thingsboard.server.service.sync.importing.EntityImportResult;
+import org.thingsboard.server.service.sync.importing.data.EntityImportResult;

 import java.util.List;

--- a/dao/src/main/java/org/thingsboard/server/dao/Dao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/Dao.java
@ -37,6 +37,8 @@ public interface Dao<T> {

    T save(TenantId tenantId, T t);

+    T saveAndFlush(TenantId tenantId, T t);
+
    boolean removeById(TenantId tenantId, UUID id);

    void removeAllByIds(Collection<UUID> ids);
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
@ -117,7 +117,7 @@ public class BaseAssetService extends AbstractEntityService implements AssetServ
        assetValidator.validate(asset, Asset::getTenantId);
        Asset savedAsset;
        try {
-            savedAsset = assetDao.save(asset.getTenantId(), asset);
+            savedAsset = assetDao.saveAndFlush(asset.getTenantId(), asset);
        } catch (Exception t) {
            ConstraintViolationException e = extractConstraintViolationException(t).orElse(null);
            if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("asset_name_unq_key")) {
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
@ -67,6 +67,14 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
        return DaoUtil.getData(entity);
    }

+    @Override
+    @Transactional
+    public D saveAndFlush(TenantId tenantId, D domain) {
+        D d = save(tenantId, domain);
+        getRepository().flush();
+        return d;
+    }
+
    @Override
    public D findById(TenantId tenantId, UUID key) {
        log.debug("Get entity by key {}", key);