The Unified and Autonomous Development Platform
Improve performance by reducing queries
Robin Shen5bb3043f797e
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex d84bdbad2f..ad79589100 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -14,6 +14,7 @@ import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.util.ProjectScopedNumber;public interface BuildManager extends EntityManager<Build> {@@ -23,6 +24,9 @@ public interface BuildManager extends EntityManager<Build> {@NullableBuild find(String buildFQN);+ @Nullable+ Build find(ProjectScopedNumber buildFQN);+Build findStreamPrevious(Build build, @Nullable Build.Status status);Collection<Long> queryNumbersOfStreamPrevious(Build build, @Nullable Build.Status status, int limit);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.javaindex 6b2b0ccb01..2844e6ab6f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java@@ -13,6 +13,7 @@ import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.issue.IssueCriteria;+import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;@@ -23,6 +24,9 @@ public interface IssueManager extends EntityManager<Issue> {@NullableIssue find(Project project, long number);+ @Nullable+ Issue find(ProjectScopedNumber issueFQN);+@NullableIssue find(String issueFQN);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.javaindex fc5ac17856..cb12f9e300 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@@ -2,6 +2,7 @@ package io.onedev.server.entitymanager;import java.util.Collection;import java.util.List;+import java.util.Map;import javax.annotation.Nullable;@@ -14,12 +15,15 @@ import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.ProjectAndBranch;+import io.onedev.server.util.ProjectScopedNumber;public interface PullRequestManager extends EntityManager<PullRequest> {@NullablePullRequest findEffective(ProjectAndBranch target, ProjectAndBranch source);+ Map<ProjectAndBranch, PullRequest> findEffectives(ProjectAndBranch target, Collection<ProjectAndBranch> sources);+@NullablePullRequest findOpen(ProjectAndBranch target, ProjectAndBranch source);@@ -33,6 +37,9 @@ public interface PullRequestManager extends EntityManager<PullRequest> {@NullablePullRequest find(String pullRequestFQN);+ @Nullable+ PullRequest find(ProjectScopedNumber pullRequestFQN);+@NullablePullRequest findLatest(Project targetProject, User submitter);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 9623878f9b..7a73b33f1d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -171,10 +171,15 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Sessional@Overridepublic Build find(String buildFQN) {- ProjectScopedNumber number = ProjectScopedNumber.from(buildFQN);- return find(number.getProject(), number.getNumber());+ return find(ProjectScopedNumber.from(buildFQN));}+ @Sessional+ @Override+ public Build find(ProjectScopedNumber buildFQN) {+ return find(buildFQN.getProject(), buildFQN.getNumber());+ }+@Transactional@Overridepublic void save(Build build) {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.javaindex 9319ba383a..88a12d34a6 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@@ -141,8 +141,13 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Overridepublic Issue find(String issueFQN) {- ProjectScopedNumber number = ProjectScopedNumber.from(issueFQN);- return find(number.getProject(), number.getNumber());+ return find(ProjectScopedNumber.from(issueFQN));+ }++ @Sessional+ @Override+ public Issue find(ProjectScopedNumber issueFQN) {+ return find(issueFQN.getProject(), issueFQN.getNumber());}@Transactionaldiff --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.javaindex 1b2c2a2081..21968df33a 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@@ -580,6 +580,26 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestreturn find(criteria);}+ @Sessional+ @Override+ public Map<ProjectAndBranch, PullRequest> findEffectives(ProjectAndBranch target, Collection<ProjectAndBranch> sources) {+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);+ Collection<Criterion> criterions = new ArrayList<>();+ for (ProjectAndBranch source: sources) {+ Criterion merged = Restrictions.and(+ Restrictions.eq("closeInfo.status", CloseInfo.Status.MERGED),+ Restrictions.eq("lastMergePreview.requestHead", source.getObjectName()));+ criterions.add(Restrictions.and(ofTarget(target), ofSource(source), Restrictions.or(ofOpen(), merged)));+ }+ criteria.add(Restrictions.or(criterions.toArray(new Criterion[0])));++ Map<ProjectAndBranch, PullRequest> requests = new HashMap<>();+ for(PullRequest request: query(criteria))+ requests.put(new ProjectAndBranch(request.getSourceProject(), request.getSourceBranch()), request);++ return requests;+ }+@Sessional@Overridepublic PullRequest findLatest(Project targetProject, User submitter) {@@ -1053,14 +1073,20 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestEntityCriteria<PullRequest> criteria = newCriteria();criteria.add(Restrictions.eq("targetProject", targetProject));criteria.add(Restrictions.eq("number", number));+ criteria.setCacheable(true);return find(criteria);}@Sessional@Overridepublic PullRequest find(String pullRequestFQN) {- ProjectScopedNumber number = ProjectScopedNumber.from(pullRequestFQN);- return find(number.getProject(), number.getNumber());+ return find(ProjectScopedNumber.from(pullRequestFQN));+ }++ @Sessional+ @Override+ public PullRequest find(ProjectScopedNumber pullRequestFQN) {+ return find(pullRequestFQN.getProject(), pullRequestFQN.getNumber());}@Sessionaldiff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 98a8da4311..3cb096febc 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -63,6 +63,7 @@ import io.onedev.server.util.BeanUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.Input;import io.onedev.server.util.IssueUtils;+import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.Referenceable;import io.onedev.server.util.facade.BuildFacade;import io.onedev.server.util.inputspec.SecretInput;@@ -718,8 +719,8 @@ public class Build extends AbstractEntity implements Referenceable {}}- public String getFQN() {- return getProject().getName() + "#" + getNumber();+ public ProjectScopedNumber getFQN() {+ return new ProjectScopedNumber(getProject(), getNumber());}public Collection<String> getOnBranches() {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.javaindex a1cebf4cd3..3c88a56ea4 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@@ -29,6 +29,8 @@ import javax.persistence.UniqueConstraint;import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.annotations.DynamicUpdate;import com.fasterxml.jackson.annotation.JsonView;@@ -45,6 +47,7 @@ import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.storage.AttachmentStorageSupport;import io.onedev.server.util.Input;+import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.Referenceable;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.facade.IssueFacade;@@ -63,6 +66,7 @@ import io.onedev.server.web.editable.annotation.Editable;@Index(columnList="commentCount"), @Index(columnList="o_milestone_id"),@Index(columnList="updateDate")},uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)//use dynamic update in order not to overwrite other edits while background threads change update date@DynamicUpdate@Editable@@ -502,8 +506,8 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStreturn getProject();}- public String getFQN() {- return getProject() + "#" + getNumber();+ public ProjectScopedNumber getFQN() {+ return new ProjectScopedNumber(getProject(), getNumber());}}diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex 94ef2e65f4..39a388b552 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -31,6 +31,8 @@ import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.annotations.DynamicUpdate;import org.hibernate.criterion.Criterion;import org.hibernate.criterion.Restrictions;@@ -51,6 +53,7 @@ import io.onedev.server.storage.AttachmentStorageSupport;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.ProjectAndBranch;+import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.Referenceable;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;@@ -73,6 +76,7 @@ import io.onedev.server.web.util.WicketUtils;uniqueConstraints={@UniqueConstraint(columnNames={"o_targetProject_id", "number"})})//use dynamic update in order not to overwrite other edits while background threads change update date@DynamicUpdate+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class PullRequest extends AbstractEntity implements Referenceable, AttachmentStorageSupport {private static final long serialVersionUID = 1L;@@ -875,8 +879,8 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachreturn getTargetProject();}- public String getFQN() {- return getTargetProject() + "#" + getNumber();+ public ProjectScopedNumber getFQN() {+ return new ProjectScopedNumber(getTargetProject(), getNumber());}public static void push(PullRequest request) {diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java b/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.javaindex f245f186c1..df883e76bd 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java@@ -25,6 +25,8 @@ import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.revwalk.filter.RevFilter;import org.eclipse.jgit.treewalk.TreeWalk;import org.eclipse.jgit.treewalk.filter.TreeFilter;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;import com.fasterxml.jackson.annotation.JsonProperty;import com.google.common.base.Preconditions;@@ -34,6 +36,7 @@ import io.onedev.server.git.GitUtils;@Entity@Table(indexes={@Index(columnList="o_request_id"), @Index(columnList="date")})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class PullRequestUpdate extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.javaindex ce5ca1b4fa..9b66ed3316 100644--- a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java@@ -1,13 +1,14 @@package io.onedev.server.notification;import java.util.Collection;-import java.util.stream.Collectors;+import java.util.HashSet;import javax.inject.Inject;import javax.inject.Singleton;import io.onedev.commons.launcher.loader.Listen;import io.onedev.server.entitymanager.UrlManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.MarkdownAware;import io.onedev.server.event.codecomment.CodeCommentCreated;import io.onedev.server.event.codecomment.CodeCommentEvent;@@ -26,11 +27,15 @@ public class CodeCommentNotificationManager {private final UrlManager urlManager;+ private final UserManager userManager;+@Inject- public CodeCommentNotificationManager(MailManager mailManager, MarkdownManager markdownManager, UrlManager urlManager) {+ public CodeCommentNotificationManager(MailManager mailManager, MarkdownManager markdownManager,+ UrlManager urlManager, UserManager userManager) {this.mailManager = mailManager;this.markdownManager = markdownManager;this.urlManager = urlManager;+ this.userManager = userManager;}@Transactional@@ -40,8 +45,15 @@ public class CodeCommentNotificationManager {MarkdownAware markdownAware = (MarkdownAware) event;String markdown = markdownAware.getMarkdown();String rendered = markdownManager.render(markdown);- Collection<User> mentionUsers = new MentionParser().parseMentions(rendered);- if (!mentionUsers.isEmpty()) {++ Collection<String> toList = new HashSet<>();+ for (String userName: new MentionParser().parseMentions(rendered)) {+ User user = userManager.findByName(userName);+ if (user != null)+ toList.add(user.getEmail());+ }++ if (!toList.isEmpty()) {String url;if (event instanceof CodeCommentCreated)url = urlManager.urlFor(((CodeCommentCreated)event).getComment(), null);@@ -54,8 +66,8 @@ public class CodeCommentNotificationManager {String subject = String.format("You are mentioned in a code comment on file '%s'",event.getComment().getMarkPos().getPath());String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);- mailManager.sendMailAsync(mentionUsers.stream().map(User::getEmail).collect(Collectors.toList()),- subject, body);++ mailManager.sendMailAsync(toList, subject, body);}}}diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.javaindex c608c37d8a..060c6e4704 100644--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java@@ -132,7 +132,14 @@ public class IssueNotificationManager {String markdown = markdownAware.getMarkdown();if (markdown != null) {String rendered = markdownManager.render(markdown);- Collection<User> mentionUsers = new MentionParser().parseMentions(rendered);++ Collection<User> mentionUsers = new HashSet<>();+ for (String userName: new MentionParser().parseMentions(rendered)) {+ User mentionUser = userManager.findByName(userName);+ if (mentionUser != null)+ mentionUsers.add(mentionUser);+ }+if (!mentionUsers.isEmpty()) {for (User mentionedUser: mentionUsers)watch(issue, mentionedUser, 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.javaindex 6911490780..8f6ac3ff4b 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@@ -149,7 +149,14 @@ public class PullRequestNotificationManager implements PersistListener {String markdown = markdownAware.getMarkdown();if (markdown != null) {String rendered = markdownManager.render(markdown);- Collection<User> mentionUsers = new MentionParser().parseMentions(rendered);++ Collection<User> mentionUsers = new HashSet<>();+ for (String userName: new MentionParser().parseMentions(rendered)) {+ User mentionUser = userManager.findByName(userName);+ if (mentionUser != null)+ mentionUsers.add(mentionUser);+ }+if (!mentionUsers.isEmpty()) {for (User mentionedUser: mentionUsers)watch(request, mentionedUser, true);diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.java b/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.javaindex 9e2642d5b2..0bed776957 100644--- a/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.java@@ -1,5 +1,8 @@package io.onedev.server.util;+import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;@@ -45,4 +48,26 @@ public class ProjectScopedNumber {return number;}+ @Override+ public boolean equals(Object other) {+ if (!(other instanceof ProjectScopedNumber))+ return false;+ if (this == other)+ return true;+ ProjectScopedNumber otherProjectScopedNumber = (ProjectScopedNumber) other;+ return new EqualsBuilder()+ .append(project, otherProjectScopedNumber.project)+ .append(number, otherProjectScopedNumber.number)+ .isEquals();+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37).append(project).append(number).toHashCode();+ }++ @Override+ public String toString() {+ return getProject().getName() + "#" + getNumber();+ }}diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/BuildParser.java b/server-core/src/main/java/io/onedev/server/util/markdown/BuildParser.javadeleted file mode 100644index 877689278a..0000000000--- a/server-core/src/main/java/io/onedev/server/util/markdown/BuildParser.java+++ /dev/null@@ -1,15 +0,0 @@-package io.onedev.server.util.markdown;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.model.Build;-import io.onedev.server.model.Project;--public class BuildParser extends ReferenceParser<Build> {-- @Override- protected Build findReferenceable(Project project, long number) {- return OneDev.getInstance(BuildManager.class).find(project, number);- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.javaindex 09c162163b..904ba4490e 100644--- a/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java+++ b/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java@@ -7,30 +7,26 @@ import org.jsoup.nodes.Document;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;-public class BuildProcessor extends BuildParser implements MarkdownProcessor {+public class BuildProcessor extends ReferenceParser implements MarkdownProcessor {- @Override- public void process(@Nullable Project project, Document document, Object context) {- parseReferences(project, document);+ public BuildProcessor() {+ super(Build.class);}@Override- protected Build findReferenceable(Project project, long number) {- Build build = super.findReferenceable(project, number);- if (build != null && SecurityUtils.canAccess(build))- return build;- else- return null;+ public void process(@Nullable Project project, Document document, Object context) {+ parseReferences(project, document);}@Override- protected String toHtml(Build build, String text) {+ protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {CharSequence url = RequestCycle.get().urlFor(- BuildDashboardPage.class, BuildDashboardPage.paramsOf(build, null));- return String.format("<a href='%s' class='build reference' data-reference=%d>%s</a>", url, build.getId(), text);+ BuildDashboardPage.class, BuildDashboardPage.paramsOf(referenceable, null));+ return String.format("<a href='%s' class='build reference' data-reference='%s'>%s</a>",+ url, referenceable.toString(), referenceText);}}diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java b/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.javaindex 7207e4ed39..5df5b6527d 100644--- a/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java+++ b/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java@@ -9,8 +9,11 @@ import org.jsoup.Jsoup;import org.jsoup.nodes.Document;import io.onedev.commons.launcher.loader.Listen;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;+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.CodeCommentUpdated;import io.onedev.server.event.entity.EntityPersisted;@@ -31,6 +34,7 @@ import io.onedev.server.model.support.issue.changedata.IssueTitleChangeData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestTitleChangeData;import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.util.ProjectScopedNumber;@Singletonpublic class EntityReferenceManager {@@ -52,8 +56,9 @@ public class EntityReferenceManager {private void addReferenceChange(Issue issue, String markdown) {if (markdown != null) {Document document = Jsoup.parseBodyFragment(markdownManager.render(markdown));- for (Issue referencedIssue: new IssueParser().parseReferences(issue.getProject(), document)) {- if (!referencedIssue.equals(issue)) {+ for (ProjectScopedNumber referencedIssueFQN: new ReferenceParser(Issue.class).parseReferences(issue.getProject(), document)) {+ Issue referencedIssue = OneDev.getInstance(IssueManager.class).find(referencedIssueFQN);+ if (referencedIssue != null && !referencedIssue.equals(issue)) {boolean found = false;for (IssueChange change: referencedIssue.getChanges()) {if (change.getData() instanceof io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData) {@@ -77,27 +82,30 @@ public class EntityReferenceManager {}}}- for (PullRequest referencedRequest: new PullRequestParser().parseReferences(issue.getProject(), document)) {- boolean found = false;- for (PullRequestChange change: referencedRequest.getChanges()) {- if (change.getData() instanceof io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData) {- io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData referencedFromIssueData =- (io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData) change.getData();- if (referencedFromIssueData.getIssueId().equals(issue.getId())) {- found = true;- break;+ for (ProjectScopedNumber referencedRequestFQN: new ReferenceParser(PullRequest.class).parseReferences(issue.getProject(), document)) {+ PullRequest referencedRequest = OneDev.getInstance(PullRequestManager.class).find(referencedRequestFQN);+ if (referencedRequest != null) {+ boolean found = false;+ for (PullRequestChange change: referencedRequest.getChanges()) {+ if (change.getData() instanceof io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData) {+ io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData referencedFromIssueData =+ (io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData) change.getData();+ if (referencedFromIssueData.getIssueId().equals(issue.getId())) {+ found = true;+ break;+ }}}- }- if (!found) {- io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData referencedFromIssueData =- new io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData(issue);- PullRequestChange change = new PullRequestChange();- change.setData(referencedFromIssueData);- change.setDate(new Date());- change.setRequest(referencedRequest);- referencedRequest.getChanges().add(change);- pullRequestChangeManager.save(change);+ if (!found) {+ io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData referencedFromIssueData =+ new io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData(issue);+ PullRequestChange change = new PullRequestChange();+ change.setData(referencedFromIssueData);+ change.setDate(new Date());+ change.setRequest(referencedRequest);+ referencedRequest.getChanges().add(change);+ pullRequestChangeManager.save(change);+ }}}}@@ -106,9 +114,11 @@ public class EntityReferenceManager {private void addReferenceChange(PullRequest request, String markdown) {if (markdown != null) {Document document = Jsoup.parseBodyFragment(markdownManager.render(markdown));- for (Issue referencedIssue: new IssueParser().parseReferences(request.getTargetProject(), document)) {- if (!referencedIssue.getProject().equals(request.getTargetProject())- || !request.getFixedIssueNumbers().contains(referencedIssue.getNumber())) {+ for (ProjectScopedNumber referencedIssueFQN: new ReferenceParser(Issue.class).parseReferences(request.getTargetProject(), document)) {+ Issue referencedIssue = OneDev.getInstance(IssueManager.class).find(referencedIssueFQN);+ if (referencedIssue != null+ && (!referencedIssue.getProject().equals(request.getTargetProject())+ || !request.getFixedIssueNumbers().contains(referencedIssue.getNumber()))) {boolean found = false;for (IssueChange change: referencedIssue.getChanges()) {if (change.getData() instanceof io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData) {@@ -132,8 +142,9 @@ public class EntityReferenceManager {}}}- for (PullRequest referencedRequest: new PullRequestParser().parseReferences(request.getTargetProject(), document)) {- if (!referencedRequest.equals(request)) {+ for (ProjectScopedNumber referencedRequestFQN: new ReferenceParser(PullRequest.class).parseReferences(request.getTargetProject(), document)) {+ PullRequest referencedRequest = OneDev.getInstance(PullRequestManager.class).find(referencedRequestFQN);+ if (referencedRequest != null && !referencedRequest.equals(request)) {boolean found = false;for (PullRequestChange change: referencedRequest.getChanges()) {if (change.getData() instanceof io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData) {@@ -163,50 +174,56 @@ public class EntityReferenceManager {private void addReferenceChange(CodeComment comment, String markdown) {if (markdown != null) {Document document = Jsoup.parseBodyFragment(markdownManager.render(markdown));- for (Issue referencedIssue: new IssueParser().parseReferences(comment.getProject(), document)) {- boolean found = false;- for (IssueChange change: referencedIssue.getChanges()) {- if (change.getData() instanceof io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData) {- io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData referencedFromCodeCommentData =- (io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData) change.getData();- if (referencedFromCodeCommentData.getCommentId().equals(comment.getId())) {- found = true;- break;+ for (ProjectScopedNumber referencedIssueFQN: new ReferenceParser(Issue.class).parseReferences(comment.getProject(), document)) {+ Issue referencedIssue = OneDev.getInstance(IssueManager.class).find(referencedIssueFQN);+ if (referencedIssue != null) {+ boolean found = false;+ for (IssueChange change: referencedIssue.getChanges()) {+ if (change.getData() instanceof io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData) {+ io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData referencedFromCodeCommentData =+ (io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData) change.getData();+ if (referencedFromCodeCommentData.getCommentId().equals(comment.getId())) {+ found = true;+ break;+ }}}- }- if (!found) {- io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData referencedFromCodeCommentData =- new io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData(comment);- IssueChange change = new IssueChange();- change.setData(referencedFromCodeCommentData);- change.setDate(new Date());- change.setIssue(referencedIssue);- referencedIssue.getChanges().add(change);- issueChangeManager.save(change);+ if (!found) {+ io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData referencedFromCodeCommentData =+ new io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData(comment);+ IssueChange change = new IssueChange();+ change.setData(referencedFromCodeCommentData);+ change.setDate(new Date());+ change.setIssue(referencedIssue);+ referencedIssue.getChanges().add(change);+ issueChangeManager.save(change);+ }}}- for (PullRequest referencedRequest: new PullRequestParser().parseReferences(comment.getProject(), document)) {- boolean found = false;- for (PullRequestChange change: referencedRequest.getChanges()) {- if (change.getData() instanceof io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData) {- io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData referencedFromCodeCommentData =- (io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData) change.getData();- if (referencedFromCodeCommentData.getCommentId().equals(comment.getId())) {- found = true;- break;+ for (ProjectScopedNumber referencedRequestFQN: new ReferenceParser(PullRequest.class).parseReferences(comment.getProject(), document)) {+ PullRequest referencedRequest = OneDev.getInstance(PullRequestManager.class).find(referencedRequestFQN);+ if (referencedRequest != null) {+ boolean found = false;+ for (PullRequestChange change: referencedRequest.getChanges()) {+ if (change.getData() instanceof io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData) {+ io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData referencedFromCodeCommentData =+ (io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData) change.getData();+ if (referencedFromCodeCommentData.getCommentId().equals(comment.getId())) {+ found = true;+ break;+ }}}- }- if (!found) {- io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData referencedFromCodeCommentData =- new io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData(comment);- PullRequestChange change = new PullRequestChange();- change.setData(referencedFromCodeCommentData);- change.setDate(new Date());- change.setRequest(referencedRequest);- referencedRequest.getChanges().add(change);- pullRequestChangeManager.save(change);+ if (!found) {+ io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData referencedFromCodeCommentData =+ new io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData(comment);+ PullRequestChange change = new PullRequestChange();+ change.setData(referencedFromCodeCommentData);+ change.setDate(new Date());+ change.setRequest(referencedRequest);+ referencedRequest.getChanges().add(change);+ pullRequestChangeManager.save(change);+ }}}}diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/IssueParser.java b/server-core/src/main/java/io/onedev/server/util/markdown/IssueParser.javadeleted file mode 100644index 8ab9fdcfc8..0000000000--- a/server-core/src/main/java/io/onedev/server/util/markdown/IssueParser.java+++ /dev/null@@ -1,15 +0,0 @@-package io.onedev.server.util.markdown;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.IssueManager;-import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;--public class IssueParser extends ReferenceParser<Issue> {-- @Override- protected Issue findReferenceable(Project project, long number) {- return OneDev.getInstance(IssueManager.class).find(project, number);- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.javaindex ac761f4f84..c6490d7a8a 100644--- a/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java+++ b/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java@@ -7,29 +7,26 @@ import org.jsoup.nodes.Document;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;-public class IssueProcessor extends IssueParser implements MarkdownProcessor {+public class IssueProcessor extends ReferenceParser implements MarkdownProcessor {- @Override- public void process(@Nullable Project project, Document document, Object context) {- parseReferences(project, document);+ public IssueProcessor() {+ super(Issue.class);}@Override- protected Issue findReferenceable(Project project, long number) {- if (SecurityUtils.canAccess(project))- return super.findReferenceable(project, number);- else- return null;+ public void process(@Nullable Project project, Document document, Object context) {+ parseReferences(project, document);}@Override- protected String toHtml(Issue issue, String text) {+ protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {CharSequence url = RequestCycle.get().urlFor(- IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));- return String.format("<a href='%s' class='issue reference' data-reference=%d>%s</a>", url, issue.getId(), text);+ IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(referenceable, null));+ return String.format("<a href='%s' class='issue reference' data-reference='%s'>%s</a>",+ url, referenceable.toString(), referenceText);}}diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/MentionParser.java b/server-core/src/main/java/io/onedev/server/util/markdown/MentionParser.javaindex f9d35ce3de..cd7313afb8 100644--- a/server-core/src/main/java/io/onedev/server/util/markdown/MentionParser.java+++ b/server-core/src/main/java/io/onedev/server/util/markdown/MentionParser.java@@ -13,9 +13,6 @@ import org.jsoup.select.NodeTraversor;import com.google.common.collect.ImmutableSet;import io.onedev.commons.utils.HtmlUtils;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.User;import io.onedev.server.util.TextNodeVisitor;public class MentionParser {@@ -24,12 +21,12 @@ public class MentionParser {private static final Pattern PATTERN = Pattern.compile("(^|\\s+)@(\\S+)($|\\s+)");- public Collection<User> parseMentions(String rendered) {+ public Collection<String> parseMentions(String rendered) {return parseMentions(Jsoup.parseBodyFragment(rendered));}- public Collection<User> parseMentions(Document document) {- Collection<User> mentions = new HashSet<>();+ public Collection<String> parseMentions(Document document) {+ Collection<String> mentions = new HashSet<>();TextNodeVisitor visitor = new TextNodeVisitor() {@@ -45,20 +42,13 @@ public class MentionParser {NodeTraversor tranversor = new NodeTraversor(visitor);tranversor.traverse(document);- UserManager userManager = OneDev.getInstance(UserManager.class);-for (TextNode node : visitor.getMatchedNodes()) {Matcher matcher = PATTERN.matcher(node.getWholeText());while (matcher.find()) {String userName = matcher.group(2);String userTag;- User user = userManager.findByName(userName);- if (user != null) {- mentions.add(user);- userTag = toHtml(user);- } else {- userTag = "@" + userName;- }+ mentions.add(userName);+ userTag = toHtml(userName);HtmlUtils.appendReplacement(matcher, node, matcher.group(1) + userTag + matcher.group(3));}HtmlUtils.appendTail(matcher, node);@@ -67,8 +57,8 @@ public class MentionParser {return mentions;}- protected String toHtml(User user) {- return "@" + user.getName();+ protected String toHtml(String userName) {+ return "@" + userName;}}diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.javaindex 91b4b188c4..c268328988 100644--- a/server-core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.java+++ b/server-core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.java@@ -4,8 +4,6 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.jsoup.nodes.Document;import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.web.page.admin.user.profile.UserProfilePage;public class MentionProcessor extends MentionParser implements MarkdownProcessor {@@ -15,14 +13,12 @@ public class MentionProcessor extends MentionParser implements MarkdownProcessor}@Override- protected String toHtml(User user) {+ protected String toHtml(String userName) {if (RequestCycle.get() != null) {- return String.format("<a href='%s' class='reference mention' data-reference=%s>@%s</a>",- RequestCycle.get().urlFor(UserProfilePage.class, UserProfilePage.paramsOf(user)),- user.getId(),- user.getName());+ return String.format("<a class='reference mention' data-reference='%s'>@%s</a>",+ userName, userName);} else {- return super.toHtml(user);+ return super.toHtml(userName);}}diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.java b/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.javadeleted file mode 100644index be15dbe8ed..0000000000--- a/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.java+++ /dev/null@@ -1,15 +0,0 @@-package io.onedev.server.util.markdown;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.PullRequestManager;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;--public class PullRequestParser extends ReferenceParser<PullRequest> {-- @Override- protected PullRequest findReferenceable(Project project, long number) {- return OneDev.getInstance(PullRequestManager.class).find(project, number);- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.javaindex c035eb44fb..db28dd4761 100644--- a/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java+++ b/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java@@ -7,29 +7,26 @@ import org.jsoup.nodes.Document;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;-public class PullRequestProcessor extends PullRequestParser implements MarkdownProcessor {+public class PullRequestProcessor extends ReferenceParser implements MarkdownProcessor {- @Override- public void process(@Nullable Project project, Document document, Object context) {- parseReferences(project, document);+ public PullRequestProcessor() {+ super(PullRequest.class);}@Override- protected PullRequest findReferenceable(Project project, long number) {- if (SecurityUtils.canReadCode(project))- return super.findReferenceable(project, number);- else- return null;+ public void process(@Nullable Project project, Document document, Object context) {+ parseReferences(project, document);}@Override- protected String toHtml(PullRequest request, String text) {+ protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {CharSequence url = RequestCycle.get().urlFor(- PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(request, null));- return String.format("<a href='%s' class='pull-request reference' data-reference=%d>%s</a>", url, request.getId(), text);+ PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(referenceable, null));+ return String.format("<a href='%s' class='pull-request reference' data-reference='%s'>%s</a>",+ url, referenceable.toString(), referenceText);}}diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java b/server-core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.javaindex 6d06430fa2..c85478c012 100644--- a/server-core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java+++ b/server-core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java@@ -2,7 +2,6 @@ package io.onedev.server.util.markdown;import java.util.Collection;import java.util.HashSet;-import java.util.List;import java.util.regex.Matcher;import java.util.regex.Pattern;@@ -22,12 +21,11 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Project;-import io.onedev.server.util.Referenceable;-import io.onedev.server.util.ReflectionUtils;+import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.TextNodeVisitor;import io.onedev.server.util.validation.ProjectNameValidator;-public abstract class ReferenceParser<T extends Referenceable> {+public class ReferenceParser {private static final Collection<String> IGNORED_TAGS = ImmutableSet.of("code", "a");@@ -35,32 +33,24 @@ public abstract class ReferenceParser<T extends Referenceable> {private final String referenceType;- public ReferenceParser() {- List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(ReferenceParser.class, getClass());- if (typeArguments.size() == 1 && AbstractEntity.class.isAssignableFrom(typeArguments.get(0))) {- Class<?> referenceClass = typeArguments.get(0);- referenceType = referenceClass.getSimpleName();- String[] words = StringUtils.split(WordUtils.uncamel(referenceType).toLowerCase(), " ");- StringBuilder builder = new StringBuilder("(^|\\W+)(");- for (int i=0; i<words.length-1; i++)- builder.append(words[i]).append("\\s*");- builder.append(words[words.length-1]).append("\\s+)(");- builder.append(ProjectNameValidator.PATTERN.pattern());- builder.append(")?#(\\d+)(?=$|\\W+)");- pattern = Pattern.compile(builder.toString(), Pattern.CASE_INSENSITIVE);- } else {- throw new RuntimeException("Subclass of ReferenceParser must realize the type argument <T>");- }+ public ReferenceParser(Class<? extends AbstractEntity> referenceClass) {+ referenceType = referenceClass.getSimpleName();+ String[] words = StringUtils.split(WordUtils.uncamel(referenceType).toLowerCase(), " ");+ StringBuilder builder = new StringBuilder("(^|\\W+)(");+ for (int i=0; i<words.length-1; i++)+ builder.append(words[i]).append("\\s*");+ builder.append(words[words.length-1]).append("\\s+)(");+ builder.append(ProjectNameValidator.PATTERN.pattern());+ builder.append(")?#(\\d+)(?=$|\\W+)");+ pattern = Pattern.compile(builder.toString(), Pattern.CASE_INSENSITIVE);}- public Collection<T> parseReferences(Project project, String rendered) {+ public Collection<ProjectScopedNumber> parseReferences(Project project, String rendered) {return parseReferences(project, Jsoup.parseBodyFragment(rendered));}- protected abstract T findReferenceable(Project project, long number);-- public Collection<T> parseReferences(@Nullable Project project, Document document) {- Collection<T> references = new HashSet<>();+ public Collection<ProjectScopedNumber> parseReferences(@Nullable Project project, Document document) {+ Collection<ProjectScopedNumber> references = new HashSet<>();TextNodeVisitor visitor = new TextNodeVisitor() {@@ -95,13 +85,9 @@ public abstract class ReferenceParser<T extends Referenceable> {String referenceTag;if (referenceProject != null) {- T referenceable = findReferenceable(referenceProject, referenceNumber);- if (referenceable != null) {- references.add(referenceable);- referenceTag = toHtml(referenceable, referenceText);- } else {- referenceTag = referenceText;- }+ ProjectScopedNumber referenceable = new ProjectScopedNumber(referenceProject, referenceNumber);+ references.add(referenceable);+ referenceTag = toHtml(referenceable, referenceText);} else {referenceTag = referenceText;}@@ -113,7 +99,7 @@ public abstract class ReferenceParser<T extends Referenceable> {return references;}- protected String toHtml(T referenceable, String referenceText) {+ protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {return referenceText;}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.javaindex a67be42d26..c5a4f10fae 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java@@ -1,6 +1,7 @@package io.onedev.server.util.validation;import java.util.function.Function;+import java.util.regex.Pattern;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;@@ -11,6 +12,8 @@ import io.onedev.server.util.validation.annotation.GroupName;public class GroupNameValidator implements ConstraintValidator<GroupName, String> {+ public static final Pattern PATTERN = Pattern.compile("\\w([\\w-\\.]*\\w)?");+private boolean interpolative;private String message;@@ -39,7 +42,16 @@ public class GroupNameValidator implements ConstraintValidator<GroupName, Stringreturn true; // will be handled by interpolative validator}- if (value.equals("new")) {+ if (!PATTERN.matcher(value).matches()) {+ constraintContext.disableDefaultConstraintViolation();+ String message = this.message;+ if (message.length() == 0) {+ message = "Should start and end with alphanumeric or underscore. "+ + "Only alphanumeric, underscore, dash, and dot are allowed in the middle.";+ }+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ } else if (value.equals("new")) {constraintContext.disableDefaultConstraintViolation();String message = this.message;if (message.length() == 0)diff --git a/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.javaindex 05b1304b0d..e29e599762 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java@@ -1,6 +1,7 @@package io.onedev.server.util.validation;import java.util.function.Function;+import java.util.regex.Pattern;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;@@ -11,6 +12,8 @@ import io.onedev.server.util.validation.annotation.UserName;public class UserNameValidator implements ConstraintValidator<UserName, String> {+ public static final Pattern PATTERN = Pattern.compile("\\w([\\w-\\.]*\\w)?");+private boolean interpolative;private String message;@@ -39,7 +42,16 @@ public class UserNameValidator implements ConstraintValidator<UserName, String>return true; // will be handled by interpolative validator}- if (value.equals("new")) {+ if (!PATTERN.matcher(value).matches()) {+ constraintContext.disableDefaultConstraintViolation();+ String message = this.message;+ if (message.length() == 0) {+ message = "Should start and end with alphanumeric or underscore. "+ + "Only alphanumeric, underscore, dash, and dot are allowed in the middle.";+ }+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ } else if (value.equals("new")) {constraintContext.disableDefaultConstraintViolation();String message = this.message;if (message.length() == 0)diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.javaindex 94ccf1a874..f18c8924a7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java@@ -28,7 +28,7 @@ import io.onedev.server.web.component.watchstatus.WatchStatusLink;@SuppressWarnings("serial")public abstract class EntityWatchesPanel extends Panel {- private static final int MAX_DISPLAY_AVATARS = 20;+ private static final int MAX_DISPLAY_AVATARS = 0;public EntityWatchesPanel(String id) {super(id);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.javaindex 8af52aeb2d..c8d6c949a6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java@@ -122,23 +122,23 @@ public abstract class IssueActivitiesPanel extends Panel {if (change.getData() instanceof IssueReferencedFromIssueData) {IssueReferencedFromIssueData referencedFromIssueData = (IssueReferencedFromIssueData) change.getData();Issue issue = OneDev.getInstance(IssueManager.class).get(referencedFromIssueData.getIssueId());- if (issue != null && SecurityUtils.canAccess(issue.getProject()))+ if (issue != null)otherActivities.add(new IssueChangeActivity(change));} else if (change.getData() instanceof IssueReferencedFromPullRequestData) {IssueReferencedFromPullRequestData referencedFromPullRequestData = (IssueReferencedFromPullRequestData) change.getData();PullRequest request = OneDev.getInstance(PullRequestManager.class).get(referencedFromPullRequestData.getRequestId());- if (request != null && SecurityUtils.canReadCode(request.getTargetProject()))+ if (request != null)otherActivities.add(new IssueChangeActivity(change));} else if (change.getData() instanceof IssueReferencedFromCodeCommentData) {IssueReferencedFromCodeCommentData referencedFromCodeCommentData = (IssueReferencedFromCodeCommentData) change.getData();CodeComment comment = OneDev.getInstance(CodeCommentManager.class).get(referencedFromCodeCommentData.getCommentId());- if (comment != null && SecurityUtils.canReadCode(comment.getProject()))+ if (comment != null)otherActivities.add(new IssueChangeActivity(change));- } else if (change.getData() instanceof IssueCommittedData && SecurityUtils.canReadCode(getIssue().getProject())) {+ } else if (change.getData() instanceof IssueCommittedData) {IssueCommittedData issueCommittedData = (IssueCommittedData) change.getData();if (getIssue().getProject().getRevCommit(issueCommittedData.getCommitHash(), false) != null)otherActivities.add(new IssueChangeActivity(change));- } else if (change.getData() instanceof IssuePullRequestData && SecurityUtils.canReadCode(getIssue().getProject())) {+ } else if (change.getData() instanceof IssuePullRequestData) {IssuePullRequestData issuePullRequestData = (IssuePullRequestData) change.getData();if (issuePullRequestData.getPullRequest() != null)otherActivities.add(new IssueChangeActivity(change));diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex 11df133d23..caaf440f47 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -131,7 +131,7 @@ public class MarkdownViewer extends GenericPanel<String> {String referenceId = params.getParameterValue(REFERENCE_ID).toString();switch (referenceType) {case "issue":- Issue issue = OneDev.getInstance(IssueManager.class).get(Long.valueOf(referenceId));+ Issue issue = OneDev.getInstance(IssueManager.class).find(referenceId);if (issue != null) {String color = OneDev.getInstance(SettingManager.class).getIssueSetting().getStateSpec(issue.getState()).getColor();String script = String.format("onedev.server.markdown.renderIssueTooltip('%s', '%s', '%s', '%s')",@@ -141,7 +141,7 @@ public class MarkdownViewer extends GenericPanel<String> {}break;case "pull request":- PullRequest request = OneDev.getInstance(PullRequestManager.class).get(Long.valueOf(referenceId));+ PullRequest request = OneDev.getInstance(PullRequestManager.class).find(referenceId);if (request != null) {String statusCss;String status;@@ -163,7 +163,7 @@ public class MarkdownViewer extends GenericPanel<String> {}break;case "build":- Build build = OneDev.getInstance(BuildManager.class).get(Long.valueOf(referenceId));+ Build build = OneDev.getInstance(BuildManager.class).find(referenceId);if (build != null) {String statusCss = "fa build-status build-status-" + build.getStatus().name().toLowerCase();String statusTitle = build.getStatus().getDisplayName();@@ -177,7 +177,7 @@ public class MarkdownViewer extends GenericPanel<String> {}break;case "user":- User user = OneDev.getInstance(UserManager.class).get(Long.valueOf(referenceId));+ User user = OneDev.getInstance(UserManager.class).findByName(referenceId);if (user != null) {String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(user);String script = String.format("onedev.server.markdown.renderUserTooltip('%s', '%s', '%s')",diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.cssindex aee3794e2f..1fe8fbb963 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css@@ -375,3 +375,6 @@ body.fullscreen {background: url("/img/ajax-indicator-big.gif") center no-repeat;}+.reference.mention {+ text-decoration: none;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.javaindex 0bf121b1e4..3ee4ce89ed 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java@@ -7,19 +7,12 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.dropdown.DropdownHoverBehavior;import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.component.user.card.UserCardPanel;-import io.onedev.server.web.page.admin.user.profile.UserProfilePage;-import io.onedev.server.web.page.my.profile.MyProfilePage;@SuppressWarnings("serial")public class UserIdentPanel extends Panel {@@ -45,16 +38,6 @@ public class UserIdentPanel extends Panel {add(new Label("name", displayName).setVisible(mode != Mode.AVATAR));add(AttributeAppender.append("class", "user"));- if (userId != null) {- User user = OneDev.getInstance(UserManager.class).load(userId);- if (SecurityUtils.isAdministrator()) {- CharSequence url = RequestCycle.get().urlFor(UserProfilePage.class, UserProfilePage.paramsOf(user));- add(AttributeAppender.append("href", url.toString()));- } else if (user.equals(SecurityUtils.getUser())) {- CharSequence url = RequestCycle.get().urlFor(MyProfilePage.class, new PageParameters());- add(AttributeAppender.append("href", url.toString()));- }- }add(new DropdownHoverBehavior(AlignPlacement.top(8), 350) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/ident/ident.css b/server-core/src/main/java/io/onedev/server/web/component/user/ident/ident.cssindex d8306d2f45..22f49cf6e8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/ident/ident.css+++ b/server-core/src/main/java/io/onedev/server/web/component/user/ident/ident.css@@ -1,3 +1,3 @@-a.user:not([href]):hover, a.user:not([href]):focus {+a.user:hover, a.user:focus {text-decoration: none;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.htmlindex a4dd4b3520..08f0b74d4e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.html@@ -1,7 +1,8 @@<wicket:panel><div class="simple-user-list">- <a wicket:id="users">- <img wicket:id="avatar"></img> <span wicket:id="name"></span>- </a>+ <div wicket:id="users">+ <img wicket:id="avatar"></img>+ <span wicket:id="name"></span>+ </div></div></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.javaindex cdd6468c21..e7b74560c1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/list/SimpleUserListPanel.java@@ -2,15 +2,13 @@ package io.onedev.server.web.component.user.list;import java.util.List;+import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.RepeatingView;import io.onedev.server.model.User;import io.onedev.server.web.component.user.avatar.UserAvatar;-import io.onedev.server.web.page.admin.user.profile.UserProfilePage;@SuppressWarnings("serial")abstract class SimpleUserListPanel extends Panel {@@ -25,11 +23,10 @@ abstract class SimpleUserListPanel extends Panel {RepeatingView usersView = new RepeatingView("users");for (User user: getUsers()) {- Link<Void> link = new BookmarkablePageLink<Void>(usersView.newChildId(),- UserProfilePage.class, UserProfilePage.paramsOf(user));- link.add(new UserAvatar("avatar", user));- link.add(new Label("name", user.getDisplayName()));- usersView.add(link);+ WebMarkupContainer container = new WebMarkupContainer(usersView.newChildId());+ container.add(new UserAvatar("avatar", user));+ container.add(new Label("name", user.getDisplayName()));+ usersView.add(container);}add(usersView);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/list/simple-user-list.css b/server-core/src/main/java/io/onedev/server/web/component/user/list/simple-user-list.cssindex e71b63eb64..eded4545e7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/list/simple-user-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/user/list/simple-user-list.css@@ -2,12 +2,6 @@padding: 12px 0;min-width: 120px;}-.floating>.content>.simple-user-list a {- display: block;- color: #555;- text-decoration: none;+.floating>.content>.simple-user-list>div {padding: 8px 12px;}-.floating>.content>.simple-user-list a:hover {- background: #F2F2F2;-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 231abf5576..3b21fd6d74 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -3,6 +3,7 @@ package io.onedev.server.web.page.project.branches;import java.io.IOException;import java.io.Serializable;import java.util.ArrayList;+import java.util.Collection;import java.util.Collections;import java.util.HashMap;import java.util.HashSet;@@ -121,6 +122,27 @@ public class ProjectBranchesPage extends ProjectPage {};+ private IModel<Map<ProjectAndBranch, PullRequest>> effectiveRequestsModel =+ new LoadableDetachableModel<Map<ProjectAndBranch, PullRequest>>() {++ @Override+ protected Map<ProjectAndBranch, PullRequest> load() {+ ProjectAndBranch target = new ProjectAndBranch(getProject(), baseBranch);++ Collection<ProjectAndBranch> sources = new ArrayList<>();+ for (long i=branchesView.getFirstItemOffset(); i<branchesModel.getObject().size(); i++) {+ if (i-branchesView.getFirstItemOffset() >= branchesView.getItemsPerPage())+ break;+ RefInfo refInfo = branchesModel.getObject().get((int)i);+ String branchName = GitUtils.ref2branch(refInfo.getRef().getName());+ sources.add(new ProjectAndBranch(getProject(), branchName));+ }++ return OneDev.getInstance(PullRequestManager.class).findEffectives(target, sources);+ }++ };+private BranchSingleChoice baseChoice;private PageableListView<RefInfo> branchesView;@@ -612,10 +634,8 @@ public class ProjectBranchesPage extends ProjectPage {WebMarkupContainer actionsContainer = new WebMarkupContainer("actions");item.add(actionsContainer.setOutputMarkupId(true));- PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);- PullRequest effectiveRequest = pullRequestManager.findEffective(- new ProjectAndBranch(getProject(), baseBranch),- new ProjectAndBranch(getProject(), branch));+ ProjectAndBranch source = new ProjectAndBranch(getProject(), branch);+ PullRequest effectiveRequest = effectiveRequestsModel.getObject().get(source);WebMarkupContainer requestLink;if (effectiveRequest != null && ab.getAhead() != 0) {requestLink = new BookmarkablePageLink<Void>("effectiveRequest",@@ -775,6 +795,7 @@ public class ProjectBranchesPage extends ProjectPage {branchesModel.detach();aheadBehindsModel.detach();aheadBehindWidthModel.detach();+ effectiveRequestsModel.detach();super.onDetach();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 431d06d7f5..7cfd764d7e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -38,6 +38,7 @@ import io.onedev.server.buildspec.job.paramsupply.ParamSupply;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;+import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.script.identity.JobIdentity;@@ -421,8 +422,12 @@ public abstract class BuildDetailPage extends ProjectPage}public static PageParameters paramsOf(Build build, @Nullable QueryPosition position) {- PageParameters params = ProjectPage.paramsOf(build.getProject());- params.add(PARAM_BUILD, build.getNumber());+ return paramsOf(build.getFQN(), position);+ }++ public static PageParameters paramsOf(ProjectScopedNumber buildFQN, @Nullable QueryPosition position) {+ PageParameters params = ProjectPage.paramsOf(buildFQN.getProject());+ params.add(PARAM_BUILD, buildFQN.getNumber());if (position != null)position.fill(params);return params;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.javaindex fdcd336cf1..b585a20f69 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java@@ -18,6 +18,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.Project;+import io.onedev.server.model.User;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.search.entity.project.ProjectQueryLexer;import io.onedev.server.util.SecurityUtils;@@ -27,8 +28,8 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.user.ident.Mode;-import io.onedev.server.web.component.user.ident.UserIdentPanel;+import io.onedev.server.web.page.admin.user.profile.UserProfilePage;+import io.onedev.server.web.page.my.profile.MyProfilePage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;@@ -48,7 +49,25 @@ public abstract class ProjectInfoPanel extends Panel {super.onInitialize();add(new Label("name", getProject().getName()));- add(new UserIdentPanel("owner", getProject().getOwner(), Mode.NAME));++ User owner = getProject().getOwner();+ if (SecurityUtils.isAdministrator()) {+ add(new ViewStateAwarePageLink<Void>("owner", UserProfilePage.class, UserProfilePage.paramsOf(owner))+ .setBody(Model.of(owner.getDisplayName())));+ } else if (owner.equals(SecurityUtils.getUser())) {+ add(new ViewStateAwarePageLink<Void>("owner", MyProfilePage.class)+ .setBody(Model.of(owner.getDisplayName())));+ } else {+ add(new Label("owner", owner.getDisplayName()) {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("span");+ }++ });+ }add(new ModalLink("forkNow") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 7a3db6f19e..21cf18f168 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -31,6 +31,7 @@ import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Issue;+import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.script.identity.ScriptIdentity;@@ -256,13 +257,17 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex}public static PageParameters paramsOf(Issue issue, @Nullable QueryPosition position) {- PageParameters params = ProjectPage.paramsOf(issue.getProject());- params.add(PARAM_ISSUE, issue.getNumber());+ return paramsOf(issue.getFQN(), position);+ }++ public static PageParameters paramsOf(ProjectScopedNumber issueFQN, @Nullable QueryPosition position) {+ PageParameters params = ProjectPage.paramsOf(issueFQN.getProject());+ params.add(PARAM_ISSUE, issueFQN.getNumber());if (position != null)position.fill(params);return params;}-+@Overridepublic List<String> getInputNames() {throw new UnsupportedOperationException();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 641ccd986f..e30c0a4e11 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -101,6 +101,7 @@ import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.util.DateUtils;import io.onedev.server.util.ProjectAndBranch;+import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.ReferenceInputBehavior;@@ -1233,8 +1234,12 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}public static PageParameters paramsOf(PullRequest request, @Nullable QueryPosition position) {- PageParameters params = ProjectPage.paramsOf(request.getTargetProject());- params.add(PARAM_REQUEST, request.getNumber());+ return paramsOf(request.getFQN(), position);+ }++ public static PageParameters paramsOf(ProjectScopedNumber requestFQN, @Nullable QueryPosition position) {+ PageParameters params = ProjectPage.paramsOf(requestFQN.getProject());+ params.add(PARAM_REQUEST, requestFQN.getNumber());if (position != null)position.fill(params);return params;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.javaindex 46ea1446be..0966999ce1 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@@ -55,7 +55,6 @@ import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.project.comment.CommentInput;import io.onedev.server.web.component.user.ident.Mode;@@ -160,17 +159,17 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {if (change.getData() instanceof PullRequestReferencedFromIssueData) {PullRequestReferencedFromIssueData referencedFromIssueData = (PullRequestReferencedFromIssueData) change.getData();Issue issue = OneDev.getInstance(IssueManager.class).get(referencedFromIssueData.getIssueId());- if (issue != null && SecurityUtils.canAccess(issue.getProject()))+ if (issue != null)otherActivities.add(new PullRequestChangeActivity(change));} else if (change.getData() instanceof PullRequestReferencedFromPullRequestData) {PullRequestReferencedFromPullRequestData referencedFromPullRequestData = (PullRequestReferencedFromPullRequestData) change.getData();PullRequest otherRequest = OneDev.getInstance(PullRequestManager.class).get(referencedFromPullRequestData.getRequestId());- if (otherRequest != null && SecurityUtils.canReadCode(otherRequest.getTargetProject()))+ if (otherRequest != null)otherActivities.add(new PullRequestChangeActivity(change));} else if (change.getData() instanceof PullRequestReferencedFromCodeCommentData) {PullRequestReferencedFromCodeCommentData referencedFromCodeCommentData = (PullRequestReferencedFromCodeCommentData) change.getData();CodeComment comment = OneDev.getInstance(CodeCommentManager.class).get(referencedFromCodeCommentData.getCommentId());- if (comment != null && SecurityUtils.canReadCode(comment.getProject()))+ if (comment != null)otherActivities.add(new PullRequestChangeActivity(change));} else {otherActivities.add(new PullRequestChangeActivity(change));diff --git a/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java b/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.javaindex 03ac262281..62d3ac1f9d 100644--- a/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java+++ b/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java@@ -15,10 +15,8 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.markdown.BuildParser;-import io.onedev.server.util.markdown.IssueParser;-import io.onedev.server.util.markdown.PullRequestParser;+import io.onedev.server.util.ProjectScopedNumber;+import io.onedev.server.util.markdown.ReferenceParser;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;@@ -39,59 +37,34 @@ public class ReferenceTransformer implements Function<String, String> {String escaped = "<pre>" + HtmlEscape.escapeHtml5(t) + "</pre>";Document doc = Jsoup.parseBodyFragment(escaped);- new IssueParser() {+ new ReferenceParser(Issue.class) {@Override- protected String toHtml(Issue referenceable, String referenceText) {+ protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {return "<a class='embedded-reference' href='" + RequestCycle.get().urlFor(IssueActivitiesPage.class,IssueActivitiesPage.paramsOf(referenceable, null)) + "'>" + referenceText + "</a>";}- @Override- protected Issue findReferenceable(Project project, long number) {- if (SecurityUtils.canAccess(project))- return super.findReferenceable(project, number);- else- return null;- }-}.parseReferences(project, doc);- new PullRequestParser() {+ new ReferenceParser(PullRequest.class) {@Override- protected String toHtml(PullRequest referenceable, String referenceText) {+ protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {return "<a class='embedded-reference' href='" + RequestCycle.get().urlFor(PullRequestActivitiesPage.class,PullRequestActivitiesPage.paramsOf(referenceable, null)) + "'>" + referenceText + "</a>";}- @Override- protected PullRequest findReferenceable(Project project, long number) {- if (SecurityUtils.canReadCode(project))- return super.findReferenceable(project, number);- else- return null;- }-}.parseReferences(project, doc);- new BuildParser() {+ new ReferenceParser(Build.class) {@Override- protected String toHtml(Build referenceable, String referenceText) {+ protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {return "<a class='embedded-reference' href='" + RequestCycle.get().urlFor(BuildDashboardPage.class,BuildDashboardPage.paramsOf(referenceable, null)) + "'>" + referenceText + "</a>";}- @Override- protected Build findReferenceable(Project project, long number) {- Build build= super.findReferenceable(project, number);- if (build != null && SecurityUtils.canAccess(build))- return build;- else- return null;- }-}.parseReferences(project, doc);if (url != null) {