Skip to content

The Unified and Autonomous Development Platform

chore: Refactoring task button and feedback

Robin Shen235a187d8daf
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index 13b6a0dc1a..80117f4fb7 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -412,7 +412,8 @@ import io.onedev.server.web.avatar.DefaultAvatarService;
import io.onedev.server.web.component.diff.blob.DiffRenderer;
import io.onedev.server.web.component.markdown.SourcePositionTrackExtension;
import io.onedev.server.web.component.markdown.emoji.EmojiExtension;
-import io.onedev.server.web.component.taskbutton.TaskFutureManager;
+import io.onedev.server.web.component.taskbutton.DefaultTaskFutureService;
+import io.onedev.server.web.component.taskbutton.TaskFutureService;
import io.onedev.server.web.editable.DefaultEditSupportRegistry;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EditSupportLocator;
@@ -748,7 +749,7 @@ public class CoreModule extends AbstractPluginModule {
bind(AlertEventBroadcaster.class);
bind(UploadService.class).to(DefaultUploadService.class);
- bind(TaskFutureManager.class);
+ bind(TaskFutureService.class).to(DefaultTaskFutureService.class);
bind(TemporalFutureService.class).to(DefaultTemporalFutureService.class);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFutureManager.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/DefaultTaskFutureService.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFutureManager.java
rename to server-core/src/main/java/io/onedev/server/web/component/taskbutton/DefaultTaskFutureService.java
index eaea2a56fc..dd8a748dce 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFutureManager.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/DefaultTaskFutureService.java
@@ -17,7 +17,7 @@ import io.onedev.server.taskschedule.SchedulableTask;
import io.onedev.server.taskschedule.TaskScheduler;
@Singleton
-public class TaskFutureManager implements SchedulableTask {
+public class DefaultTaskFutureService implements SchedulableTask, TaskFutureService {
private final Map<String, TaskFuture> taskFutures = new ConcurrentHashMap<>();
@@ -37,6 +37,7 @@ public class TaskFutureManager implements SchedulableTask {
taskScheduler.unschedule(cleanupTaskId);
}
+ @Override
public Map<String, TaskFuture> getTaskFutures() {
return taskFutures;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
index 15073f0e1c..e814e21c43 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
@@ -38,7 +38,7 @@ import io.onedev.server.web.component.taskbutton.TaskResult.PlainMessage;
public abstract class TaskButton extends AjaxButton {
@Inject
- private TaskFutureManager taskFutureManager;
+ private TaskFutureService taskFutureService;
@Inject
private ExecutorService executorService;
@@ -132,7 +132,7 @@ public abstract class TaskButton extends AjaxButton {
messages.add(new JobLogEntryEx(new JobLogEntry(new Date(), _T("Please wait..."))));
var application = Application.get();
var requestCycle = RequestCycle.get();
- TaskFuture prevFuture = taskFutureManager.getTaskFutures().put(taskId, new TaskFuture(executorService.submit(new Callable<TaskResult>() {
+ TaskFuture prevFuture = taskFutureService.getTaskFutures().put(taskId, new TaskFuture(executorService.submit(new Callable<TaskResult>() {
@Override
public TaskResult call() throws Exception {
@@ -194,7 +194,7 @@ public abstract class TaskButton extends AjaxButton {
@Override
protected void onClosed() {
super.onClosed();
- TaskFuture future = taskFutureManager.getTaskFutures().remove(taskId);
+ TaskFuture future = taskFutureService.getTaskFutures().remove(taskId);
AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
if (future != null) {
@@ -216,7 +216,7 @@ public abstract class TaskButton extends AjaxButton {
@Override
protected List<JobLogEntryEx> getLogEntries() {
- TaskFuture future = taskFutureManager.getTaskFutures().get(taskId);
+ TaskFuture future = taskFutureService.getTaskFutures().get(taskId);
if (future != null)
return future.getLogEntries();
else
@@ -225,7 +225,7 @@ public abstract class TaskButton extends AjaxButton {
@Override
protected TaskResult getResult() {
- TaskFuture future = taskFutureManager.getTaskFutures().get(taskId);
+ TaskFuture future = taskFutureService.getTaskFutures().get(taskId);
if (future != null && future.isDone() && !future.isCancelled()) {
try {
result = future.get();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFutureService.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFutureService.java
new file mode 100644
index 0000000000..3a10f812e2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFutureService.java
@@ -0,0 +1,9 @@
+package io.onedev.server.web.component.taskbutton;
+
+import java.util.Map;
+
+public interface TaskFutureService {
+
+ Map<String, TaskFuture> getTaskFutures();
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index f1727e618c..dc263e7de0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -9,7 +9,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.web.page.base.BasePage;
public class TestPage extends BasePage {
-
+
public TestPage(PageParameters params) {
super(params);
}