Skip to content

The Unified and Autonomous Development Platform

Do not trigger entity reference parsing for EntityPersist event

Robin Shend8959078c806
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestDiscardTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestDiscardTrigger.java
index 59f5287fb4..95eacc74bc 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestDiscardTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestDiscardTrigger.java
@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.trigger;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.SubmitReason;
import io.onedev.server.event.ProjectEvent;
-import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
+import io.onedev.server.event.pullrequest.PullRequestChanged;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
import io.onedev.server.web.editable.annotation.Editable;
@@ -14,8 +14,8 @@ public class PullRequestDiscardTrigger extends PullRequestTrigger {
@Override
public SubmitReason triggerMatches(ProjectEvent event, Job job) {
- if (event instanceof PullRequestChangeEvent) {
- PullRequestChangeEvent pullRequestChangeEvent = (PullRequestChangeEvent) event;
+ if (event instanceof PullRequestChanged) {
+ PullRequestChanged pullRequestChangeEvent = (PullRequestChanged) event;
if (pullRequestChangeEvent.getChange().getData() instanceof PullRequestDiscardData)
return triggerMatches(pullRequestChangeEvent.getRequest());
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestMergeTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestMergeTrigger.java
index ca432256b9..5984ab677c 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestMergeTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestMergeTrigger.java
@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.job.trigger;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.SubmitReason;
import io.onedev.server.event.ProjectEvent;
-import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
+import io.onedev.server.event.pullrequest.PullRequestChanged;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
import io.onedev.server.web.editable.annotation.Editable;
@@ -14,8 +14,8 @@ public class PullRequestMergeTrigger extends PullRequestTrigger {
@Override
public SubmitReason triggerMatches(ProjectEvent event, Job job) {
- if (event instanceof PullRequestChangeEvent) {
- PullRequestChangeEvent pullRequestChangeEvent = (PullRequestChangeEvent) event;
+ if (event instanceof PullRequestChanged) {
+ PullRequestChanged pullRequestChangeEvent = (PullRequestChanged) event;
if (pullRequestChangeEvent.getChange().getData() instanceof PullRequestMergeData)
return triggerMatches(pullRequestChangeEvent.getRequest());
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index 2dff7282d4..ea596ee56d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -44,7 +44,7 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.event.build.BuildFinished;
import io.onedev.server.event.issue.IssueChanged;
-import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
+import io.onedev.server.event.pullrequest.PullRequestChanged;
import io.onedev.server.event.pullrequest.PullRequestOpened;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
@@ -498,7 +498,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
@Transactional
@Listen
- public void on(PullRequestChangeEvent event) {
+ public void on(PullRequestChanged event) {
if (event.getChange().getData() instanceof PullRequestMergeData)
on(event.getRequest(), MergePullRequestTrigger.class);
else if (event.getChange().getData() instanceof PullRequestDiscardData)
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
index 42004015b8..cff583cc24 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
@@ -7,7 +7,7 @@ import javax.inject.Singleton;
import io.onedev.commons.loader.ListenerRegistry;
import io.onedev.server.entitymanager.PullRequestChangeManager;
-import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
+import io.onedev.server.event.pullrequest.PullRequestChanged;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
@@ -34,7 +34,7 @@ public class DefaultPullRequestChangeManager extends BaseEntityManager<PullReque
@Override
public void save(PullRequestChange change) {
dao.persist(change);
- listenerRegistry.post(new PullRequestChangeEvent(change));
+ listenerRegistry.post(new PullRequestChanged(change));
}
@Transactional
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index d1b91ba37c..887edcfb63 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -74,7 +74,7 @@ import io.onedev.server.event.RefUpdated;
import io.onedev.server.event.build.BuildEvent;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.pullrequest.PullRequestBuildEvent;
-import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
+import io.onedev.server.event.pullrequest.PullRequestChanged;
import io.onedev.server.event.pullrequest.PullRequestEvent;
import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;
import io.onedev.server.event.pullrequest.PullRequestOpened;
@@ -648,7 +648,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
@Transactional
@Listen
- public void on(PullRequestChangeEvent event) {
+ public void on(PullRequestChanged event) {
PullRequestChangeData data = event.getChange().getData();
if (data instanceof PullRequestApproveData || data instanceof PullRequestDiscardData
|| data instanceof PullRequestMergeStrategyChangeData) {
@@ -675,8 +675,8 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
}
} else {
boolean minorChange = false;
- if (event instanceof PullRequestChangeEvent) {
- PullRequestChangeData changeData = ((PullRequestChangeEvent)event).getChange().getData();
+ if (event instanceof PullRequestChanged) {
+ PullRequestChangeData changeData = ((PullRequestChanged)event).getChange().getData();
if (changeData instanceof PullRequestReviewerAddData
|| changeData instanceof PullRequestReviewerRemoveData
|| changeData instanceof PullRequestAssigneeAddData
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java b/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java
index 0a48f1a8a8..80fd242468 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java
@@ -15,19 +15,20 @@ import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.event.codecomment.CodeCommentCreated;
+import io.onedev.server.event.codecomment.CodeCommentReplied;
import io.onedev.server.event.codecomment.CodeCommentUpdated;
-import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.issue.IssueChanged;
+import io.onedev.server.event.issue.IssueCommented;
import io.onedev.server.event.issue.IssueOpened;
+import io.onedev.server.event.pullrequest.PullRequestChanged;
+import io.onedev.server.event.pullrequest.PullRequestCommented;
import io.onedev.server.event.pullrequest.PullRequestOpened;
import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
-import io.onedev.server.model.IssueComment;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
-import io.onedev.server.model.PullRequestComment;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.util.ProjectScopedNumber;
@@ -227,25 +228,34 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {
@Transactional
@Listen
- public void on(EntityPersisted event) {
- if (event.getEntity() instanceof IssueComment) {
- IssueComment comment = (IssueComment) event.getEntity();
- addReferenceChange(comment.getIssue(), comment.getContent());
- } else if (event.getEntity() instanceof IssueChange) {
- IssueChange change = (IssueChange) event.getEntity();
- addReferenceChange(change.getIssue(), change.getComment());
- } else if (event.getEntity() instanceof PullRequestComment) {
- PullRequestComment comment = (PullRequestComment) event.getEntity();
- addReferenceChange(comment.getRequest(), comment.getContent());
- } else if (event.getEntity() instanceof PullRequestChange) {
- PullRequestChange change = (PullRequestChange) event.getEntity();
- addReferenceChange(change.getRequest(), change.getComment());
- } else if (event.getEntity() instanceof CodeCommentReply) {
- CodeCommentReply reply = (CodeCommentReply) event.getEntity();
- addReferenceChange(reply.getComment(), reply.getContent());
- }
+ public void on(IssueCommented event) {
+ addReferenceChange(event.getIssue(), event.getComment().getContent());
}
+ @Transactional
+ @Listen
+ public void on(IssueChanged event) {
+ addReferenceChange(event.getIssue(), event.getChange().getComment());
+ }
+
+ @Transactional
+ @Listen
+ public void on(PullRequestCommented event) {
+ addReferenceChange(event.getRequest(), event.getComment().getContent());
+ }
+
+ @Transactional
+ @Listen
+ public void on(PullRequestChanged event) {
+ addReferenceChange(event.getRequest(), event.getChange().getComment());
+ }
+
+ @Transactional
+ @Listen
+ public void on(CodeCommentReplied event) {
+ addReferenceChange(event.getComment(), event.getReply().getContent());
+ }
+
@Transactional
@Listen
public void on(PullRequestOpened event) {
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java
similarity index 90%
rename from server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java
rename to server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java
index 1497318925..3ad23e0012 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java
@@ -9,11 +9,11 @@ import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeDat
import io.onedev.server.util.CommitAware;
import io.onedev.server.util.ProjectScopedCommit;
-public class PullRequestChangeEvent extends PullRequestEvent implements CommitAware {
+public class PullRequestChanged extends PullRequestEvent implements CommitAware {
private final PullRequestChange change;
- public PullRequestChangeEvent(PullRequestChange change) {
+ public PullRequestChanged(PullRequestChange change) {
super(change.getUser(), change.getDate(), change.getRequest());
this.change = change;
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
index 5cbc775971..58b750f03c 100644
--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
@@ -22,7 +22,7 @@ import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.pullrequest.PullRequestBuildEvent;
-import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
+import io.onedev.server.event.pullrequest.PullRequestChanged;
import io.onedev.server.event.pullrequest.PullRequestCodeCommentCreated;
import io.onedev.server.event.pullrequest.PullRequestCodeCommentReplied;
import io.onedev.server.event.pullrequest.PullRequestCommented;
@@ -86,8 +86,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
String url;
if (event instanceof PullRequestCommented)
url = urlManager.urlFor(((PullRequestCommented)event).getComment());
- else if (event instanceof PullRequestChangeEvent)
- url = urlManager.urlFor(((PullRequestChangeEvent)event).getChange());
+ else if (event instanceof PullRequestChanged)
+ url = urlManager.urlFor(((PullRequestChanged)event).getChange());
else if (event instanceof PullRequestCodeCommentCreated)
url = urlManager.urlFor(((PullRequestCodeCommentCreated)event).getComment());
else if (event instanceof PullRequestCodeCommentReplied)
@@ -187,10 +187,10 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
String replyAddress = mailManager.getReplyAddress(request);
boolean replyable = replyAddress != null;
- if (event instanceof PullRequestChangeEvent
+ if (event instanceof PullRequestChanged
&& request.getSubmitter() != null
&& !notifiedUsers.contains(request.getSubmitter())) {
- PullRequestChangeEvent changeEvent = (PullRequestChangeEvent) event;
+ PullRequestChanged changeEvent = (PullRequestChanged) event;
PullRequestChangeData changeData = changeEvent.getChange().getData();
if (changeData instanceof PullRequestApproveData
|| changeData instanceof PullRequestRequestedForChangesData
@@ -235,8 +235,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
}
boolean notifyWatchers = false;
- if (event instanceof PullRequestChangeEvent) {
- PullRequestChangeData changeData = ((PullRequestChangeEvent) event).getChange().getData();
+ if (event instanceof PullRequestChanged) {
+ PullRequestChangeData changeData = ((PullRequestChanged) event).getChange().getData();
if (changeData instanceof PullRequestApproveData
|| changeData instanceof PullRequestRequestedForChangesData
|| changeData instanceof PullRequestMergeData