The Unified and Autonomous Development Platform
Fix issue #1082 - Mention criteria to search issues and pull requests
Robin Shen0654ab005df7
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex c55122660e..d14d0a505c 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -28,6 +28,8 @@ import javax.validation.Validation;import javax.validation.Validator;import javax.validation.ValidatorFactory;+import io.onedev.server.entitymanager.*;+import io.onedev.server.entitymanager.impl.*;import org.apache.shiro.authc.credential.PasswordService;import org.apache.shiro.guice.aop.ShiroAopModule;import org.apache.shiro.mgt.RememberMeManager;@@ -91,125 +93,6 @@ import io.onedev.server.commandhandler.CleanDatabase;import io.onedev.server.commandhandler.ResetAdminPassword;import io.onedev.server.commandhandler.RestoreDatabase;import io.onedev.server.commandhandler.Upgrade;-import io.onedev.server.entitymanager.AgentAttributeManager;-import io.onedev.server.entitymanager.AgentManager;-import io.onedev.server.entitymanager.AgentTokenManager;-import io.onedev.server.entitymanager.BuildDependenceManager;-import io.onedev.server.entitymanager.BuildLabelManager;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.BuildMetricManager;-import io.onedev.server.entitymanager.BuildParamManager;-import io.onedev.server.entitymanager.BuildQueryPersonalizationManager;-import io.onedev.server.entitymanager.ClusterCredentialManager;-import io.onedev.server.entitymanager.ClusterServerManager;-import io.onedev.server.entitymanager.CodeCommentManager;-import io.onedev.server.entitymanager.CodeCommentQueryPersonalizationManager;-import io.onedev.server.entitymanager.CodeCommentReplyManager;-import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;-import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;-import io.onedev.server.entitymanager.DashboardGroupShareManager;-import io.onedev.server.entitymanager.DashboardManager;-import io.onedev.server.entitymanager.DashboardUserShareManager;-import io.onedev.server.entitymanager.DashboardVisitManager;-import io.onedev.server.entitymanager.EmailAddressManager;-import io.onedev.server.entitymanager.GitLfsLockManager;-import io.onedev.server.entitymanager.GpgKeyManager;-import io.onedev.server.entitymanager.GroupAuthorizationManager;-import io.onedev.server.entitymanager.GroupManager;-import io.onedev.server.entitymanager.IssueAuthorizationManager;-import io.onedev.server.entitymanager.IssueChangeManager;-import io.onedev.server.entitymanager.IssueCommentManager;-import io.onedev.server.entitymanager.IssueFieldManager;-import io.onedev.server.entitymanager.IssueLinkManager;-import io.onedev.server.entitymanager.IssueManager;-import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;-import io.onedev.server.entitymanager.IssueScheduleManager;-import io.onedev.server.entitymanager.IssueVoteManager;-import io.onedev.server.entitymanager.IssueWatchManager;-import io.onedev.server.entitymanager.LabelManager;-import io.onedev.server.entitymanager.LinkAuthorizationManager;-import io.onedev.server.entitymanager.LinkSpecManager;-import io.onedev.server.entitymanager.MembershipManager;-import io.onedev.server.entitymanager.MilestoneManager;-import io.onedev.server.entitymanager.PendingSuggestionApplyManager;-import io.onedev.server.entitymanager.ProjectLabelManager;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.ProjectUpdateManager;-import io.onedev.server.entitymanager.PullRequestAssignmentManager;-import io.onedev.server.entitymanager.PullRequestChangeManager;-import io.onedev.server.entitymanager.PullRequestCommentManager;-import io.onedev.server.entitymanager.PullRequestLabelManager;-import io.onedev.server.entitymanager.PullRequestManager;-import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;-import io.onedev.server.entitymanager.PullRequestReviewManager;-import io.onedev.server.entitymanager.PullRequestUpdateManager;-import io.onedev.server.entitymanager.PullRequestWatchManager;-import io.onedev.server.entitymanager.RoleManager;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.entitymanager.SshKeyManager;-import io.onedev.server.entitymanager.UrlManager;-import io.onedev.server.entitymanager.UserAuthorizationManager;-import io.onedev.server.entitymanager.UserInvitationManager;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.entitymanager.impl.DefaultAgentAttributeManager;-import io.onedev.server.entitymanager.impl.DefaultAgentManager;-import io.onedev.server.entitymanager.impl.DefaultAgentTokenManager;-import io.onedev.server.entitymanager.impl.DefaultBuildDependenceManager;-import io.onedev.server.entitymanager.impl.DefaultBuildLabelManager;-import io.onedev.server.entitymanager.impl.DefaultBuildManager;-import io.onedev.server.entitymanager.impl.DefaultBuildMetricManager;-import io.onedev.server.entitymanager.impl.DefaultBuildParamManager;-import io.onedev.server.entitymanager.impl.DefaultBuildQueryPersonalizationManager;-import io.onedev.server.entitymanager.impl.DefaultClusterCredentialManager;-import io.onedev.server.entitymanager.impl.DefaultClusterServerManager;-import io.onedev.server.entitymanager.impl.DefaultCodeCommentManager;-import io.onedev.server.entitymanager.impl.DefaultCodeCommentQueryPersonalizationManager;-import io.onedev.server.entitymanager.impl.DefaultCodeCommentReplyManager;-import io.onedev.server.entitymanager.impl.DefaultCodeCommentStatusChangeManager;-import io.onedev.server.entitymanager.impl.DefaultCommitQueryPersonalizationManager;-import io.onedev.server.entitymanager.impl.DefaultDashboardGroupShareManager;-import io.onedev.server.entitymanager.impl.DefaultDashboardManager;-import io.onedev.server.entitymanager.impl.DefaultDashboardUserShareManager;-import io.onedev.server.entitymanager.impl.DefaultDashboardVisitManager;-import io.onedev.server.entitymanager.impl.DefaultEmailAddressManager;-import io.onedev.server.entitymanager.impl.DefaultGitLfsLockManager;-import io.onedev.server.entitymanager.impl.DefaultGpgKeyManager;-import io.onedev.server.entitymanager.impl.DefaultGroupAuthorizationManager;-import io.onedev.server.entitymanager.impl.DefaultGroupManager;-import io.onedev.server.entitymanager.impl.DefaultIssueAuthorizationManager;-import io.onedev.server.entitymanager.impl.DefaultIssueChangeManager;-import io.onedev.server.entitymanager.impl.DefaultIssueCommentManager;-import io.onedev.server.entitymanager.impl.DefaultIssueFieldManager;-import io.onedev.server.entitymanager.impl.DefaultIssueLinkManager;-import io.onedev.server.entitymanager.impl.DefaultIssueManager;-import io.onedev.server.entitymanager.impl.DefaultIssueQueryPersonalizationManager;-import io.onedev.server.entitymanager.impl.DefaultIssueScheduleManager;-import io.onedev.server.entitymanager.impl.DefaultIssueVoteManager;-import io.onedev.server.entitymanager.impl.DefaultIssueWatchManager;-import io.onedev.server.entitymanager.impl.DefaultLabelManager;-import io.onedev.server.entitymanager.impl.DefaultLinkAuthorizationManager;-import io.onedev.server.entitymanager.impl.DefaultLinkSpecManager;-import io.onedev.server.entitymanager.impl.DefaultMembershipManager;-import io.onedev.server.entitymanager.impl.DefaultMilestoneManager;-import io.onedev.server.entitymanager.impl.DefaultPendingSuggestionApplyManager;-import io.onedev.server.entitymanager.impl.DefaultProjectLabelManager;-import io.onedev.server.entitymanager.impl.DefaultProjectManager;-import io.onedev.server.entitymanager.impl.DefaultProjectUpdateManager;-import io.onedev.server.entitymanager.impl.DefaultPullRequestAssignmentManager;-import io.onedev.server.entitymanager.impl.DefaultPullRequestChangeManager;-import io.onedev.server.entitymanager.impl.DefaultPullRequestCommentManager;-import io.onedev.server.entitymanager.impl.DefaultPullRequestLabelManager;-import io.onedev.server.entitymanager.impl.DefaultPullRequestManager;-import io.onedev.server.entitymanager.impl.DefaultPullRequestQueryPersonalizationManager;-import io.onedev.server.entitymanager.impl.DefaultPullRequestReviewManager;-import io.onedev.server.entitymanager.impl.DefaultPullRequestUpdateManager;-import io.onedev.server.entitymanager.impl.DefaultPullRequestWatchManager;-import io.onedev.server.entitymanager.impl.DefaultRoleManager;-import io.onedev.server.entitymanager.impl.DefaultSettingManager;-import io.onedev.server.entitymanager.impl.DefaultSshKeyManager;-import io.onedev.server.entitymanager.impl.DefaultUserAuthorizationManager;-import io.onedev.server.entitymanager.impl.DefaultUserInvitationManager;-import io.onedev.server.entitymanager.impl.DefaultUserManager;import io.onedev.server.entityreference.DefaultEntityReferenceManager;import io.onedev.server.entityreference.EntityReferenceManager;import io.onedev.server.event.DefaultListenerRegistry;@@ -444,6 +327,9 @@ public class CoreModule extends AbstractPluginModule {bind(BatchWorkManager.class).to(DefaultBatchWorkManager.class);bind(WorkExecutor.class).to(DefaultWorkExecutor.class);bind(GroupManager.class).to(DefaultGroupManager.class);+ bind(IssueMentionManager.class).to(DefaultIssueMentionManager.class);+ bind(PullRequestMentionManager.class).to(DefaultPullRequestMentionManager.class);+ bind(CodeCommentMentionManager.class).to(DefaultCodeCommentMentionManager.class);bind(MembershipManager.class).to(DefaultMembershipManager.class);bind(PullRequestChangeManager.class).to(DefaultPullRequestChangeManager.class);bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentMentionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentMentionManager.javanew file mode 100644index 0000000000..a7f81966da--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentMentionManager.java@@ -0,0 +1,10 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.*;+import io.onedev.server.persistence.dao.EntityManager;++public interface CodeCommentMentionManager extends EntityManager<CodeCommentMention> {++ void mention(CodeComment comment, User user);++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueMentionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueMentionManager.javanew file mode 100644index 0000000000..472fec01f6--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueMentionManager.java@@ -0,0 +1,13 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueMention;+import io.onedev.server.model.IssueVote;+import io.onedev.server.model.User;+import io.onedev.server.persistence.dao.EntityManager;++public interface IssueMentionManager extends EntityManager<IssueMention> {++ void mention(Issue issue, User user);++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestMentionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestMentionManager.javanew file mode 100644index 0000000000..6b2bf1464a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestMentionManager.java@@ -0,0 +1,10 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.*;+import io.onedev.server.persistence.dao.EntityManager;++public interface PullRequestMentionManager extends EntityManager<PullRequestMention> {++ void mention(PullRequest request, User user);++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentMentionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentMentionManager.javanew file mode 100644index 0000000000..26841b256c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentMentionManager.java@@ -0,0 +1,31 @@+package io.onedev.server.entitymanager.impl;++import io.onedev.server.entitymanager.CodeCommentMentionManager;+import io.onedev.server.entitymanager.IssueMentionManager;+import io.onedev.server.model.*;+import io.onedev.server.persistence.dao.BaseEntityManager;+import io.onedev.server.persistence.dao.Dao;++import javax.inject.Inject;+import javax.inject.Singleton;++@Singleton+public class DefaultCodeCommentMentionManager extends BaseEntityManager<CodeCommentMention>+ implements CodeCommentMentionManager {++ @Inject+ public DefaultCodeCommentMentionManager(Dao dao) {+ super(dao);+ }++ @Override+ public void mention(CodeComment comment, User user) {+ if (comment.getMentions().stream().noneMatch(it->it.getUser().equals(user))) {+ CodeCommentMention mention = new CodeCommentMention();+ mention.setComment(comment);+ mention.setUser(user);+ save(mention);+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueMentionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueMentionManager.javanew file mode 100644index 0000000000..5a990e0364--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueMentionManager.java@@ -0,0 +1,32 @@+package io.onedev.server.entitymanager.impl;++import io.onedev.server.entitymanager.IssueMentionManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueMention;+import io.onedev.server.model.User;+import io.onedev.server.persistence.dao.BaseEntityManager;+import io.onedev.server.persistence.dao.Dao;++import javax.inject.Inject;+import javax.inject.Singleton;++@Singleton+public class DefaultIssueMentionManager extends BaseEntityManager<IssueMention>+ implements IssueMentionManager {++ @Inject+ public DefaultIssueMentionManager(Dao dao) {+ super(dao);+ }++ @Override+ public void mention(Issue issue, User user) {+ if (issue.getMentions().stream().noneMatch(it->it.getUser().equals(user))) {+ IssueMention mention = new IssueMention();+ mention.setIssue(issue);+ mention.setUser(user);+ save(mention);+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestMentionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestMentionManager.javanew file mode 100644index 0000000000..beefc40b33--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestMentionManager.java@@ -0,0 +1,31 @@+package io.onedev.server.entitymanager.impl;++import io.onedev.server.entitymanager.IssueMentionManager;+import io.onedev.server.entitymanager.PullRequestMentionManager;+import io.onedev.server.model.*;+import io.onedev.server.persistence.dao.BaseEntityManager;+import io.onedev.server.persistence.dao.Dao;++import javax.inject.Inject;+import javax.inject.Singleton;++@Singleton+public class DefaultPullRequestMentionManager extends BaseEntityManager<PullRequestMention>+ implements PullRequestMentionManager {++ @Inject+ public DefaultPullRequestMentionManager(Dao dao) {+ super(dao);+ }++ @Override+ public void mention(PullRequest request, User user) {+ if (request.getMentions().stream().noneMatch(it->it.getUser().equals(user))) {+ PullRequestMention mention = new PullRequestMention();+ mention.setRequest(request);+ mention.setUser(user);+ save(mention);+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 47f80bf1fa..bb8b717d69 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -24,6 +24,9 @@ import java.util.regex.Pattern;import javax.annotation.Nullable;import javax.inject.Singleton;+import io.onedev.server.OneDev;+import io.onedev.server.markdown.MarkdownManager;+import io.onedev.server.markdown.MentionParser;import org.apache.commons.io.IOUtils;import org.apache.commons.lang3.RandomStringUtils;import org.apache.commons.lang3.tuple.Triple;@@ -4644,5 +4647,145 @@ public class DataMigrator {}}}++ private Set<String> getMentioned108(Map<String, String> userIds, String content) {+ Set<String> mentioned = new HashSet<>();+ MarkdownManager markdownManager = OneDev.getInstance(MarkdownManager.class);+ for (String userName: new MentionParser().parseMentions(markdownManager.render(content))) {+ String userId = userIds.get(userName);+ if (userId != null)+ mentioned.add(userId);+ }+ return mentioned;+ }++ private void migrate108(File dataDir, Stack<Integer> versions) {+ Set<Pair<String, String>> issueMentions = new HashSet<>();+ Set<Pair<String, String>> pullRequestMentions = new HashSet<>();+ Set<Pair<String, String>> codeCommentMentions = new HashSet<>();++ Map<String, String> userIds = new HashMap<>();+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Users.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ userIds.put(element.elementText("name").trim(),+ element.elementTextTrim("id"));+ }+ }+ }+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Issues.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String issueId = element.elementTextTrim("id");+ Element descriptionElement = element.element("description");+ if (descriptionElement != null) {+ getMentioned108(userIds, descriptionElement.getText()).forEach(userId -> {+ issueMentions.add(new Pair<>(issueId, userId));+ });+ }+ }+ } else if (file.getName().startsWith("IssueComments.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String issueId = element.elementTextTrim("issue");+ Element contentElement = element.element("content");+ if (contentElement != null) {+ getMentioned108(userIds, contentElement.getText()).forEach(userId -> {+ issueMentions.add(new Pair<>(issueId, userId));+ });+ }+ }+ } else if (file.getName().startsWith("PullRequests.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String requestId = element.elementTextTrim("id");+ Element descriptionElement = element.element("description");+ if (descriptionElement != null) {+ getMentioned108(userIds, descriptionElement.getText()).forEach(userId -> {+ pullRequestMentions.add(new Pair<>(requestId, userId));+ });+ }+ }+ } else if (file.getName().startsWith("PullRequestComments.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String requestId = element.elementTextTrim("request");+ Element contentElement = element.element("content");+ if (contentElement != null) {+ getMentioned108(userIds, contentElement.getText()).forEach(userId -> {+ pullRequestMentions.add(new Pair<>(requestId, userId));+ });+ }+ }+ } else if (file.getName().startsWith("CodeComments.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String commentId = element.elementTextTrim("id");+ Element contentElement = element.element("content");+ if (contentElement != null) {+ getMentioned108(userIds, contentElement.getText()).forEach(userId -> {+ codeCommentMentions.add(new Pair<>(commentId, userId));+ });+ }+ }+ } else if (file.getName().startsWith("CodeCommentReplys.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String commentId = element.elementTextTrim("comment");+ Element contentElement = element.element("content");+ if (contentElement != null) {+ getMentioned108(userIds, contentElement.getText()).forEach(userId -> {+ codeCommentMentions.add(new Pair<>(commentId, userId));+ });+ }+ }+ }+ }++ VersionedXmlDoc mentionsDom;+ File mentionsFile = new File(dataDir, "IssueMentions.xml");+ mentionsDom = new VersionedXmlDoc();+ Element mentionsElement = mentionsDom.addElement("list");++ Long id = 1L;+ for (Pair<String, String> issueMention : issueMentions) {+ Element mentionElement = mentionsElement.addElement("io.onedev.server.model.IssueMention");+ mentionElement.addElement("id").setText(String.valueOf(id++));+ mentionElement.addAttribute("revision", "0.0");+ mentionElement.addElement("issue").setText(issueMention.getFirst());+ mentionElement.addElement("user").setText(issueMention.getSecond());+ }+ mentionsDom.writeToFile(mentionsFile, true);++ mentionsFile = new File(dataDir, "PullRequestMentions.xml");+ mentionsDom = new VersionedXmlDoc();+ mentionsElement = mentionsDom.addElement("list");++ id = 1L;+ for (Pair<String, String> it : pullRequestMentions) {+ Element mentionElement = mentionsElement.addElement("io.onedev.server.model.PullRequestMention");+ mentionElement.addElement("id").setText(String.valueOf(id++));+ mentionElement.addAttribute("revision", "0.0");+ mentionElement.addElement("request").setText(it.getFirst());+ mentionElement.addElement("user").setText(it.getSecond());+ }+ mentionsDom.writeToFile(mentionsFile, true);++ mentionsFile = new File(dataDir, "CodeCommentMentions.xml");+ mentionsDom = new VersionedXmlDoc();+ mentionsElement = mentionsDom.addElement("list");++ id = 1L;+ for (Pair<String, String> it : codeCommentMentions) {+ Element mentionElement = mentionsElement.addElement("io.onedev.server.model.CodeCommentMention");+ mentionElement.addElement("id").setText(String.valueOf(id++));+ mentionElement.addAttribute("revision", "0.0");+ mentionElement.addElement("comment").setText(it.getFirst());+ mentionElement.addElement("user").setText(it.getSecond());+ }+ mentionsDom.writeToFile(mentionsFile, true);+ }}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 2ba8aa14d5..3277205105 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@@ -123,6 +123,9 @@ public class CodeComment extends ProjectBelonging implements AttachmentStorageSuprivate CompareContext compareContext;private boolean resolved;++ @OneToMany(mappedBy="comment", cascade=CascadeType.REMOVE)+ private Collection<CodeCommentMention> mentions = new ArrayList<>();@OneToMany(mappedBy="comment", cascade=CascadeType.REMOVE)private Collection<CodeCommentReply> replies = new ArrayList<>();@@ -243,6 +246,14 @@ public class CodeComment extends ProjectBelonging implements AttachmentStorageSuthis.resolved = resolved;}+ public Collection<CodeCommentMention> getMentions() {+ return mentions;+ }++ public void setMentions(Collection<CodeCommentMention> mentions) {+ this.mentions = mentions;+ }+public boolean isVisitedAfter(Date date) {User user = SecurityUtils.getUser();if (user != null) {diff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentMention.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentMention.javanew file mode 100644index 0000000000..50db781e31--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/CodeCommentMention.java@@ -0,0 +1,42 @@+package io.onedev.server.model;++import javax.persistence.*;++@Entity+@Table(+ indexes={@Index(columnList="o_comment_id"), @Index(columnList="o_user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_comment_id", "o_user_id"})}+)+public class CodeCommentMention extends AbstractEntity {++ public static final String PROP_USER = "user";++ public static final String PROP_COMMENT = "comment";++ private static final long serialVersionUID = 1L;++ @ManyToOne+ @JoinColumn(nullable=false)+ private CodeComment comment;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private User user;++ public CodeComment getComment() {+ return comment;+ }++ public void setComment(CodeComment comment) {+ this.comment = comment;+ }++ public User getUser() {+ return user;+ }++ public void setUser(User user) {+ this.user = user;+ }++}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 6acdfa5182..0c89f6de93 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@@ -307,6 +307,9 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachment@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)private Collection<IssueWatch> watches = new ArrayList<>();++ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)+ private Collection<IssueMention> mentions = new ArrayList<>();@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@@ -506,6 +509,14 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachment}}+ public Collection<IssueMention> getMentions() {+ return mentions;+ }++ public void setMentions(Collection<IssueMention> mentions) {+ this.mentions = mentions;+ }+public Collection<IssueAuthorization> getAuthorizations() {return authorizations;}diff --git a/server-core/src/main/java/io/onedev/server/model/IssueMention.java b/server-core/src/main/java/io/onedev/server/model/IssueMention.javanew file mode 100644index 0000000000..458c9b57b1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/IssueMention.java@@ -0,0 +1,42 @@+package io.onedev.server.model;++import javax.persistence.*;++@Entity+@Table(+ indexes={@Index(columnList="o_issue_id"), @Index(columnList="o_user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_issue_id", "o_user_id"})}+)+public class IssueMention extends AbstractEntity {++ public static final String PROP_USER = "user";++ public static final String PROP_ISSUE = "issue";++ private static final long serialVersionUID = 1L;++ @ManyToOne+ @JoinColumn(nullable=false)+ private Issue issue;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private User user;++ public Issue getIssue() {+ return issue;+ }++ public void setIssue(Issue issue) {+ this.issue = issue;+ }++ public User getUser() {+ return user;+ }++ public void setUser(User user) {+ this.user = user;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex aa4dda81ef..0cec5d8f00 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -974,6 +974,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelnamedCodeCommentQueries = new ArrayList<>();namedCodeCommentQueries.add(new NamedCodeCommentQuery("Unresolved", "unresolved"));namedCodeCommentQueries.add(new NamedCodeCommentQuery("Created by me", "created by me"));+ namedCodeCommentQueries.add(new NamedCodeCommentQuery("Mentioned me", "mentioned me"));namedCodeCommentQueries.add(new NamedCodeCommentQuery("Created recently", "\"Create Date\" is since \"last week\""));namedCodeCommentQueries.add(new NamedCodeCommentQuery("Updated recently", "\"Update Date\" is since \"last week\""));namedCodeCommentQueries.add(new NamedCodeCommentQuery("Resolved", "resolved"));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 a0abaa44d3..743df6a399 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@@ -306,6 +306,9 @@ public class PullRequest extends ProjectBelonging@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)private Collection<PullRequestWatch> watches = new ArrayList<>();++ @OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)+ private Collection<PullRequestMention> mentions = new ArrayList<>();@OneToMany(mappedBy="compareContext.pullRequest")private Collection<CodeComment> codeComments = new ArrayList<>();@@ -484,6 +487,14 @@ public class PullRequest extends ProjectBelongingthis.changes = changes;}+ public Collection<PullRequestMention> getMentions() {+ return mentions;+ }++ public void setMentions(Collection<PullRequestMention> mentions) {+ this.mentions = mentions;+ }+@Overridepublic Collection<PullRequestWatch> getWatches() {return watches;diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestMention.java b/server-core/src/main/java/io/onedev/server/model/PullRequestMention.javanew file mode 100644index 0000000000..dfd116dd86--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestMention.java@@ -0,0 +1,42 @@+package io.onedev.server.model;++import javax.persistence.*;++@Entity+@Table(+ indexes={@Index(columnList="o_request_id"), @Index(columnList="o_user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_request_id", "o_user_id"})}+)+public class PullRequestMention extends AbstractEntity {++ public static final String PROP_USER = "user";++ public static final String PROP_REQUEST = "request";++ private static final long serialVersionUID = 1L;++ @ManyToOne+ @JoinColumn(nullable=false)+ private PullRequest request;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private User user;++ public PullRequest getRequest() {+ return request;+ }++ public void setRequest(PullRequest request) {+ this.request = request;+ }++ public User getUser() {+ return user;+ }++ public void setUser(User user) {+ this.user = user;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javaindex 48440afd35..ac97885980 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java@@ -1,733 +1,734 @@-package io.onedev.server.model.support.administration;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Comparator;-import java.util.HashSet;-import java.util.Iterator;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;-import java.util.stream.Collectors;--import javax.annotation.Nullable;--import com.google.common.collect.Lists;--import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.Choice;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;-import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.SpecifiedDefaultValue;-import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;-import io.onedev.server.model.support.inputspec.showcondition.ValueIsOneOf;-import io.onedev.server.model.support.issue.BoardSpec;-import io.onedev.server.model.support.issue.IssueTemplate;-import io.onedev.server.model.support.issue.NamedIssueQuery;-import io.onedev.server.model.support.issue.StateSpec;-import io.onedev.server.model.support.issue.TransitionSpec;-import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;-import io.onedev.server.model.support.issue.field.spec.ChoiceField;-import io.onedev.server.model.support.issue.field.spec.FieldSpec;-import io.onedev.server.model.support.issue.field.spec.UserChoiceField;-import io.onedev.server.model.support.issue.transitiontrigger.BranchUpdateTrigger;-import io.onedev.server.model.support.issue.transitiontrigger.BuildSuccessfulTrigger;-import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;-import io.onedev.server.model.support.issue.transitiontrigger.StateTransitionTrigger;-import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.search.entity.issue.IssueQueryParseOption;-import io.onedev.server.util.match.Matcher;-import io.onedev.server.util.match.PathMatcher;-import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.util.usage.Usage;-import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;-import io.onedev.server.web.editable.annotation.Editable;--@Editable-public class GlobalIssueSetting implements Serializable {-- private static final long serialVersionUID = 1L;-- private List<StateSpec> stateSpecs = new ArrayList<>();-- private List<TransitionSpec> transitionSpecs = new ArrayList<>();-- private List<FieldSpec> fieldSpecs = new ArrayList<>();-- private List<BoardSpec> boardSpecs = new ArrayList<>();-- private List<String> listFields = new ArrayList<>();-- private List<String> listLinks = new ArrayList<>();-- private List<NamedIssueQuery> namedQueries = new ArrayList<>();-- private List<IssueTemplate> issueTemplates = new ArrayList<>();-- private boolean reconciled = true;-- public GlobalIssueSetting() {- ChoiceField type = new ChoiceField();- type.setName("Type");- SpecifiedChoices specifiedChoices = new SpecifiedChoices();-- List<Choice> choices = new ArrayList<>();- Choice newFeature = new Choice();- newFeature.setValue("New Feature");- newFeature.setColor("#1bc5bd");- choices.add(newFeature);-- Choice improvement = new Choice();- improvement.setValue("Improvement");- improvement.setColor("#1bc5bd");- choices.add(improvement);-- Choice bug = new Choice();- bug.setValue("Bug");- bug.setColor("#F64E60");- choices.add(bug);-- Choice task = new Choice();- task.setValue("Task");- task.setColor("#8950FC");- choices.add(task);-- Choice buildFailure = new Choice();- buildFailure.setValue("Build Failure");- buildFailure.setColor("#F64E60");- choices.add(buildFailure);-- specifiedChoices.setChoices(choices);- type.setChoiceProvider(specifiedChoices);-- SpecifiedDefaultValue specifiedDefaultValue = new SpecifiedDefaultValue();- specifiedDefaultValue.setValue("Bug");- type.setDefaultValueProvider(specifiedDefaultValue);-- fieldSpecs.add(type);-- ChoiceField priority = new ChoiceField();- priority.setName("Priority");- specifiedChoices = new SpecifiedChoices();-- choices = new ArrayList<>();-- Choice minor = new Choice();- minor.setValue("Minor");- minor.setColor("#E4E6EF");- choices.add(minor);-- Choice normal = new Choice();- normal.setValue("Normal");- normal.setColor("#3699FF");- choices.add(normal);-- Choice major = new Choice();- major.setValue("Major");- major.setColor("#FFA800");- choices.add(major);-- Choice critical = new Choice();- critical.setValue("Critical");- critical.setColor("#F64E60");- choices.add(critical);-- specifiedChoices.setChoices(choices);- priority.setChoiceProvider(specifiedChoices);-- specifiedDefaultValue = new SpecifiedDefaultValue();- specifiedDefaultValue.setValue("Normal");- priority.setDefaultValueProvider(specifiedDefaultValue);-- fieldSpecs.add(priority);-- UserChoiceField assignees = new UserChoiceField();- assignees.setAllowMultiple(true);- assignees.setAllowEmpty(true);- assignees.setNameOfEmptyValue("Not assigned");- assignees.setName("Assignees");-- fieldSpecs.add(assignees);-- BuildChoiceField failedBuild = new BuildChoiceField();- failedBuild.setName("Failed Build");- failedBuild.setAllowEmpty(true);- failedBuild.setNameOfEmptyValue("Not specified");-- fieldSpecs.add(failedBuild);-- ShowCondition showCondition = new ShowCondition();- showCondition.setInputName("Type");- ValueIsOneOf valueIsOneOf = new ValueIsOneOf();- valueIsOneOf.setValues(Lists.newArrayList("Build Failure"));- showCondition.setValueMatcher(valueIsOneOf);- failedBuild.setShowCondition(showCondition);-- StateSpec open = new StateSpec();- open.setName("Open");- open.setColor("#FFA800");-- stateSpecs.add(open);-- StateSpec closed = new StateSpec();- closed.setColor("#1BC5BD");- closed.setName("Closed");-- stateSpecs.add(closed);-- TransitionSpec transition = new TransitionSpec();- transition.setFromStates(Lists.newArrayList("Open"));- transition.setToState("Closed");- PressButtonTrigger pressButton = new PressButtonTrigger();- pressButton.setButtonLabel("Close");- pressButton.setAuthorizedRoles(Lists.newArrayList("Code Writer", PressButtonTrigger.ROLE_SUBMITTER, "{Assignees}"));- pressButton.setIssueQuery("not(any \"Blocked By\" matching(\"State\" is \"Open\")) and not(any \"Child Issue\" matching(\"State\" is \"Open\"))");- transition.setTrigger(pressButton);-- transitionSpecs.add(transition);-- transition = new TransitionSpec();- transition.setFromStates(Lists.newArrayList("Open"));- transition.setToState("Closed");- BranchUpdateTrigger branchUpdate = new BranchUpdateTrigger();- branchUpdate.setBranches("master main");- transition.setTrigger(branchUpdate);-- transitionSpecs.add(transition);-- transition = new TransitionSpec();- transition.setFromStates(Lists.newArrayList("Open"));- transition.setToState("Closed");- BuildSuccessfulTrigger buildSuccessful = new BuildSuccessfulTrigger();- buildSuccessful.setBranches("master main");- buildSuccessful.setIssueQuery("\"Type\" is \"Build Failure\" and (\"Failed Build\" is current or \"Failed Build\" is previous)");- transition.setTrigger(buildSuccessful);-- transitionSpecs.add(transition);-- transition = new TransitionSpec();- transition.setFromStates(Lists.newArrayList("Open"));- transition.setToState("Closed");- StateTransitionTrigger stateTransition = new StateTransitionTrigger();- stateTransition.setStates(Lists.newArrayList("Closed"));- stateTransition.setIssueQuery("any \"Child Issue\" matching(current issue) and all \"Child Issue\" matching(\"State\" is \"Closed\")");- transition.setTrigger(stateTransition);-- transitionSpecs.add(transition);-- transition = new TransitionSpec();- transition.setFromStates(Lists.newArrayList("Closed"));- transition.setToState("Open");- pressButton = new PressButtonTrigger();- pressButton.setButtonLabel("Reopen");- pressButton.setAuthorizedRoles(Lists.newArrayList("Code Writer", "Code Reader", "Issue Reporter"));- transition.setTrigger(pressButton);-- transitionSpecs.add(transition);-- transition = new TransitionSpec();- transition.setFromStates(Lists.newArrayList("Closed"));- transition.setToState("Open");- stateTransition = new StateTransitionTrigger();- stateTransition.setStates(Lists.newArrayList("Open"));- stateTransition.setIssueQuery("any \"Child Issue\" matching(current issue) or any \"Blocked By\" matching(current issue)");- transition.setTrigger(stateTransition);-- transitionSpecs.add(transition);-- BoardSpec board = new BoardSpec();- board.setName(Issue.NAME_STATE);- board.setIdentifyField(Issue.NAME_STATE);- board.setColumns(Lists.newArrayList("Open", "Closed"));- board.setDisplayFields(Lists.newArrayList(Issue.NAME_STATE, "Type", "Priority", "Assignees"));- board.setDisplayLinks(Lists.newArrayList("Child Issue", "Blocked By"));- boardSpecs.add(board);-- listFields.add(Issue.NAME_STATE);- listFields.add("Type");- listFields.add("Priority");- listFields.add("Assignees");-- listLinks.add("Child Issue");- listLinks.add("Blocked By");-- namedQueries.add(new NamedIssueQuery("Open", "\"State\" is \"Open\""));- namedQueries.add(new NamedIssueQuery("Assigned to me & Open", "\"Assignees\" is me and \"State\" is \"Open\""));- namedQueries.add(new NamedIssueQuery("Submitted by me & Open", "submitted by me and \"State\" is \"Open\""));- namedQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignees\" is me"));- namedQueries.add(new NamedIssueQuery("Blocked Issues", "any \"Blocked By\" matching(\"State\" is \"Open\") or any \"Child Issue\" matching(\"State\" is \"Open\")"));- namedQueries.add(new NamedIssueQuery("Submitted by me", "submitted by me"));- namedQueries.add(new NamedIssueQuery("Submitted recently", "\"Submit Date\" is since \"last week\""));- namedQueries.add(new NamedIssueQuery("Updated recently", "\"Update Date\" is since \"last week\""));- namedQueries.add(new NamedIssueQuery("Open & Critical", "\"State\" is \"Open\" and \"Priority\" is \"Critical\""));- namedQueries.add(new NamedIssueQuery("Open & Unassigned", "\"State\" is \"Open\" and \"Assignees\" is empty"));- namedQueries.add(new NamedIssueQuery("Closed", "\"State\" is \"Closed\""));- namedQueries.add(new NamedIssueQuery("All", null));- }-- public List<String> sortFieldNames(Collection<String> fieldNames) {- List<String> sorted = new ArrayList<>(fieldNames);- List<String> allFieldNames = getFieldNames();- Collections.sort(sorted, new Comparator<String>() {-- @Override- public int compare(String o1, String o2) {- return allFieldNames.indexOf(o1) - allFieldNames.indexOf(o2);- }-- });- return sorted;- }-- public List<StateSpec> getStateSpecs() {- return stateSpecs;- }-- public void setStateSpecs(List<StateSpec> stateSpecs) {- this.stateSpecs = stateSpecs;- }-- public List<TransitionSpec> getTransitionSpecs() {- return transitionSpecs;- }-- public void setTransitionSpecs(List<TransitionSpec> transitionSpecs) {- this.transitionSpecs = transitionSpecs;- }-- @Editable- public List<FieldSpec> getFieldSpecs() {- return fieldSpecs;- }-- public void setFieldSpecs(List<FieldSpec> fieldSpecs) {- this.fieldSpecs = fieldSpecs;- }-- public boolean isReconciled() {- return reconciled;- }-- public void setReconciled(boolean reconciled) {- this.reconciled = reconciled;- }-- public Map<String, FieldSpec> getFieldSpecMap(@Nullable Collection<String> fieldNames) {- Map<String, FieldSpec> fieldSpecMap = new LinkedHashMap<>();- for (FieldSpec fieldSpec: getFieldSpecs()) {- if (fieldNames == null || fieldNames.contains(fieldSpec.getName()))- fieldSpecMap.put(fieldSpec.getName(), fieldSpec);- }- return fieldSpecMap;- }-- public Map<String, StateSpec> getStateSpecMap() {- Map<String, StateSpec> stateSpecMap = new LinkedHashMap<>();- for (StateSpec state: getStateSpecs())- stateSpecMap.put(state.getName(), state);- return stateSpecMap;- }-- public List<String> getFieldNames() {- return new ArrayList<>(getFieldSpecMap(null).keySet());- }-- @Nullable- public StateSpec getStateSpec(String stateName) {- return getStateSpecMap().get(stateName);- }-- @Nullable- public FieldSpec getFieldSpec(String fieldName) {- return getFieldSpecMap(null).get(fieldName);- }-- public Collection<String> getUndefinedStates() {- Collection<String> undefinedStates = new HashSet<>();- for (TransitionSpec transition: getTransitionSpecs())- undefinedStates.addAll(transition.getUndefinedStates());- for (BoardSpec board: getBoardSpecs())- undefinedStates.addAll(board.getUndefinedStates());- for (IssueTemplate template: getIssueTemplates())- undefinedStates.addAll(template.getQueryUpdater().getUndefinedStates());-- IssueQueryParseOption option = new IssueQueryParseOption().enableAll(true);- for (NamedIssueQuery namedQuery: getNamedQueries()) {-- try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), option, false);- undefinedStates.addAll(query.getUndefinedStates());- } catch (Exception e) {- }- }- return undefinedStates;- }-- public Collection<String> getUndefinedFields() {- Collection<String> undefinedFields = new HashSet<>();- for (String fieldName: getListFields()) {- if (!fieldName.equals(Issue.NAME_STATE) && getFieldSpec(fieldName) == null)- undefinedFields.add(fieldName);- }-- for (TransitionSpec transition: getTransitionSpecs())- undefinedFields.addAll(transition.getUndefinedFields());- for (FieldSpec field: getFieldSpecs())- undefinedFields.addAll(field.getUndefinedFields());- for (BoardSpec board: getBoardSpecs())- undefinedFields.addAll(board.getUndefinedFields());- for (IssueTemplate template: getIssueTemplates())- undefinedFields.addAll(template.getQueryUpdater().getUndefinedFields());-- IssueQueryParseOption option = new IssueQueryParseOption().enableAll(true);-- for (NamedIssueQuery namedQuery: getNamedQueries()) {- try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), option, false);- undefinedFields.addAll(query.getUndefinedFields());- } catch (Exception e) {- }- }- return undefinedFields;- }-- public Collection<UndefinedFieldValue> getUndefinedFieldValues() {- Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();- for (TransitionSpec transition: getTransitionSpecs())- undefinedFieldValues.addAll(transition.getUndefinedFieldValues());- for (FieldSpec field: getFieldSpecs())- undefinedFieldValues.addAll(field.getUndefinedFieldValues());- for (BoardSpec board: getBoardSpecs())- undefinedFieldValues.addAll(board.getUndefinedFieldValues());- for (IssueTemplate template: getIssueTemplates())- undefinedFieldValues.addAll(template.getQueryUpdater().getUndefinedFieldValues());-- IssueQueryParseOption option = new IssueQueryParseOption().enableAll(true);- for (NamedIssueQuery namedQuery: getNamedQueries()) {- try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), option, false);- undefinedFieldValues.addAll(query.getUndefinedFieldValues());- } catch (Exception e) {- }- }- return undefinedFieldValues;- }-- public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {- for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {- if (!it.next().fixUndefinedStates(resolutions))- it.remove();- }- for (Iterator<BoardSpec> it = getBoardSpecs().iterator(); it.hasNext();) {- if (!it.next().fixUndefinedStates(resolutions))- it.remove();- }- for (Iterator<IssueTemplate> it = getIssueTemplates().iterator(); it.hasNext();) {- if (!it.next().getQueryUpdater().fixUndefinedStates(resolutions))- it.remove();- }-- IssueQueryParseOption option = new IssueQueryParseOption().enableAll(true);- for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {- NamedIssueQuery namedQuery = it.next();- try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), option, false);- if (query.fixUndefinedStates(resolutions))- namedQuery.setQuery(query.toString());- else- it.remove();- } catch (Exception e) {- }- }- }-- public Collection<String> fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {- for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {- if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD)- ReconcileUtils.renameItem(listFields, entry.getKey(), entry.getValue().getNewField());- else- listFields.remove(entry.getKey());- }-- for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {- if (!it.next().fixUndefinedFields(resolutions))- it.remove();- }- for (Iterator<BoardSpec> it = getBoardSpecs().iterator(); it.hasNext();) {- if (!it.next().fixUndefinedFields(resolutions))- it.remove();- }- for (Iterator<IssueTemplate> it = getIssueTemplates().iterator(); it.hasNext();) {- if (!it.next().getQueryUpdater().fixUndefinedFields(resolutions))- it.remove();- }-- IssueQueryParseOption option = new IssueQueryParseOption().enableAll(true);- for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {- NamedIssueQuery namedQuery = it.next();- try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), option, false);- if (query.fixUndefinedFields(resolutions))- namedQuery.setQuery(query.toString());- else- it.remove();- } catch (Exception e) {- }- }-- Collection<String> derivedDeletions = new HashSet<>();- for (Iterator<FieldSpec> it = getFieldSpecs().iterator(); it.hasNext();) {- FieldSpec field = it.next();- if (!field.fixUndefinedFields(resolutions)) {- it.remove();- derivedDeletions.add(field.getName());- }- }-- return derivedDeletions;- }-- public Collection<String> fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {- for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {- if (!it.next().fixUndefinedFieldValues(resolutions))- it.remove();- }- for (Iterator<BoardSpec> it = getBoardSpecs().iterator(); it.hasNext();) {- if (!it.next().fixUndefinedFieldValues(resolutions))- it.remove();- }- for (Iterator<IssueTemplate> it = getIssueTemplates().iterator(); it.hasNext();) {- if (!it.next().getQueryUpdater().fixUndefinedFieldValues(resolutions))- it.remove();- }-- IssueQueryParseOption option = new IssueQueryParseOption().enableAll(true);- for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {- NamedIssueQuery namedQuery = it.next();- try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), option, false);- if (query.fixUndefinedFieldValues(resolutions))- namedQuery.setQuery(query.toString());- else- it.remove();- } catch (Exception e) {- }- }-- Collection<String> derivedDeletions = new HashSet<>();- for (Iterator<FieldSpec> it = getFieldSpecs().iterator(); it.hasNext();) {- FieldSpec field = it.next();- if (!field.fixUndefinedFieldValues(resolutions)) {- it.remove();- derivedDeletions.add(field.getName());- }- }-- return derivedDeletions;- }-- public void onRenameUser(String oldName, String newName) {- for (FieldSpec field: getFieldSpecs())- field.onRenameUser(oldName, newName);- for (BoardSpec board: getBoardSpecs())- board.onRenameUser(this, oldName, newName);- }-- public Usage onDeleteUser(String userName) {- Usage usage = new Usage();- for (Iterator<BoardSpec> it = getBoardSpecs().iterator(); it.hasNext();) {- if (it.next().onDeleteUser(this, userName))- it.remove();- }- for (FieldSpec field: getFieldSpecs())- usage.add(field.onDeleteUser(userName));-- return usage.prefix("issue setting");- }-- public void onRenameGroup(String oldName, String newName) {- for (FieldSpec field: getFieldSpecs())- field.onRenameGroup(oldName, newName);- }-- public Usage onDeleteGroup(String groupName) {- Usage usage = new Usage();-- for (FieldSpec field: getFieldSpecs())- usage.add(field.onDeleteGroup(groupName));-- return usage.prefix("issue setting");- }-- public void onMoveProject(String oldPath, String newPath) {- for (FieldSpec field: getFieldSpecs())- field.onMoveProject(oldPath, newPath);-- for (TransitionSpec transition: getTransitionSpecs())- transition.onMoveProject(oldPath, newPath);- for (BoardSpec board: getBoardSpecs()) {- board.getBaseQueryUpdater().onMoveProject(oldPath, newPath);- board.getBacklogBaseQueryUpdater().onMoveProject(oldPath, newPath);- }-- for (IssueTemplate template: getIssueTemplates())- template.getQueryUpdater().onMoveProject(oldPath, newPath);- }-- public Usage onDeleteProject(String projectPath) {- Usage usage = new Usage();-- for (FieldSpec field: getFieldSpecs())- usage.add(field.onDeleteProject(projectPath));-- int index = 1;- for (TransitionSpec transition: getTransitionSpecs())- usage.add(transition.onDeleteProject(projectPath).prefix("state transition #" + index++));-- index = 1;- for (BoardSpec board: getBoardSpecs()) {- usage.add(board.getBaseQueryUpdater().onDeleteProject(projectPath).prefix("default board #" + index));- usage.add(board.getBacklogBaseQueryUpdater().onDeleteProject(projectPath).prefix("default board #" + index));- index++;- }-- index = 1;- for (IssueTemplate template: getIssueTemplates())- usage.add(template.getQueryUpdater().onDeleteProject(projectPath).prefix("description template #" + index++));-- return usage.prefix("issue setting");-- }-- public void onRenameRole(String oldName, String newName) {- for (TransitionSpec transition: getTransitionSpecs())- transition.onRenameRole(oldName, newName);- }-- public Usage onDeleteRole(String roleName) {- Usage usage = new Usage();-- int index = 1;- for (TransitionSpec transition: getTransitionSpecs())- usage.add(transition.onDeleteRole(roleName).prefix("state transition #" + index++));-- return usage.prefix("issue setting");- }-- public void onRenameLink(String oldName, String newName) {- for (TransitionSpec transition: getTransitionSpecs())- transition.onRenameLink(oldName, newName);- for (BoardSpec board: getBoardSpecs()) {- board.getBaseQueryUpdater().onRenameLink(oldName, newName);- board.getBacklogBaseQueryUpdater().onRenameLink(oldName, newName);- ReconcileUtils.renameItem(board.getDisplayLinks(), oldName, newName);- }-- for (IssueTemplate template: getIssueTemplates())- template.getQueryUpdater().onRenameLink(oldName, newName);-- ReconcileUtils.renameItem(listLinks, oldName, newName);- }-- public Usage onDeleteLink(String linkName) {- Usage usage = new Usage();-- int index = 1;- for (TransitionSpec transition: getTransitionSpecs())- usage.add(transition.onDeleteLink(linkName).prefix("state transition #" + index++));-- index = 1;- for (BoardSpec board: getBoardSpecs()) {- usage.add(board.getBaseQueryUpdater().onDeleteLink(linkName).prefix("default board #" + index));- usage.add(board.getBacklogBaseQueryUpdater().onDeleteLink(linkName).prefix("default board #" + index));- if (board.getDisplayLinks().contains(linkName))- usage.add("display links").prefix("default board #" + index);- index++;- }-- index = 1;- for (IssueTemplate template: getIssueTemplates())- usage.add(template.getQueryUpdater().onDeleteLink(linkName).prefix("description template #" + index++));-- if (listLinks.contains(linkName))- usage.add(new Usage().add("fields & links").prefix("-> issues"));-- return usage.prefix("issue setting");- }-- public StateSpec getInitialStateSpec() {- if (!getStateSpecs().isEmpty())- return getStateSpecs().iterator().next();- else- throw new ExplicitException("No any issue state is defined");- }-- public List<BoardSpec> getBoardSpecs() {- return boardSpecs;- }-- public void setBoardSpecs(List<BoardSpec> boardSpecs) {- this.boardSpecs = boardSpecs;- }-- public List<String> getListFields() {- return listFields;- }-- public void setListFields(List<String> listFields) {- this.listFields = listFields;- }-- public List<String> getListLinks() {- return listLinks;- }-- public void setListLinks(List<String> listLinks) {- this.listLinks = listLinks;- }-- public List<NamedIssueQuery> getNamedQueries() {- return namedQueries;- }-- public void setNamedQueries(List<NamedIssueQuery> namedQueries) {- this.namedQueries = namedQueries;- }-- public List<IssueTemplate> getIssueTemplates() {- return issueTemplates;- }-- public void setIssueTemplates(List<IssueTemplate> issueTemplates) {- this.issueTemplates = issueTemplates;- }-- @Nullable- public NamedIssueQuery getNamedQuery(String name) {- for (NamedIssueQuery namedQuery: getNamedQueries()) {- if (namedQuery.getName().equals(name))- return namedQuery;- }- return null;- }-- public Collection<String> getPromptFieldsUponIssueOpen(Project project) {- Matcher matcher = new PathMatcher();- return getFieldSpecs().stream()- .filter(it->it.isPromptUponIssueOpen() && (it.getApplicableProjects() == null || PatternSet.parse(it.getApplicableProjects()).matches(matcher, project.getPath())))- .map(it->it.getName())- .collect(Collectors.toList());- }-- public int getStateOrdinal(String state) {- return getStateSpecs().indexOf(getStateSpec(state));- }--}+package io.onedev.server.model.support.administration;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Comparator;+import java.util.HashSet;+import java.util.Iterator;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.stream.Collectors;++import javax.annotation.Nullable;++import com.google.common.collect.Lists;++import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.Choice;+import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.SpecifiedDefaultValue;+import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;+import io.onedev.server.model.support.inputspec.showcondition.ValueIsOneOf;+import io.onedev.server.model.support.issue.BoardSpec;+import io.onedev.server.model.support.issue.IssueTemplate;+import io.onedev.server.model.support.issue.NamedIssueQuery;+import io.onedev.server.model.support.issue.StateSpec;+import io.onedev.server.model.support.issue.TransitionSpec;+import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;+import io.onedev.server.model.support.issue.field.spec.ChoiceField;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.UserChoiceField;+import io.onedev.server.model.support.issue.transitiontrigger.BranchUpdateTrigger;+import io.onedev.server.model.support.issue.transitiontrigger.BuildSuccessfulTrigger;+import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;+import io.onedev.server.model.support.issue.transitiontrigger.StateTransitionTrigger;+import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.search.entity.issue.IssueQueryParseOption;+import io.onedev.server.util.match.Matcher;+import io.onedev.server.util.match.PathMatcher;+import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.util.usage.Usage;+import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class GlobalIssueSetting implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<StateSpec> stateSpecs = new ArrayList<>();++ private List<TransitionSpec> transitionSpecs = new ArrayList<>();++ private List<FieldSpec> fieldSpecs = new ArrayList<>();++ private List<BoardSpec> boardSpecs = new ArrayList<>();++ private List<String> listFields = new ArrayList<>();++ private List<String> listLinks = new ArrayList<>();++ private List<NamedIssueQuery> namedQueries = new ArrayList<>();++ private List<IssueTemplate> issueTemplates = new ArrayList<>();++ private boolean reconciled = true;++ public GlobalIssueSetting() {+ ChoiceField type = new ChoiceField();+ type.setName("Type");+ SpecifiedChoices specifiedChoices = new SpecifiedChoices();++ List<Choice> choices = new ArrayList<>();+ Choice newFeature = new Choice();+ newFeature.setValue("New Feature");+ newFeature.setColor("#1bc5bd");+ choices.add(newFeature);++ Choice improvement = new Choice();+ improvement.setValue("Improvement");+ improvement.setColor("#1bc5bd");+ choices.add(improvement);++ Choice bug = new Choice();+ bug.setValue("Bug");+ bug.setColor("#F64E60");+ choices.add(bug);++ Choice task = new Choice();+ task.setValue("Task");+ task.setColor("#8950FC");+ choices.add(task);++ Choice buildFailure = new Choice();+ buildFailure.setValue("Build Failure");+ buildFailure.setColor("#F64E60");+ choices.add(buildFailure);++ specifiedChoices.setChoices(choices);+ type.setChoiceProvider(specifiedChoices);++ SpecifiedDefaultValue specifiedDefaultValue = new SpecifiedDefaultValue();+ specifiedDefaultValue.setValue("Bug");+ type.setDefaultValueProvider(specifiedDefaultValue);++ fieldSpecs.add(type);++ ChoiceField priority = new ChoiceField();+ priority.setName("Priority");+ specifiedChoices = new SpecifiedChoices();++ choices = new ArrayList<>();++ Choice minor = new Choice();+ minor.setValue("Minor");+ minor.setColor("#E4E6EF");+ choices.add(minor);++ Choice normal = new Choice();+ normal.setValue("Normal");+ normal.setColor("#3699FF");+ choices.add(normal);++ Choice major = new Choice();+ major.setValue("Major");+ major.setColor("#FFA800");+ choices.add(major);++ Choice critical = new Choice();+ critical.setValue("Critical");+ critical.setColor("#F64E60");+ choices.add(critical);++ specifiedChoices.setChoices(choices);+ priority.setChoiceProvider(specifiedChoices);++ specifiedDefaultValue = new SpecifiedDefaultValue();+ specifiedDefaultValue.setValue("Normal");+ priority.setDefaultValueProvider(specifiedDefaultValue);++ fieldSpecs.add(priority);++ UserChoiceField assignees = new UserChoiceField();+ assignees.setAllowMultiple(true);+ assignees.setAllowEmpty(true);+ assignees.setNameOfEmptyValue("Not assigned");+ assignees.setName("Assignees");++ fieldSpecs.add(assignees);++ BuildChoiceField failedBuild = new BuildChoiceField();+ failedBuild.setName("Failed Build");+ failedBuild.setAllowEmpty(true);+ failedBuild.setNameOfEmptyValue("Not specified");++ fieldSpecs.add(failedBuild);++ ShowCondition showCondition = new ShowCondition();+ showCondition.setInputName("Type");+ ValueIsOneOf valueIsOneOf = new ValueIsOneOf();+ valueIsOneOf.setValues(Lists.newArrayList("Build Failure"));+ showCondition.setValueMatcher(valueIsOneOf);+ failedBuild.setShowCondition(showCondition);++ StateSpec open = new StateSpec();+ open.setName("Open");+ open.setColor("#FFA800");++ stateSpecs.add(open);++ StateSpec closed = new StateSpec();+ closed.setColor("#1BC5BD");+ closed.setName("Closed");++ stateSpecs.add(closed);++ TransitionSpec transition = new TransitionSpec();+ transition.setFromStates(Lists.newArrayList("Open"));+ transition.setToState("Closed");+ PressButtonTrigger pressButton = new PressButtonTrigger();+ pressButton.setButtonLabel("Close");+ pressButton.setAuthorizedRoles(Lists.newArrayList("Code Writer", PressButtonTrigger.ROLE_SUBMITTER, "{Assignees}"));+ pressButton.setIssueQuery("not(any \"Blocked By\" matching(\"State\" is \"Open\")) and not(any \"Child Issue\" matching(\"State\" is \"Open\"))");+ transition.setTrigger(pressButton);++ transitionSpecs.add(transition);++ transition = new TransitionSpec();+ transition.setFromStates(Lists.newArrayList("Open"));+ transition.setToState("Closed");+ BranchUpdateTrigger branchUpdate = new BranchUpdateTrigger();+ branchUpdate.setBranches("master main");+ transition.setTrigger(branchUpdate);++ transitionSpecs.add(transition);++ transition = new TransitionSpec();+ transition.setFromStates(Lists.newArrayList("Open"));+ transition.setToState("Closed");+ BuildSuccessfulTrigger buildSuccessful = new BuildSuccessfulTrigger();+ buildSuccessful.setBranches("master main");+ buildSuccessful.setIssueQuery("\"Type\" is \"Build Failure\" and (\"Failed Build\" is current or \"Failed Build\" is previous)");+ transition.setTrigger(buildSuccessful);++ transitionSpecs.add(transition);++ transition = new TransitionSpec();+ transition.setFromStates(Lists.newArrayList("Open"));+ transition.setToState("Closed");+ StateTransitionTrigger stateTransition = new StateTransitionTrigger();+ stateTransition.setStates(Lists.newArrayList("Closed"));+ stateTransition.setIssueQuery("any \"Child Issue\" matching(current issue) and all \"Child Issue\" matching(\"State\" is \"Closed\")");+ transition.setTrigger(stateTransition);++ transitionSpecs.add(transition);++ transition = new TransitionSpec();+ transition.setFromStates(Lists.newArrayList("Closed"));+ transition.setToState("Open");+ pressButton = new PressButtonTrigger();+ pressButton.setButtonLabel("Reopen");+ pressButton.setAuthorizedRoles(Lists.newArrayList("Code Writer", "Code Reader", "Issue Reporter"));+ transition.setTrigger(pressButton);++ transitionSpecs.add(transition);++ transition = new TransitionSpec();+ transition.setFromStates(Lists.newArrayList("Closed"));+ transition.setToState("Open");+ stateTransition = new StateTransitionTrigger();+ stateTransition.setStates(Lists.newArrayList("Open"));+ stateTransition.setIssueQuery("any \"Child Issue\" matching(current issue) or any \"Blocked By\" matching(current issue)");+ transition.setTrigger(stateTransition);++ transitionSpecs.add(transition);++ BoardSpec board = new BoardSpec();+ board.setName(Issue.NAME_STATE);+ board.setIdentifyField(Issue.NAME_STATE);+ board.setColumns(Lists.newArrayList("Open", "Closed"));+ board.setDisplayFields(Lists.newArrayList(Issue.NAME_STATE, "Type", "Priority", "Assignees"));+ board.setDisplayLinks(Lists.newArrayList("Child Issue", "Blocked By"));+ boardSpecs.add(board);++ listFields.add(Issue.NAME_STATE);+ listFields.add("Type");+ listFields.add("Priority");+ listFields.add("Assignees");++ listLinks.add("Child Issue");+ listLinks.add("Blocked By");++ namedQueries.add(new NamedIssueQuery("Open", "\"State\" is \"Open\""));+ namedQueries.add(new NamedIssueQuery("Assigned to me & Open", "\"Assignees\" is me and \"State\" is \"Open\""));+ namedQueries.add(new NamedIssueQuery("Submitted by me & Open", "submitted by me and \"State\" is \"Open\""));+ namedQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignees\" is me"));+ namedQueries.add(new NamedIssueQuery("Blocked Issues", "any \"Blocked By\" matching(\"State\" is \"Open\") or any \"Child Issue\" matching(\"State\" is \"Open\")"));+ namedQueries.add(new NamedIssueQuery("Submitted by me", "submitted by me"));+ namedQueries.add(new NamedIssueQuery("Submitted recently", "\"Submit Date\" is since \"last week\""));+ namedQueries.add(new NamedIssueQuery("Mentioned me", "mentioned me"));+ namedQueries.add(new NamedIssueQuery("Updated recently", "\"Update Date\" is since \"last week\""));+ namedQueries.add(new NamedIssueQuery("Open & Critical", "\"State\" is \"Open\" and \"Priority\" is \"Critical\""));+ namedQueries.add(new NamedIssueQuery("Open & Unassigned", "\"State\" is \"Open\" and \"Assignees\" is empty"));+ namedQueries.add(new NamedIssueQuery("Closed", "\"State\" is \"Closed\""));+ namedQueries.add(new NamedIssueQuery("All", null));+ }++ public List<String> sortFieldNames(Collection<String> fieldNames) {+ List<String> sorted = new ArrayList<>(fieldNames);+ List<String> allFieldNames = getFieldNames();+ Collections.sort(sorted, new Comparator<String>() {++ @Override+ public int compare(String o1, String o2) {+ return allFieldNames.indexOf(o1) - allFieldNames.indexOf(o2);+ }++ });+ return sorted;+ }++ public List<StateSpec> getStateSpecs() {+ return stateSpecs;+ }++ public void setStateSpecs(List<StateSpec> stateSpecs) {+ this.stateSpecs = stateSpecs;+ }++ public List<TransitionSpec> getTransitionSpecs() {+ return transitionSpecs;+ }++ public void setTransitionSpecs(List<TransitionSpec> transitionSpecs) {+ this.transitionSpecs = transitionSpecs;+ }++ @Editable+ public List<FieldSpec> getFieldSpecs() {+ return fieldSpecs;+ }++ public void setFieldSpecs(List<FieldSpec> fieldSpecs) {+ this.fieldSpecs = fieldSpecs;+ }++ public boolean isReconciled() {+ return reconciled;+ }++ public void setReconciled(boolean reconciled) {+ this.reconciled = reconciled;+ }++ public Map<String, FieldSpec> getFieldSpecMap(@Nullable Collection<String> fieldNames) {+ Map<String, FieldSpec> fieldSpecMap = new LinkedHashMap<>();+ for (FieldSpec fieldSpec: getFieldSpecs()) {+ if (fieldNames == null || fieldNames.contains(fieldSpec.getName()))+ fieldSpecMap.put(fieldSpec.getName(), fieldSpec);+ }+ return fieldSpecMap;+ }++ public Map<String, StateSpec> getStateSpecMap() {+ Map<String, StateSpec> stateSpecMap = new LinkedHashMap<>();+ for (StateSpec state: getStateSpecs())+ stateSpecMap.put(state.getName(), state);+ return stateSpecMap;+ }++ public List<String> getFieldNames() {+ return new ArrayList<>(getFieldSpecMap(null).keySet());+ }++ @Nullable+ public StateSpec getStateSpec(String stateName) {+ return getStateSpecMap().get(stateName);+ }++ @Nullable+ public FieldSpec getFieldSpec(String fieldName) {+ return getFieldSpecMap(null).get(fieldName);+ }++ public Collection<String> getUndefinedStates() {+ Collection<String> undefinedStates = new HashSet<>();+ for (TransitionSpec transition: getTransitionSpecs())+ undefinedStates.addAll(transition.getUndefinedStates());+ for (BoardSpec board: getBoardSpecs())+ undefinedStates.addAll(board.getUndefinedStates());+ for (IssueTemplate template: getIssueTemplates())+ undefinedStates.addAll(template.getQueryUpdater().getUndefinedStates());++ IssueQueryParseOption option = new IssueQueryParseOption().enableAll(true);+ for (NamedIssueQuery namedQuery: getNamedQueries()) {++ try {+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), option, false);+ undefinedStates.addAll(query.getUndefinedStates());+ } catch (Exception e) {+ }+ }+ return undefinedStates;+ }++ public Collection<String> getUndefinedFields() {+ Collection<String> undefinedFields = new HashSet<>();+ for (String fieldName: getListFields()) {+ if (!fieldName.equals(Issue.NAME_STATE) && getFieldSpec(fieldName) == null)+ undefinedFields.add(fieldName);+ }++ for (TransitionSpec transition: getTransitionSpecs())+ undefinedFields.addAll(transition.getUndefinedFields());+ for (FieldSpec field: getFieldSpecs())+ undefinedFields.addAll(field.getUndefinedFields());+ for (BoardSpec board: getBoardSpecs())+ undefinedFields.addAll(board.getUndefinedFields());+ for (IssueTemplate template: getIssueTemplates())+ undefinedFields.addAll(template.getQueryUpdater().getUndefinedFields());++ IssueQueryParseOption option = new IssueQueryParseOption().enableAll(true);++ for (NamedIssueQuery namedQuery: getNamedQueries()) {+ try {+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), option, false);+ undefinedFields.addAll(query.getUndefinedFields());+ } catch (Exception e) {+ }+ }+ return undefinedFields;+ }++ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();+ for (TransitionSpec transition: getTransitionSpecs())+ undefinedFieldValues.addAll(transition.getUndefinedFieldValues());+ for (FieldSpec field: getFieldSpecs())+ undefinedFieldValues.addAll(field.getUndefinedFieldValues());+ for (BoardSpec board: getBoardSpecs())+ undefinedFieldValues.addAll(board.getUndefinedFieldValues());+ for (IssueTemplate template: getIssueTemplates())+ undefinedFieldValues.addAll(template.getQueryUpdater().getUndefinedFieldValues());++ IssueQueryParseOption option = new IssueQueryParseOption().enableAll(true);+ for (NamedIssueQuery namedQuery: getNamedQueries()) {+ try {+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), option, false);+ undefinedFieldValues.addAll(query.getUndefinedFieldValues());+ } catch (Exception e) {+ }+ }+ return undefinedFieldValues;+ }++ public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {+ for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {+ if (!it.next().fixUndefinedStates(resolutions))+ it.remove();+ }+ for (Iterator<BoardSpec> it = getBoardSpecs().iterator(); it.hasNext();) {+ if (!it.next().fixUndefinedStates(resolutions))+ it.remove();+ }+ for (Iterator<IssueTemplate> it = getIssueTemplates().iterator(); it.hasNext();) {+ if (!it.next().getQueryUpdater().fixUndefinedStates(resolutions))+ it.remove();+ }++ IssueQueryParseOption option = new IssueQueryParseOption().enableAll(true);+ for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {+ NamedIssueQuery namedQuery = it.next();+ try {+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), option, false);+ if (query.fixUndefinedStates(resolutions))+ namedQuery.setQuery(query.toString());+ else+ it.remove();+ } catch (Exception e) {+ }+ }+ }++ public Collection<String> fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {+ if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD)+ ReconcileUtils.renameItem(listFields, entry.getKey(), entry.getValue().getNewField());+ else+ listFields.remove(entry.getKey());+ }++ for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {+ if (!it.next().fixUndefinedFields(resolutions))+ it.remove();+ }+ for (Iterator<BoardSpec> it = getBoardSpecs().iterator(); it.hasNext();) {+ if (!it.next().fixUndefinedFields(resolutions))+ it.remove();+ }+ for (Iterator<IssueTemplate> it = getIssueTemplates().iterator(); it.hasNext();) {+ if (!it.next().getQueryUpdater().fixUndefinedFields(resolutions))+ it.remove();+ }++ IssueQueryParseOption option = new IssueQueryParseOption().enableAll(true);+ for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {+ NamedIssueQuery namedQuery = it.next();+ try {+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), option, false);+ if (query.fixUndefinedFields(resolutions))+ namedQuery.setQuery(query.toString());+ else+ it.remove();+ } catch (Exception e) {+ }+ }++ Collection<String> derivedDeletions = new HashSet<>();+ for (Iterator<FieldSpec> it = getFieldSpecs().iterator(); it.hasNext();) {+ FieldSpec field = it.next();+ if (!field.fixUndefinedFields(resolutions)) {+ it.remove();+ derivedDeletions.add(field.getName());+ }+ }++ return derivedDeletions;+ }++ public Collection<String> fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {+ for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {+ if (!it.next().fixUndefinedFieldValues(resolutions))+ it.remove();+ }+ for (Iterator<BoardSpec> it = getBoardSpecs().iterator(); it.hasNext();) {+ if (!it.next().fixUndefinedFieldValues(resolutions))+ it.remove();+ }+ for (Iterator<IssueTemplate> it = getIssueTemplates().iterator(); it.hasNext();) {+ if (!it.next().getQueryUpdater().fixUndefinedFieldValues(resolutions))+ it.remove();+ }++ IssueQueryParseOption option = new IssueQueryParseOption().enableAll(true);+ for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {+ NamedIssueQuery namedQuery = it.next();+ try {+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), option, false);+ if (query.fixUndefinedFieldValues(resolutions))+ namedQuery.setQuery(query.toString());+ else+ it.remove();+ } catch (Exception e) {+ }+ }++ Collection<String> derivedDeletions = new HashSet<>();+ for (Iterator<FieldSpec> it = getFieldSpecs().iterator(); it.hasNext();) {+ FieldSpec field = it.next();+ if (!field.fixUndefinedFieldValues(resolutions)) {+ it.remove();+ derivedDeletions.add(field.getName());+ }+ }++ return derivedDeletions;+ }++ public void onRenameUser(String oldName, String newName) {+ for (FieldSpec field: getFieldSpecs())+ field.onRenameUser(oldName, newName);+ for (BoardSpec board: getBoardSpecs())+ board.onRenameUser(this, oldName, newName);+ }++ public Usage onDeleteUser(String userName) {+ Usage usage = new Usage();+ for (Iterator<BoardSpec> it = getBoardSpecs().iterator(); it.hasNext();) {+ if (it.next().onDeleteUser(this, userName))+ it.remove();+ }+ for (FieldSpec field: getFieldSpecs())+ usage.add(field.onDeleteUser(userName));++ return usage.prefix("issue setting");+ }++ public void onRenameGroup(String oldName, String newName) {+ for (FieldSpec field: getFieldSpecs())+ field.onRenameGroup(oldName, newName);+ }++ public Usage onDeleteGroup(String groupName) {+ Usage usage = new Usage();++ for (FieldSpec field: getFieldSpecs())+ usage.add(field.onDeleteGroup(groupName));++ return usage.prefix("issue setting");+ }++ public void onMoveProject(String oldPath, String newPath) {+ for (FieldSpec field: getFieldSpecs())+ field.onMoveProject(oldPath, newPath);++ for (TransitionSpec transition: getTransitionSpecs())+ transition.onMoveProject(oldPath, newPath);+ for (BoardSpec board: getBoardSpecs()) {+ board.getBaseQueryUpdater().onMoveProject(oldPath, newPath);+ board.getBacklogBaseQueryUpdater().onMoveProject(oldPath, newPath);+ }++ for (IssueTemplate template: getIssueTemplates())+ template.getQueryUpdater().onMoveProject(oldPath, newPath);+ }++ public Usage onDeleteProject(String projectPath) {+ Usage usage = new Usage();++ for (FieldSpec field: getFieldSpecs())+ usage.add(field.onDeleteProject(projectPath));++ int index = 1;+ for (TransitionSpec transition: getTransitionSpecs())+ usage.add(transition.onDeleteProject(projectPath).prefix("state transition #" + index++));++ index = 1;+ for (BoardSpec board: getBoardSpecs()) {+ usage.add(board.getBaseQueryUpdater().onDeleteProject(projectPath).prefix("default board #" + index));+ usage.add(board.getBacklogBaseQueryUpdater().onDeleteProject(projectPath).prefix("default board #" + index));+ index++;+ }++ index = 1;+ for (IssueTemplate template: getIssueTemplates())+ usage.add(template.getQueryUpdater().onDeleteProject(projectPath).prefix("description template #" + index++));++ return usage.prefix("issue setting");++ }++ public void onRenameRole(String oldName, String newName) {+ for (TransitionSpec transition: getTransitionSpecs())+ transition.onRenameRole(oldName, newName);+ }++ public Usage onDeleteRole(String roleName) {+ Usage usage = new Usage();++ int index = 1;+ for (TransitionSpec transition: getTransitionSpecs())+ usage.add(transition.onDeleteRole(roleName).prefix("state transition #" + index++));++ return usage.prefix("issue setting");+ }++ public void onRenameLink(String oldName, String newName) {+ for (TransitionSpec transition: getTransitionSpecs())+ transition.onRenameLink(oldName, newName);+ for (BoardSpec board: getBoardSpecs()) {+ board.getBaseQueryUpdater().onRenameLink(oldName, newName);+ board.getBacklogBaseQueryUpdater().onRenameLink(oldName, newName);+ ReconcileUtils.renameItem(board.getDisplayLinks(), oldName, newName);+ }++ for (IssueTemplate template: getIssueTemplates())+ template.getQueryUpdater().onRenameLink(oldName, newName);++ ReconcileUtils.renameItem(listLinks, oldName, newName);+ }++ public Usage onDeleteLink(String linkName) {+ Usage usage = new Usage();++ int index = 1;+ for (TransitionSpec transition: getTransitionSpecs())+ usage.add(transition.onDeleteLink(linkName).prefix("state transition #" + index++));++ index = 1;+ for (BoardSpec board: getBoardSpecs()) {+ usage.add(board.getBaseQueryUpdater().onDeleteLink(linkName).prefix("default board #" + index));+ usage.add(board.getBacklogBaseQueryUpdater().onDeleteLink(linkName).prefix("default board #" + index));+ if (board.getDisplayLinks().contains(linkName))+ usage.add("display links").prefix("default board #" + index);+ index++;+ }++ index = 1;+ for (IssueTemplate template: getIssueTemplates())+ usage.add(template.getQueryUpdater().onDeleteLink(linkName).prefix("description template #" + index++));++ if (listLinks.contains(linkName))+ usage.add(new Usage().add("fields & links").prefix("-> issues"));++ return usage.prefix("issue setting");+ }++ public StateSpec getInitialStateSpec() {+ if (!getStateSpecs().isEmpty())+ return getStateSpecs().iterator().next();+ else+ throw new ExplicitException("No any issue state is defined");+ }++ public List<BoardSpec> getBoardSpecs() {+ return boardSpecs;+ }++ public void setBoardSpecs(List<BoardSpec> boardSpecs) {+ this.boardSpecs = boardSpecs;+ }++ public List<String> getListFields() {+ return listFields;+ }++ public void setListFields(List<String> listFields) {+ this.listFields = listFields;+ }++ public List<String> getListLinks() {+ return listLinks;+ }++ public void setListLinks(List<String> listLinks) {+ this.listLinks = listLinks;+ }++ public List<NamedIssueQuery> getNamedQueries() {+ return namedQueries;+ }++ public void setNamedQueries(List<NamedIssueQuery> namedQueries) {+ this.namedQueries = namedQueries;+ }++ public List<IssueTemplate> getIssueTemplates() {+ return issueTemplates;+ }++ public void setIssueTemplates(List<IssueTemplate> issueTemplates) {+ this.issueTemplates = issueTemplates;+ }++ @Nullable+ public NamedIssueQuery getNamedQuery(String name) {+ for (NamedIssueQuery namedQuery: getNamedQueries()) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }++ public Collection<String> getPromptFieldsUponIssueOpen(Project project) {+ Matcher matcher = new PathMatcher();+ return getFieldSpecs().stream()+ .filter(it->it.isPromptUponIssueOpen() && (it.getApplicableProjects() == null || PatternSet.parse(it.getApplicableProjects()).matches(matcher, project.getPath())))+ .map(it->it.getName())+ .collect(Collectors.toList());+ }++ public int getStateOrdinal(String state) {+ return getStateSpecs().indexOf(getStateSpec(state));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.javaindex 7f05b96228..7f23aa9a20 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java@@ -1,47 +1,49 @@-package io.onedev.server.model.support.administration;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--import javax.annotation.Nullable;--import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;--public class GlobalPullRequestSetting implements Serializable {-- private static final long serialVersionUID = 1L;-- private List<NamedPullRequestQuery> namedQueries = new ArrayList<>();-- public GlobalPullRequestSetting() {- namedQueries.add(new NamedPullRequestQuery("Open", "open"));- namedQueries.add(new NamedPullRequestQuery("To be reviewed by me", "open and to be reviewed by me"));- namedQueries.add(new NamedPullRequestQuery("To be changed by me", "open and submitted by me and someone requested for changes"));- namedQueries.add(new NamedPullRequestQuery("Requested for changes by me", "requested for changes by me"));- namedQueries.add(new NamedPullRequestQuery("Approved by me", "approved by me"));- namedQueries.add(new NamedPullRequestQuery("Submitted by me", "submitted by me"));- namedQueries.add(new NamedPullRequestQuery("Submitted recently", "\"Submit Date\" is since \"last week\""));- namedQueries.add(new NamedPullRequestQuery("Updated recently", "\"Update Date\" is since \"last week\""));- namedQueries.add(new NamedPullRequestQuery("Closed", "merged or discarded"));- namedQueries.add(new NamedPullRequestQuery("All", null));- }-- public List<NamedPullRequestQuery> getNamedQueries() {- return namedQueries;- }-- public void setNamedQueries(List<NamedPullRequestQuery> namedQueries) {- this.namedQueries = namedQueries;- }-- @Nullable- public NamedPullRequestQuery getNamedQuery(String name) {- for (NamedPullRequestQuery namedQuery: getNamedQueries()) {- if (namedQuery.getName().equals(name))- return namedQuery;- }- return null;- }--}+package io.onedev.server.model.support.administration;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import javax.annotation.Nullable;++import io.onedev.server.model.support.issue.NamedIssueQuery;+import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;++public class GlobalPullRequestSetting implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<NamedPullRequestQuery> namedQueries = new ArrayList<>();++ public GlobalPullRequestSetting() {+ namedQueries.add(new NamedPullRequestQuery("Open", "open"));+ namedQueries.add(new NamedPullRequestQuery("To be reviewed by me", "open and to be reviewed by me"));+ namedQueries.add(new NamedPullRequestQuery("To be changed by me", "open and submitted by me and someone requested for changes"));+ namedQueries.add(new NamedPullRequestQuery("Requested for changes by me", "requested for changes by me"));+ namedQueries.add(new NamedPullRequestQuery("Approved by me", "approved by me"));+ namedQueries.add(new NamedPullRequestQuery("Submitted by me", "submitted by me"));+ namedQueries.add(new NamedPullRequestQuery("Submitted recently", "\"Submit Date\" is since \"last week\""));+ namedQueries.add(new NamedPullRequestQuery("Mentioned me", "mentioned me"));+ namedQueries.add(new NamedPullRequestQuery("Updated recently", "\"Update Date\" is since \"last week\""));+ namedQueries.add(new NamedPullRequestQuery("Closed", "merged or discarded"));+ namedQueries.add(new NamedPullRequestQuery("All", null));+ }++ public List<NamedPullRequestQuery> getNamedQueries() {+ return namedQueries;+ }++ public void setNamedQueries(List<NamedPullRequestQuery> namedQueries) {+ this.namedQueries = namedQueries;+ }++ @Nullable+ public NamedPullRequestQuery getNamedQuery(String name) {+ for (NamedPullRequestQuery namedQuery: getNamedQueries()) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }++}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 300acff5a7..1ef229c9be 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@@ -10,6 +10,7 @@ import javax.inject.Singleton;import com.google.common.collect.Lists;+import io.onedev.server.entitymanager.CodeCommentMentionManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.Listen;@@ -26,23 +27,27 @@ import io.onedev.server.util.commenttext.MarkdownText;@Singletonpublic class CodeCommentNotificationManager extends AbstractNotificationManager {-+private final MailManager mailManager;-+private final UserManager userManager;-+private final TransactionManager transactionManager;++ private final CodeCommentMentionManager mentionManager;@Inject- public CodeCommentNotificationManager(MailManager mailManager, MarkdownManager markdownManager,- UserManager userManager, SettingManager settingManager,- TransactionManager transactionManager) {+ public CodeCommentNotificationManager(MailManager mailManager, MarkdownManager markdownManager,+ UserManager userManager, SettingManager settingManager,+ TransactionManager transactionManager,+ CodeCommentMentionManager mentionManager) {super(markdownManager, settingManager);this.mailManager = mailManager;this.userManager = userManager;this.transactionManager = transactionManager;+ this.mentionManager = mentionManager;}-+@Transactional@Listenpublic void on(CodeCommentEvent event) {@@ -53,49 +58,51 @@ public class CodeCommentNotificationManager extends AbstractNotificationManagerCodeComment comment = event.getComment();if (comment.getCompareContext().getPullRequest() == null) {MarkdownText markdown = (MarkdownText) event.getCommentText();-- Collection<User> notifyUsers = new HashSet<>();-++ Collection<User> notifyUsers = new HashSet<>();+notifyUsers.add(comment.getUser());- notifyUsers.addAll(comment.getReplies().stream().map(it->it.getUser()).collect(Collectors.toSet()));- notifyUsers.addAll(comment.getChanges().stream().map(it->it.getUser()).collect(Collectors.toSet()));+ notifyUsers.addAll(comment.getReplies().stream().map(it -> it.getUser()).collect(Collectors.toSet()));+ notifyUsers.addAll(comment.getChanges().stream().map(it -> it.getUser()).collect(Collectors.toSet()));if (markdown != null) {- for (String userName: new MentionParser().parseMentions(markdown.getRendered())) {+ for (String userName : new MentionParser().parseMentions(markdown.getRendered())) {User user = userManager.findByName(userName);- if (user != null)+ if (user != null) {+ mentionManager.mention(comment, user);notifyUsers.add(user);+ }}}-+Set<String> emailAddresses = notifyUsers.stream()- .filter(it-> it.isOrdinary()- && !it.equals(event.getUser())- && it.getPrimaryEmailAddress() != null+ .filter(it -> it.isOrdinary()+ && !it.equals(event.getUser())+ && it.getPrimaryEmailAddress() != null&& it.getPrimaryEmailAddress().isVerified())- .map(it->it.getPrimaryEmailAddress().getValue())+ .map(it -> it.getPrimaryEmailAddress().getValue()).collect(Collectors.toSet());if (!emailAddresses.isEmpty() && !(event instanceof CodeCommentUpdated)) {String url = event.getUrl();- String subject = String.format("[Code Comment] %s:%s",+ String subject = String.format("[Code Comment] %s:%s",event.getProject().getPath(), comment.getMark().getPath());-- String summary = String.format("%s %s code comment",++ String summary = String.format("%s %s code comment",event.getUser().getDisplayName(), event.getActivity());-- String threadingReferences = "<" + comment.getProject().getPath()++ String threadingReferences = "<" + comment.getProject().getPath()+ "-codecomment-" + comment.getId() + "@onedev>";- mailManager.sendMailAsync(emailAddresses, Lists.newArrayList(),- Lists.newArrayList(), subject,- getHtmlBody(event, summary, markdown!=null?markdown.getProcessed():null, url, false, null),- getTextBody(event, summary, markdown!=null?markdown.getContent():null, url, false, null),+ mailManager.sendMailAsync(emailAddresses, Lists.newArrayList(),+ Lists.newArrayList(), subject,+ getHtmlBody(event, summary, markdown != null ? markdown.getProcessed() : null, url, false, null),+ getTextBody(event, summary, markdown != null ? markdown.getContent() : null, url, false, null),null, threadingReferences);}- }+ }}-+});}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 e2684dbee5..007d5bdc02 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@@ -10,15 +10,12 @@ import java.util.stream.Collectors;import javax.inject.Inject;import javax.inject.Singleton;+import io.onedev.server.entitymanager.*;import org.apache.commons.lang3.StringUtils;import com.google.common.collect.Lists;import com.google.common.collect.Sets;-import io.onedev.server.entitymanager.IssueAuthorizationManager;-import io.onedev.server.entitymanager.IssueWatchManager;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.entitymanager.UserManager;import io.onedev.server.entityreference.ReferencedFromAware;import io.onedev.server.event.Listen;import io.onedev.server.event.project.issue.IssueChanged;@@ -57,16 +54,22 @@ public class IssueNotificationManager extends AbstractNotificationManager {private final VisitInfoManager userInfoManager;+ private final IssueMentionManager mentionManager;+@Inject- public IssueNotificationManager(MarkdownManager markdownManager, MailManager mailManager,- IssueWatchManager watchManager, VisitInfoManager userInfoManager, UserManager userManager,- SettingManager settingManager, IssueAuthorizationManager authorizationManager) {+ public IssueNotificationManager(MarkdownManager markdownManager, MailManager mailManager,+ IssueWatchManager watchManager, VisitInfoManager userInfoManager,+ UserManager userManager, SettingManager settingManager,+ IssueAuthorizationManager authorizationManager,+ IssueMentionManager mentionManager) {super(markdownManager, settingManager);+this.mailManager = mailManager;this.watchManager = watchManager;this.userInfoManager = userInfoManager;this.userManager = userManager;this.authorizationManager = authorizationManager;+ this.mentionManager = mentionManager;}@Transactional@@ -209,6 +212,7 @@ public class IssueNotificationManager extends AbstractNotificationManager {for (String userName: new MentionParser().parseMentions(markdown.getRendered())) {User mentionedUser = userManager.findByName(userName);if (mentionedUser != null) {+ mentionManager.mention(issue, mentionedUser);watchManager.watch(issue, mentionedUser, true);authorizationManager.authorize(issue, mentionedUser);if (!isNotified(notifiedEmailAddresses, mentionedUser)) {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 afa64f2615..b6f6f55f82 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@@ -11,6 +11,7 @@ import java.util.stream.Collectors;import javax.inject.Inject;import javax.inject.Singleton;+import io.onedev.server.entitymanager.PullRequestMentionManager;import org.apache.commons.lang3.StringUtils;import org.apache.commons.text.WordUtils;import org.apache.shiro.authz.Permission;@@ -63,26 +64,31 @@ import io.onedev.server.util.commenttext.MarkdownText;@Singletonpublic class PullRequestNotificationManager extends AbstractNotificationManager {-+private final MailManager mailManager;-- private final PullRequestWatchManager pullRequestWatchManager;-++ private final PullRequestWatchManager watchManager;+private final VisitInfoManager userInfoManager;-+private final UserManager userManager;-++ private final PullRequestMentionManager mentionManager;+@Inject- public PullRequestNotificationManager(MailManager mailManager, MarkdownManager markdownManager,- PullRequestWatchManager pullRequestWatchManager, VisitInfoManager userInfoManager,- UserManager userManager, SettingManager settingManager) {+ public PullRequestNotificationManager(MailManager mailManager, MarkdownManager markdownManager,+ PullRequestWatchManager watchManager,+ VisitInfoManager userInfoManager,+ UserManager userManager, SettingManager settingManager,+ PullRequestMentionManager mentionManager) {super(markdownManager, settingManager);this.mailManager = mailManager;- this.pullRequestWatchManager = pullRequestWatchManager;+ this.watchManager = watchManager;this.userInfoManager = userInfoManager;this.userManager = userManager;+ this.mentionManager = mentionManager;}-+@Transactional@Listenpublic void on(PullRequestEvent event) {@@ -90,8 +96,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManagerUser user = event.getUser();String url = event.getUrl();-- for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {++ for (Map.Entry<User, Boolean> entry : new QueryWatchBuilder<PullRequest>() {@Overrideprotected PullRequest getEntity() {@@ -112,12 +118,12 @@ public class PullRequestNotificationManager extends AbstractNotificationManagerprotected Collection<? extends NamedQuery> getNamedQueries() {return request.getTargetProject().getNamedPullRequestQueries();}-+}.getWatches().entrySet()) {- pullRequestWatchManager.watch(request, entry.getKey(), entry.getValue());+ watchManager.watch(request, entry.getKey(), entry.getValue());}-- for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {++ for (Map.Entry<User, Boolean> entry : new QueryWatchBuilder<PullRequest>() {@Overrideprotected PullRequest getEntity() {@@ -126,7 +132,7 @@ public class PullRequestNotificationManager extends AbstractNotificationManager@Overrideprotected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {- return userManager.query().stream().map(it->it.getPullRequestQueryPersonalization()).collect(Collectors.toList());+ return userManager.query().stream().map(it -> it.getPullRequestQueryPersonalization()).collect(Collectors.toList());}@Override@@ -138,18 +144,18 @@ public class PullRequestNotificationManager extends AbstractNotificationManagerprotected Collection<? extends NamedQuery> getNamedQueries() {return settingManager.getPullRequestSetting().getNamedQueries();}-+}.getWatches().entrySet()) {- pullRequestWatchManager.watch(request, entry.getKey(), entry.getValue());+ watchManager.watch(request, entry.getKey(), entry.getValue());}-+Collection<User> notifiedUsers = Sets.newHashSet();if (user != null) {notifiedUsers.add(user); // no need to notify the user generating the eventif (!user.isSystem())- pullRequestWatchManager.watch(request, user, true);+ watchManager.watch(request, user, true);}-+User committer = null;if (event instanceof PullRequestUpdated) {PullRequestUpdated pullRequestUpdated = (PullRequestUpdated) event;@@ -158,49 +164,49 @@ public class PullRequestNotificationManager extends AbstractNotificationManagercommitter = committers.iterator().next();notifiedUsers.add(committer);}- for (User each: committers) {+ for (User each : committers) {if (!each.isSystem())- pullRequestWatchManager.watch(request, each, true);+ watchManager.watch(request, each, true);}}-- String summary;++ String summary;if (user != null)summary = user.getDisplayName() + " " + event.getActivity();else if (committer != null)summary = committer.getDisplayName() + " " + event.getActivity();elsesummary = StringUtils.capitalize(event.getActivity());-+String replyAddress = mailManager.getReplyAddress(request);boolean replyable = replyAddress != null;-+Set<User> reviewers = new HashSet<>();Set<User> assignees = new HashSet<>();if (event instanceof PullRequestOpened) {- for (PullRequestReview review: request.getReviews()) {+ for (PullRequestReview review : request.getReviews()) {if (review.getStatus() == Status.PENDING)reviewers.add(review.getUser());}- for (PullRequestAssignment assignment: request.getAssignments())+ for (PullRequestAssignment assignment : request.getAssignments())assignees.add(assignment.getUser());} else if (event instanceof PullRequestChanged) {PullRequestChanged changeEvent = (PullRequestChanged) event;PullRequestChangeData changeData = changeEvent.getChange().getData();if ((changeData instanceof PullRequestApproveData- || changeData instanceof PullRequestRequestedForChangesData- || changeData instanceof PullRequestDiscardData)+ || changeData instanceof PullRequestRequestedForChangesData+ || changeData instanceof PullRequestDiscardData)&& request.getSubmitter() != null && !notifiedUsers.contains(request.getSubmitter())) {- String subject = String.format("[Pull Request %s] (%s) %s", request.getFQN(),+ String subject = String.format("[Pull Request %s] (%s) %s", request.getFQN(),WordUtils.capitalize(changeData.getActivity()), request.getTitle());- String threadingReferences = String.format("<%s-%s@onedev>",+ String threadingReferences = String.format("<%s-%s@onedev>",changeData.getActivity().replace(' ', '-'), request.getUUID());EmailAddress emailAddress = request.getSubmitter().getPrimaryEmailAddress();if (emailAddress != null && emailAddress.isVerified()) {- mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),- Lists.newArrayList(), Lists.newArrayList(), subject,- getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),- getTextBody(event, summary, event.getTextBody(), url, replyable, null),+ mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),+ Lists.newArrayList(), Lists.newArrayList(), subject,+ getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),+ getTextBody(event, summary, event.getTextBody(), url, replyable, null),replyAddress, threadingReferences);}notifiedUsers.add(request.getSubmitter());@@ -211,10 +217,10 @@ public class PullRequestNotificationManager extends AbstractNotificationManagerreviewers.add(((PullRequestReviewRequested) event).getReviewer());}- for (User assignee: assignees) {- pullRequestWatchManager.watch(request, assignee, true);+ for (User assignee : assignees) {+ watchManager.watch(request, assignee, true);if (!notifiedUsers.contains(assignee)) {- String subject = String.format("[Pull Request %s] (Assigned) %s",+ String subject = String.format("[Pull Request %s] (Assigned) %s",request.getFQN(), request.getTitle());String threadingReferences = String.format("<assigned-%s@onedev>", request.getUUID());String assignmentSummary;@@ -224,20 +230,20 @@ public class PullRequestNotificationManager extends AbstractNotificationManagerassignmentSummary = "Assigned to you";EmailAddress emailAddress = assignee.getPrimaryEmailAddress();if (emailAddress != null && emailAddress.isVerified()) {- mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),- Lists.newArrayList(), Lists.newArrayList(), subject,- getHtmlBody(event, assignmentSummary, event.getHtmlBody(), url, replyable, null),- getTextBody(event, assignmentSummary, event.getTextBody(), url, replyable, null),+ mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),+ Lists.newArrayList(), Lists.newArrayList(), subject,+ getHtmlBody(event, assignmentSummary, event.getHtmlBody(), url, replyable, null),+ getTextBody(event, assignmentSummary, event.getTextBody(), url, replyable, null),replyAddress, threadingReferences);- }+ }notifiedUsers.add(assignee);}}- for (User reviewer: reviewers) {- pullRequestWatchManager.watch(request, reviewer, true);+ for (User reviewer : reviewers) {+ watchManager.watch(request, reviewer, true);if (!notifiedUsers.contains(reviewer)) {- String subject = String.format("[Pull Request %s] (Review Request) %s",+ String subject = String.format("[Pull Request %s] (Review Request) %s",request.getFQN(), request.getTitle());String threadingReferences = String.format("<review-invitation-%s@onedev>", request.getUUID());String reviewInvitationSummary;@@ -245,60 +251,61 @@ public class PullRequestNotificationManager extends AbstractNotificationManagerreviewInvitationSummary = user.getDisplayName() + " requested review from you";elsereviewInvitationSummary = "Requested review from you";-+EmailAddress emailAddress = reviewer.getPrimaryEmailAddress();if (emailAddress != null && emailAddress.isVerified()) {- mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),- Lists.newArrayList(), Lists.newArrayList(), subject,- getHtmlBody(event, reviewInvitationSummary, event.getHtmlBody(), url, replyable, null),- getTextBody(event, reviewInvitationSummary, event.getTextBody(), url, replyable, null),+ mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),+ Lists.newArrayList(), Lists.newArrayList(), subject,+ getHtmlBody(event, reviewInvitationSummary, event.getHtmlBody(), url, replyable, null),+ getTextBody(event, reviewInvitationSummary, event.getTextBody(), url, replyable, null),replyAddress, threadingReferences);}notifiedUsers.add(reviewer);}}-+Collection<String> notifiedEmailAddresses;if (event instanceof PullRequestCommented)notifiedEmailAddresses = ((PullRequestCommented) event).getNotifiedEmailAddresses();elsenotifiedEmailAddresses = new ArrayList<>();-+if (event.getCommentText() instanceof MarkdownText) {MarkdownText markdown = (MarkdownText) event.getCommentText();- for (String userName: new MentionParser().parseMentions(markdown.getRendered())) {+ for (String userName : new MentionParser().parseMentions(markdown.getRendered())) {User mentionedUser = userManager.findByName(userName);- if (mentionedUser != null) {- pullRequestWatchManager.watch(request, mentionedUser, true);+ if (mentionedUser != null) {+ mentionManager.mention(request, mentionedUser);+ watchManager.watch(request, mentionedUser, true);if (!isNotified(notifiedEmailAddresses, mentionedUser)) {String subject = String.format("[Pull Request %s] (Mentioned You) %s", request.getFQN(), request.getTitle());String threadingReferences = String.format("<mentioned-%s@onedev>", request.getUUID());-+EmailAddress emailAddress = mentionedUser.getPrimaryEmailAddress();if (emailAddress != null && emailAddress.isVerified()) {- mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),- Sets.newHashSet(), Sets.newHashSet(), subject,- getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),+ mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),+ Sets.newHashSet(), Sets.newHashSet(), subject,+ getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),getTextBody(event, summary, event.getTextBody(), url, replyable, null),replyAddress, threadingReferences);}notifiedUsers.add(mentionedUser);- }+ }}}- }-+ }+boolean notifyWatchers = false;if (event instanceof PullRequestChanged) {PullRequestChangeData changeData = ((PullRequestChanged) event).getChange().getData();- if (changeData instanceof PullRequestApproveData- || changeData instanceof PullRequestRequestedForChangesData- || changeData instanceof PullRequestMergeData+ if (changeData instanceof PullRequestApproveData+ || changeData instanceof PullRequestRequestedForChangesData+ || changeData instanceof PullRequestMergeData|| changeData instanceof PullRequestDiscardData|| changeData instanceof PullRequestReopenData) {notifyWatchers = true;}- } else if (!(event instanceof PullRequestMergePreviewCalculated+ } else if (!(event instanceof PullRequestMergePreviewCalculated|| event instanceof PullRequestBuildEvent|| event instanceof PullRequestCheckFailed|| event instanceof PullRequestReviewRequested@@ -307,15 +314,15 @@ public class PullRequestNotificationManager extends AbstractNotificationManager|| event instanceof PullRequestUnassigned)) {notifyWatchers = true;}-+if (notifyWatchers) {Collection<String> bccEmailAddresses = new HashSet<>();-- for (PullRequestWatch watch: request.getWatches()) {++ for (PullRequestWatch watch : request.getWatches()) {Date visitDate = userInfoManager.getPullRequestVisitDate(watch.getUser(), request);Permission permission = new ProjectPermission(request.getProject(), new ReadCode());- if (watch.isWatching()- && (visitDate == null || visitDate.before(event.getDate()))+ if (watch.isWatching()+ && (visitDate == null || visitDate.before(event.getDate()))&& (!(event instanceof PullRequestUpdated) || !watch.getUser().equals(request.getSubmitter()))&& !notifiedUsers.contains(watch.getUser())&& !isNotified(notifiedEmailAddresses, watch.getUser())@@ -327,18 +334,18 @@ public class PullRequestNotificationManager extends AbstractNotificationManager}if (!bccEmailAddresses.isEmpty()) {- String subject = String.format("[Pull Request %s] (%s) %s",- request.getFQN(), (event instanceof PullRequestOpened)?"Opened":"Updated", request.getTitle());+ String subject = String.format("[Pull Request %s] (%s) %s",+ request.getFQN(), (event instanceof PullRequestOpened) ? "Opened" : "Updated", request.getTitle());String threadingReferences = "<" + request.getUUID() + "@onedev>";Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(request));String htmlBody = getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, unsubscribable);String textBody = getTextBody(event, summary, event.getTextBody(), url, replyable, unsubscribable);mailManager.sendMailAsync(Lists.newArrayList(), Lists.newArrayList(),- bccEmailAddresses, subject, htmlBody, textBody,+ bccEmailAddresses, subject, htmlBody, textBody,replyAddress, threadingReferences);}- }+ }}-+}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4index 6563873e1d..ee25320fb7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4@@ -7,8 +7,8 @@ query;criteria- : operator=(CreatedByMe|Resolved|Unresolved) #OperatorCriteria- | operator=(CreatedBy|OnCommit) WS+ criteriaValue=Quoted #OperatorValueCriteria+ : operator=(CreatedByMe|MentionedMe|Resolved|Unresolved) #OperatorCriteria+ | operator=(CreatedBy|Mentioned|OnCommit) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsUntil|IsSince|IsGreaterThan|IsLessThan|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria@@ -23,6 +23,10 @@ orderCreatedByMe: 'created' WS+ 'by' WS+ 'me';++MentionedMe+ : 'mentioned' WS+ 'me'+ ;Resolved: 'resolved'@@ -35,6 +39,10 @@ UnresolvedCreatedBy: 'created' WS+ 'by';++Mentioned+ : 'mentioned'+ ;OnCommit: 'on' WS+ 'commit'diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.javaindex 5171f86feb..e022708ce2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java@@ -51,9 +51,9 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {private static final long serialVersionUID = 1L;private final Criteria<CodeComment> criteria;-+private final List<EntitySort> sorts;-+public CodeCommentQuery(@Nullable Criteria<CodeComment> criteria, List<EntitySort> sorts) {this.criteria = criteria;this.sorts = sorts;@@ -62,25 +62,25 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {public CodeCommentQuery(@Nullable Criteria<CodeComment> criteria) {this(criteria, new ArrayList<>());}-+public CodeCommentQuery() {this(null);}-- public static CodeCommentQuery parse(Project project, @Nullable String queryString,- boolean withCurrentUserCriteria) {++ public static CodeCommentQuery parse(Project project, @Nullable String queryString,+ boolean withCurrentUserCriteria) {if (queryString != null) {- CharStream is = CharStreams.fromString(queryString);+ CharStream is = CharStreams.fromString(queryString);CodeCommentQueryLexer lexer = new CodeCommentQueryLexer(is);lexer.removeErrorListeners();lexer.addErrorListener(new BaseErrorListener() {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,- int charPositionInLine, String msg, RecognitionException e) {+ int charPositionInLine, String msg, RecognitionException e) {throw new RuntimeException("Malformed code comment query", e);}-+});CommonTokenStream tokens = new CommonTokenStream(lexer);CodeCommentQueryParser parser = new CodeCommentQueryParser(tokens);@@ -95,29 +95,35 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {@Overridepublic Criteria<CodeComment> visitOperatorCriteria(OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {- case CodeCommentQueryLexer.Resolved:- return new ResolvedCriteria();- case CodeCommentQueryLexer.Unresolved:- return new UnresolvedCriteria();- default:- if (!withCurrentUserCriteria)- throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");- return new CreatedByMeCriteria();+ case CodeCommentQueryLexer.Resolved:+ return new ResolvedCriteria();+ case CodeCommentQueryLexer.Unresolved:+ return new UnresolvedCriteria();+ case CodeCommentQueryLexer.MentionedMe:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new MentionedMeCriteria();+ default:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new CreatedByMeCriteria();}}-+@Overridepublic Criteria<CodeComment> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {int operator = ctx.operator.getType();String value = getValue(ctx.Quoted().getText());- if (operator == CodeCommentQueryLexer.CreatedBy) {+ if (operator == CodeCommentQueryLexer.Mentioned) {+ return new MentionedCriteria(getUser(value));+ } else if (operator == CodeCommentQueryLexer.CreatedBy) {return new CreatedByCriteria(getUser(value));} else {- ProjectScopedCommit commitId = getCommitId(project, value);+ ProjectScopedCommit commitId = getCommitId(project, value);return new OnCommitCriteria(commitId.getProject(), commitId.getCommitId());}}-+@Overridepublic Criteria<CodeComment> visitParensCriteria(ParensCriteriaContext ctx) {return (Criteria<CodeComment>) visit(ctx.criteria()).withParens(true);@@ -129,49 +135,49 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {String value = getValue(ctx.Quoted(1).getText());int operator = ctx.operator.getType();checkField(project, fieldName, operator);-+switch (operator) {- case CodeCommentQueryLexer.IsUntil:- case CodeCommentQueryLexer.IsSince:- Date dateValue = getDateValue(value);- switch (fieldName) {- case NAME_CREATE_DATE:- return new CreateDateCriteria(dateValue, value, operator);- case NAME_UPDATE_DATE:- return new UpdateDateCriteria(dateValue, value, operator);- default:- throw new IllegalStateException();- }- case CodeCommentQueryLexer.IsLessThan:- case CodeCommentQueryLexer.IsGreaterThan:- return new ReplyCountCriteria(getIntValue(value), operator);- case CodeCommentQueryLexer.Contains:- switch (fieldName) {- case NAME_CONTENT:- return new ContentCriteria(value);- case NAME_REPLY:- return new ReplyCriteria(value);- default:- throw new IllegalStateException();- }- case CodeCommentQueryLexer.Is:- switch (fieldName) {- case NAME_PATH:- return new PathCriteria(value);- case NAME_REPLY_COUNT:+ case CodeCommentQueryLexer.IsUntil:+ case CodeCommentQueryLexer.IsSince:+ Date dateValue = getDateValue(value);+ switch (fieldName) {+ case NAME_CREATE_DATE:+ return new CreateDateCriteria(dateValue, value, operator);+ case NAME_UPDATE_DATE:+ return new UpdateDateCriteria(dateValue, value, operator);+ default:+ throw new IllegalStateException();+ }+ case CodeCommentQueryLexer.IsLessThan:+ case CodeCommentQueryLexer.IsGreaterThan:return new ReplyCountCriteria(getIntValue(value), operator);- default:+ case CodeCommentQueryLexer.Contains:+ switch (fieldName) {+ case NAME_CONTENT:+ return new ContentCriteria(value);+ case NAME_REPLY:+ return new ReplyCriteria(value);+ default:+ throw new IllegalStateException();+ }+ case CodeCommentQueryLexer.Is:+ switch (fieldName) {+ case NAME_PATH:+ return new PathCriteria(value);+ case NAME_REPLY_COUNT:+ return new ReplyCountCriteria(getIntValue(value), operator);+ default:+ throw new IllegalStateException();+ }+ default:throw new IllegalStateException();- }- default:- throw new IllegalStateException();}}-+@Overridepublic Criteria<CodeComment> visitOrCriteria(OrCriteriaContext ctx) {List<Criteria<CodeComment>> childCriterias = new ArrayList<>();- for (CriteriaContext childCtx: ctx.criteria())+ for (CriteriaContext childCtx : ctx.criteria())childCriterias.add(visit(childCtx));return new OrCriteria<CodeComment>(childCriterias);}@@ -179,7 +185,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {@Overridepublic Criteria<CodeComment> visitAndCriteria(AndCriteriaContext ctx) {List<Criteria<CodeComment>> childCriterias = new ArrayList<>();- for (CriteriaContext childCtx: ctx.criteria())+ for (CriteriaContext childCtx : ctx.criteria())childCriterias.add(visit(childCtx));return new AndCriteria<CodeComment>(childCriterias);}@@ -195,11 +201,11 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {}List<EntitySort> commentSorts = new ArrayList<>();- for (OrderContext order: queryContext.order()) {+ for (OrderContext order : queryContext.order()) {String fieldName = getValue(order.Quoted().getText());- if (!ORDER_FIELDS.containsKey(fieldName))+ if (!ORDER_FIELDS.containsKey(fieldName))throw new ExplicitException("Can not order by field: " + fieldName);-+EntitySort commentSort = new EntitySort();commentSort.setField(fieldName);if (order.direction != null && order.direction.getText().equals("desc"))@@ -208,50 +214,50 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {commentSort.setDirection(Direction.ASCENDING);commentSorts.add(commentSort);}-+return new CodeCommentQuery(commentCriteria, commentSorts);} else {return new CodeCommentQuery();}}-+public static void checkField(Project project, String fieldName, int operator) {if (!QUERY_FIELDS.contains(fieldName))throw new ExplicitException("Field not found: " + fieldName);switch (operator) {- case CodeCommentQueryLexer.IsUntil:- case CodeCommentQueryLexer.IsSince:- if (!fieldName.equals(NAME_CREATE_DATE) && !fieldName.equals(NAME_UPDATE_DATE))- throw newOperatorException(fieldName, operator);- break;- case CodeCommentQueryLexer.IsGreaterThan:- case CodeCommentQueryLexer.IsLessThan:- if (!fieldName.equals(NAME_REPLY_COUNT))- throw newOperatorException(fieldName, operator);- break;- case CodeCommentQueryLexer.Contains:- if (!fieldName.equals(NAME_CONTENT) && !fieldName.equals(NAME_REPLY))- throw newOperatorException(fieldName, operator);- break;- case CodeCommentQueryLexer.Is:- if (!fieldName.equals(NAME_REPLY_COUNT) && !fieldName.equals(NAME_PATH))- throw newOperatorException(fieldName, operator);- break;+ case CodeCommentQueryLexer.IsUntil:+ case CodeCommentQueryLexer.IsSince:+ if (!fieldName.equals(NAME_CREATE_DATE) && !fieldName.equals(NAME_UPDATE_DATE))+ throw newOperatorException(fieldName, operator);+ break;+ case CodeCommentQueryLexer.IsGreaterThan:+ case CodeCommentQueryLexer.IsLessThan:+ if (!fieldName.equals(NAME_REPLY_COUNT))+ throw newOperatorException(fieldName, operator);+ break;+ case CodeCommentQueryLexer.Contains:+ if (!fieldName.equals(NAME_CONTENT) && !fieldName.equals(NAME_REPLY))+ throw newOperatorException(fieldName, operator);+ break;+ case CodeCommentQueryLexer.Is:+ if (!fieldName.equals(NAME_REPLY_COUNT) && !fieldName.equals(NAME_PATH))+ throw newOperatorException(fieldName, operator);+ break;}}-+private static ExplicitException newOperatorException(String fieldName, int operator) {return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");}-+public static String getRuleName(int rule) {return AntlrUtils.getLexerRuleName(CodeCommentQueryLexer.ruleNames, rule);}-+public static int getOperator(String operatorName) {return AntlrUtils.getLexerRule(CodeCommentQueryLexer.ruleNames, operatorName);}-+@Overridepublic Criteria<CodeComment> getCriteria() {return criteria;@@ -261,5 +267,5 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {public List<EntitySort> getSorts() {return sorts;}-+}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedCriteria.javanew file mode 100644index 0000000000..a5aad158f1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedCriteria.java@@ -0,0 +1,41 @@+package io.onedev.server.search.entity.codecomment;++import io.onedev.server.model.CodeComment;+import io.onedev.server.model.CodeCommentMention;+import io.onedev.server.model.User;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.*;++public class MentionedCriteria extends Criteria<CodeComment> {++ private static final long serialVersionUID = 1L;++ private final User user;++ public MentionedCriteria(User user) {+ this.user = user;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {+ Subquery<CodeCommentMention> mentionQuery = query.subquery(CodeCommentMention.class);+ Root<CodeCommentMention> mention = mentionQuery.from(CodeCommentMention.class);+ mentionQuery.select(mention);+ mentionQuery.where(builder.and(+ builder.equal(mention.get(CodeCommentMention.PROP_COMMENT), from),+ builder.equal(mention.get(CodeCommentMention.PROP_USER), user)));+ return builder.exists(mentionQuery);+ }++ @Override+ public boolean matches(CodeComment comment) {+ return comment.getMentions().stream().anyMatch(it->it.getUser().equals(user));+ }++ @Override+ public String toStringWithoutParens() {+ return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Mentioned) + " " + quote(user.getName());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.javanew file mode 100644index 0000000000..74fbd99011--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedMeCriteria.java@@ -0,0 +1,43 @@+package io.onedev.server.search.entity.codecomment;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.model.CodeComment;+import io.onedev.server.model.CodeCommentMention;+import io.onedev.server.model.User;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.*;++public class MentionedMeCriteria extends Criteria<CodeComment> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {+ if (User.get() != null) {+ Subquery<CodeCommentMention> mentionQuery = query.subquery(CodeCommentMention.class);+ Root<CodeCommentMention> mention = mentionQuery.from(CodeCommentMention.class);+ mentionQuery.select(mention);+ mentionQuery.where(builder.and(+ builder.equal(mention.get(CodeCommentMention.PROP_COMMENT), from),+ builder.equal(mention.get(CodeCommentMention.PROP_USER), User.get())));+ return builder.exists(mentionQuery);+ } else {+ throw new ExplicitException("Please login to perform this query");+ }+ }++ @Override+ public boolean matches(CodeComment comment) {+ if (User.get() != null)+ return comment.getMentions().stream().anyMatch(it->it.getUser().equals(User.get()));+ else+ throw new ExplicitException("Please login to perform this query");+ }++ @Override+ public String toStringWithoutParens() {+ return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.MentionedMe);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4index 920380bb17..3ea9d1d9a4 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4@@ -7,8 +7,8 @@ query;criteria- : operator=(Confidential|SubmittedByMe|FixedInCurrentCommit|FixedInCurrentBuild|FixedInCurrentPullRequest|CurrentIssue) #OperatorCriteria- | operator=(SubmittedBy|FixedInCommit|FixedInBuild|FixedInPullRequest|HasAny) WS+ criteriaValue=Quoted #OperatorValueCriteria+ : operator=(Confidential|SubmittedByMe|MentionedMe|FixedInCurrentCommit|FixedInCurrentBuild|FixedInCurrentPullRequest|CurrentIssue) #OperatorCriteria+ | operator=(SubmittedBy|Mentioned|FixedInCommit|FixedInBuild|FixedInPullRequest|HasAny) WS+ criteriaValue=Quoted #OperatorValueCriteria| FixedBetween WS+ revisionCriteria WS+ And WS+ revisionCriteria #FixedBetweenCriteria| criteriaField=Quoted WS+ operator=(IsMe|IsEmpty|IsCurrent|IsPrevious) #FieldOperatorCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsUntil|IsSince|IsAfter|IsBefore|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria@@ -95,6 +95,14 @@ Contains: 'contains';+Mentioned+ : 'mentioned'+ ;++MentionedMe+ : 'mentioned' WS+ 'me'+ ;+IsGreaterThan: 'is' WS+ 'greater' WS+ 'than';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex e94d19a8c7..bdc84ea9cb 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -75,9 +75,9 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>private static final long serialVersionUID = 1L;private final Criteria<Issue> criteria;-+private final List<EntitySort> sorts;-+public IssueQuery(@Nullable Criteria<Issue> criteria, List<EntitySort> sorts) {this.criteria = criteria;this.sorts = sorts;@@ -86,11 +86,11 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>public IssueQuery(@Nullable Criteria<Issue> criteria) {this(criteria, new ArrayList<>());}-+public IssueQuery() {this(null);}-+@Nullablepublic Criteria<Issue> getCriteria() {return criteria;@@ -100,26 +100,26 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>return sorts;}- public static IssueQuery parse(@Nullable Project project, @Nullable String queryString,- IssueQueryParseOption option, boolean validate) {+ public static IssueQuery parse(@Nullable Project project, @Nullable String queryString,+ IssueQueryParseOption option, boolean validate) {if (queryString != null) {- CharStream is = CharStreams.fromString(queryString);+ CharStream is = CharStreams.fromString(queryString);IssueQueryLexer lexer = new IssueQueryLexer(is);lexer.removeErrorListeners();lexer.addErrorListener(new BaseErrorListener() {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,- int charPositionInLine, String msg, RecognitionException e) {+ int charPositionInLine, String msg, RecognitionException e) {throw new RuntimeException("Malformed issue query", e);}-+});CommonTokenStream tokens = new CommonTokenStream(lexer);IssueQueryParser parser = new IssueQueryParser(tokens);parser.removeErrorListeners();parser.setErrorHandler(new BailErrorStrategy());-+QueryContext queryContext = parser.query();CriteriaContext criteriaContext = queryContext.criteria();Criteria<Issue> issueCriteria;@@ -130,42 +130,46 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>List<String> choices = new ArrayList<>(field.getChoiceProvider().getChoices(true).keySet());return choices.indexOf(value);}-+@Overridepublic Criteria<Issue> visitOperatorCriteria(OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {- case IssueQueryLexer.Confidential:- return new ConfidentialCriteria();- case IssueQueryLexer.SubmittedByMe:- if (!option.withCurrentUserCriteria())- throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");- return new SubmittedByMeCriteria();- case IssueQueryLexer.FixedInCurrentBuild:- if (!option.withCurrentBuildCriteria())- throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");- return new FixedInCurrentBuildCriteria();- case IssueQueryLexer.FixedInCurrentPullRequest:- if (!option.withCurrentPullRequestCriteria())- throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");- return new FixedInCurrentPullRequestCriteria();- case IssueQueryLexer.FixedInCurrentCommit:- if (!option.withCurrentCommitCriteria())- throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");- return new FixedInCurrentCommitCriteria();- case IssueQueryLexer.CurrentIssue:- if (!option.withCurrentIssueCriteria())- throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");- return new CurrentIssueCriteria();- default:- throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());+ case IssueQueryLexer.Confidential:+ return new ConfidentialCriteria();+ case IssueQueryLexer.MentionedMe:+ if (!option.withCurrentUserCriteria())+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new MentionedMeCriteria();+ case IssueQueryLexer.SubmittedByMe:+ if (!option.withCurrentUserCriteria())+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new SubmittedByMeCriteria();+ case IssueQueryLexer.FixedInCurrentBuild:+ if (!option.withCurrentBuildCriteria())+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new FixedInCurrentBuildCriteria();+ case IssueQueryLexer.FixedInCurrentPullRequest:+ if (!option.withCurrentPullRequestCriteria())+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new FixedInCurrentPullRequestCriteria();+ case IssueQueryLexer.FixedInCurrentCommit:+ if (!option.withCurrentCommitCriteria())+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new FixedInCurrentCommitCriteria();+ case IssueQueryLexer.CurrentIssue:+ if (!option.withCurrentIssueCriteria())+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new CurrentIssueCriteria();+ default:+ throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());}}-+@Overridepublic Criteria<Issue> visitFieldOperatorCriteria(FieldOperatorCriteriaContext ctx) {String fieldName = getValue(ctx.Quoted().getText());int operator = ctx.operator.getType();- if (validate)+ if (validate)checkField(fieldName, operator, option);if (fieldName.equals(Issue.NAME_PROJECT)) {return new ProjectIsCurrentCriteria();@@ -173,13 +177,13 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>return new MilestoneIsEmptyCriteria();} else {FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);- if (fieldSpec != null)+ if (fieldSpec != null)return new FieldOperatorCriteria(fieldName, operator, fieldSpec.isAllowMultiple());- else+ elsereturn new FieldOperatorCriteria(fieldName, operator, false);}}-+@Overridepublic Criteria<Issue> visitLinkMatchCriteria(LinkMatchCriteriaContext ctx) {String linkName = getValue(ctx.Quoted().getText());@@ -187,36 +191,38 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>Criteria<Issue> criteria = visit(ctx.criteria());return new LinkMatchCriteria(linkName, criteria, allMatch);}-+public Criteria<Issue> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {String value = getValue(ctx.Quoted().getText());- if (ctx.SubmittedBy() != null)+ if (ctx.Mentioned() != null)+ return new MentionedCriteria(getUser(value));+ if (ctx.SubmittedBy() != null)return new SubmittedByCriteria(getUser(value));- else if (ctx.FixedInBuild() != null)+ else if (ctx.FixedInBuild() != null)return new FixedInBuildCriteria(project, value);- else if (ctx.FixedInPullRequest() != null)+ else if (ctx.FixedInPullRequest() != null)return new FixedInPullRequestCriteria(project, value);- else if (ctx.FixedInCommit() != null)+ else if (ctx.FixedInCommit() != null)return new FixedInCommitCriteria(project, value);- else if (ctx.HasAny() != null)+ else if (ctx.HasAny() != null)return new HasLinkCriteria(value);- else+ elsethrow new RuntimeException("Unexpected operator: " + ctx.operator.getText());}-+@Overridepublic Criteria<Issue> visitFixedBetweenCriteria(FixedBetweenCriteriaContext ctx) {RevisionCriteriaContext firstRevision = ctx.revisionCriteria(0);int firstType = firstRevision.revisionType.getType();String firstValue = getValue(firstRevision.Quoted().getText());-+RevisionCriteriaContext secondRevision = ctx.revisionCriteria(1);int secondType = secondRevision.revisionType.getType();String secondValue = getValue(secondRevision.Quoted().getText());-+return new FixedBetweenCriteria(project, firstType, firstValue, secondType, secondValue);}-+@Overridepublic Criteria<Issue> visitParensCriteria(ParensCriteriaContext ctx) {return (Criteria<Issue>) visit(ctx.criteria()).withParens(true);@@ -227,98 +233,98 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>String fieldName = getValue(ctx.Quoted(0).getText());String value = getValue(ctx.Quoted(1).getText());int operator = ctx.operator.getType();- if (validate)+ if (validate)checkField(fieldName, operator, option);-+switch (operator) {- case IssueQueryLexer.IsUntil:- case IssueQueryLexer.IsSince:- if (fieldName.equals(Issue.NAME_SUBMIT_DATE))- return new SubmitDateCriteria(value, operator);- else if (fieldName.equals(Issue.NAME_UPDATE_DATE))- return new UpdateDateCriteria(value, operator);- else- return new DateFieldCriteria(fieldName, value, operator);- case IssueQueryLexer.Contains:- if (fieldName.equals(Issue.NAME_TITLE)) {- return new TitleCriteria(value);- } else if (fieldName.equals(Issue.NAME_DESCRIPTION)) {- return new DescriptionCriteria(value);- } else if (fieldName.equals(Issue.NAME_COMMENT)) {- return new CommentCriteria(value);- } else {- return new StringFieldCriteria(fieldName, value, operator);- }- case IssueQueryLexer.Is:- if (fieldName.equals(Issue.NAME_PROJECT)) {- return new ProjectCriteria(value);- } else if (fieldName.equals(IssueSchedule.NAME_MILESTONE)) {- return new MilestoneCriteria(value);- } else if (fieldName.equals(Issue.NAME_STATE)) {- return new StateCriteria(value, operator);- } else if (fieldName.equals(Issue.NAME_VOTE_COUNT)) {- return new VoteCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.NAME_COMMENT_COUNT)) {- return new CommentCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.NAME_NUMBER)) {- return new NumberCriteria(project, value, operator);- } else {- FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);- if (field instanceof IssueChoiceField) {- return new IssueFieldCriteria(fieldName, project, value);- } else if (field instanceof BuildChoiceField) {- return new BuildFieldCriteria(fieldName, project, value, field.isAllowMultiple());- } else if (field instanceof PullRequestChoiceField) {- return new PullRequestFieldCriteria(fieldName, project, value);- } else if (field instanceof CommitField) {- return new CommitFieldCriteria(fieldName, project, value);- } else if (field instanceof BooleanField) {- return new BooleanFieldCriteria(fieldName, getBooleanValue(value));- } else if (field instanceof IntegerField) {- return new NumericFieldCriteria(fieldName, getIntValue(value), operator);- } else if (field instanceof ChoiceField) {- long ordinal = getValueOrdinal((ChoiceField) field, value);- return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, field.isAllowMultiple());- } else if (field instanceof UserChoiceField- || field instanceof GroupChoiceField) {- return new ChoiceFieldCriteria(fieldName, value, -1, operator, field.isAllowMultiple());+ case IssueQueryLexer.IsUntil:+ case IssueQueryLexer.IsSince:+ if (fieldName.equals(Issue.NAME_SUBMIT_DATE))+ return new SubmitDateCriteria(value, operator);+ else if (fieldName.equals(Issue.NAME_UPDATE_DATE))+ return new UpdateDateCriteria(value, operator);+ else+ return new DateFieldCriteria(fieldName, value, operator);+ case IssueQueryLexer.Contains:+ if (fieldName.equals(Issue.NAME_TITLE)) {+ return new TitleCriteria(value);+ } else if (fieldName.equals(Issue.NAME_DESCRIPTION)) {+ return new DescriptionCriteria(value);+ } else if (fieldName.equals(Issue.NAME_COMMENT)) {+ return new CommentCriteria(value);} else {return new StringFieldCriteria(fieldName, value, operator);}- }- case IssueQueryLexer.IsLessThan:- case IssueQueryLexer.IsGreaterThan:- if (fieldName.equals(Issue.NAME_VOTE_COUNT)) {- return new VoteCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.NAME_COMMENT_COUNT)) {- return new CommentCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.NAME_NUMBER)) {- return new NumberCriteria(project, value, operator);- } else {- FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);- if (field instanceof IntegerField) {- return new NumericFieldCriteria(fieldName, getIntValue(value), operator);+ case IssueQueryLexer.Is:+ if (fieldName.equals(Issue.NAME_PROJECT)) {+ return new ProjectCriteria(value);+ } else if (fieldName.equals(IssueSchedule.NAME_MILESTONE)) {+ return new MilestoneCriteria(value);+ } else if (fieldName.equals(Issue.NAME_STATE)) {+ return new StateCriteria(value, operator);+ } else if (fieldName.equals(Issue.NAME_VOTE_COUNT)) {+ return new VoteCountCriteria(getIntValue(value), operator);+ } else if (fieldName.equals(Issue.NAME_COMMENT_COUNT)) {+ return new CommentCountCriteria(getIntValue(value), operator);+ } else if (fieldName.equals(Issue.NAME_NUMBER)) {+ return new NumberCriteria(project, value, operator);} else {- long ordinal;- if (validate)- ordinal = getValueOrdinal((ChoiceField) field, value);- else- ordinal = 0;- return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, false);+ FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);+ if (field instanceof IssueChoiceField) {+ return new IssueFieldCriteria(fieldName, project, value);+ } else if (field instanceof BuildChoiceField) {+ return new BuildFieldCriteria(fieldName, project, value, field.isAllowMultiple());+ } else if (field instanceof PullRequestChoiceField) {+ return new PullRequestFieldCriteria(fieldName, project, value);+ } else if (field instanceof CommitField) {+ return new CommitFieldCriteria(fieldName, project, value);+ } else if (field instanceof BooleanField) {+ return new BooleanFieldCriteria(fieldName, getBooleanValue(value));+ } else if (field instanceof IntegerField) {+ return new NumericFieldCriteria(fieldName, getIntValue(value), operator);+ } else if (field instanceof ChoiceField) {+ long ordinal = getValueOrdinal((ChoiceField) field, value);+ return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, field.isAllowMultiple());+ } else if (field instanceof UserChoiceField+ || field instanceof GroupChoiceField) {+ return new ChoiceFieldCriteria(fieldName, value, -1, operator, field.isAllowMultiple());+ } else {+ return new StringFieldCriteria(fieldName, value, operator);+ }}- }- case IssueQueryLexer.IsBefore:- case IssueQueryLexer.IsAfter:- return new StateCriteria(value, operator);- default:- throw new ExplicitException("Unexpected operator " + getRuleName(operator));+ case IssueQueryLexer.IsLessThan:+ case IssueQueryLexer.IsGreaterThan:+ if (fieldName.equals(Issue.NAME_VOTE_COUNT)) {+ return new VoteCountCriteria(getIntValue(value), operator);+ } else if (fieldName.equals(Issue.NAME_COMMENT_COUNT)) {+ return new CommentCountCriteria(getIntValue(value), operator);+ } else if (fieldName.equals(Issue.NAME_NUMBER)) {+ return new NumberCriteria(project, value, operator);+ } else {+ FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);+ if (field instanceof IntegerField) {+ return new NumericFieldCriteria(fieldName, getIntValue(value), operator);+ } else {+ long ordinal;+ if (validate)+ ordinal = getValueOrdinal((ChoiceField) field, value);+ else+ ordinal = 0;+ return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, false);+ }+ }+ case IssueQueryLexer.IsBefore:+ case IssueQueryLexer.IsAfter:+ return new StateCriteria(value, operator);+ default:+ throw new ExplicitException("Unexpected operator " + getRuleName(operator));}}-+@Overridepublic Criteria<Issue> visitOrCriteria(OrCriteriaContext ctx) {List<Criteria<Issue>> childCriterias = new ArrayList<>();- for (CriteriaContext childCtx: ctx.criteria())+ for (CriteriaContext childCtx : ctx.criteria())childCriterias.add(visit(childCtx));return new OrCriteria<Issue>(childCriterias);}@@ -326,7 +332,7 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>@Overridepublic Criteria<Issue> visitAndCriteria(AndCriteriaContext ctx) {List<Criteria<Issue>> childCriterias = new ArrayList<>();- for (CriteriaContext childCtx: ctx.criteria())+ for (CriteriaContext childCtx : ctx.criteria())childCriterias.add(visit(childCtx));return new AndCriteria<Issue>(childCriterias);}@@ -335,24 +341,24 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>public Criteria<Issue> visitNotCriteria(NotCriteriaContext ctx) {return new NotCriteria<Issue>(visit(ctx.criteria()));}-+}.visit(criteriaContext);} else {issueCriteria = null;}List<EntitySort> issueSorts = new ArrayList<>();- for (OrderContext order: queryContext.order()) {+ for (OrderContext order : queryContext.order()) {String fieldName = getValue(order.Quoted().getText());if (validate && !Issue.ORDER_FIELDS.containsKey(fieldName)) {FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);- if (validate && !(fieldSpec instanceof ChoiceField) && !(fieldSpec instanceof DateField)- && !(fieldSpec instanceof DateTimeField) && !(fieldSpec instanceof IntegerField)+ if (validate && !(fieldSpec instanceof ChoiceField) && !(fieldSpec instanceof DateField)+ && !(fieldSpec instanceof DateTimeField) && !(fieldSpec instanceof IntegerField)&& !(fieldSpec instanceof MilestoneChoiceField)) {throw new ExplicitException("Can not order by field: " + fieldName);}}-+EntitySort issueSort = new EntitySort();issueSort.setField(fieldName);if (order.direction != null && order.direction.getText().equals("desc"))@@ -361,144 +367,144 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>issueSort.setDirection(Direction.ASCENDING);issueSorts.add(issueSort);}-+return new IssueQuery(issueCriteria, issueSorts);} else {return new IssueQuery();- }+ }}-+private static GlobalIssueSetting getGlobalIssueSetting() {- if (WicketUtils.getPage() instanceof IssueSettingPage)- return ((IssueSettingPage)WicketUtils.getPage()).getSetting();+ if (WicketUtils.getPage() instanceof IssueSettingPage)+ return ((IssueSettingPage) WicketUtils.getPage()).getSetting();elsereturn OneDev.getInstance(SettingManager.class).getIssueSetting();}-+private static ExplicitException newOperatorException(String fieldName, int operator) {return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");}-+public static void checkField(String fieldName, int operator, IssueQueryParseOption option) {FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);if (fieldSpec == null && !Issue.QUERY_FIELDS.contains(fieldName))throw new ExplicitException("Field not found: " + fieldName);switch (operator) {- case IssueQueryLexer.IsEmpty:- if (Issue.QUERY_FIELDS.contains(fieldName)- && !fieldName.equals(IssueSchedule.NAME_MILESTONE)) {- throw newOperatorException(fieldName, operator);- }- break;- case IssueQueryLexer.IsMe:- if (!(fieldSpec instanceof UserChoiceField && option.withCurrentUserCriteria()))- throw newOperatorException(fieldName, operator);- break;- case IssueQueryLexer.IsCurrent:- if (!(fieldName.equals(Issue.NAME_PROJECT) && option.withCurrentProjectCriteria()- || fieldSpec instanceof BuildChoiceField && option.withCurrentBuildCriteria()- || fieldSpec instanceof PullRequestChoiceField && option.withCurrentPullRequestCriteria()- || fieldSpec instanceof CommitField && option.withCurrentCommitCriteria()))- throw newOperatorException(fieldName, operator);- break;- case IssueQueryLexer.IsPrevious:- if (!(fieldSpec instanceof BuildChoiceField && option.withCurrentBuildCriteria()))- throw newOperatorException(fieldName, operator);- break;- case IssueQueryLexer.IsUntil:- case IssueQueryLexer.IsSince:- if (!fieldName.equals(Issue.NAME_SUBMIT_DATE)- && !fieldName.equals(Issue.NAME_UPDATE_DATE)- && !(fieldSpec instanceof DateField)- && !(fieldSpec instanceof DateTimeField)) {- throw newOperatorException(fieldName, operator);- }- break;- case IssueQueryLexer.Contains:- if (!fieldName.equals(Issue.NAME_TITLE)- && !fieldName.equals(Issue.NAME_DESCRIPTION)- && !fieldName.equals(Issue.NAME_COMMENT)- && !(fieldSpec instanceof TextField)) {- throw newOperatorException(fieldName, operator);- }- break;- case IssueQueryLexer.Is:- if (!fieldName.equals(Issue.NAME_PROJECT)- && !fieldName.equals(Issue.NAME_STATE)- && !fieldName.equals(Issue.NAME_VOTE_COUNT)- && !fieldName.equals(Issue.NAME_COMMENT_COUNT)- && !fieldName.equals(Issue.NAME_NUMBER)- && !fieldName.equals(IssueSchedule.NAME_MILESTONE)- && !(fieldSpec instanceof IssueChoiceField)- && !(fieldSpec instanceof PullRequestChoiceField)- && !(fieldSpec instanceof BuildChoiceField)- && !(fieldSpec instanceof BooleanField)- && !(fieldSpec instanceof IntegerField)- && !(fieldSpec instanceof CommitField)- && !(fieldSpec instanceof ChoiceField)- && !(fieldSpec instanceof UserChoiceField)- && !(fieldSpec instanceof GroupChoiceField)- && !(fieldSpec instanceof TextField)) {- throw newOperatorException(fieldName, operator);- }- break;- case IssueQueryLexer.IsBefore:- case IssueQueryLexer.IsAfter:- if (!fieldName.equals(Issue.NAME_STATE))- throw newOperatorException(fieldName, operator);- break;- case IssueQueryLexer.IsLessThan:- case IssueQueryLexer.IsGreaterThan:- if (!fieldName.equals(Issue.NAME_VOTE_COUNT)- && !fieldName.equals(Issue.NAME_COMMENT_COUNT)- && !fieldName.equals(Issue.NAME_NUMBER)- && !(fieldSpec instanceof IntegerField)- && !(fieldSpec instanceof ChoiceField && !fieldSpec.isAllowMultiple()))- throw newOperatorException(fieldName, operator);- break;+ case IssueQueryLexer.IsEmpty:+ if (Issue.QUERY_FIELDS.contains(fieldName)+ && !fieldName.equals(IssueSchedule.NAME_MILESTONE)) {+ throw newOperatorException(fieldName, operator);+ }+ break;+ case IssueQueryLexer.IsMe:+ if (!(fieldSpec instanceof UserChoiceField && option.withCurrentUserCriteria()))+ throw newOperatorException(fieldName, operator);+ break;+ case IssueQueryLexer.IsCurrent:+ if (!(fieldName.equals(Issue.NAME_PROJECT) && option.withCurrentProjectCriteria()+ || fieldSpec instanceof BuildChoiceField && option.withCurrentBuildCriteria()+ || fieldSpec instanceof PullRequestChoiceField && option.withCurrentPullRequestCriteria()+ || fieldSpec instanceof CommitField && option.withCurrentCommitCriteria()))+ throw newOperatorException(fieldName, operator);+ break;+ case IssueQueryLexer.IsPrevious:+ if (!(fieldSpec instanceof BuildChoiceField && option.withCurrentBuildCriteria()))+ throw newOperatorException(fieldName, operator);+ break;+ case IssueQueryLexer.IsUntil:+ case IssueQueryLexer.IsSince:+ if (!fieldName.equals(Issue.NAME_SUBMIT_DATE)+ && !fieldName.equals(Issue.NAME_UPDATE_DATE)+ && !(fieldSpec instanceof DateField)+ && !(fieldSpec instanceof DateTimeField)) {+ throw newOperatorException(fieldName, operator);+ }+ break;+ case IssueQueryLexer.Contains:+ if (!fieldName.equals(Issue.NAME_TITLE)+ && !fieldName.equals(Issue.NAME_DESCRIPTION)+ && !fieldName.equals(Issue.NAME_COMMENT)+ && !(fieldSpec instanceof TextField)) {+ throw newOperatorException(fieldName, operator);+ }+ break;+ case IssueQueryLexer.Is:+ if (!fieldName.equals(Issue.NAME_PROJECT)+ && !fieldName.equals(Issue.NAME_STATE)+ && !fieldName.equals(Issue.NAME_VOTE_COUNT)+ && !fieldName.equals(Issue.NAME_COMMENT_COUNT)+ && !fieldName.equals(Issue.NAME_NUMBER)+ && !fieldName.equals(IssueSchedule.NAME_MILESTONE)+ && !(fieldSpec instanceof IssueChoiceField)+ && !(fieldSpec instanceof PullRequestChoiceField)+ && !(fieldSpec instanceof BuildChoiceField)+ && !(fieldSpec instanceof BooleanField)+ && !(fieldSpec instanceof IntegerField)+ && !(fieldSpec instanceof CommitField)+ && !(fieldSpec instanceof ChoiceField)+ && !(fieldSpec instanceof UserChoiceField)+ && !(fieldSpec instanceof GroupChoiceField)+ && !(fieldSpec instanceof TextField)) {+ throw newOperatorException(fieldName, operator);+ }+ break;+ case IssueQueryLexer.IsBefore:+ case IssueQueryLexer.IsAfter:+ if (!fieldName.equals(Issue.NAME_STATE))+ throw newOperatorException(fieldName, operator);+ break;+ case IssueQueryLexer.IsLessThan:+ case IssueQueryLexer.IsGreaterThan:+ if (!fieldName.equals(Issue.NAME_VOTE_COUNT)+ && !fieldName.equals(Issue.NAME_COMMENT_COUNT)+ && !fieldName.equals(Issue.NAME_NUMBER)+ && !(fieldSpec instanceof IntegerField)+ && !(fieldSpec instanceof ChoiceField && !fieldSpec.isAllowMultiple()))+ throw newOperatorException(fieldName, operator);+ break;}}-+@Overridepublic boolean matches(Issue issue) {return criteria == null || criteria.matches(issue);}-+public static String getRuleName(int rule) {return AntlrUtils.getLexerRuleName(IssueQueryLexer.ruleNames, rule);}-+public static int getOperator(String operatorName) {return AntlrUtils.getLexerRule(IssueQueryLexer.ruleNames, operatorName);}-+public IssueQuery onRenameLink(String oldName, String newName) {if (getCriteria() != null)getCriteria().onRenameLink(oldName, newName);return this;}-+public boolean isUsingLink(String linkName) {if (getCriteria() != null)return getCriteria().isUsingLink(linkName);elsereturn false;}-+public Collection<String> getUndefinedStates() {- if (criteria != null)+ if (criteria != null)return criteria.getUndefinedStates();elsereturn new ArrayList<>();}-+public Collection<String> getUndefinedFields() {Set<String> undefinedFields = new HashSet<>();if (criteria != null) {undefinedFields.addAll(criteria.getUndefinedFields());}- for (EntitySort sort: sorts) {- if (!Issue.QUERY_FIELDS.contains(sort.getField())+ for (EntitySort sort : sorts) {+ if (!Issue.QUERY_FIELDS.contains(sort.getField())&& getGlobalIssueSetting().getFieldSpec(sort.getField()) == null) {undefinedFields.add(sort.getField());}@@ -514,16 +520,16 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>}public boolean fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {- if (criteria != null)+ if (criteria != null)return criteria.fixUndefinedStates(resolutions);- else+ elsereturn true;}-+public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {if (criteria != null && !criteria.fixUndefinedFields(resolutions))return false;- for (Iterator<EntitySort> it = sorts.iterator(); it.hasNext();) {+ for (Iterator<EntitySort> it = sorts.iterator(); it.hasNext(); ) {EntitySort sort = it.next();UndefinedFieldResolution resolution = resolutions.get(sort.getField());if (resolution != null) {@@ -535,14 +541,14 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>}return true;}-+public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {- if (criteria != null)+ if (criteria != null)return criteria.fixUndefinedFieldValues(resolutions);- else+ elsereturn true;}-+public static IssueQuery merge(IssueQuery query1, IssueQuery query2) {List<Criteria<Issue>> criterias = new ArrayList<>();if (query1.getCriteria() != null)@@ -557,7 +563,7 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>@Overridepublic int compare(Issue o1, Issue o2) {- for (EntitySort sort: getSorts()) {+ for (EntitySort sort : getSorts()) {int result = Issue.ORDER_FIELDS.get(sort.getField()).getComparator().compare(o1, o2);if (sort.getDirection() == Direction.DESCENDING)result *= -1;@@ -566,5 +572,5 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>}return 0;}-+}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedCriteria.javanew file mode 100644index 0000000000..4387bc684b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedCriteria.java@@ -0,0 +1,41 @@+package io.onedev.server.search.entity.issue;++import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueMention;+import io.onedev.server.model.User;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.*;++public class MentionedCriteria extends Criteria<Issue> {++ private static final long serialVersionUID = 1L;++ private final User user;++ public MentionedCriteria(User user) {+ this.user = user;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {+ Subquery<IssueMention> mentionQuery = query.subquery(IssueMention.class);+ Root<IssueMention> mention = mentionQuery.from(IssueMention.class);+ mentionQuery.select(mention);+ mentionQuery.where(builder.and(+ builder.equal(mention.get(IssueMention.PROP_ISSUE), from),+ builder.equal(mention.get(IssueMention.PROP_USER), user)));+ return builder.exists(mentionQuery);+ }++ @Override+ public boolean matches(Issue issue) {+ return issue.getMentions().stream().anyMatch(it->it.getUser().equals(user));+ }++ @Override+ public String toStringWithoutParens() {+ return IssueQuery.getRuleName(IssueQueryLexer.Mentioned) + " " + quote(user.getName());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.javanew file mode 100644index 0000000000..8df16fc868--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedMeCriteria.java@@ -0,0 +1,43 @@+package io.onedev.server.search.entity.issue;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueMention;+import io.onedev.server.model.User;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.*;++public class MentionedMeCriteria extends Criteria<Issue> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {+ if (User.get() != null) {+ Subquery<IssueMention> mentionQuery = query.subquery(IssueMention.class);+ Root<IssueMention> mention = mentionQuery.from(IssueMention.class);+ mentionQuery.select(mention);+ mentionQuery.where(builder.and(+ builder.equal(mention.get(IssueMention.PROP_ISSUE), from),+ builder.equal(mention.get(IssueMention.PROP_USER), User.get())));+ return builder.exists(mentionQuery);+ } else {+ throw new ExplicitException("Please login to perform this query");+ }+ }++ @Override+ public boolean matches(Issue issue) {+ if (User.get() != null)+ return issue.getMentions().stream().anyMatch(it->it.getUser().equals(User.get()));+ else+ throw new ExplicitException("Please login to perform this query");+ }++ @Override+ public String toStringWithoutParens() {+ return IssueQuery.getRuleName(IssueQueryLexer.MentionedMe);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedCriteria.javanew file mode 100644index 0000000000..b0d9d48508--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedCriteria.java@@ -0,0 +1,41 @@+package io.onedev.server.search.entity.pullrequest;++import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestMention;+import io.onedev.server.model.User;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.*;++public class MentionedCriteria extends Criteria<PullRequest> {++ private static final long serialVersionUID = 1L;++ private final User user;++ public MentionedCriteria(User user) {+ this.user = user;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {+ Subquery<PullRequestMention> mentionQuery = query.subquery(PullRequestMention.class);+ Root<PullRequestMention> mention = mentionQuery.from(PullRequestMention.class);+ mentionQuery.select(mention);+ mentionQuery.where(builder.and(+ builder.equal(mention.get(PullRequestMention.PROP_REQUEST), from),+ builder.equal(mention.get(PullRequestMention.PROP_USER), user)));+ return builder.exists(mentionQuery);+ }++ @Override+ public boolean matches(PullRequest request) {+ return request.getMentions().stream().anyMatch(it->it.getUser().equals(user));+ }++ @Override+ public String toStringWithoutParens() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.Mentioned) + " " + quote(user.getName());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.javanew file mode 100644index 0000000000..6b90373b04--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java@@ -0,0 +1,43 @@+package io.onedev.server.search.entity.pullrequest;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestMention;+import io.onedev.server.model.User;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.*;++public class MentionedMeCriteria extends Criteria<PullRequest> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {+ if (User.get() != null) {+ Subquery<PullRequestMention> mentionQuery = query.subquery(PullRequestMention.class);+ Root<PullRequestMention> mention = mentionQuery.from(PullRequestMention.class);+ mentionQuery.select(mention);+ mentionQuery.where(builder.and(+ builder.equal(mention.get(PullRequestMention.PROP_REQUEST), from),+ builder.equal(mention.get(PullRequestMention.PROP_USER), User.get())));+ return builder.exists(mentionQuery);+ } else {+ throw new ExplicitException("Please login to perform this query");+ }+ }++ @Override+ public boolean matches(PullRequest request) {+ if (User.get() != null)+ return request.getMentions().stream().anyMatch(it->it.getUser().equals(User.get()));+ else+ throw new ExplicitException("Please login to perform this query");+ }++ @Override+ public String toStringWithoutParens() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.MentionedMe);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4index dcb1d9d190..3c7e995774 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4@@ -7,8 +7,8 @@ query;criteria- : operator=(Open|Merged|Discarded|AssignedToMe|SubmittedByMe|ToBeReviewedByMe|RequestedForChangesByMe|ApprovedByMe|SomeoneRequestedForChanges|HasPendingReviews|HasFailedBuilds|ToBeVerifiedByBuilds|HasMergeConflicts) #OperatorCriteria- | operator=(ToBeReviewedBy|AssignedTo|ApprovedBy|RequestedForChangesBy|SubmittedBy|IncludesCommit|IncludesIssue) WS+ criteriaValue=Quoted #OperatorValueCriteria+ : operator=(Open|Merged|Discarded|AssignedToMe|SubmittedByMe|ToBeReviewedByMe|RequestedForChangesByMe|ApprovedByMe|MentionedMe|SomeoneRequestedForChanges|HasPendingReviews|HasFailedBuilds|ToBeVerifiedByBuilds|HasMergeConflicts) #OperatorCriteria+ | operator=(ToBeReviewedBy|AssignedTo|ApprovedBy|RequestedForChangesBy|SubmittedBy|Mentioned|IncludesCommit|IncludesIssue) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsUntil|IsSince|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria@@ -51,6 +51,10 @@ ApprovedByMeSubmittedByMe: 'submitted' WS+ 'by' WS+ 'me';++MentionedMe+ : 'mentioned' WS+ 'me'+ ;SomeoneRequestedForChanges: 'someone' WS+ 'requested' WS+ 'for' WS+ 'changes'@@ -91,6 +95,10 @@ ApprovedBySubmittedBy: 'submitted' WS+ 'by';++Mentioned+ : 'mentioned'+ ;IncludesCommit: 'includes' WS+ 'commit'diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.javaindex bc53b6e19b..c4e7f70b84 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java@@ -41,9 +41,9 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {private static final long serialVersionUID = 1L;private final Criteria<PullRequest> criteria;-+private final List<EntitySort> sorts;-+public PullRequestQuery(@Nullable Criteria<PullRequest> criteria, List<EntitySort> sorts) {this.criteria = criteria;this.sorts = sorts;@@ -52,24 +52,24 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {public PullRequestQuery(@Nullable Criteria<PullRequest> criteria) {this(criteria, new ArrayList<>());}-+public PullRequestQuery() {this(null);}-+public static PullRequestQuery parse(@Nullable Project project, @Nullable String queryString, boolean withCurrentUserCriteria) {if (queryString != null) {- CharStream is = CharStreams.fromString(queryString);+ CharStream is = CharStreams.fromString(queryString);PullRequestQueryLexer lexer = new PullRequestQueryLexer(is);lexer.removeErrorListeners();lexer.addErrorListener(new BaseErrorListener() {@Overridepublic void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,- int charPositionInLine, String msg, RecognitionException e) {+ int charPositionInLine, String msg, RecognitionException e) {throw new RuntimeException("Malformed pull request query", e);}-+});CommonTokenStream tokens = new CommonTokenStream(lexer);PullRequestQueryParser parser = new PullRequestQueryParser(tokens);@@ -84,70 +84,76 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {@Overridepublic Criteria<PullRequest> visitOperatorCriteria(OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {- case PullRequestQueryLexer.Open:- return new OpenCriteria();- case PullRequestQueryLexer.Merged:- return new MergedCriteria();- case PullRequestQueryLexer.Discarded:- return new DiscardedCriteria();- case PullRequestQueryLexer.SubmittedByMe:- if (!withCurrentUserCriteria)- throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");- return new SubmittedByMeCriteria();- case PullRequestQueryLexer.ToBeReviewedByMe:- if (!withCurrentUserCriteria)- throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");- return new ToBeReviewedByMeCriteria();- case PullRequestQueryLexer.RequestedForChangesByMe:- if (!withCurrentUserCriteria)- throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");- return new RequestedForChangesByMeCriteria();- case PullRequestQueryLexer.ApprovedByMe:- if (!withCurrentUserCriteria)- throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");- return new ApprovedByMeCriteria();- case PullRequestQueryLexer.AssignedToMe:- if (!withCurrentUserCriteria)- throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");- return new AssignedToMeCriteria();- case PullRequestQueryLexer.SomeoneRequestedForChanges:- return new SomeoneRequestedForChangesCriteria();- case PullRequestQueryLexer.HasFailedBuilds:- return new HasFailedBuildsCriteria();- case PullRequestQueryLexer.HasMergeConflicts:- return new HasMergeConflictsCriteria();- case PullRequestQueryLexer.ToBeVerifiedByBuilds:- return new ToBeVerifiedByBuildsCriteria();- case PullRequestQueryLexer.HasPendingReviews:- return new HasPendingReviewsCriteria();- default:- throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());+ case PullRequestQueryLexer.Open:+ return new OpenCriteria();+ case PullRequestQueryLexer.Merged:+ return new MergedCriteria();+ case PullRequestQueryLexer.Discarded:+ return new DiscardedCriteria();+ case PullRequestQueryLexer.MentionedMe:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new MentionedMeCriteria();+ case PullRequestQueryLexer.SubmittedByMe:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new SubmittedByMeCriteria();+ case PullRequestQueryLexer.ToBeReviewedByMe:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new ToBeReviewedByMeCriteria();+ case PullRequestQueryLexer.RequestedForChangesByMe:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new RequestedForChangesByMeCriteria();+ case PullRequestQueryLexer.ApprovedByMe:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new ApprovedByMeCriteria();+ case PullRequestQueryLexer.AssignedToMe:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new AssignedToMeCriteria();+ case PullRequestQueryLexer.SomeoneRequestedForChanges:+ return new SomeoneRequestedForChangesCriteria();+ case PullRequestQueryLexer.HasFailedBuilds:+ return new HasFailedBuildsCriteria();+ case PullRequestQueryLexer.HasMergeConflicts:+ return new HasMergeConflictsCriteria();+ case PullRequestQueryLexer.ToBeVerifiedByBuilds:+ return new ToBeVerifiedByBuildsCriteria();+ case PullRequestQueryLexer.HasPendingReviews:+ return new HasPendingReviewsCriteria();+ default:+ throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());}}-+@Overridepublic Criteria<PullRequest> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {String value = getValue(ctx.Quoted().getText());switch (ctx.operator.getType()) {- case PullRequestQueryLexer.ToBeReviewedBy:- return new ToBeReviewedByCriteria(getUser(value));- case PullRequestQueryLexer.ApprovedBy:- return new ApprovedByCriteria(getUser(value));- case PullRequestQueryLexer.AssignedTo:- return new AssignedToCriteria(getUser(value));- case PullRequestQueryLexer.RequestedForChangesBy:- return new RequestedForChangesByCriteria(getUser(value));- case PullRequestQueryLexer.SubmittedBy:- return new SubmittedByCriteria(getUser(value));- case PullRequestQueryLexer.IncludesCommit:- return new IncludesCommitCriteria(project, value);- case PullRequestQueryLexer.IncludesIssue:- return new IncludesIssueCriteria(project, value);- default:- throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());+ case PullRequestQueryLexer.ToBeReviewedBy:+ return new ToBeReviewedByCriteria(getUser(value));+ case PullRequestQueryLexer.ApprovedBy:+ return new ApprovedByCriteria(getUser(value));+ case PullRequestQueryLexer.AssignedTo:+ return new AssignedToCriteria(getUser(value));+ case PullRequestQueryLexer.RequestedForChangesBy:+ return new RequestedForChangesByCriteria(getUser(value));+ case PullRequestQueryLexer.Mentioned:+ return new MentionedCriteria(getUser(value));+ case PullRequestQueryLexer.SubmittedBy:+ return new SubmittedByCriteria(getUser(value));+ case PullRequestQueryLexer.IncludesCommit:+ return new IncludesCommitCriteria(project, value);+ case PullRequestQueryLexer.IncludesIssue:+ return new IncludesIssueCriteria(project, value);+ default:+ throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());}}-+@Overridepublic Criteria<PullRequest> visitParensCriteria(ParensCriteriaContext ctx) {return (Criteria<PullRequest>) visit(ctx.criteria()).withParens(true);@@ -159,75 +165,75 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {String value = getValue(ctx.Quoted(1).getText());int operator = ctx.operator.getType();checkField(fieldName, operator);-+switch (operator) {- case PullRequestQueryLexer.IsUntil:- case PullRequestQueryLexer.IsSince:- switch (fieldName) {- case PullRequest.NAME_SUBMIT_DATE:- return new SubmitDateCriteria(value, operator);- case PullRequest.NAME_UPDATE_DATE:- return new UpdateDateCriteria(value, operator);- default:- throw new IllegalStateException();- }- case PullRequestQueryLexer.Contains:- switch (fieldName) {- case PullRequest.NAME_TITLE:- return new TitleCriteria(value);- case PullRequest.NAME_DESCRIPTION:- return new DescriptionCriteria(value);- case PullRequest.NAME_COMMENT:- return new CommentCriteria(value);- default:- throw new IllegalStateException();- }- case PullRequestQueryLexer.Is:- switch (fieldName) {- case PullRequest.NAME_NUMBER:- return new NumberCriteria(project, value, operator);- case PullRequest.NAME_STATUS:- try {- return new StatusCriteria(PullRequest.Status.valueOf(value.toUpperCase()));- } catch (IllegalArgumentException e) {- throw new ExplicitException("Invalid status: " + value);+ case PullRequestQueryLexer.IsUntil:+ case PullRequestQueryLexer.IsSince:+ switch (fieldName) {+ case PullRequest.NAME_SUBMIT_DATE:+ return new SubmitDateCriteria(value, operator);+ case PullRequest.NAME_UPDATE_DATE:+ return new UpdateDateCriteria(value, operator);+ default:+ throw new IllegalStateException();+ }+ case PullRequestQueryLexer.Contains:+ switch (fieldName) {+ case PullRequest.NAME_TITLE:+ return new TitleCriteria(value);+ case PullRequest.NAME_DESCRIPTION:+ return new DescriptionCriteria(value);+ case PullRequest.NAME_COMMENT:+ return new CommentCriteria(value);+ default:+ throw new IllegalStateException();+ }+ case PullRequestQueryLexer.Is:+ switch (fieldName) {+ case PullRequest.NAME_NUMBER:+ return new NumberCriteria(project, value, operator);+ case PullRequest.NAME_STATUS:+ try {+ return new StatusCriteria(PullRequest.Status.valueOf(value.toUpperCase()));+ } catch (IllegalArgumentException e) {+ throw new ExplicitException("Invalid status: " + value);+ }+ case PullRequest.NAME_MERGE_STRATEGY:+ return new MergeStrategyCriteria(MergeStrategy.fromString(value));+ case PullRequest.NAME_SOURCE_BRANCH:+ return new SourceBranchCriteria(value);+ case PullRequest.NAME_SOURCE_PROJECT:+ return new SourceProjectCriteria(value);+ case PullRequest.NAME_TARGET_BRANCH:+ return new TargetBranchCriteria(value);+ case PullRequest.NAME_TARGET_PROJECT:+ return new TargetProjectCriteria(value);+ case PullRequest.NAME_LABEL:+ return new LabelCriteria(getLabelSpec(value));+ case PullRequest.NAME_COMMENT_COUNT:+ return new CommentCountCriteria(getIntValue(value), operator);+ default:+ throw new IllegalStateException();+ }+ case PullRequestQueryLexer.IsLessThan:+ case PullRequestQueryLexer.IsGreaterThan:+ switch (fieldName) {+ case PullRequest.NAME_NUMBER:+ return new NumberCriteria(project, value, operator);+ case PullRequest.NAME_COMMENT_COUNT:+ return new CommentCountCriteria(getIntValue(value), operator);+ default:+ throw new IllegalStateException();}- case PullRequest.NAME_MERGE_STRATEGY:- return new MergeStrategyCriteria(MergeStrategy.fromString(value));- case PullRequest.NAME_SOURCE_BRANCH:- return new SourceBranchCriteria(value);- case PullRequest.NAME_SOURCE_PROJECT:- return new SourceProjectCriteria(value);- case PullRequest.NAME_TARGET_BRANCH:- return new TargetBranchCriteria(value);- case PullRequest.NAME_TARGET_PROJECT:- return new TargetProjectCriteria(value);- case PullRequest.NAME_LABEL:- return new LabelCriteria(getLabelSpec(value));- case PullRequest.NAME_COMMENT_COUNT:- return new CommentCountCriteria(getIntValue(value), operator);- default:- throw new IllegalStateException();- }- case PullRequestQueryLexer.IsLessThan:- case PullRequestQueryLexer.IsGreaterThan:- switch (fieldName) {- case PullRequest.NAME_NUMBER:- return new NumberCriteria(project, value, operator);- case PullRequest.NAME_COMMENT_COUNT:- return new CommentCountCriteria(getIntValue(value), operator);default:throw new IllegalStateException();- }- default:- throw new IllegalStateException();}}-+@Overridepublic Criteria<PullRequest> visitOrCriteria(OrCriteriaContext ctx) {List<Criteria<PullRequest>> childCriterias = new ArrayList<>();- for (CriteriaContext childCtx: ctx.criteria())+ for (CriteriaContext childCtx : ctx.criteria())childCriterias.add(visit(childCtx));return new OrCriteria<PullRequest>(childCriterias);}@@ -235,7 +241,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {@Overridepublic Criteria<PullRequest> visitAndCriteria(AndCriteriaContext ctx) {List<Criteria<PullRequest>> childCriterias = new ArrayList<>();- for (CriteriaContext childCtx: ctx.criteria())+ for (CriteriaContext childCtx : ctx.criteria())childCriterias.add(visit(childCtx));return new AndCriteria<PullRequest>(childCriterias);}@@ -251,11 +257,11 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {}List<EntitySort> requestSorts = new ArrayList<>();- for (OrderContext order: queryContext.order()) {+ for (OrderContext order : queryContext.order()) {String fieldName = getValue(order.Quoted().getText());if (!PullRequest.ORDER_FIELDS.containsKey(fieldName))throw new ExplicitException("Can not order by field: " + fieldName);-+EntitySort requestSort = new EntitySort();requestSort.setField(fieldName);if (order.direction != null && order.direction.getText().equals("desc"))@@ -264,67 +270,67 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {requestSort.setDirection(Direction.ASCENDING);requestSorts.add(requestSort);}-+return new PullRequestQuery(requestCriteria, requestSorts);} else {return new PullRequestQuery();}}-+public static void checkField(String fieldName, int operator) {if (!PullRequest.QUERY_FIELDS.contains(fieldName))throw new ExplicitException("Field not found: " + fieldName);switch (operator) {- case PullRequestQueryLexer.IsUntil:- case PullRequestQueryLexer.IsSince:- if (!fieldName.equals(PullRequest.NAME_SUBMIT_DATE)- && !fieldName.equals(PullRequest.NAME_UPDATE_DATE)- && !fieldName.equals(PullRequest.NAME_CLOSE_DATE)) {- throw newOperatorException(fieldName, operator);- }- break;- case PullRequestQueryLexer.Contains:- if (!fieldName.equals(PullRequest.NAME_TITLE)- && !fieldName.equals(PullRequest.NAME_DESCRIPTION)- && !fieldName.equals(PullRequest.NAME_COMMENT)) {- throw newOperatorException(fieldName, operator);- }- break;- case PullRequestQueryLexer.Is:- if (!fieldName.equals(PullRequest.NAME_NUMBER)- && !fieldName.equals(PullRequest.NAME_STATUS)- && !fieldName.equals(PullRequest.NAME_MERGE_STRATEGY)- && !fieldName.equals(PullRequest.NAME_TARGET_PROJECT)- && !fieldName.equals(PullRequest.NAME_TARGET_BRANCH)- && !fieldName.equals(PullRequest.NAME_SOURCE_PROJECT)- && !fieldName.equals(PullRequest.NAME_SOURCE_BRANCH)- && !fieldName.equals(PullRequest.NAME_LABEL)- && !fieldName.equals(PullRequest.NAME_COMMENT_COUNT)) {- throw newOperatorException(fieldName, operator);- }- break;- case PullRequestQueryLexer.IsLessThan:- case PullRequestQueryLexer.IsGreaterThan:- if (!fieldName.equals(PullRequest.NAME_NUMBER)- && !fieldName.equals(PullRequest.NAME_COMMENT_COUNT)) {- throw newOperatorException(fieldName, operator);- }- break;+ case PullRequestQueryLexer.IsUntil:+ case PullRequestQueryLexer.IsSince:+ if (!fieldName.equals(PullRequest.NAME_SUBMIT_DATE)+ && !fieldName.equals(PullRequest.NAME_UPDATE_DATE)+ && !fieldName.equals(PullRequest.NAME_CLOSE_DATE)) {+ throw newOperatorException(fieldName, operator);+ }+ break;+ case PullRequestQueryLexer.Contains:+ if (!fieldName.equals(PullRequest.NAME_TITLE)+ && !fieldName.equals(PullRequest.NAME_DESCRIPTION)+ && !fieldName.equals(PullRequest.NAME_COMMENT)) {+ throw newOperatorException(fieldName, operator);+ }+ break;+ case PullRequestQueryLexer.Is:+ if (!fieldName.equals(PullRequest.NAME_NUMBER)+ && !fieldName.equals(PullRequest.NAME_STATUS)+ && !fieldName.equals(PullRequest.NAME_MERGE_STRATEGY)+ && !fieldName.equals(PullRequest.NAME_TARGET_PROJECT)+ && !fieldName.equals(PullRequest.NAME_TARGET_BRANCH)+ && !fieldName.equals(PullRequest.NAME_SOURCE_PROJECT)+ && !fieldName.equals(PullRequest.NAME_SOURCE_BRANCH)+ && !fieldName.equals(PullRequest.NAME_LABEL)+ && !fieldName.equals(PullRequest.NAME_COMMENT_COUNT)) {+ throw newOperatorException(fieldName, operator);+ }+ break;+ case PullRequestQueryLexer.IsLessThan:+ case PullRequestQueryLexer.IsGreaterThan:+ if (!fieldName.equals(PullRequest.NAME_NUMBER)+ && !fieldName.equals(PullRequest.NAME_COMMENT_COUNT)) {+ throw newOperatorException(fieldName, operator);+ }+ break;}}-+private static ExplicitException newOperatorException(String fieldName, int operator) {return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");}-+public static String getRuleName(int rule) {return AntlrUtils.getLexerRuleName(PullRequestQueryLexer.ruleNames, rule);}-+public static int getOperator(String operatorName) {return AntlrUtils.getLexerRule(PullRequestQueryLexer.ruleNames, operatorName);}-+@Overridepublic Criteria<PullRequest> getCriteria() {return criteria;@@ -334,7 +340,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {public List<EntitySort> getSorts() {return sorts;}-+public static PullRequestQuery merge(PullRequestQuery query1, PullRequestQuery query2) {List<Criteria<PullRequest>> criterias = new ArrayList<>();if (query1.getCriteria() != null)@@ -346,5 +352,5 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {sorts.addAll(query2.getSorts());return new PullRequestQuery(Criteria.andCriterias(criterias), sorts);}-+}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.javaindex dcbb1fb1ba..0b78464f71 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java@@ -1,18 +1,7 @@package io.onedev.server.web.behavior;-import static io.onedev.server.search.entity.codecomment.CodeCommentQuery.*;-import static io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer.*;--import java.util.ArrayList;-import java.util.List;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.Component;-import org.apache.wicket.model.IModel;-import com.google.common.base.Optional;import com.google.common.base.Preconditions;-import io.onedev.commons.codeassist.FenceAware;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;@@ -20,15 +9,23 @@ import io.onedev.commons.codeassist.parser.Element;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.search.entity.codecomment.CodeCommentQuery;-import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.util.DateUtils;-import io.onedev.server.model.CodeComment;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;++import java.util.ArrayList;+import java.util.List;++import static io.onedev.server.search.entity.codecomment.CodeCommentQuery.getRuleName;+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer.*;@SuppressWarnings("serial")public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {@@ -77,7 +74,7 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = CodeCommentQuery.getOperator(operatorName);if (fieldElements.isEmpty()) {- if (operator == CodeCommentQueryLexer.CreatedBy)+ if (operator == Mentioned || operator == CreatedBy)return SuggestionUtils.suggestUsers(matchWith);elsereturn null;@@ -115,7 +112,7 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {if (!withOrder && suggestedLiteral.equals(getRuleName(OrderBy))- || !withCurrentUserCriteria && suggestedLiteral.equals(getRuleName(CreatedByMe))) {+ || !withCurrentUserCriteria && (suggestedLiteral.equals(getRuleName(CreatedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)))) {return null;}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex 6952a8357d..a0e3e6e6ee 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -1,44 +1,8 @@package io.onedev.server.web.behavior;-import static io.onedev.server.model.Issue.NAME_COMMENT;-import static io.onedev.server.model.Issue.NAME_COMMENT_COUNT;-import static io.onedev.server.model.Issue.NAME_DESCRIPTION;-import static io.onedev.server.model.Issue.NAME_NUMBER;-import static io.onedev.server.model.Issue.NAME_PROJECT;-import static io.onedev.server.model.Issue.NAME_STATE;-import static io.onedev.server.model.Issue.NAME_SUBMIT_DATE;-import static io.onedev.server.model.Issue.NAME_TITLE;-import static io.onedev.server.model.Issue.NAME_UPDATE_DATE;-import static io.onedev.server.model.Issue.NAME_VOTE_COUNT;-import static io.onedev.server.search.entity.EntityQuery.getValue;-import static io.onedev.server.search.entity.issue.IssueQuery.checkField;-import static io.onedev.server.search.entity.issue.IssueQuery.getOperator;-import static io.onedev.server.search.entity.issue.IssueQuery.getRuleName;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.CurrentIssue;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInBuild;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentBuild;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentCommit;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentPullRequest;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInPullRequest;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.HasAny;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.OrderBy;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedBy;-import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedByMe;--import java.util.ArrayList;-import java.util.List;-import java.util.stream.Collectors;--import javax.annotation.Nullable;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.Component;-import org.apache.wicket.model.IModel;-import com.google.common.base.Optional;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;-import io.onedev.commons.codeassist.FenceAware;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;@@ -55,20 +19,7 @@ import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.LinkSpec;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.issue.field.spec.BooleanField;-import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;-import io.onedev.server.model.support.issue.field.spec.ChoiceField;-import io.onedev.server.model.support.issue.field.spec.CommitField;-import io.onedev.server.model.support.issue.field.spec.DateField;-import io.onedev.server.model.support.issue.field.spec.DateTimeField;-import io.onedev.server.model.support.issue.field.spec.FieldSpec;-import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;-import io.onedev.server.model.support.issue.field.spec.IntegerField;-import io.onedev.server.model.support.issue.field.spec.IssueChoiceField;-import io.onedev.server.model.support.issue.field.spec.MilestoneChoiceField;-import io.onedev.server.model.support.issue.field.spec.PullRequestChoiceField;-import io.onedev.server.model.support.issue.field.spec.TextField;-import io.onedev.server.model.support.issue.field.spec.UserChoiceField;+import io.onedev.server.model.support.issue.field.spec.*;import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.search.entity.issue.IssueQueryParser;import io.onedev.server.search.entity.project.ProjectQuery;@@ -77,6 +28,19 @@ import io.onedev.server.util.DateUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;++import javax.annotation.Nullable;+import java.util.ArrayList;+import java.util.List;+import java.util.stream.Collectors;++import static io.onedev.server.model.Issue.*;+import static io.onedev.server.search.entity.EntityQuery.getValue;+import static io.onedev.server.search.entity.issue.IssueQuery.*;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.*;@SuppressWarnings("serial")public class IssueQueryBehavior extends ANTLRAssistBehavior {@@ -155,7 +119,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = getOperator(operatorName);if (fieldElements.isEmpty()) {- if (operator == SubmittedBy)+ if (operator == Mentioned || operator == SubmittedBy)return SuggestionUtils.suggestUsers(matchWith);else if (operator == FixedInBuild)return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);@@ -251,7 +215,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {if (!option.withOrder() && suggestedLiteral.equals(getRuleName(OrderBy))- || !option.withCurrentUserCriteria() && suggestedLiteral.equals(getRuleName(SubmittedByMe))+ || !option.withCurrentUserCriteria() && (suggestedLiteral.equals(getRuleName(SubmittedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)))|| !option.withCurrentBuildCriteria() && suggestedLiteral.equals(getRuleName(FixedInCurrentBuild))|| !option.withCurrentPullRequestCriteria() && suggestedLiteral.equals(getRuleName(FixedInCurrentPullRequest))|| !option.withCurrentCommitCriteria() && suggestedLiteral.equals(getRuleName(FixedInCurrentCommit))diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex c608d6055d..0355673193 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -5,14 +5,7 @@ import static io.onedev.server.search.entity.EntityQuery.getValue;import static io.onedev.server.search.entity.pullrequest.PullRequestQuery.checkField;import static io.onedev.server.search.entity.pullrequest.PullRequestQuery.getOperator;import static io.onedev.server.search.entity.pullrequest.PullRequestQuery.getRuleName;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.ApprovedByMe;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.AssignedToMe;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.IncludesCommit;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.IncludesIssue;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.OrderBy;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.RequestedForChangesByMe;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.SubmittedByMe;-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.ToBeReviewedByMe;+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.*;import java.util.ArrayList;import java.util.List;@@ -162,7 +155,7 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {if (!withOrder && suggestedLiteral.equals(getRuleName(OrderBy))- || !withCurrentUserCriteria && (suggestedLiteral.equals(getRuleName(SubmittedByMe))+ || !withCurrentUserCriteria && ((suggestedLiteral.equals(getRuleName(SubmittedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)))|| suggestedLiteral.equals(getRuleName(ToBeReviewedByMe))|| suggestedLiteral.equals(getRuleName(RequestedForChangesByMe))|| suggestedLiteral.equals(getRuleName(ApprovedByMe))