Rename packages for export/import

application/src/main/java/org/thingsboard/server/controller/EntitiesExportImportController.java

@@ -26,17 +26,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.export.EntityExportData;
-import org.thingsboard.server.common.data.export.ExportableEntity;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
-import org.thingsboard.server.service.expimp.EntitiesExportImportService;
-import org.thingsboard.server.service.expimp.exp.EntityExportSettings;
-import org.thingsboard.server.service.expimp.imp.EntityImportResult;
-import org.thingsboard.server.service.expimp.imp.EntityImportSettings;
+import org.thingsboard.server.service.exportimport.EntitiesExportImportService;
+import org.thingsboard.server.service.exportimport.exporting.EntityExportSettings;
+import org.thingsboard.server.service.exportimport.exporting.data.EntityExportData;
+import org.thingsboard.server.service.exportimport.importing.EntityImportResult;
+import org.thingsboard.server.service.exportimport.importing.EntityImportSettings;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;

application/src/main/java/org/thingsboard/server/service/expimp/DefaultEntitiesExportImportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/DefaultEntitiesExportImportService.java

@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp;
+package org.thingsboard.server.service.exportimport;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.EntityExportData;
-import org.thingsboard.server.common.data.export.ExportableEntity;
+import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.ExportableEntityDao;
 import org.thingsboard.server.queue.util.TbCoreComponent;
-import org.thingsboard.server.service.expimp.exp.EntityExportService;
-import org.thingsboard.server.service.expimp.exp.EntityExportSettings;
-import org.thingsboard.server.service.expimp.imp.EntityImportResult;
-import org.thingsboard.server.service.expimp.imp.EntityImportService;
-import org.thingsboard.server.service.expimp.imp.EntityImportSettings;
+import org.thingsboard.server.service.exportimport.exporting.EntityExportService;
+import org.thingsboard.server.service.exportimport.exporting.EntityExportSettings;
+import org.thingsboard.server.service.exportimport.exporting.data.EntityExportData;
+import org.thingsboard.server.service.exportimport.importing.EntityImportResult;
+import org.thingsboard.server.service.exportimport.importing.EntityImportService;
+import org.thingsboard.server.service.exportimport.importing.EntityImportSettings;
 
 import java.util.Collection;
 import java.util.HashMap;

application/src/main/java/org/thingsboard/server/service/expimp/EntitiesExportImportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/EntitiesExportImportService.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp;
+package org.thingsboard.server.service.exportimport;
 
