The Unified and Autonomous Development Platform
feat: Better user autocomplete suggestion (OD-1974)
Robin Shena9aeada91a13
diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.javaindex 86285f5792..94c181d767 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java@@ -276,7 +276,7 @@ public class CodeComment extends ProjectBelonging implements AttachmentStorageSureturn uuid;}- public Collection<User> getParticipants() {+ public List<User> getParticipants() {if (participants == null) {participants = new LinkedHashSet<>();if (getUser() != null)@@ -286,7 +286,7 @@ public class CodeComment extends ProjectBelonging implements AttachmentStorageSuparticipants.add(reply.getUser());}}- return participants;+ return new ArrayList<>(participants);}}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 d30ab81157..26b6800c66 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@@ -812,7 +812,7 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupportreturn isFieldVisible(fieldName, Sets.newHashSet());}- public Collection<User> getParticipants() {+ public List<User> getParticipants() {if (participants == null) {participants = new LinkedHashSet<>();if (getSubmitter() != null)@@ -843,7 +843,7 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport}participants.remove(userManager.getSystem());}- return participants;+ return new ArrayList<>(participants);}private boolean isFieldVisible(String fieldName, Set<String> checkedFieldNames) {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 a2c39a1dbe..ad22d11bf6 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@@ -38,10 +38,7 @@ import java.util.*;import java.util.stream.Collectors;import static io.onedev.server.model.AbstractEntity.PROP_NUMBER;-import static io.onedev.server.model.Build.*;import static io.onedev.server.model.PullRequest.*;-import static io.onedev.server.model.PullRequest.PROP_STATUS;-import static io.onedev.server.model.PullRequest.PROP_SUBMIT_DATE;import static io.onedev.server.model.support.TimeGroups.*;import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;import static java.lang.ThreadLocal.withInitial;@@ -851,7 +848,7 @@ public class PullRequest extends ProjectBelongingreturn pendingCommits;}- public Collection<User> getParticipants() {+ public List<User> getParticipants() {if (participants == null) {participants = new LinkedHashSet<>();if (getSubmitter() != null)@@ -866,7 +863,7 @@ public class PullRequest extends ProjectBelonging}participants.remove(OneDev.getInstance(UserManager.class).getSystem());}- return participants;+ return new ArrayList<>(participants);}public boolean isValid() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex 91fd3d04ef..8a76015ad4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -1,16 +1,31 @@package io.onedev.server.web.component.codecomment;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Date;-import java.util.List;--import javax.annotation.Nullable;-+import com.google.common.collect.Sets;+import io.onedev.server.OneDev;+import io.onedev.server.attachment.AttachmentSupport;+import io.onedev.server.attachment.ProjectAttachmentSupport;+import io.onedev.server.entitymanager.CodeCommentManager;+import io.onedev.server.entitymanager.CodeCommentReplyManager;+import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.*;+import io.onedev.server.model.support.CompareContext;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.UrlUtils;+import io.onedev.server.util.date.DateUtils;+import io.onedev.server.web.UrlManager;+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.behavior.ChangeObserver;+import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.component.markdown.ContentQuoted;import io.onedev.server.web.component.markdown.MarkdownEditor;+import io.onedev.server.web.component.markdown.MarkdownViewer;+import io.onedev.server.web.component.markdown.SuggestionSupport;+import io.onedev.server.web.component.user.ident.Mode;+import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.page.base.BasePage;+import io.onedev.server.xodus.VisitInfoManager;import org.apache.wicket.AttributeModifier;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -40,39 +55,16 @@ import org.apache.wicket.request.IRequestHandler;import org.apache.wicket.request.Url;import org.apache.wicket.request.cycle.IRequestCycleListener;import org.apache.wicket.request.cycle.RequestCycle;--import com.google.common.collect.Sets;--import io.onedev.server.OneDev;-import io.onedev.server.attachment.AttachmentSupport;-import io.onedev.server.attachment.ProjectAttachmentSupport;-import io.onedev.server.entitymanager.CodeCommentManager;-import io.onedev.server.entitymanager.CodeCommentReplyManager;-import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;-import io.onedev.server.web.UrlManager;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.xodus.VisitInfoManager;-import io.onedev.server.model.CodeComment;-import io.onedev.server.model.CodeCommentReply;-import io.onedev.server.model.CodeCommentStatusChange;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.model.support.CompareContext;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.date.DateUtils;-import io.onedev.server.util.UrlUtils;-import io.onedev.server.util.facade.UserCache;-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.behavior.ChangeObserver;-import io.onedev.server.web.component.markdown.MarkdownViewer;-import io.onedev.server.web.component.markdown.SuggestionSupport;-import io.onedev.server.web.component.comment.CommentInput;-import io.onedev.server.web.component.user.ident.Mode;-import io.onedev.server.web.component.user.ident.UserIdentPanel;import org.apache.wicket.util.visit.IVisit;import org.apache.wicket.util.visit.IVisitor;+import javax.annotation.Nullable;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Date;+import java.util.List;+@SuppressWarnings("serial")public abstract class CodeCommentPanel extends Panel {@@ -197,8 +189,8 @@ public abstract class CodeCommentPanel extends Panel {}@Override- protected List<User> getMentionables() {- return CodeCommentPanel.this.getMentionables();+ protected List<User> getParticipants() {+ return getComment().getParticipants();}};@@ -579,8 +571,8 @@ public abstract class CodeCommentPanel extends Panel {}@Override- protected List<User> getMentionables() {- return CodeCommentPanel.this.getMentionables();+ protected List<User> getParticipants() {+ return getComment().getParticipants();}};@@ -763,13 +755,6 @@ public abstract class CodeCommentPanel extends Panel {}- private List<User> getMentionables() {- UserCache cache = getUserManager().cloneCache();- List<User> users = new ArrayList<>(cache.getUsers());- users.sort(cache.comparingDisplayName(getComment().getParticipants()));- return users;- }-public class CodeCommentReplyActivity implements CodeCommentActivity {private final Long replyId;@@ -871,8 +856,8 @@ public abstract class CodeCommentPanel extends Panel {}@Override- protected List<User> getMentionables() {- return CodeCommentPanel.this.getMentionables();+ protected List<User> getParticipants() {+ return getComment().getParticipants();}};diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.javaindex d0ebd1febc..b32387cca1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java@@ -1,6 +1,5 @@package io.onedev.server.web.component.comment;-import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.IssueManager;@@ -28,21 +27,33 @@ public abstract class CommentInput extends MarkdownEditor {@Overrideprotected final UserMentionSupport getUserMentionSupport() {return (query, count) -> {- List<User> mentionables = getMentionables();- UserCache cache = getUserManager().cloneCache();+ var cache = getUserManager().cloneCache();+ var participants = getParticipants();+ var otherUsers = new ArrayList<>(cache.getUsers());+ otherUsers.removeAll(participants);- List<User> similarities = new Similarities<User>(mentionables) {+ var similarities = new Similarities<>(participants) {@Overridepublic double getSimilarScore(User object) {return cache.getSimilarScore(object, query);}-+};+ if (similarities.size() < count) {+ similarities.addAll(new Similarities<>(otherUsers) {++ @Override+ public double getSimilarScore(User object) {+ return cache.getSimilarScore(object, query);+ }++ });+ }if (similarities.size() > count)return similarities.subList(0, count);- else+ elsereturn similarities;};}@@ -51,13 +62,10 @@ public abstract class CommentInput extends MarkdownEditor {return OneDev.getInstance(UserManager.class);}- protected List<User> getMentionables() {- UserCache cache = getUserManager().cloneCache();- List<User> users = new ArrayList<>(cache.getUsers());- users.sort(cache.comparingDisplayName(Sets.newHashSet()));- return users;+ protected List<User> getParticipants() {+ return new ArrayList<>();}-+@Overrideprotected final AtWhoReferenceSupport getReferenceSupport() {return new AtWhoReferenceSupport() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.javaindex 1bb7c13b1f..761e6a8df6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java@@ -1,6 +1,5 @@package io.onedev.server.web.component.comment;-import com.google.common.collect.Sets;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.attachment.AttachmentSupport;@@ -127,8 +126,8 @@ public abstract class CommentPanel extends Panel {}@Override- protected List<User> getMentionables() {- return CommentPanel.this.getMentionables();+ protected List<User> getParticipants() {+ return CommentPanel.this.getParticipants();}};@@ -262,10 +261,14 @@ public abstract class CommentPanel extends Panel {@Nullableprotected abstract DeleteCallback getDeleteCallback();+ protected List<User> getParticipants() {+ return new ArrayList<>();+ }+protected List<User> getMentionables() {UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();List<User> users = new ArrayList<>(cache.getUsers());- users.sort(cache.comparingDisplayName(Sets.newHashSet()));+ users.sort(cache.comparingDisplayName(getParticipants()));return users;}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 a26f409786..b0673e1198 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@@ -5,13 +5,11 @@ import io.onedev.server.OneDev;import io.onedev.server.attachment.AttachmentSupport;import io.onedev.server.attachment.ProjectAttachmentSupport;import io.onedev.server.entitymanager.IssueCommentManager;-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.*;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectScopedCommit;-import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.ChangeObserver;import io.onedev.server.web.component.comment.CommentInput;@@ -239,11 +237,8 @@ public abstract class IssueActivitiesPanel extends Panel {}@Override- protected List<User> getMentionables() {- UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();- List<User> users = new ArrayList<>(cache.getUsers());- users.sort(cache.comparingDisplayName(getIssue().getParticipants()));- return users;+ protected List<User> getParticipants() {+ return getIssue().getParticipants();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.javaindex 7442b9a1ce..fe57a7eed5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java@@ -78,11 +78,8 @@ class IssueCommentedPanel extends GenericPanel<IssueComment> {}@Override- protected List<User> getMentionables() {- UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();- List<User> users = new ArrayList<>(cache.getUsers());- users.sort(cache.comparingDisplayName(IssueCommentedPanel.this.getComment().getIssue().getParticipants()));- return users;+ protected List<User> getParticipants() {+ return IssueCommentedPanel.this.getComment().getIssue().getParticipants();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.javaindex b70e43e8f1..ff55926151 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java@@ -1,29 +1,25 @@package io.onedev.server.web.component.issue.activities.activity;-import java.util.ArrayList;-import java.util.List;--import io.onedev.server.entitymanager.IssueChangeManager;-import io.onedev.server.web.page.base.BasePage;-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.UserManager;+import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.date.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.page.base.BasePage;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.List;@SuppressWarnings("serial")class IssueOpenedPanel extends GenericPanel<Issue> {@@ -55,11 +51,8 @@ class IssueOpenedPanel extends GenericPanel<Issue> {}@Override- protected List<User> getMentionables() {- UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();- List<User> users = new ArrayList<>(cache.getUsers());- users.sort(cache.comparingDisplayName(getIssue().getParticipants()));- return users;+ protected List<User> getParticipants() {+ return getIssue().getParticipants();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.javaindex 53a7a618f2..feaa0c61bb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java@@ -1,16 +1,22 @@package io.onedev.server.web.component.issue.transitionoption;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.List;-import java.util.Map;--import javax.annotation.Nullable;-+import com.google.common.collect.Lists;+import io.onedev.server.OneDev;+import io.onedev.server.attachment.AttachmentSupport;+import io.onedev.server.attachment.ProjectAttachmentSupport;import io.onedev.server.buildspecmodel.inputspec.InputContext;import io.onedev.server.buildspecmodel.inputspec.InputSpec;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.model.support.issue.field.FieldUtils;+import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.component.comment.CommentInput;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;@@ -23,23 +29,11 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.cycle.RequestCycle;-import com.google.common.collect.Lists;--import io.onedev.server.OneDev;-import io.onedev.server.attachment.AttachmentSupport;-import io.onedev.server.attachment.ProjectAttachmentSupport;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.field.FieldUtils;-import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.facade.UserCache;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.component.comment.CommentInput;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;+import javax.annotation.Nullable;+import java.io.Serializable;+import java.util.Collection;+import java.util.List;+import java.util.Map;@SuppressWarnings("serial")public abstract class TransitionOptionPanel extends Panel implements InputContext {@@ -95,11 +89,8 @@ public abstract class TransitionOptionPanel extends Panel implements InputContex}@Override- protected List<User> getMentionables() {- UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();- List<User> users = new ArrayList<>(cache.getUsers());- users.sort(cache.comparingDisplayName(getIssue().getParticipants()));- return users;+ protected List<User> getParticipants() {+ return getIssue().getParticipants();}});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 2628ebc06c..18fc7c522a 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@@ -7,14 +7,12 @@ import io.onedev.server.attachment.AttachmentSupport;import io.onedev.server.attachment.ProjectAttachmentSupport;import io.onedev.server.entitymanager.BuildManager;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.pullrequest.changedata.PullRequestDescriptionChangeData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCommitData;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectScopedCommit;-import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.ChangeObserver;import io.onedev.server.web.component.comment.CommentInput;@@ -285,11 +283,8 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {}@Override- protected List<User> getMentionables() {- UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();- List<User> users = new ArrayList<>(cache.getUsers());- users.sort(cache.comparingDisplayName(getPullRequest().getParticipants()));- return users;+ protected List<User> getParticipants() {+ return getPullRequest().getParticipants();}@Overridediff --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.javaindex 4e6d170fb3..dc7e69967b 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@@ -5,14 +5,12 @@ import io.onedev.server.OneDev;import io.onedev.server.attachment.AttachmentSupport;import io.onedev.server.attachment.ProjectAttachmentSupport;import io.onedev.server.entitymanager.PullRequestCommentManager;-import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.date.DateUtils;-import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.component.comment.CommentPanel;import io.onedev.server.web.component.markdown.ContentVersionSupport;import io.onedev.server.web.page.base.BasePage;@@ -27,7 +25,6 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;-import java.util.ArrayList;import java.util.List;@SuppressWarnings("serial")@@ -97,11 +94,8 @@ class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {}@Override- protected List<User> getMentionables() {- UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();- List<User> users = new ArrayList<>(cache.getUsers());- users.sort(cache.comparingDisplayName(PullRequestCommentedPanel.this.getComment().getRequest().getParticipants()));- return users;+ protected List<User> getParticipants() {+ return PullRequestCommentedPanel.this.getComment().getRequest().getParticipants();}@Overridediff --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.javaindex 43dafe5124..ca5bc14dac 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@@ -4,13 +4,11 @@ import io.onedev.server.OneDev;import io.onedev.server.attachment.AttachmentSupport;import io.onedev.server.attachment.ProjectAttachmentSupport;import io.onedev.server.entitymanager.PullRequestChangeManager;-import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.date.DateUtils;-import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.component.comment.CommentPanel;import io.onedev.server.web.component.markdown.ContentVersionSupport;import io.onedev.server.web.page.base.BasePage;@@ -21,7 +19,6 @@ 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")@@ -60,11 +57,8 @@ class PullRequestOpenedPanel extends GenericPanel<PullRequest> {}@Override- protected List<User> getMentionables() {- UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();- List<User> users = new ArrayList<>(cache.getUsers());- users.sort(cache.comparingDisplayName(getPullRequest().getParticipants()));- return users;+ protected List<User> getParticipants() {+ return getPullRequest().getParticipants();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.javaindex b20f185d75..164ac61fd7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java@@ -1,26 +1,19 @@package io.onedev.server.web.page.project.pullrequests.detail.operationconfirm;-import java.util.ArrayList;-import java.util.List;--import javax.annotation.Nullable;--import org.apache.wicket.AttributeModifier;-import org.apache.wicket.behavior.Behavior;-import org.apache.wicket.model.PropertyModel;-import com.google.common.collect.Lists;--import io.onedev.server.OneDev;import io.onedev.server.attachment.AttachmentSupport;import io.onedev.server.attachment.ProjectAttachmentSupport;-import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.facade.UserCache;-import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.comment.CommentInput;+import io.onedev.server.web.component.modal.ModalPanel;+import org.apache.wicket.AttributeModifier;+import org.apache.wicket.behavior.Behavior;+import org.apache.wicket.model.PropertyModel;++import javax.annotation.Nullable;+import java.util.List;@SuppressWarnings("serial")public abstract class CommentableOperationConfirmPanel extends OperationConfirmPanel {@@ -49,11 +42,8 @@ public abstract class CommentableOperationConfirmPanel extends OperationConfirmP}@Override- protected List<User> getMentionables() {- UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();- List<User> users = new ArrayList<>(cache.getUsers());- users.sort(cache.comparingDisplayName(getLatestUpdate().getRequest().getParticipants()));- return users;+ protected List<User> getParticipants() {+ return getLatestUpdate().getRequest().getParticipants();}@Override