The Unified and Autonomous Development Platform
Adapt to TaskScheduler changes in utils project
robin shen97ba7aba7b5d
diff --git a/core/src/main/java/com/gitplex/server/GitPlex.java b/core/src/main/java/com/gitplex/server/GitPlex.javaindex 09a77bbeba..e7e85803a0 100644--- a/core/src/main/java/com/gitplex/server/GitPlex.java+++ b/core/src/main/java/com/gitplex/server/GitPlex.java@@ -62,14 +62,17 @@ public class GitPlex extends AbstractPlugin implements Serializable {private final ListenerRegistry listenerRegistry;+ private final TaskScheduler taskScheduler;+private volatile InitStage initStage;@Inject- public GitPlex(JettyRunner jettyRunner, PersistManager persistManager,+ public GitPlex(JettyRunner jettyRunner, PersistManager persistManager, TaskScheduler taskScheduler,UnitOfWork unitOfWork, ServerConfig serverConfig, DataManager dataManager, ConfigManager configManager,UserManager userManager, ListenerRegistry listenerRegistry) {this.jettyRunner = jettyRunner;this.persistManager = persistManager;+ this.taskScheduler = taskScheduler;this.unitOfWork = unitOfWork;this.configManager = configManager;this.dataManager = dataManager;@@ -85,7 +88,7 @@ public class GitPlex extends AbstractPlugin implements Serializable {jettyRunner.start();if (Bootstrap.command == null) {- TaskScheduler.getInstance().start();+ taskScheduler.start();}persistManager.start();@@ -178,7 +181,7 @@ public class GitPlex extends AbstractPlugin implements Serializable {}persistManager.stop();- TaskScheduler.getInstance().stop();+ taskScheduler.stop();jettyRunner.stop();}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.javaindex a6968f5796..b1b7cf0305 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java@@ -38,14 +38,17 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableTprivate final StorageManager storageManager;+ private final TaskScheduler taskScheduler;+private final Dao dao;private String taskId;@Inject- public DefaultAttachmentManager(Dao dao, StorageManager storageManager) {+ public DefaultAttachmentManager(Dao dao, StorageManager storageManager, TaskScheduler taskScheduler) {this.dao = dao;this.storageManager = storageManager;+ this.taskScheduler = taskScheduler;}@Override@@ -85,12 +88,12 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT@Listenpublic void on(SystemStarted event) {- taskId = TaskScheduler.getInstance().schedule(this);+ taskId = taskScheduler.schedule(this);}@Listenpublic void on(SystemStopping event) {- TaskScheduler.getInstance().unschedule(taskId);+ taskScheduler.unschedule(taskId);}@Sessionaldiff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDataManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDataManager.javaindex a49380506a..c7b27fbdba 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDataManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDataManager.java@@ -65,16 +65,19 @@ public class DefaultDataManager implements DataManager, Serializable {private final PasswordService passwordService;+ private final TaskScheduler taskScheduler;+private String backupTaskId;@Injectpublic DefaultDataManager(IdManager idManager, UserManager userManager,ConfigManager configManager, PersistManager persistManager,- MailManager mailManager, Validator validator,+ MailManager mailManager, Validator validator, TaskScheduler taskScheduler,PasswordService passwordService) {this.userManager = userManager;this.configManager = configManager;this.validator = validator;+ this.taskScheduler = taskScheduler;this.idManager = idManager;this.persistManager = persistManager;this.mailManager = mailManager;@@ -189,9 +192,9 @@ public class DefaultDataManager implements DataManager, Serializable {@Overridepublic void scheduleBackup(BackupSetting backupSetting) {if (backupTaskId != null)- TaskScheduler.getInstance().unschedule(backupTaskId);+ taskScheduler.unschedule(backupTaskId);if (backupSetting != null) {- backupTaskId = TaskScheduler.getInstance().schedule(new SchedulableTask() {+ backupTaskId = taskScheduler.schedule(new SchedulableTask() {@Overridepublic void execute() {