-import org.thingsboard.server.common.data.export.EntityExportData;
-import org.thingsboard.server.common.data.export.ExportableEntity;
+import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.service.expimp.exp.EntityExportSettings;
-import org.thingsboard.server.service.expimp.imp.EntityImportResult;
-import org.thingsboard.server.service.expimp.imp.EntityImportSettings;
+import org.thingsboard.server.service.exportimport.exporting.EntityExportSettings;
+import org.thingsboard.server.service.exportimport.exporting.data.EntityExportData;
+import org.thingsboard.server.service.exportimport.importing.EntityImportResult;
+import org.thingsboard.server.service.exportimport.importing.EntityImportSettings;
 
 public interface EntitiesExportImportService extends ExportableEntitiesService {
 

application/src/main/java/org/thingsboard/server/service/expimp/ExportableEntitiesService.java → application/src/main/java/org/thingsboard/server/service/exportimport/ExportableEntitiesService.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp;
+package org.thingsboard.server.service.exportimport;
 
-import org.thingsboard.server.common.data.export.ExportableEntity;
+import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 

application/src/main/java/org/thingsboard/server/service/expimp/exp/EntityExportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/EntityExportService.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.exp;
+package org.thingsboard.server.service.exportimport.exporting;
 
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.EntityExportData;
-import org.thingsboard.server.common.data.export.ExportableEntity;
+import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.service.exportimport.exporting.data.EntityExportData;
 
 public interface EntityExportService<I extends EntityId, E extends ExportableEntity<I>, D extends EntityExportData<E>> {
 

application/src/main/java/org/thingsboard/server/service/expimp/exp/EntityExportSettings.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/EntityExportSettings.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.exp;
+package org.thingsboard.server.service.exportimport.exporting;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

common/data/src/main/java/org/thingsboard/server/common/data/export/impl/AssetExportData.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/data/AssetExportData.java

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.common.data.export.impl;
+package org.thingsboard.server.service.exportimport.exporting.data;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.asset.Asset;
-import org.thingsboard.server.common.data.export.EntityExportData;
 
 @EqualsAndHashCode(callSuper = true)
 @Data

common/data/src/main/java/org/thingsboard/server/common/data/export/impl/CustomerExportData.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/data/CustomerExportData.java

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.common.data.export.impl;
+package org.thingsboard.server.service.exportimport.exporting.data;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.EntityExportData;
 
 @EqualsAndHashCode(callSuper = true)
 @Data

common/data/src/main/java/org/thingsboard/server/common/data/export/impl/DashboardExportData.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/data/DashboardExportData.java

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.common.data.export.impl;
+package org.thingsboard.server.service.exportimport.exporting.data;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.EntityExportData;
 
 @EqualsAndHashCode(callSuper = true)
 @Data

common/data/src/main/java/org/thingsboard/server/common/data/export/impl/DeviceExportData.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/data/DeviceExportData.java

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.common.data.export.impl;
+package org.thingsboard.server.service.exportimport.exporting.data;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.EntityExportData;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 
 @EqualsAndHashCode(callSuper = true)

common/data/src/main/java/org/thingsboard/server/common/data/export/impl/DeviceProfileExportData.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/data/DeviceProfileExportData.java

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.common.data.export.impl;
+package org.thingsboard.server.service.exportimport.exporting.data;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.EntityExportData;
 
 @EqualsAndHashCode(callSuper = true)
 @Data

common/data/src/main/java/org/thingsboard/server/common/data/export/EntityExportData.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/data/EntityExportData.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.common.data.export;
+package org.thingsboard.server.service.exportimport.exporting.data;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -22,12 +22,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.Data;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.impl.AssetExportData;
-import org.thingsboard.server.common.data.export.impl.CustomerExportData;
-import org.thingsboard.server.common.data.export.impl.DashboardExportData;
-import org.thingsboard.server.common.data.export.impl.DeviceExportData;
-import org.thingsboard.server.common.data.export.impl.DeviceProfileExportData;
-import org.thingsboard.server.common.data.export.impl.RuleChainExportData;
+import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 

common/data/src/main/java/org/thingsboard/server/common/data/export/impl/RuleChainExportData.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/data/RuleChainExportData.java

@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.common.data.export.impl;
+package org.thingsboard.server.service.exportimport.exporting.data;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.EntityExportData;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChainMetaData;
 

application/src/main/java/org/thingsboard/server/service/expimp/exp/impl/AbstractEntityExportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/impl/AbstractEntityExportService.java

@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.exp.impl;
+package org.thingsboard.server.service.exportimport.exporting.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.thingsboard.server.common.data.export.EntityExportData;
-import org.thingsboard.server.common.data.export.ExportableEntity;
+import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
 import org.thingsboard.server.dao.relation.RelationService;
-import org.thingsboard.server.service.expimp.ExportableEntitiesService;
-import org.thingsboard.server.service.expimp.exp.EntityExportService;
-import org.thingsboard.server.service.expimp.exp.EntityExportSettings;
+import org.thingsboard.server.service.exportimport.ExportableEntitiesService;
+import org.thingsboard.server.service.exportimport.exporting.EntityExportService;
+import org.thingsboard.server.service.exportimport.exporting.EntityExportSettings;
+import org.thingsboard.server.service.exportimport.exporting.data.EntityExportData;
 
 import java.util.List;
 

application/src/main/java/org/thingsboard/server/service/expimp/exp/impl/AssetExportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/impl/AssetExportService.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.exp.impl;
+package org.thingsboard.server.service.exportimport.exporting.impl;
 
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.asset.Asset;
-import org.thingsboard.server.common.data.export.impl.AssetExportData;
 import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.exportimport.exporting.data.AssetExportData;
 
 @Service
 @TbCoreComponent

application/src/main/java/org/thingsboard/server/service/expimp/exp/impl/CustomerExportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/impl/CustomerExportService.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.exp.impl;
+package org.thingsboard.server.service.exportimport.exporting.impl;
 
 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.export.impl.CustomerExportData;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.exportimport.exporting.data.CustomerExportData;
 
 @Service
 @TbCoreComponent

application/src/main/java/org/thingsboard/server/service/expimp/exp/impl/DashboardExportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/impl/DashboardExportService.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.exp.impl;
+package org.thingsboard.server.service.exportimport.exporting.impl;
 
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.impl.DashboardExportData;
 import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.exportimport.exporting.data.DashboardExportData;
 
 @Service
 @TbCoreComponent

application/src/main/java/org/thingsboard/server/service/expimp/exp/impl/DeviceExportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/impl/DeviceExportService.java

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.exp.impl;
+package org.thingsboard.server.service.exportimport.exporting.impl;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.impl.DeviceExportData;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.device.DeviceCredentialsService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.exportimport.exporting.data.DeviceExportData;
 
 @Service
 @TbCoreComponent

application/src/main/java/org/thingsboard/server/service/expimp/exp/impl/DeviceProfileExportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/impl/DeviceProfileExportService.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.exp.impl;
+package org.thingsboard.server.service.exportimport.exporting.impl;
 
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.impl.DeviceProfileExportData;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.exportimport.exporting.data.DeviceProfileExportData;
 
 @Service
 @TbCoreComponent

application/src/main/java/org/thingsboard/server/service/expimp/exp/impl/RuleChainExportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/exporting/impl/RuleChainExportService.java

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.exp.impl;
+package org.thingsboard.server.service.exportimport.exporting.impl;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.impl.RuleChainExportData;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.exportimport.exporting.data.RuleChainExportData;
 
 @Service
 @TbCoreComponent

application/src/main/java/org/thingsboard/server/service/expimp/imp/EntityImportResult.java → application/src/main/java/org/thingsboard/server/service/exportimport/importing/EntityImportResult.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.imp;
+package org.thingsboard.server.service.exportimport.importing;
 
 import lombok.Data;
-import org.thingsboard.server.common.data.export.ExportableEntity;
+import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.id.EntityId;
 
 @Data

application/src/main/java/org/thingsboard/server/service/expimp/imp/EntityImportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/importing/EntityImportService.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.imp;
+package org.thingsboard.server.service.exportimport.importing;
 
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.EntityExportData;
-import org.thingsboard.server.common.data.export.ExportableEntity;
+import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.service.exportimport.exporting.data.EntityExportData;
 
 public interface EntityImportService<I extends EntityId, E extends ExportableEntity<I>, D extends EntityExportData<E>> {
 

application/src/main/java/org/thingsboard/server/service/expimp/imp/EntityImportSettings.java → application/src/main/java/org/thingsboard/server/service/exportimport/importing/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.expimp.imp;
+package org.thingsboard.server.service.exportimport.importing;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

application/src/main/java/org/thingsboard/server/service/expimp/imp/impl/AbstractEntityImportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/importing/impl/AbstractEntityImportService.java

@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.imp.impl;
+package org.thingsboard.server.service.exportimport.importing.impl;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.thingsboard.server.common.data.export.EntityExportData;
-import org.thingsboard.server.common.data.export.ExportableEntity;
+import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.HasId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.relation.RelationService;
-import org.thingsboard.server.service.expimp.ExportableEntitiesService;
-import org.thingsboard.server.service.expimp.imp.EntityImportResult;
-import org.thingsboard.server.service.expimp.imp.EntityImportService;
-import org.thingsboard.server.service.expimp.imp.EntityImportSettings;
+import org.thingsboard.server.service.exportimport.ExportableEntitiesService;
+import org.thingsboard.server.service.exportimport.exporting.data.EntityExportData;
+import org.thingsboard.server.service.exportimport.importing.EntityImportResult;
+import org.thingsboard.server.service.exportimport.importing.EntityImportService;
+import org.thingsboard.server.service.exportimport.importing.EntityImportSettings;
 
 public abstract class AbstractEntityImportService<I extends EntityId, E extends ExportableEntity<I>, D extends EntityExportData<E>> implements EntityImportService<I, E, D> {
 

application/src/main/java/org/thingsboard/server/service/expimp/imp/impl/AssetImportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/importing/impl/AssetImportService.java

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.imp.impl;
+package org.thingsboard.server.service.exportimport.importing.impl;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.asset.Asset;
-import org.thingsboard.server.common.data.export.impl.AssetExportData;
 import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
-import org.thingsboard.server.service.expimp.imp.EntityImportSettings;
+import org.thingsboard.server.service.exportimport.exporting.data.AssetExportData;
+import org.thingsboard.server.service.exportimport.importing.EntityImportSettings;
 
 @Service
 @TbCoreComponent

application/src/main/java/org/thingsboard/server/service/expimp/imp/impl/CustomerImportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/importing/impl/CustomerImportService.java

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.imp.impl;
+package org.thingsboard.server.service.exportimport.importing.impl;
 
 import lombok.RequiredArgsConstructor;
 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.export.impl.CustomerExportData;
 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.expimp.imp.EntityImportSettings;
+import org.thingsboard.server.service.exportimport.exporting.data.CustomerExportData;
+import org.thingsboard.server.service.exportimport.importing.EntityImportSettings;
 
 @Service
 @TbCoreComponent

application/src/main/java/org/thingsboard/server/service/expimp/imp/impl/DashboardImportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/importing/impl/DashboardImportService.java

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.imp.impl;
+package org.thingsboard.server.service.exportimport.importing.impl;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.impl.DashboardExportData;
 import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.dashboard.DashboardService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
-import org.thingsboard.server.service.expimp.imp.EntityImportSettings;
+import org.thingsboard.server.service.exportimport.exporting.data.DashboardExportData;
+import org.thingsboard.server.service.exportimport.importing.EntityImportSettings;
 
 @Service
 @TbCoreComponent

application/src/main/java/org/thingsboard/server/service/expimp/imp/impl/DeviceImportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/importing/impl/DeviceImportService.java

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.imp.impl;
+package org.thingsboard.server.service.exportimport.importing.impl;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.impl.DeviceExportData;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
-import org.thingsboard.server.service.expimp.imp.EntityImportSettings;
+import org.thingsboard.server.service.exportimport.exporting.data.DeviceExportData;
+import org.thingsboard.server.service.exportimport.importing.EntityImportSettings;
 
 @Service
 @TbCoreComponent

application/src/main/java/org/thingsboard/server/service/expimp/imp/impl/DeviceProfileImportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/importing/impl/DeviceProfileImportService.java

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.imp.impl;
+package org.thingsboard.server.service.exportimport.importing.impl;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.impl.DeviceProfileExportData;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.device.DeviceProfileService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
-import org.thingsboard.server.service.expimp.imp.EntityImportSettings;
+import org.thingsboard.server.service.exportimport.exporting.data.DeviceProfileExportData;
+import org.thingsboard.server.service.exportimport.importing.EntityImportSettings;
 
 @Service
 @TbCoreComponent

application/src/main/java/org/thingsboard/server/service/expimp/imp/impl/RuleChainImportService.java → application/src/main/java/org/thingsboard/server/service/exportimport/importing/impl/RuleChainImportService.java

@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.expimp.imp.impl;
+package org.thingsboard.server.service.exportimport.importing.impl;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.export.impl.RuleChainExportData;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChainMetaData;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
-import org.thingsboard.server.service.expimp.imp.EntityImportSettings;
+import org.thingsboard.server.service.exportimport.exporting.data.RuleChainExportData;
+import org.thingsboard.server.service.exportimport.importing.EntityImportSettings;
 
 @Service
 @TbCoreComponent

common/data/src/main/java/org/thingsboard/server/common/data/Customer.java

@@ -22,7 +22,6 @@ import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import org.thingsboard.server.common.data.export.ExportableEntity;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.validation.Length;

common/data/src/main/java/org/thingsboard/server/common/data/Dashboard.java

@@ -19,7 +19,6 @@ import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import org.thingsboard.server.common.data.export.ExportableEntity;
 import org.thingsboard.server.common.data.id.DashboardId;
 
 public class Dashboard extends DashboardInfo implements ExportableEntity<DashboardId> {

common/data/src/main/java/org/thingsboard/server/common/data/Device.java

@@ -25,7 +25,6 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.device.data.DeviceData;
-import org.thingsboard.server.common.data.export.ExportableEntity;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;

common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java

@@ -24,7 +24,6 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
-import org.thingsboard.server.common.data.export.ExportableEntity;
 import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.OtaPackageId;

common/data/src/main/java/org/thingsboard/server/common/data/export/ExportableEntity.java → common/data/src/main/java/org/thingsboard/server/common/data/ExportableEntity.java

@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.common.data.export;
+package org.thingsboard.server.common.data;
 
-import org.thingsboard.server.common.data.HasName;
-import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.HasId;
 import org.thingsboard.server.common.data.id.TenantId;

common/data/src/main/java/org/thingsboard/server/common/data/asset/Asset.java

@@ -21,11 +21,11 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
+import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.HasCustomerId;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo;
-import org.thingsboard.server.common.data.export.ExportableEntity;
 import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;

common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java

@@ -22,10 +22,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo;
-import org.thingsboard.server.common.data.export.ExportableEntity;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.TenantId;