Skip to content

The Unified and Autonomous Development Platform

Refactor to use project event

Robin Shen0060e728ef02
diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.java
index a189681cb3..459a2b582d 100644
--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultIssueInfoManager.java
@@ -3,13 +3,11 @@ package io.onedev.server.infomanager;
import com.google.common.base.Preconditions;
import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.commons.utils.FileUtils;
-import io.onedev.server.cluster.ClusterRunnable;
import io.onedev.server.cluster.ClusterTask;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.event.Listen;
-import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.project.ProjectDeleted;
import io.onedev.server.event.project.issue.*;
import io.onedev.server.event.system.SystemStarted;
@@ -19,7 +17,6 @@ import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;
import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.Day;
@@ -183,74 +180,6 @@ public class DefaultIssueInfoManager extends AbstractMultiEnvironmentManager
}
}
- @Transactional
- @Listen
- public void on(EntityPersisted event) {
- if (event.isNew()) {
- Long projectId;
- if (event.getEntity() instanceof Issue)
- projectId = ((Issue)event.getEntity()).getProject().getId();
- else if (event.getEntity() instanceof IssueChange)
- projectId = ((IssueChange)event.getEntity()).getIssue().getProject().getId();
- else
- projectId = null;
-
- if(projectId != null) {
- if (event.getEntity() instanceof Issue) {
- Issue issue = (Issue) event.getEntity();
- Long oldProjectId;
- if (issue.getOldVersion() != null)
- oldProjectId = issue.getOldVersion().getProjectId();
- else
- oldProjectId = null;
- if (oldProjectId != null && !projectId.equals(oldProjectId)) {
- Long issueId = issue.getId();
- transactionManager.runAfterCommit(new ClusterRunnable() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public void run() {
- projectManager.submitToProjectServer(oldProjectId, new ClusterTask<Void>() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Void call() throws Exception {
- remove(oldProjectId, issueId);
- return null;
- }
-
- });
- }
-
- });
- }
- }
- transactionManager.runAfterCommit(new ClusterRunnable() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public void run() {
- projectManager.submitToProjectServer(projectId, new ClusterTask<Void>() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Void call() throws Exception {
- batchWorkManager.submit(getBatchWorker(projectId), new Prioritized(PRIORITY));
- return null;
- }
-
- });
- }
-
- });
- }
- }
- }
-
private void remove(Long projectId, Long issueId) {
Environment env = getEnv(projectId.toString());
Store stateHistoryStore = getStore(env, STATE_HISTORY_STORE);
diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java
index b78338c9ab..9e249786ce 100644
--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java
@@ -1,37 +1,21 @@
package io.onedev.server.infomanager;
-import java.io.File;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.nio.ByteBuffer;
-import java.util.Collection;
-import java.util.List;
-import java.util.UUID;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.eclipse.jgit.lib.ObjectId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.commons.utils.FileUtils;
import io.onedev.server.cluster.ClusterManager;
-import io.onedev.server.cluster.ClusterRunnable;
import io.onedev.server.cluster.ClusterTask;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.PullRequestUpdateManager;
import io.onedev.server.event.Listen;
-import io.onedev.server.event.entity.EntityPersisted;
-import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.project.ProjectDeleted;
+import io.onedev.server.event.project.pullrequest.PullRequestOpened;
+import io.onedev.server.event.project.pullrequest.PullRequestUpdated;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.concurrent.BatchWorkManager;
import io.onedev.server.util.concurrent.BatchWorker;
@@ -40,9 +24,18 @@ import jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
import jetbrains.exodus.env.Environment;
import jetbrains.exodus.env.Store;
-import jetbrains.exodus.env.Transaction;
-import jetbrains.exodus.env.TransactionalComputable;
-import jetbrains.exodus.env.TransactionalExecutable;
+import org.eclipse.jgit.lib.ObjectId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.io.File;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.List;
@Singleton
public class DefaultPullRequestInfoManager extends AbstractMultiEnvironmentManager
@@ -107,26 +100,9 @@ public class DefaultPullRequestInfoManager extends AbstractMultiEnvironmentManag
};
}
- @Transactional
@Listen
- public void on(EntityRemoved event) {
- if (event.getEntity() instanceof Project) {
- Long projectId = event.getEntity().getId();
- UUID storageServerUUID = projectManager.getStorageServerUUID(projectId, false);
- if (storageServerUUID != null) {
- clusterManager.runOnServer(storageServerUUID, new ClusterTask<Void>() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Void call() throws Exception {
- removeEnv(projectId.toString());
- return null;
- }
-
- });
- }
- }
+ public void on(ProjectDeleted event) {
+ removeEnv(event.getProjectId().toString());
}
@Sessional
@@ -181,33 +157,17 @@ public class DefaultPullRequestInfoManager extends AbstractMultiEnvironmentManag
});
}
+
+ @Sessional
+ @Listen
+ public void on(PullRequestOpened event) {
+ batchWorkManager.submit(getBatchWorker(event.getProject().getId()), new Prioritized(PRIORITY));
+ }
- @Transactional
+ @Sessional
@Listen
- public void on(EntityPersisted event) {
- if (event.isNew() && event.getEntity() instanceof PullRequestUpdate) {
- Long projectId = ((PullRequestUpdate) event.getEntity()).getRequest().getTargetProject().getId();
- transactionManager.runAfterCommit(new ClusterRunnable() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public void run() {
- projectManager.submitToProjectServer(projectId, new ClusterTask<Void>() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Void call() throws Exception {
- batchWorkManager.submit(getBatchWorker(projectId), new Prioritized(PRIORITY));
- return null;
- }
-
- });
- }
-
- });
- }
+ public void on(PullRequestUpdated event) {
+ batchWorkManager.submit(getBatchWorker(event.getProject().getId()), new Prioritized(PRIORITY));
}
@Sessional
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index ec0e90749d..7785997166 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -5,7 +5,9 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
+import io.onedev.server.annotation.Editable;
import io.onedev.server.attachment.AttachmentStorageSupport;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -18,7 +20,6 @@ import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.ProjectBelonging;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.rest.annotation.Api;
import io.onedev.server.search.entity.SortField;
@@ -30,7 +31,6 @@ import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.facade.IssueFacade;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.annotation.Editable;
import io.onedev.server.web.util.IssueAware;
import io.onedev.server.web.util.WicketUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html
index 5ee475fdd3..b151b4e371 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
<div class="issue-commits">
<div wicket:id="commits" class="commit py-3">
- <wicket:container wicket:id="commit" class=""></wicket:container>
+ <wicket:container wicket:id="commit"></wicket:container>
</div>
</div>
</wicket:panel>