Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Renaming

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-03-13 15:59:50 +01:00
parent a506023585
commit e4efb0d485
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ems-core/src/main/java/it/integry/ems/migration/MigrationService.java → ems-core/src/main/java/it/integry/ems/migration/MigrationComponent.java
View File

@@ -24,7 +24,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.reflections.Reflections; import org.reflections.Reflections;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Component;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
@@ -32,8 +32,8 @@ import java.sql.SQLException;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Component
public class MigrationService { public class MigrationComponent {
private final Logger logger = LogManager.getLogger(); private final Logger logger = LogManager.getLogger();

14
ems-core/src/main/java/it/integry/ems/migration/service/MigrationSetupService.java
View File

@@ -2,7 +2,7 @@ package it.integry.ems.migration.service;
import com.annimon.stream.Stream; import com.annimon.stream.Stream;
import it.integry.ems.javabeans.RequestDataDTO; import it.integry.ems.javabeans.RequestDataDTO;
import it.integry.ems.migration.MigrationService; import it.integry.ems.migration.MigrationComponent;
import it.integry.ems.migration.dto.MigrationStatusDTO; import it.integry.ems.migration.dto.MigrationStatusDTO;
import it.integry.ems.migration.dto.MigrationStatusEnum; import it.integry.ems.migration.dto.MigrationStatusEnum;
import it.integry.ems.service.EntityProcessor; import it.integry.ems.service.EntityProcessor;
@@ -33,7 +33,7 @@ public class MigrationSetupService {
private SettingsModel settingsModel; private SettingsModel settingsModel;
@Autowired @Autowired
private MigrationService migrationService; private MigrationComponent migrationComponent;
@Autowired @Autowired
private EntityProcessor entityProcessor; private EntityProcessor entityProcessor;
@@ -45,7 +45,7 @@ public class MigrationSetupService {
private MultiDBTransactionManager multiDBTransactionManager; private MultiDBTransactionManager multiDBTransactionManager;
public List<MigrationStatusDTO> retrieveAll() throws Exception { public List<MigrationStatusDTO> retrieveAll() throws Exception {
final List<Long> migrationCodes = migrationService.getMigrationCodes(); final List<Long> migrationCodes = migrationComponent.getMigrationCodes();
final List<MigrationStatusDTO> migrationStatuses = new ArrayList<>(); final List<MigrationStatusDTO> migrationStatuses = new ArrayList<>();
@@ -103,7 +103,7 @@ public class MigrationSetupService {
} }
public void retry(long migrationCode) throws Exception { public void retry(long migrationCode) throws Exception {
migrationService.executeMigrationGroup(multiDBTransactionManager.getActiveConnections().get(0)); migrationComponent.executeMigrationGroup(multiDBTransactionManager.getActiveConnections().get(0));
} }
public void skip(long migrationCode) throws Exception { public void skip(long migrationCode) throws Exception {
@@ -122,8 +122,8 @@ public class MigrationSetupService {
entityProcessor.processEntity(stbMigrationStatus, multiDBTransactionManager); entityProcessor.processEntity(stbMigrationStatus, multiDBTransactionManager);
} }
migrationService.updateLastMigrationIntoDB(advancedDataSource, migrationCode); migrationComponent.updateLastMigrationIntoDB(advancedDataSource, migrationCode);
migrationService.executeMigrationGroup(advancedDataSource); migrationComponent.executeMigrationGroup(advancedDataSource);
} }
@@ -135,6 +135,6 @@ public class MigrationSetupService {
} }
} }
migrationService.startMigrationsGlobally(multiDBTransactionManager); migrationComponent.startMigrationsGlobally(multiDBTransactionManager);
} }
} }

6
ems-core/src/main/java/it/integry/ems/system/SystemRequisiteCheckInterceptor.java
View File

@@ -6,7 +6,7 @@ import it.integry.common.var.CommonConstants;
import it.integry.common.var.EmsDBConst; import it.integry.common.var.EmsDBConst;
import it.integry.ems._context.EmsCoreContext; import it.integry.ems._context.EmsCoreContext;
import it.integry.ems.exception.SystemNotInitializedException; import it.integry.ems.exception.SystemNotInitializedException;
import it.integry.ems.migration.MigrationService; import it.integry.ems.migration.MigrationComponent;
import it.integry.ems.settings.Model.AvailableConnectionsModel; import it.integry.ems.settings.Model.AvailableConnectionsModel;
import it.integry.ems.settings.Model.SettingsModel; import it.integry.ems.settings.Model.SettingsModel;
import it.integry.ems_model.utility.UtilityHashMap; import it.integry.ems_model.utility.UtilityHashMap;
@@ -27,7 +27,7 @@ public class SystemRequisiteCheckInterceptor extends HandlerInterceptorAdapter {
EmsCoreContext emsCoreContext; EmsCoreContext emsCoreContext;
@Autowired @Autowired
MigrationService migrationService; MigrationComponent migrationComponent;
@Autowired @Autowired
EmsDBConst emsDBConst; EmsDBConst emsDBConst;
@@ -58,7 +58,7 @@ public class SystemRequisiteCheckInterceptor extends HandlerInterceptorAdapter {
throw new SystemNotInitializedException(551, "System not initialized yet"); throw new SystemNotInitializedException(551, "System not initialized yet");
} }
if (migrationService.isAnyMigrationFailed()) { if (migrationComponent.isAnyMigrationFailed()) {
throw new SystemNotInitializedException(552, "Some migrations have failed"); throw new SystemNotInitializedException(552, "Some migrations have failed");
} }
} }