Skip to content

The Unified and Autonomous Development Platform

Fix issue #1247 - Pull request fuzzy search does not index newly opened pull requests

Robin Shen556d120f141c
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java
index a708638589..e83f9d0b8e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java
@@ -14,6 +14,8 @@ public interface PullRequestChangeManager extends EntityManager<PullRequestChang
void changeMergeStrategy(PullRequest request, MergeStrategy mergeStrategy);
void changeTitle(PullRequest request, String title);
+
+ void changeDescription(PullRequest request, @Nullable String description);
void changeTargetBranch(PullRequest request, String targetBranch);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentManager.java
index 7f62bebd49..76c3133577 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentManager.java
@@ -7,8 +7,8 @@ import java.util.Collection;
public interface PullRequestCommentManager extends EntityManager<PullRequestComment> {
- void createOrUpdate(PullRequestComment comment);
+ void create(PullRequestComment comment, Collection<String> notifiedEmailAddresses);
- void createOrUpdate(PullRequestComment comment, Collection<String> notifiedEmailAddresses);
+ void update(PullRequestComment comment);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
index 36b018c6ff..6914524b43 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
@@ -1,13 +1,5 @@
package io.onedev.server.entitymanager;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import org.eclipse.jgit.lib.ObjectId;
-
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.persistence.dao.EntityManager;
@@ -16,6 +8,12 @@ import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.ProjectPullRequestStats;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.criteria.Criteria;
+import org.eclipse.jgit.lib.ObjectId;
+
+import javax.annotation.Nullable;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
public interface PullRequestManager extends EntityManager<PullRequest> {
@@ -72,9 +70,7 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
List<PullRequest> query(Project targetProject, String term, int count);
- void delete(Collection<PullRequest> requests);
-
- void saveDescription(PullRequest request, @Nullable String description);
+ void delete(Collection<PullRequest> requests, Project project);
List<ProjectPullRequestStats> queryStats(Collection<Project> projects);
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 a29487afd5..c1403763c1 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
@@ -137,6 +137,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
}
}
+ @Transactional
@Override
public void changeDescription(Issue issue, @Nullable String description) {
String prevDescription = issue.getDescription();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 53cba6cd7f..301554f6f5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -5,6 +5,7 @@ import com.google.common.collect.Lists;
import com.hazelcast.core.HazelcastInstance;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.loader.ManagedSerializedForm;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.entitymanager.*;
import io.onedev.server.entityreference.ReferenceMigrator;
@@ -17,7 +18,6 @@ import io.onedev.server.migration.VersionedXmlDoc;
import io.onedev.server.model.*;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.model.support.issue.StateSpec;
import io.onedev.server.model.support.issue.changedata.IssueProjectChangeData;
@@ -850,7 +850,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
dao.remove(issue);
removeFromCacheAfterCommit(Lists.newArrayList(issue));
- listenerRegistry.post(new IssuesDeleted(issue.getProject(), Lists.newArrayList(issue)));
+ listenerRegistry.post(new IssueDeleted(issue));
}
private String getCacheKey(Issue issue) {
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 f2f2b0a247..de5eb41c6f 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
@@ -1,18 +1,15 @@
package io.onedev.server.entitymanager.impl;
-import java.util.Date;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
+import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.entitymanager.PullRequestChangeManager;
+import io.onedev.server.entityreference.EntityReferenceManager;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.pullrequest.PullRequestChanged;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestTargetBranchChangeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestTitleChangeData;
@@ -21,16 +18,26 @@ import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.security.SecurityUtils;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Date;
+import java.util.Objects;
+
@Singleton
public class DefaultPullRequestChangeManager extends BaseEntityManager<PullRequestChange>
implements PullRequestChangeManager {
private final ListenerRegistry listenerRegistry;
+ private final EntityReferenceManager entityReferenceManager;
+
@Inject
- public DefaultPullRequestChangeManager(Dao dao, ListenerRegistry listenerRegistry) {
+ public DefaultPullRequestChangeManager(Dao dao, ListenerRegistry listenerRegistry,
+ EntityReferenceManager entityReferenceManager) {
super(dao);
this.listenerRegistry = listenerRegistry;
+ this.entityReferenceManager = entityReferenceManager;
}
@Transactional
@@ -81,6 +88,25 @@ public class DefaultPullRequestChangeManager extends BaseEntityManager<PullReque
}
}
+ @Transactional
+ @Override
+ public void changeDescription(PullRequest request, @Nullable String description) {
+ String prevDescription = request.getDescription();
+ if (!Objects.equals(description, prevDescription)) {
+ if (description != null && description.length() > PullRequest.MAX_DESCRIPTION_LEN)
+ throw new ExplicitException("Description too long");
+ request.setDescription(description);
+ entityReferenceManager.addReferenceChange(request, description);
+
+ PullRequestChange change = new PullRequestChange();
+ change.setRequest(request);
+ change.setUser(SecurityUtils.getUser());
+ change.setData(new PullRequestDescriptionChangeData(prevDescription, request.getDescription()));
+ create(change, null);
+ dao.persist(request);
+ }
+ }
+
@Transactional
@Override
public void changeTargetBranch(PullRequest request, String targetBranch) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java
index da9a495514..dd5cefa49e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java
@@ -1,21 +1,19 @@
package io.onedev.server.entitymanager.impl;
-import java.util.Collection;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import com.google.common.collect.Lists;
-
import io.onedev.server.entitymanager.PullRequestCommentManager;
import io.onedev.server.event.ListenerRegistry;
-import io.onedev.server.event.project.pullrequest.PullRequestCommented;
-import io.onedev.server.model.PullRequest;
+import io.onedev.server.event.project.pullrequest.PullRequestCommentCreated;
+import io.onedev.server.event.project.pullrequest.PullRequestCommentDeleted;
+import io.onedev.server.event.project.pullrequest.PullRequestCommentUpdated;
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Collection;
+
@Singleton
public class DefaultPullRequestCommentManager extends BaseEntityManager<PullRequestComment>
implements PullRequestCommentManager {
@@ -30,30 +28,25 @@ public class DefaultPullRequestCommentManager extends BaseEntityManager<PullRequ
@Transactional
@Override
- public void createOrUpdate(PullRequestComment comment) {
- createOrUpdate(comment, Lists.newArrayList());
+ public void delete(PullRequestComment comment) {
+ super.delete(comment);
+ comment.getRequest().setCommentCount(comment.getRequest().getCommentCount()-1);
+ listenerRegistry.post(new PullRequestCommentDeleted(comment));
}
@Transactional
@Override
- public void delete(PullRequestComment comment) {
- super.delete(comment);
- PullRequest request = comment.getRequest();
- request.setCommentCount(request.getCommentCount()-1);
+ public void create(PullRequestComment comment, Collection<String> notifiedEmailAddresses) {
+ dao.persist(comment);
+ comment.getRequest().setCommentCount(comment.getRequest().getCommentCount()+1);
+ listenerRegistry.post(new PullRequestCommentCreated(comment, notifiedEmailAddresses));
}
@Transactional
@Override
- public void createOrUpdate(PullRequestComment comment, Collection<String> notifiedEmailAddresses) {
- boolean isNew = comment.isNew();
+ public void update(PullRequestComment comment) {
dao.persist(comment);
- if (isNew) {
- PullRequestCommented event = new PullRequestCommented(comment, notifiedEmailAddresses);
- listenerRegistry.post(event);
-
- PullRequest request = comment.getRequest();
- request.setCommentCount(request.getCommentCount()+1);
- }
+ listenerRegistry.post(new PullRequestCommentUpdated(comment));
}
-
+
}
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 e91896337a..7c6dede7c8 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
@@ -11,7 +11,6 @@ import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.cluster.ClusterRunnable;
import io.onedev.server.cluster.ClusterTask;
import io.onedev.server.entitymanager.*;
-import io.onedev.server.entityreference.EntityReferenceManager;
import io.onedev.server.event.Listen;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.entity.EntityRemoved;
@@ -22,7 +21,6 @@ import io.onedev.server.git.GitUtils;
import io.onedev.server.git.service.GitService;
import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.infomanager.PullRequestInfoManager;
-import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.model.*;
import io.onedev.server.model.PullRequest.Status;
import io.onedev.server.model.support.CompareContext;
@@ -103,8 +101,6 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
private final TransactionManager transactionManager;
- private final EntityReferenceManager referenceManager;
-
private final PendingSuggestionApplyManager pendingSuggestionApplyManager;
private final GitService gitService;
@@ -114,15 +110,14 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
private final SequenceGenerator numberGenerator;
@Inject
- public DefaultPullRequestManager(Dao dao, PullRequestUpdateManager updateManager,
- PullRequestReviewManager reviewManager, MarkdownManager markdownManager,
- ListenerRegistry listenerRegistry, PullRequestChangeManager changeManager,
- BuildManager buildManager, TransactionManager transactionManager,
- ProjectManager projectManager, CommitInfoManager commitInfoManager,
- EntityReferenceManager referenceManager, ClusterManager clusterManager,
- UserManager userManager, GitService gitService,
- PendingSuggestionApplyManager pendingSuggestionApplyManager,
- PullRequestInfoManager pullRequestInfoManager) {
+ public DefaultPullRequestManager(Dao dao, PullRequestUpdateManager updateManager,
+ PullRequestReviewManager reviewManager, ListenerRegistry listenerRegistry,
+ PullRequestChangeManager changeManager, BuildManager buildManager,
+ TransactionManager transactionManager, ProjectManager projectManager,
+ CommitInfoManager commitInfoManager, ClusterManager clusterManager,
+ UserManager userManager, GitService gitService,
+ PendingSuggestionApplyManager pendingSuggestionApplyManager,
+ PullRequestInfoManager pullRequestInfoManager) {
super(dao);
this.updateManager = updateManager;
@@ -133,7 +128,6 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
this.buildManager = buildManager;
this.projectManager = projectManager;
this.commitInfoManager = commitInfoManager;
- this.referenceManager = referenceManager;
this.pendingSuggestionApplyManager = pendingSuggestionApplyManager;
this.userManager = userManager;
this.gitService = gitService;
@@ -145,12 +139,17 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
public Object writeReplace() throws ObjectStreamException {
return new ManagedSerializedForm(PullRequestManager.class);
}
-
+
@Transactional
@Override
public void delete(PullRequest request) {
+ doDelete(request);
+ listenerRegistry.post(new PullRequestDeleted(request));
+ }
+
+ private void doDelete(PullRequest request) {
Collection<String> refs = Lists.newArrayList(
- request.getHeadRef(), request.getMergeRef(), request.getBaseRef());
+ request.getHeadRef(), request.getMergeRef(), request.getBaseRef(), request.getBuildRef());
for (PullRequestUpdate update: request.getUpdates())
refs.add(update.getHeadRef());
@@ -943,22 +942,10 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
@Transactional
@Override
- public void delete(Collection<PullRequest> requests) {
+ public void delete(Collection<PullRequest> requests, Project project) {
for (PullRequest request: requests)
- delete(request);
- }
-
- @Transactional
- @Override
- public void saveDescription(PullRequest request, @Nullable String description) {
- String prevDescription = request.getDescription();
- if (!Objects.equals(description, prevDescription)) {
- if (description != null && description.length() > PullRequest.MAX_DESCRIPTION_LEN)
- throw new ExplicitException("Description too long");
- request.setDescription(description);
- referenceManager.addReferenceChange(request, description);
- dao.persist(request);
- }
+ doDelete(request);
+ listenerRegistry.post(new PullRequestsDeleted(project, requests));
}
@Sessional
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 12ebf01117..d60ef2ae14 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
@@ -14,7 +14,7 @@ import io.onedev.server.event.project.issue.IssueChanged;
import io.onedev.server.event.project.issue.IssueCommentCreated;
import io.onedev.server.event.project.issue.IssueOpened;
import io.onedev.server.event.project.pullrequest.PullRequestChanged;
-import io.onedev.server.event.project.pullrequest.PullRequestCommented;
+import io.onedev.server.event.project.pullrequest.PullRequestCommentCreated;
import io.onedev.server.event.project.pullrequest.PullRequestOpened;
import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.model.*;
@@ -292,7 +292,7 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {
@Transactional
@Listen
- public void on(PullRequestCommented event) {
+ public void on(PullRequestCommentCreated event) {
addReferenceChange(event.getRequest(), event.getComment().getContent());
}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/issue/IssueDeleted.java b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueDeleted.java
new file mode 100644
index 0000000000..5e8712e993
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/project/issue/IssueDeleted.java
@@ -0,0 +1,29 @@
+package io.onedev.server.event.project.issue;
+
+import io.onedev.server.event.project.ProjectEvent;
+import io.onedev.server.model.Issue;
+import io.onedev.server.security.SecurityUtils;
+
+import java.util.Date;
+
+public class IssueDeleted extends ProjectEvent {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Long issueId;
+
+ public IssueDeleted(Issue issue) {
+ super(SecurityUtils.getUser(), new Date(), issue.getProject());
+ issueId = issue.getId();
+ }
+
+ public Long getIssueId() {
+ return issueId;
+ }
+
+ @Override
+ public String getActivity() {
+ return "issue deleted";
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommented.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentCreated.java
similarity index 87%
rename from server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommented.java
rename to server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentCreated.java
index 76833d633c..864021eb70 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommented.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentCreated.java
@@ -9,7 +9,7 @@ import io.onedev.server.model.PullRequestComment;
import io.onedev.server.util.commenttext.CommentText;
import io.onedev.server.util.commenttext.MarkdownText;
-public class PullRequestCommented extends PullRequestEvent {
+public class PullRequestCommentCreated extends PullRequestEvent {
private static final long serialVersionUID = 1L;
@@ -17,7 +17,7 @@ public class PullRequestCommented extends PullRequestEvent {
private final Collection<String> notifiedEmailAddresses;
- public PullRequestCommented(PullRequestComment comment, Collection<String> notifiedEmailAddresses) {
+ public PullRequestCommentCreated(PullRequestComment comment, Collection<String> notifiedEmailAddresses) {
super(comment.getUser(), comment.getDate(), comment.getRequest());
commentId = comment.getId();
this.notifiedEmailAddresses = notifiedEmailAddresses;
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentDeleted.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentDeleted.java
new file mode 100644
index 0000000000..5b644ac540
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentDeleted.java
@@ -0,0 +1,33 @@
+package io.onedev.server.event.project.pullrequest;
+
+import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.security.SecurityUtils;
+
+import java.util.Date;
+
+public class PullRequestCommentDeleted extends PullRequestEvent {
+
+ private final Long commentId;
+
+ private static final long serialVersionUID = 1L;
+
+ public PullRequestCommentDeleted(PullRequestComment comment) {
+ super(SecurityUtils.getUser(), new Date(), comment.getRequest());
+ this.commentId = comment.getId();
+ }
+
+ public Long getCommentId() {
+ return commentId;
+ }
+
+ @Override
+ public boolean isMinor() {
+ return true;
+ }
+
+ @Override
+ public String getActivity() {
+ return "comment deleted";
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentUpdated.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentUpdated.java
new file mode 100644
index 0000000000..a55a9a95a5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestCommentUpdated.java
@@ -0,0 +1,35 @@
+package io.onedev.server.event.project.pullrequest;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestCommentManager;
+import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.security.SecurityUtils;
+
+import java.util.Date;
+
+public class PullRequestCommentUpdated extends PullRequestEvent {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Long commentId;
+
+ public PullRequestCommentUpdated(PullRequestComment comment) {
+ super(SecurityUtils.getUser(), new Date(), comment.getRequest());
+ this.commentId = comment.getId();
+ }
+
+ public PullRequestComment getComment() {
+ return OneDev.getInstance(PullRequestCommentManager.class).load(commentId);
+ }
+
+ @Override
+ public boolean isMinor() {
+ return true;
+ }
+
+ @Override
+ public String getActivity() {
+ return "comment updated";
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestDeleted.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestDeleted.java
new file mode 100644
index 0000000000..fc7d123ba0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestDeleted.java
@@ -0,0 +1,29 @@
+package io.onedev.server.event.project.pullrequest;
+
+import io.onedev.server.event.project.ProjectEvent;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.security.SecurityUtils;
+
+import java.util.Date;
+
+public class PullRequestDeleted extends ProjectEvent {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Long requestId;
+
+ public PullRequestDeleted(PullRequest request) {
+ super(SecurityUtils.getUser(), new Date(), request.getProject());
+ requestId = request.getId();
+ }
+
+ public Long getRequestId() {
+ return requestId;
+ }
+
+ @Override
+ public String getActivity() {
+ return "pull request deleted";
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestsDeleted.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestsDeleted.java
new file mode 100644
index 0000000000..8141e04736
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestsDeleted.java
@@ -0,0 +1,33 @@
+package io.onedev.server.event.project.pullrequest;
+
+import io.onedev.server.event.project.ProjectEvent;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.security.SecurityUtils;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.stream.Collectors;
+
+public class PullRequestsDeleted extends ProjectEvent {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Collection<Long> requestIds;
+
+ public PullRequestsDeleted(Project project, Collection<PullRequest> requests) {
+ super(SecurityUtils.getUser(), new Date(), project);
+ requestIds = requests.stream().map(PullRequest::getId).collect(Collectors.toSet());
+ }
+
+ public Collection<Long> getRequestIds() {
+ return requestIds;
+ }
+
+ @Override
+ public String getActivity() {
+ return "pull requests deleted";
+ }
+
+}
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 39663bfb12..a189681cb3 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,7 +3,6 @@ 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.ClusterManager;
import io.onedev.server.cluster.ClusterRunnable;
import io.onedev.server.cluster.ClusterTask;
import io.onedev.server.entitymanager.IssueChangeManager;
@@ -29,7 +28,9 @@ import io.onedev.server.util.concurrent.BatchWorker;
import io.onedev.server.util.concurrent.Prioritized;
import jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
-import jetbrains.exodus.env.*;
+import jetbrains.exodus.env.Environment;
+import jetbrains.exodus.env.Store;
+import jetbrains.exodus.env.Transaction;
import org.apache.commons.lang.SerializationUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -78,15 +79,13 @@ public class DefaultIssueInfoManager extends AbstractMultiEnvironmentManager
private final ProjectManager projectManager;
- private final ClusterManager clusterManager;
-
private final Dao dao;
@Inject
public DefaultIssueInfoManager(Dao dao, TransactionManager transactionManager,
StorageManager storageManager, IssueManager issueManager,
IssueChangeManager issueChangeManager, BatchWorkManager batchWorkManager,
- ProjectManager projectManager, ClusterManager clusterManager) {
+ ProjectManager projectManager) {
this.dao = dao;
this.storageManager = storageManager;
this.issueManager = issueManager;
@@ -94,7 +93,6 @@ public class DefaultIssueInfoManager extends AbstractMultiEnvironmentManager
this.batchWorkManager = batchWorkManager;
this.transactionManager = transactionManager;
this.projectManager = projectManager;
- this.clusterManager = clusterManager;
}
public Object writeReplace() throws ObjectStreamException {
@@ -121,77 +119,52 @@ public class DefaultIssueInfoManager extends AbstractMultiEnvironmentManager
Store defaultStore = getStore(env, DEFAULT_STORE);
Store stateHistoryStore = getStore(env, STATE_HISTORY_STORE);
- Long lastIssueId = env.computeInTransaction(new TransactionalComputable<Long>() {
-
- @Override
- public Long compute(Transaction txn) {
- return readLong(defaultStore, txn, LAST_ISSUE_KEY, 0);
- }
-
- });
+ Long lastIssueId = env.computeInTransaction(txn -> readLong(defaultStore, txn, LAST_ISSUE_KEY, 0));
List<Issue> unprocessedIssues = issueManager.queryAfter(projectId, lastIssueId, BATCH_SIZE);
- env.executeInTransaction(new TransactionalExecutable() {
-
- @Override
- public void execute(Transaction txn) {
- Issue lastIssue = null;
- for (Issue issue: unprocessedIssues) {
- initStateHistory(stateHistoryStore, txn, issue);
- lastIssue = issue;
- }
- if (lastIssue != null)
- defaultStore.put(txn, LAST_ISSUE_KEY, new LongByteIterable(lastIssue.getId()));
+ env.executeInTransaction(txn -> {
+ Issue lastIssue = null;
+ for (Issue issue: unprocessedIssues) {
+ initStateHistory(stateHistoryStore, txn, issue);
+ lastIssue = issue;
}
-
+ if (lastIssue != null)
+ defaultStore.put(txn, LAST_ISSUE_KEY, new LongByteIterable(lastIssue.getId()));
});
- Long lastChangeId = env.computeInTransaction(new TransactionalComputable<Long>() {
-
- @Override
- public Long compute(Transaction txn) {
- return readLong(defaultStore, txn, LAST_ISSUE_CHANGE_KEY, 0);
- }
-
- });
+ Long lastChangeId = env.computeInTransaction(txn -> readLong(defaultStore, txn, LAST_ISSUE_CHANGE_KEY, 0));
List<IssueChange> unprocessedChanges = issueChangeManager.queryAfter(projectId, lastChangeId, BATCH_SIZE);
- env.executeInTransaction(new TransactionalExecutable() {
-
- @SuppressWarnings("unchecked")
- @Override
- public void execute(Transaction txn) {
- IssueChange lastChange = null;
+ env.executeInTransaction(txn -> {
+ IssueChange lastChange = null;
+
+ for (IssueChange change: unprocessedChanges) {
+ Issue issue = change.getIssue();
+ initStateHistory(stateHistoryStore, txn, issue);
- for (IssueChange change: unprocessedChanges) {
- Issue issue = change.getIssue();
- initStateHistory(stateHistoryStore, txn, issue);
-
- String state = null;
- if (change.getData() instanceof IssueStateChangeData) {
- IssueStateChangeData changeData = (IssueStateChangeData) change.getData();
- if (!changeData.getOldState().equals(changeData.getNewState()))
- state = changeData.getNewState();
- } else if (change.getData() instanceof IssueBatchUpdateData) {
- IssueBatchUpdateData changeData = (IssueBatchUpdateData) change.getData();
- if (!changeData.getOldState().equals(changeData.getNewState()))
- state = changeData.getNewState();
- }
+ String state = null;
+ if (change.getData() instanceof IssueStateChangeData) {
+ IssueStateChangeData changeData = (IssueStateChangeData) change.getData();
+ if (!changeData.getOldState().equals(changeData.getNewState()))
+ state = changeData.getNewState();
+ } else if (change.getData() instanceof IssueBatchUpdateData) {
+ IssueBatchUpdateData changeData = (IssueBatchUpdateData) change.getData();
+ if (!changeData.getOldState().equals(changeData.getNewState()))
+ state = changeData.getNewState();
+ }
- if (state != null) {
- ArrayByteIterable issueKey = new LongByteIterable(issue.getId());
- byte[] bytes = Preconditions.checkNotNull(readBytes(stateHistoryStore, txn, issueKey));
- Map<Integer, String> stateHistory = (Map<Integer, String>) SerializationUtils.deserialize(bytes);
- stateHistory.put(new Day(change.getDate()).getValue(), state);
- stateHistoryStore.put(txn, issueKey, new ArrayByteIterable(SerializationUtils.serialize((Serializable) stateHistory)));
- }
-
- lastChange = change;
+ if (state != null) {
+ ArrayByteIterable issueKey = new LongByteIterable(issue.getId());
+ byte[] bytes = Preconditions.checkNotNull(readBytes(stateHistoryStore, txn, issueKey));
+ Map<Integer, String> stateHistory = (Map<Integer, String>) SerializationUtils.deserialize(bytes);
+ stateHistory.put(new Day(change.getDate()).getValue(), state);
+ stateHistoryStore.put(txn, issueKey, new ArrayByteIterable(SerializationUtils.serialize((Serializable) stateHistory)));
}
- if (lastChange != null)
- defaultStore.put(txn, LAST_ISSUE_CHANGE_KEY, new LongByteIterable(lastChange.getId()));
+
+ lastChange = change;
}
-
+ if (lastChange != null)
+ defaultStore.put(txn, LAST_ISSUE_CHANGE_KEY, new LongByteIterable(lastChange.getId()));
});
logger.debug("Collected issue info");
@@ -281,14 +254,7 @@ public class DefaultIssueInfoManager extends AbstractMultiEnvironmentManager
private void remove(Long projectId, Long issueId) {
Environment env = getEnv(projectId.toString());
Store stateHistoryStore = getStore(env, STATE_HISTORY_STORE);
- env.executeInTransaction(new TransactionalExecutable() {
-
- @Override
- public void execute(Transaction txn) {
- stateHistoryStore.delete(txn, new LongByteIterable(issueId));
- }
-
- });
+ env.executeInTransaction(txn -> stateHistoryStore.delete(txn, new LongByteIterable(issueId)));
}
@Sessional
@@ -327,6 +293,12 @@ public class DefaultIssueInfoManager extends AbstractMultiEnvironmentManager
for (var issueId: event.getIssueIds())
remove(event.getProject().getId(), issueId);
}
+
+ @Sessional
+ @Listen
+ public void on(IssueDeleted event) {
+ remove(event.getProject().getId(), event.getIssueId());
+ }
@Sessional
@Listen
@@ -387,36 +359,30 @@ public class DefaultIssueInfoManager extends AbstractMultiEnvironmentManager
Environment env = getEnv(projectId.toString());
Store stateHistoryStore = getStore(env, STATE_HISTORY_STORE);
- return env.computeInTransaction(new TransactionalComputable<Map<Integer, String>>() {
-
- @SuppressWarnings("unchecked")
- @Override
- public Map<Integer, String> compute(Transaction txn) {
- Map<Integer, String> dailyStates = new LinkedHashMap<>();
- byte[] bytes = readBytes(stateHistoryStore, txn, new LongByteIterable(issueId));
- if (bytes != null) {
- Map<Integer, String> stateHistory = (Map<Integer, String>) SerializationUtils.deserialize(bytes);
- String currentState = null;
- for (Map.Entry<Integer, String> entry: stateHistory.entrySet()) {
- if (entry.getKey()<=fromDay)
- currentState = entry.getValue();
- else
- break;
- }
-
- int currentDay = fromDay;
- while (currentDay <= toDay) {
- String stateOnDay = stateHistory.get(currentDay);
- if (stateOnDay != null)
- currentState = stateOnDay;
- dailyStates.put(currentDay, currentState);
- currentDay = new Day(new Day(currentDay).getDate().plusDays(1)).getValue();
- }
- }
+ return env.computeInTransaction(txn -> {
+ Map<Integer, String> dailyStates = new LinkedHashMap<>();
+ byte[] bytes = readBytes(stateHistoryStore, txn, new LongByteIterable(issueId));
+ if (bytes != null) {
+ Map<Integer, String> stateHistory = (Map<Integer, String>) SerializationUtils.deserialize(bytes);
+ String currentState = null;
+ for (Map.Entry<Integer, String> entry: stateHistory.entrySet()) {
+ if (entry.getKey()<=fromDay)
+ currentState = entry.getValue();
+ else
+ break;
+ }
- return dailyStates;
- }
+ int currentDay = fromDay;
+ while (currentDay <= toDay) {
+ String stateOnDay = stateHistory.get(currentDay);
+ if (stateOnDay != null)
+ currentState = stateOnDay;
+ dailyStates.put(currentDay, currentState);
+ currentDay = new Day(new Day(currentDay).getDate().plusDays(1)).getValue();
+ }
+ }
+ return dailyStates;
});
}
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 629eb07388..b78338c9ab 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
@@ -137,38 +137,26 @@ public class DefaultPullRequestInfoManager extends AbstractMultiEnvironmentManag
Store defaultStore = getStore(env, DEFAULT_STORE);
Store commitToIdsStore = getStore(env, COMMIT_TO_IDS_STORE);
- Long lastPullRequestUpdateId = env.computeInTransaction(new TransactionalComputable<Long>() {
-
- @Override
- public Long compute(Transaction txn) {
- return readLong(defaultStore, txn, LAST_PULL_REQUEST_UPDATE_KEY, 0);
- }
-
- });
+ Long lastPullRequestUpdateId = env.computeInTransaction(txn -> readLong(defaultStore, txn, LAST_PULL_REQUEST_UPDATE_KEY, 0));
List<PullRequestUpdate> unprocessedPullRequestUpdates = pullRequestUpdateManager.queryAfter(
projectId, lastPullRequestUpdateId, BATCH_SIZE);
- env.executeInTransaction(new TransactionalExecutable() {
-
- @Override
- public void execute(Transaction txn) {
- PullRequestUpdate lastUpdate = null;
- for (PullRequestUpdate update: unprocessedPullRequestUpdates) {
- PullRequest request = update.getRequest();
- if (request.isValid()) {
- for (ObjectId commit: update.getCommits()) {
- ByteIterable commitKey = new CommitByteIterable(commit);
- Collection<Long> pullRequestIds = readLongs(commitToIdsStore, txn, commitKey);
- pullRequestIds.add(update.getRequest().getId());
- writeLongs(commitToIdsStore, txn, commitKey, pullRequestIds);
- }
+ env.executeInTransaction(txn -> {
+ PullRequestUpdate lastUpdate = null;
+ for (PullRequestUpdate update: unprocessedPullRequestUpdates) {
+ PullRequest request = update.getRequest();
+ if (request.isValid()) {
+ for (ObjectId commit: update.getCommits()) {
+ ByteIterable commitKey = new CommitByteIterable(commit);
+ Collection<Long> pullRequestIds = readLongs(commitToIdsStore, txn, commitKey);
+ pullRequestIds.add(update.getRequest().getId());
+ writeLongs(commitToIdsStore, txn, commitKey, pullRequestIds);
}
- lastUpdate = update;
}
- if (lastUpdate != null)
- defaultStore.put(txn, LAST_PULL_REQUEST_UPDATE_KEY, new LongByteIterable(lastUpdate.getId()));
+ lastUpdate = update;
}
-
+ if (lastUpdate != null)
+ defaultStore.put(txn, LAST_PULL_REQUEST_UPDATE_KEY, new LongByteIterable(lastUpdate.getId()));
});
logger.debug("Collected pull request info (project id: {})", projectId);
@@ -188,14 +176,7 @@ public class DefaultPullRequestInfoManager extends AbstractMultiEnvironmentManag
Environment env = getEnv(projectId.toString());
Store store = getStore(env, COMMIT_TO_IDS_STORE);
- return env.computeInTransaction(new TransactionalComputable<Collection<Long>>() {
-
- @Override
- public Collection<Long> compute(Transaction txn) {
- return readLongs(store, txn, new CommitByteIterable(commitId));
- }
-
- });
+ return env.computeInTransaction(txn -> readLongs(store, txn, new CommitByteIterable(commitId)));
}
});
@@ -269,17 +250,12 @@ public class DefaultPullRequestInfoManager extends AbstractMultiEnvironmentManag
Environment env = getEnv(targetProjectId.toString());
Store store = getStore(env, COMPARISON_BASES_STORE);
- return env.computeInTransaction(new TransactionalComputable<ObjectId>() {
-
- @Override
- public ObjectId compute(Transaction txn) {
- byte[] valueBytes = readBytes(store, txn, getComparisonBaseKey(requestId, commitId1, commitId2));
- if (valueBytes != null)
- return ObjectId.fromRaw(valueBytes);
- else
- return null;
- }
-
+ return env.computeInTransaction(txn -> {
+ byte[] valueBytes = readBytes(store, txn, getComparisonBaseKey(requestId, commitId1, commitId2));
+ if (valueBytes != null)
+ return ObjectId.fromRaw(valueBytes);
+ else
+ return null;
});
}
@@ -310,14 +286,7 @@ public class DefaultPullRequestInfoManager extends AbstractMultiEnvironmentManag
Environment env = getEnv(targetProjectId.toString());
Store store = getStore(env, COMPARISON_BASES_STORE);
- env.executeInTransaction(new TransactionalExecutable() {
-
- @Override
- public void execute(Transaction txn) {
- store.put(txn, getComparisonBaseKey(requestId, commitId1, commitId2), new CommitByteIterable(comparisonBase));
- }
-
- });
+ env.executeInTransaction(txn -> store.put(txn, getComparisonBaseKey(requestId, commitId1, commitId2), new CommitByteIterable(comparisonBase)));
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
index 46a414d2c2..cb47104d96 100644
--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
@@ -705,7 +705,7 @@ public class DefaultMailManager implements MailManager, Serializable {
String content = stripQuotationAndSignature(sendSetting, getText(pullRequest.getProject(), pullRequest.getUUID(), message, null));
if (content != null) {
comment.setContent(decorateContent(content));
- pullRequestCommentManager.createOrUpdate(comment, receiverEmailAddresses);
+ pullRequestCommentManager.create(comment, receiverEmailAddresses);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java
new file mode 100644
index 0000000000..32df9e060e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java
@@ -0,0 +1,45 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import io.onedev.server.notification.ActivityDetail;
+
+import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.Map;
+
+public class PullRequestDescriptionChangeData extends PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String oldDescription;
+
+ private final String newDescription;
+
+ public PullRequestDescriptionChangeData(@Nullable String oldDescription, @Nullable String newDescription) {
+ if (oldDescription == null)
+ oldDescription = "";
+ this.oldDescription = oldDescription;
+ if (newDescription == null)
+ newDescription = "";
+ this.newDescription = newDescription;
+ }
+
+ @Override
+ public String getActivity() {
+ return "changed description";
+ }
+
+ @Override
+ public boolean isMinor() {
+ return true;
+ }
+
+ @Override
+ public ActivityDetail getActivityDetail() {
+ Map<String, String> oldFieldValues = new HashMap<>();
+ oldFieldValues.put("Description", oldDescription);
+ Map<String, String> newFieldValues = new HashMap<>();
+ newFieldValues.put("Description", newDescription);
+ return ActivityDetail.compare(oldFieldValues, newFieldValues, true);
+ }
+
+}
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 88773f5d52..d1763f07e2 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
@@ -244,8 +244,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
}
Collection<String> notifiedEmailAddresses;
- if (event instanceof PullRequestCommented)
- notifiedEmailAddresses = ((PullRequestCommented) event).getNotifiedEmailAddresses();
+ if (event instanceof PullRequestCommentCreated)
+ notifiedEmailAddresses = ((PullRequestCommentCreated) event).getNotifiedEmailAddresses();
else
notifiedEmailAddresses = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestCommentResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestCommentResource.java
index 079dec476f..2b30b07c82 100644
--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestCommentResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestCommentResource.java
@@ -1,24 +1,18 @@
package io.onedev.server.rest;
+import io.onedev.server.entitymanager.PullRequestCommentManager;
+import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.security.SecurityUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-
-import org.apache.shiro.authz.UnauthorizedException;
-
-import io.onedev.server.entitymanager.PullRequestCommentManager;
-import io.onedev.server.model.PullRequestComment;
-import io.onedev.server.rest.annotation.Api;
-import io.onedev.server.security.SecurityUtils;
+import java.util.ArrayList;
@Api(order=3200)
@Path("/pull-request-comments")
@@ -51,8 +45,12 @@ public class PullRequestCommentResource {
!SecurityUtils.isAdministrator() && !comment.getUser().equals(SecurityUtils.getUser())) {
throw new UnauthorizedException();
}
-
- commentManager.createOrUpdate(comment);
+
+ if (comment.isNew())
+ commentManager.create(comment, new ArrayList<>());
+ else
+ commentManager.update(comment);
+
return comment.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
index 481ce6fa40..17ede45968 100644
--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
@@ -1,45 +1,12 @@
package io.onedev.server.rest;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.shiro.authz.UnauthorizedException;
-import org.eclipse.jgit.lib.ObjectId;
-import org.joda.time.DateTime;
-
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.git.service.GitService;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestAssignment;
-import io.onedev.server.model.PullRequestChange;
-import io.onedev.server.model.PullRequestComment;
-import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.*;
import io.onedev.server.model.PullRequestReview.Status;
-import io.onedev.server.model.PullRequestUpdate;
-import io.onedev.server.model.PullRequestWatch;
-import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.rest.annotation.Api;
@@ -49,6 +16,22 @@ import io.onedev.server.rest.support.RestConstants;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectAndBranch;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.eclipse.jgit.lib.ObjectId;
+import org.joda.time.DateTime;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
@Api(order=3000, description="In most cases, pull request resource is operated with pull request id, which is different from pull request number. "
+ "To get pull request id of a particular pull request number, use the <a href='/~help/api/io.onedev.server.rest.PullRequestResource/queryBasicInfo'>Query Basic Info</a> operation with query for "
@@ -297,7 +280,7 @@ public class PullRequestResource {
PullRequest request = pullRequestManager.load(requestId);
if (!SecurityUtils.canModify(request))
throw new UnauthorizedException();
- pullRequestManager.saveDescription(request, description);
+ pullRequestChangeManager.changeDescription(request, description);
return Response.ok().build();
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java
index 4b7b454f03..f0c41c112e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultIssueTextManager.java
@@ -1,5 +1,6 @@
package io.onedev.server.search.entitytext;
+import com.google.common.collect.Lists;
import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.cluster.ClusterTask;
@@ -15,7 +16,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.issue.changedata.IssueChangeData;
import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;
import io.onedev.server.model.support.issue.changedata.IssueTitleChangeData;
-import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.dao.Dao;
@@ -67,19 +67,15 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implement
private final IssueLinkManager linkManager;
- private final SessionManager sessionManager;
-
@Inject
public DefaultIssueTextManager(Dao dao, StorageManager storageManager, BatchWorkManager batchWorkManager,
TransactionManager transactionManager, ProjectManager projectManager,
IssueFieldManager fieldManager, IssueLinkManager linkManager,
- ClusterManager clusterManager, UserManager userManager,
- SessionManager sessionManager) {
+ ClusterManager clusterManager, UserManager userManager) {
super(dao, storageManager, batchWorkManager, transactionManager, projectManager, clusterManager);
this.fieldManager = fieldManager;
this.linkManager = linkManager;
this.userManager = userManager;
- this.sessionManager = sessionManager;
}
public Object writeReplace() throws ObjectStreamException {
@@ -144,6 +140,12 @@ public class DefaultIssueTextManager extends ProjectTextManager<Issue> implement
public void on(IssuesDeleted event) {
deleteEntitiesLocal(event.getIssueIds());
}
+
+ @Sessional
+ @Listen
+ public void on(IssueDeleted event) {
+ deleteEntitiesLocal(Lists.newArrayList(event.getIssueId()));
+ }
@Sessional
@Listen
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java
index cf2697dfa0..84c9cd1258 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/DefaultPullRequestTextManager.java
@@ -1,40 +1,22 @@
package io.onedev.server.search.entitytext;
-import java.io.ObjectStreamException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.PullRequestComment;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.LongPoint;
-import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
-import org.apache.lucene.queryparser.classic.ParseException;
-import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.search.BoostQuery;
-import org.apache.lucene.search.PrefixQuery;
-import org.apache.lucene.search.Query;
-
+import com.google.common.collect.Lists;
import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.PullRequestReviewManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.event.Listen;
+import io.onedev.server.event.project.pullrequest.*;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestTitleChangeData;
import io.onedev.server.persistence.TransactionManager;
+import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ReadCode;
@@ -43,6 +25,25 @@ import io.onedev.server.util.concurrent.BatchWorkManager;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.lucene.BooleanQueryBuilder;
import io.onedev.server.util.lucene.LuceneUtils;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.LongPoint;
+import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
+import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.lucene.search.BoostQuery;
+import org.apache.lucene.search.PrefixQuery;
+import org.apache.lucene.search.Query;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.io.ObjectStreamException;
+import java.util.*;
+import java.util.stream.Collectors;
@Singleton
public class DefaultPullRequestTextManager extends ProjectTextManager<PullRequest>
@@ -98,6 +99,50 @@ public class DefaultPullRequestTextManager extends ProjectTextManager<PullReques
document.add(new TextField(FIELD_COMMENTS, builder.toString(), Store.NO));
}
+ @Sessional
+ @Listen
+ public void on(PullRequestOpened event) {
+ requestIndexLocal(event.getRequest());
+ }
+
+ @Sessional
+ @Listen
+ public void on(PullRequestChanged event) {
+ PullRequestChangeData data = event.getChange().getData();
+ if (data instanceof PullRequestTitleChangeData || data instanceof PullRequestDescriptionChangeData)
+ requestIndexLocal(event.getRequest());
+ }
+
+ @Sessional
+ @Listen
+ public void on(PullRequestCommentCreated event) {
+ requestIndexLocal(event.getRequest());
+ }
+
+ @Sessional
+ @Listen
+ public void on(PullRequestCommentUpdated event) {
+ requestIndexLocal(event.getRequest());
+ }
+
+ @Sessional
+ @Listen
+ public void on(PullRequestCommentDeleted event) {
+ requestIndexLocal(event.getRequest());
+ }
+
+ @Sessional
+ @Listen
+ public void on(PullRequestsDeleted event) {
+ deleteEntitiesLocal(event.getRequestIds());
+ }
+
+ @Sessional
+ @Listen
+ public void on(PullRequestDeleted event) {
+ deleteEntitiesLocal(Lists.newArrayList(event.getRequestId()));
+ }
+
@Nullable
private Query buildQuery(@Nullable Project project, String queryString) {
BooleanQueryBuilder queryBuilder = new BooleanQueryBuilder();
@@ -123,7 +168,7 @@ public class DefaultPullRequestTextManager extends ProjectTextManager<PullReques
try {
Long number = Long.valueOf(numberString);
contentQueryBuilder.add(new BoostQuery(LongPoint.newExactQuery(FIELD_NUMBER, number), 1f), Occur.SHOULD);
- } catch (NumberFormatException e) {
+ } catch (NumberFormatException ignored) {
}
try (Analyzer analyzer = newAnalyzer()) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java
index 2461e1a9d6..d0aad62b51 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java
@@ -514,7 +514,7 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implements
protected static interface WriterRunnable {
- abstract void run(IndexWriter writer) throws IOException;
+ void run(IndexWriter writer) throws IOException;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index edb42188c4..ce6b8df674 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -347,7 +347,7 @@ public abstract class PullRequestListPanel extends Panel {
Collection<PullRequest> requests = new ArrayList<>();
for (IModel<PullRequest> each: selectionColumn.getSelections())
requests.add(each.getObject());
- OneDev.getInstance(PullRequestManager.class).delete(requests);
+ OneDev.getInstance(PullRequestManager.class).delete(requests, getProject());
target.add(body);
selectionColumn.getSelections().clear();
}
@@ -485,7 +485,7 @@ public abstract class PullRequestListPanel extends Panel {
Collection<PullRequest> requests = new ArrayList<>();
for (Iterator<PullRequest> it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext();)
requests.add(it.next());
- OneDev.getInstance(PullRequestManager.class).delete(requests);
+ OneDev.getInstance(PullRequestManager.class).delete(requests, getProject());
dataProvider.detach();
target.add(body);
selectionColumn.getSelections().clear();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
index a3c863bd86..274e4c7df6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
@@ -10,6 +10,8 @@ import io.onedev.server.entitymanager.PullRequestCommentManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.model.*;
+import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCommitData;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScopedCommit;
@@ -147,7 +149,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
ProjectScopedCommit commit = ((PullRequestReferencedFromCommitData) change.getData()).getCommit();
if (commit.canDisplay() && getPullRequest().getUpdates().stream().noneMatch(it->it.getCommits().contains(commit.getCommitId())))
otherActivities.add(new PullRequestChangeActivity(change));
- } else {
+ } else if (!(change.getData() instanceof PullRequestDescriptionChangeData)) {
otherActivities.add(new PullRequestChangeActivity(change));
}
}
@@ -314,7 +316,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
comment.setRequest(getPullRequest());
comment.setUser(getLoginUser());
comment.setContent(input.getModelObject());
- OneDev.getInstance(PullRequestCommentManager.class).createOrUpdate(comment);
+ OneDev.getInstance(PullRequestCommentManager.class).create(comment, new ArrayList<>());
input.clearMarkdown();
target.add(fragment);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
index cea95bc5be..5c76970566 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
@@ -79,7 +79,7 @@ class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {
if (comment.length() > PullRequestComment.MAX_CONTENT_LEN)
throw new ExplicitException("Comment too long");
PullRequestCommentedPanel.this.getComment().setContent(comment);
- OneDev.getInstance(PullRequestCommentManager.class).createOrUpdate(PullRequestCommentedPanel.this.getComment());
+ OneDev.getInstance(PullRequestCommentManager.class).update(PullRequestCommentedPanel.this.getComment());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
index 06398d4f14..f0b8ef3e99 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
@@ -1,18 +1,9 @@
package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
-
import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentSupport;
import io.onedev.server.attachment.ProjectAttachmentSupport;
-import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
@@ -20,9 +11,17 @@ import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.facade.UserCache;
-import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.component.comment.CommentPanel;
+import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.util.DeleteCallback;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+
+import java.util.ArrayList;
+import java.util.List;
@SuppressWarnings("serial")
class PullRequestOpenedPanel extends GenericPanel<PullRequest> {
@@ -49,7 +48,7 @@ class PullRequestOpenedPanel extends GenericPanel<PullRequest> {
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
- OneDev.getInstance(PullRequestManager.class).saveDescription(getPullRequest(), comment);
+ OneDev.getInstance(PullRequestChangeManager.class).changeDescription(getPullRequest(), comment);
}
@Override