Change naming

thingsboard · Dec 4, 2024 · 69f1530 · 69f1530
1 parent 6ac7fce
commit 69f1530
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.../server/service/cloud/MigrateService.java → ...ice/cloud/CloudEventMigrationService.java b/.../server/service/cloud/MigrateService.java → ...ice/cloud/CloudEventMigrationService.java
@@ -17,7 +17,7 @@
 
 import org.thingsboard.server.common.data.id.TenantId;
 
-public interface MigrateService {
+public interface CloudEventMigrationService {
 
     boolean isMigrated();
 

diff --git a/application/src/main/java/org/thingsboard/server/service/cloud/CloudManagerService.java b/application/src/main/java/org/thingsboard/server/service/cloud/CloudManagerService.java
@@ -135,7 +135,7 @@ public class CloudManagerService {
     private ConfigurableApplicationContext context;
 
     @Autowired(required = false)
-    private MigrateService migrateService;
+    private CloudEventMigrationService cloudEventMigrationService;
 
     private EdgeSettings currentEdgeSettings;
 
@@ -300,8 +300,8 @@ private void initAndUpdateEdgeSettings(EdgeConfiguration edgeConfiguration) thro
 
         initialized = true;
 
-        if (migrateService != null && !migrateService.isMigrated()) {
-            migrateService.migrateUnprocessedEventToKafka(tenantId);
+        if (cloudEventMigrationService != null && !cloudEventMigrationService.isMigrated()) {
+            cloudEventMigrationService.migrateUnprocessedEventToKafka(tenantId);
         }
     }
 

diff --git a/...er/service/cloud/KafkaMigrateService.java → ...loud/KafkaCloudEventMigrationService.java b/...er/service/cloud/KafkaMigrateService.java → ...loud/KafkaCloudEventMigrationService.java
@@ -54,7 +54,7 @@
 @Slf4j
 @Service
 @ConditionalOnExpression("'${queue.type:null}'=='kafka'")
-public class KafkaMigrateService implements MigrateService {
+public class KafkaCloudEventMigrationService implements CloudEventMigrationService {
     private final TbCloudEventProvider tbCloudEventProvider;
     private final CloudEventDao cloudEventDao;
     private final TsKvCloudEventDao tsKvCloudEventDao;
@@ -65,9 +65,9 @@ public class KafkaMigrateService implements MigrateService {
     @Getter
     private boolean isMigrated = false;
 
-    public KafkaMigrateService(TbCloudEventProvider tbCloudEventProvider, CloudEventDao cloudEventDao,
-                               TsKvCloudEventDao tsKvCloudEventDao, AttributesService attributesService,
-                               DbCallbackExecutorService dbCallbackExecutorService) {
+    public KafkaCloudEventMigrationService(TbCloudEventProvider tbCloudEventProvider, CloudEventDao cloudEventDao,
+                                           TsKvCloudEventDao tsKvCloudEventDao, AttributesService attributesService,
+                                           DbCallbackExecutorService dbCallbackExecutorService) {
         this.tbCloudEventProvider = tbCloudEventProvider;
         this.cloudEventDao = cloudEventDao;
         this.tsKvCloudEventDao = tsKvCloudEventDao;