The Unified and Autonomous Development Platform
Add project criteria to issue/pullrequest/build global query
Robin Shend850cf14d0e6
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex c8b103a2ab..26b3af1407 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -4,8 +4,8 @@ import static io.onedev.server.search.entity.EntityQuery.quote;import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;import static io.onedev.server.search.entity.build.BuildQueryLexer.And;import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;-import static io.onedev.server.util.BuildConstants.FIELD_COMMIT;-import static io.onedev.server.util.BuildConstants.FIELD_JOB;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_COMMIT;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_JOB;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.javaindex 2a94328b22..4e186c5857 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java@@ -30,10 +30,10 @@ import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.Opeimport io.onedev.server.buildspec.job.action.condition.ActionConditionParser.OrCriteriaContext;import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.ParensCriteriaContext;import io.onedev.server.model.Build;-import io.onedev.server.util.BuildConstants;import io.onedev.server.util.criteria.AndCriteria;import io.onedev.server.util.criteria.NotCriteria;import io.onedev.server.util.criteria.OrCriteria;+import io.onedev.server.util.query.BuildQueryConstants;public class ActionCondition implements Predicate<Build> {@@ -126,9 +126,9 @@ public class ActionCondition implements Predicate<Build> {checkField(job, fieldName, operator);switch (fieldName) {- case BuildConstants.FIELD_LOG:+ case BuildQueryConstants.FIELD_LOG:return new LogCriteria(fieldValue);- case BuildConstants.FIELD_ERROR_MESSAGE:+ case BuildQueryConstants.FIELD_ERROR_MESSAGE:return new ErrorMessageCriteria(fieldValue);default:return new ParamCriteria(fieldName, fieldValue);@@ -168,7 +168,7 @@ public class ActionCondition implements Predicate<Build> {}public static void checkField(Job job, String fieldName, int operator) {- if (fieldName.equals(BuildConstants.FIELD_ERROR_MESSAGE) || fieldName.equals(BuildConstants.FIELD_LOG)) {+ if (fieldName.equals(BuildQueryConstants.FIELD_ERROR_MESSAGE) || fieldName.equals(BuildQueryConstants.FIELD_LOG)) {if (operator != ActionConditionLexer.Contains)throw newOperatorException(fieldName, operator);} else if (job.getParamSpecMap().containsKey(fieldName)) {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.javaindex ef7a880119..774435793e 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java@@ -28,10 +28,10 @@ import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.NotCriimport io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.OrCriteriaContext;import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.ParensCriteriaContext;import io.onedev.server.model.Build;-import io.onedev.server.util.BuildConstants;import io.onedev.server.util.criteria.AndCriteria;import io.onedev.server.util.criteria.NotCriteria;import io.onedev.server.util.criteria.OrCriteria;+import io.onedev.server.util.query.BuildQueryConstants;public class RetryCondition implements Predicate<Build> {@@ -96,9 +96,9 @@ public class RetryCondition implements Predicate<Build> {checkField(job, fieldName, operator);switch (fieldName) {- case BuildConstants.FIELD_LOG:+ case BuildQueryConstants.FIELD_LOG:return new LogCriteria(fieldValue);- case BuildConstants.FIELD_ERROR_MESSAGE:+ case BuildQueryConstants.FIELD_ERROR_MESSAGE:return new ErrorMessageCriteria(fieldValue);default:return new ParamCriteria(fieldName, fieldValue);@@ -133,7 +133,7 @@ public class RetryCondition implements Predicate<Build> {}public static void checkField(Job job, String fieldName, int operator) {- if (fieldName.equals(BuildConstants.FIELD_ERROR_MESSAGE) || fieldName.equals(BuildConstants.FIELD_LOG)) {+ if (fieldName.equals(BuildQueryConstants.FIELD_ERROR_MESSAGE) || fieldName.equals(BuildQueryConstants.FIELD_LOG)) {if (operator != RetryConditionLexer.Contains)throw newOperatorException(fieldName, operator);} else if (job.getParamSpecMap().containsKey(fieldName)) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex e15d5eb9c8..df3b474ef2 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -83,10 +83,10 @@ import io.onedev.server.security.permission.ManageProject;import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.security.permission.SystemAdministration;import io.onedev.server.storage.StorageManager;-import io.onedev.server.util.BuildConstants;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.facade.BuildFacade;import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.util.query.BuildQueryConstants;@Singletonpublic class DefaultBuildManager extends AbstractEntityManager<Build> implements BuildManager, SchedulableTask {@@ -263,12 +263,12 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsfor (Map.Entry<String, List<String>> entry: params.entrySet()) {if (!entry.getValue().isEmpty()) {for (String value: entry.getValue()) {- Join<?, ?> join = root.join(BuildConstants.ATTR_PARAMS, JoinType.INNER);+ Join<?, ?> join = root.join(BuildQueryConstants.ATTR_PARAMS, JoinType.INNER);predicates.add(builder.equal(join.get(BuildParam.ATTR_NAME), entry.getKey()));predicates.add(builder.equal(join.get(BuildParam.ATTR_VALUE), value));}} else {- Join<?, ?> join = root.join(BuildConstants.ATTR_PARAMS, JoinType.INNER);+ Join<?, ?> join = root.join(BuildQueryConstants.ATTR_PARAMS, JoinType.INNER);predicates.add(builder.equal(join.get(BuildParam.ATTR_NAME), entry.getKey()));predicates.add(builder.isNull(join.get(BuildParam.ATTR_VALUE)));}@@ -296,13 +296,13 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsList<Build> builds = new ArrayList<>();EntityCriteria<Build> criteria = newCriteria();- criteria.add(Restrictions.eq(BuildConstants.ATTR_PROJECT, project));+ criteria.add(Restrictions.eq(BuildQueryConstants.ATTR_PROJECT, project));Subject subject = User.asSubject(user);if (!subject.isPermitted(new ProjectPermission(project, new ManageProject()))) {List<Criterion> jobCriterions = new ArrayList<>();for (String jobName: getAccessibleJobNames(project, user).get(project))- jobCriterions.add(Restrictions.eq(BuildConstants.ATTR_JOB, jobName));+ jobCriterions.add(Restrictions.eq(BuildQueryConstants.ATTR_JOB, jobName));if (!jobCriterions.isEmpty())criteria.add(Restrictions.or(jobCriterions.toArray(new Criterion[jobCriterions.size()])));else@@ -334,14 +334,14 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsCriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<String> criteriaQuery = builder.createQuery(String.class);Root<Build> root = criteriaQuery.from(Build.class);- criteriaQuery.select(root.get(BuildConstants.ATTR_VERSION)).distinct(true);+ criteriaQuery.select(root.get(BuildQueryConstants.ATTR_VERSION)).distinct(true);Collection<Predicate> predicates = getPredicates(project, root, builder, user);predicates.add(builder.like(- builder.lower(root.get(BuildConstants.ATTR_VERSION)),+ builder.lower(root.get(BuildQueryConstants.ATTR_VERSION)),"%" + matchWith.toLowerCase() + "%"));criteriaQuery.where(predicates.toArray(new Predicate[predicates.size()]));- criteriaQuery.orderBy(builder.asc(root.get(BuildConstants.ATTR_VERSION)));+ criteriaQuery.orderBy(builder.asc(root.get(BuildQueryConstants.ATTR_VERSION)));Query<String> query = getSession().createQuery(criteriaQuery);query.setFirstResult(0);@@ -370,24 +370,24 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsSubject subject = User.asSubject(user);if (project != null) {- predicates.add(builder.equal(root.get(BuildConstants.ATTR_PROJECT), project));+ predicates.add(builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), project));if (!subject.isPermitted(new ProjectPermission(project, new ManageProject()))) {List<Predicate> jobPredicates = new ArrayList<>();for (String jobName: getAccessibleJobNames(project, user).get(project))- jobPredicates.add(builder.equal(root.get(BuildConstants.ATTR_JOB), jobName));+ jobPredicates.add(builder.equal(root.get(BuildQueryConstants.ATTR_JOB), jobName));predicates.add(builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()])));}} else if (!subject.isPermitted(new SystemAdministration())) {List<Predicate> projectPredicates = new ArrayList<>();for (Map.Entry<Project, Collection<String>> entry: getAccessibleJobNames(null, user).entrySet()) {if (subject.isPermitted(new ProjectPermission(project, new ManageProject()))) {- projectPredicates.add(builder.equal(root.get(BuildConstants.ATTR_PROJECT), entry.getKey()));+ projectPredicates.add(builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), entry.getKey()));} else {List<Predicate> jobPredicates = new ArrayList<>();for (String jobName: entry.getValue())- jobPredicates.add(builder.equal(root.get(BuildConstants.ATTR_JOB), jobName));+ jobPredicates.add(builder.equal(root.get(BuildQueryConstants.ATTR_JOB), jobName));projectPredicates.add(builder.and(- builder.equal(root.get(BuildConstants.ATTR_PROJECT), entry.getKey()),+ builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), entry.getKey()),builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()]))));}}@@ -417,13 +417,13 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsList<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: buildQuery.getSorts()) {if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(BuildQuery.getPath(root, BuildConstants.ORDER_FIELDS.get(sort.getField()))));+ orders.add(builder.asc(BuildQuery.getPath(root, BuildQueryConstants.ORDER_FIELDS.get(sort.getField()))));else- orders.add(builder.desc(BuildQuery.getPath(root, BuildConstants.ORDER_FIELDS.get(sort.getField()))));+ orders.add(builder.desc(BuildQuery.getPath(root, BuildQueryConstants.ORDER_FIELDS.get(sort.getField()))));}if (orders.isEmpty())- orders.add(builder.desc(root.get(BuildConstants.ATTR_ID)));+ orders.add(builder.desc(root.get(BuildQueryConstants.ATTR_ID)));query.orderBy(orders);return query;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex 3ea4617b5b..45899b3622 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java@@ -60,9 +60,9 @@ import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.codecomment.CodeCommentQuery;-import io.onedev.server.util.CodeCommentConstants;import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.util.diff.WhitespaceOption;+import io.onedev.server.util.query.CodeCommentQueryConstants;@Singletonpublic class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment> implements CodeCommentManager {@@ -240,10 +240,10 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeCommentProject project, PullRequest request, Root<CodeComment> root, CriteriaBuilder builder, User user) {List<Predicate> predicates = new ArrayList<>();if (request != null) {- Join<?, ?> relations = root.join(CodeCommentConstants.ATTR_RELATIONS, JoinType.INNER);+ Join<?, ?> relations = root.join(CodeCommentQueryConstants.ATTR_RELATIONS, JoinType.INNER);relations.on(builder.equal(relations.get(CodeCommentRelation.ATTR_REQUEST), request));} else {- predicates.add(builder.equal(root.get(CodeCommentConstants.ATTR_PROJECT), project));+ predicates.add(builder.equal(root.get(CodeCommentQueryConstants.ATTR_PROJECT), project));}if (criteria != null)predicates.add(criteria.getPredicate(root, builder, user));@@ -262,13 +262,13 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeCommentList<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: commentQuery.getSorts()) {if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(CodeCommentQuery.getPath(root, CodeCommentConstants.ORDER_FIELDS.get(sort.getField()))));+ orders.add(builder.asc(CodeCommentQuery.getPath(root, CodeCommentQueryConstants.ORDER_FIELDS.get(sort.getField()))));else- orders.add(builder.desc(CodeCommentQuery.getPath(root, CodeCommentConstants.ORDER_FIELDS.get(sort.getField()))));+ orders.add(builder.desc(CodeCommentQuery.getPath(root, CodeCommentQueryConstants.ORDER_FIELDS.get(sort.getField()))));}if (orders.isEmpty())- orders.add(builder.desc(root.get(CodeCommentConstants.ATTR_ID)));+ orders.add(builder.desc(root.get(CodeCommentQueryConstants.ATTR_ID)));query.orderBy(orders);return query;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex c0bfb73a83..70adf78708 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -68,11 +68,11 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.MilestoneCriteria;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.security.permission.SystemAdministration;-import io.onedev.server.util.IssueConstants;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.util.facade.IssueFacade;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.util.query.IssueQueryConstants;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.UndefinedStateResolution;@@ -184,11 +184,11 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Nullable Project project, Root<Issue> root, CriteriaBuilder builder, @Nullable User user) {List<Predicate> predicates = new ArrayList<>();if (project != null) {- predicates.add(builder.equal(root.get(IssueConstants.ATTR_PROJECT), project));+ predicates.add(builder.equal(root.get(IssueQueryConstants.ATTR_PROJECT), project));} else if (!User.asSubject(user).isPermitted(new SystemAdministration())) {Collection<Project> projects = projectManager.getPermittedProjects(user, new AccessProject());if (!projects.isEmpty())- predicates.add(root.get(IssueConstants.ATTR_PROJECT).in(projects));+ predicates.add(root.get(IssueQueryConstants.ATTR_PROJECT).in(projects));elsepredicates.add(builder.disjunction());}@@ -207,13 +207,13 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsList<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: issueQuery.getSorts()) {- if (IssueConstants.ORDER_FIELDS.containsKey(sort.getField())) {+ if (IssueQueryConstants.ORDER_FIELDS.containsKey(sort.getField())) {if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(IssueQuery.getPath(root, IssueConstants.ORDER_FIELDS.get(sort.getField()))));+ orders.add(builder.asc(IssueQuery.getPath(root, IssueQueryConstants.ORDER_FIELDS.get(sort.getField()))));else- orders.add(builder.desc(IssueQuery.getPath(root, IssueConstants.ORDER_FIELDS.get(sort.getField()))));+ orders.add(builder.desc(IssueQuery.getPath(root, IssueQueryConstants.ORDER_FIELDS.get(sort.getField()))));} else {- Join<Issue, IssueField> join = root.join(IssueConstants.ATTR_FIELDS, JoinType.LEFT);+ Join<Issue, IssueField> join = root.join(IssueQueryConstants.ATTR_FIELDS, JoinType.LEFT);join.on(builder.equal(join.get(IssueField.ATTR_NAME), sort.getField()));if (sort.getDirection() == Direction.ASCENDING)orders.add(builder.asc(join.get(IssueField.ATTR_ORDINAL)));@@ -223,7 +223,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}if (orders.isEmpty())- orders.add(builder.desc(root.get(IssueConstants.ATTR_ID)));+ orders.add(builder.desc(root.get(IssueQueryConstants.ATTR_ID)));query.orderBy(orders);return query;@@ -359,7 +359,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsList<Issue> issues = new ArrayList<>();EntityCriteria<Issue> criteria = newCriteria();- criteria.add(Restrictions.eq(IssueConstants.ATTR_PROJECT, project));+ criteria.add(Restrictions.eq(IssueQueryConstants.ATTR_PROJECT, project));if (term.startsWith("#"))term = term.substring(1);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 414cab5535..7d346aa5ae 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -80,10 +80,10 @@ import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.security.permission.SystemAdministration;-import io.onedev.server.util.ProjectConstants;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.Usage;import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.util.query.ProjectQueryConstants;import io.onedev.server.web.avatar.AvatarManager;@Singleton@@ -489,13 +489,13 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemList<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: projectQuery.getSorts()) {if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(ProjectQuery.getPath(root, ProjectConstants.ORDER_FIELDS.get(sort.getField()))));+ orders.add(builder.asc(ProjectQuery.getPath(root, ProjectQueryConstants.ORDER_FIELDS.get(sort.getField()))));else- orders.add(builder.desc(ProjectQuery.getPath(root, ProjectConstants.ORDER_FIELDS.get(sort.getField()))));+ orders.add(builder.desc(ProjectQuery.getPath(root, ProjectQueryConstants.ORDER_FIELDS.get(sort.getField()))));}if (orders.isEmpty())- orders.add(builder.asc(root.get(ProjectConstants.ATTR_NAME)));+ orders.add(builder.asc(root.get(ProjectQueryConstants.ATTR_NAME)));query.orderBy(orders);return query;@@ -508,7 +508,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemCollection<Long> projectIds = getPermittedProjects(user, new AccessProject()).stream().map(it->it.getId()).collect(Collectors.toSet());if (!projectIds.isEmpty())- predicates.add(root.get(ProjectConstants.ATTR_ID).in(projectIds));+ predicates.add(root.get(ProjectQueryConstants.ATTR_ID).in(projectIds));elsepredicates.add(builder.disjunction());}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 679a3d7b4c..f19c889971 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -127,9 +127,9 @@ import io.onedev.server.security.permission.SystemAdministration;import io.onedev.server.security.permission.WriteCode;import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.ProjectScopedNumber;-import io.onedev.server.util.PullRequestConstants;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.markdown.MarkdownManager;+import io.onedev.server.util.query.PullRequestQueryConstants;import io.onedev.server.util.reviewrequirement.ReviewRequirement;import io.onedev.server.util.script.identity.JobIdentity;import io.onedev.server.util.script.identity.ScriptIdentity;@@ -960,7 +960,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest} else if (!User.asSubject(user).isPermitted(new SystemAdministration())) {Collection<Project> projects = projectManager.getPermittedProjects(user, new ReadCode());if (!projects.isEmpty())- predicates.add(root.get(PullRequestConstants.ATTR_TARGET_PROJECT).in(projects));+ predicates.add(root.get(PullRequestQueryConstants.ATTR_TARGET_PROJECT).in(projects));elsepredicates.add(builder.disjunction());}@@ -983,15 +983,15 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestfor (EntitySort sort: requestQuery.getSorts()) {if (sort.getDirection() == Direction.ASCENDING) {orders.add(builder.asc(PullRequestQuery.getPath(- root, PullRequestConstants.ORDER_FIELDS.get(sort.getField()))));+ root, PullRequestQueryConstants.ORDER_FIELDS.get(sort.getField()))));} else {orders.add(builder.desc(PullRequestQuery.getPath(- root, PullRequestConstants.ORDER_FIELDS.get(sort.getField()))));+ root, PullRequestQueryConstants.ORDER_FIELDS.get(sort.getField()))));}}if (orders.isEmpty())- orders.add(builder.desc(root.get(PullRequestConstants.ATTR_ID)));+ orders.add(builder.desc(root.get(PullRequestQueryConstants.ATTR_ID)));query.orderBy(orders);return query;@@ -1081,7 +1081,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestList<PullRequest> requests = new ArrayList<>();EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(Restrictions.eq(PullRequestConstants.ATTR_TARGET_PROJECT, project));+ criteria.add(Restrictions.eq(PullRequestQueryConstants.ATTR_TARGET_PROJECT, project));if (term.startsWith("#"))term = term.substring(1);diff --git a/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java b/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.javaindex cfe41e26c6..02971f7054 100644--- a/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java+++ b/server-core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java@@ -29,6 +29,7 @@ import io.onedev.server.OneException;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.User;import io.onedev.server.model.support.BranchProtection;@@ -36,7 +37,6 @@ import io.onedev.server.model.support.TagProtection;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.security.permission.ManageProject;import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.util.PullRequestConstants;@SuppressWarnings("serial")@Singleton@@ -135,7 +135,7 @@ public class GitPreReceiveCallback extends HttpServlet {User user = userManager.getCurrent();Preconditions.checkNotNull(user);- if (refName.startsWith(PullRequestConstants.REFS_PREFIX) || refName.startsWith(PullRequestUpdate.REFS_PREFIX)) {+ if (refName.startsWith(PullRequest.REFS_PREFIX) || refName.startsWith(PullRequestUpdate.REFS_PREFIX)) {if (!user.asSubject().isPermitted(new ProjectPermission(project, new ManageProject()))) {error(output, refName, Lists.newArrayList("Only project administrators can update onedev refs."));break;diff --git a/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/issue/BoardSpec.javaindex 43ba1038e4..a13953e405 100644--- a/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java@@ -26,10 +26,10 @@ import io.onedev.server.issue.fieldspec.UserChoiceField;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.util.EditContext;-import io.onedev.server.util.IssueConstants;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.util.query.IssueQueryConstants;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.UndefinedStateResolution;@@ -55,7 +55,7 @@ public class BoardSpec implements Serializable {private List<String> columns = new ArrayList<>();- private List<String> displayFields = Lists.newArrayList(IssueConstants.FIELD_STATE);+ private List<String> displayFields = Lists.newArrayList(IssueQueryConstants.FIELD_STATE);private List<String> editColumns;@@ -138,7 +138,7 @@ public class BoardSpec implements Serializable {@SuppressWarnings("unused")private static List<String> getIdentifyFieldChoices() {List<String> choices = new ArrayList<>();- choices.add(IssueConstants.FIELD_STATE);+ choices.add(IssueQueryConstants.FIELD_STATE);for (FieldSpec fieldSpec: getIssueSetting().getFieldSpecs()) {if (!fieldSpec.isAllowMultiple() && (fieldSpec instanceof ChoiceField || fieldSpec instanceof UserChoiceField || fieldSpec instanceof GroupChoiceField))choices.add(fieldSpec.getName());@@ -149,7 +149,7 @@ public class BoardSpec implements Serializable {@SuppressWarnings("unused")private static List<String> getDisplayFieldsChoices() {List<String> choices = new ArrayList<>();- choices.add(IssueConstants.FIELD_STATE);+ choices.add(IssueQueryConstants.FIELD_STATE);for (FieldSpec fieldSpec: getIssueSetting().getFieldSpecs()) {choices.add(fieldSpec.getName());}@@ -160,7 +160,7 @@ public class BoardSpec implements Serializable {private static Map<String, String> getColumnChoices() {Map<String, String> choices = new LinkedHashMap<>();String fieldName = (String) EditContext.get().getInputValue("identifyField");- if (IssueConstants.FIELD_STATE.equals(fieldName)) {+ if (IssueQueryConstants.FIELD_STATE.equals(fieldName)) {for (StateSpec state: getIssueSetting().getStateSpecs())choices.put(state.getName(), state.getName());} else if (fieldName != null) {@@ -196,7 +196,7 @@ public class BoardSpec implements Serializable {} catch (Exception e) {}}- if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {+ if (getIdentifyField().equals(IssueQueryConstants.FIELD_STATE)) {for (String column: getColumns()) {if (getIssueSetting().getStateSpec(column) == null)undefinedStates.add(column);@@ -216,7 +216,7 @@ public class BoardSpec implements Serializable {} catch (Exception e) {}}- if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {+ if (getIdentifyField().equals(IssueQueryConstants.FIELD_STATE)) {for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {int index = getColumns().indexOf(entry.getKey());if (index != -1) {@@ -238,13 +238,13 @@ public class BoardSpec implements Serializable {} catch (Exception e) {}}- if (!IssueConstants.FIELD_STATE.equals(getIdentifyField())) {+ if (!IssueQueryConstants.FIELD_STATE.equals(getIdentifyField())) {FieldSpec fieldSpec = getIssueSetting().getFieldSpec(getIdentifyField());if (fieldSpec == null)undefinedFields.add(getIdentifyField());}for (String displayField: getDisplayFields()) {- if (!IssueConstants.FIELD_STATE.equals(displayField)) {+ if (!IssueQueryConstants.FIELD_STATE.equals(displayField)) {FieldSpec fieldSpec = getIssueSetting().getFieldSpec(displayField);if (fieldSpec == null)undefinedFields.add(displayField);@@ -365,7 +365,7 @@ public class BoardSpec implements Serializable {}public void onRenameState(String oldName, String newName) {- if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {+ if (getIdentifyField().equals(IssueQueryConstants.FIELD_STATE)) {int index = getColumns().indexOf(oldName);if (index != -1) {if (getColumns().contains(newName))@@ -425,7 +425,7 @@ public class BoardSpec implements Serializable {}public boolean onDeleteState(String stateName) {- if (getIdentifyField().equals(IssueConstants.FIELD_STATE))+ if (getIdentifyField().equals(IssueQueryConstants.FIELD_STATE))getColumns().remove(stateName);if (getBaseQuery() != null) {try {@@ -493,7 +493,7 @@ public class BoardSpec implements Serializable {public Collection<UndefinedFieldValue> getUndefinedFieldValues() {Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();- if (!identifyField.equals(IssueConstants.FIELD_STATE)) {+ if (!identifyField.equals(IssueQueryConstants.FIELD_STATE)) {SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getIssueSetting().getFieldSpec(identifyField));if (specifiedChoices != null) {for (String column: getColumns()) {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 c8ce03f084..cd471c1650 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@@ -50,7 +50,6 @@ import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.storage.AttachmentStorageSupport;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.ProjectAndBranch;-import io.onedev.server.util.PullRequestConstants;import io.onedev.server.util.Referenceable;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;@@ -75,6 +74,12 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachprivate static final long serialVersionUID = 1L;+ public static final String STATE_OPEN = "Open";++ public static final String REFS_PREFIX = "refs/pull/";++ public static final int MAX_CODE_COMMENTS = 1000;+private static final int MAX_CHECK_ERROR_LEN = 1024;@Embedded@@ -471,19 +476,19 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach@JsonView(RestView.class)public String getBaseRef() {Preconditions.checkNotNull(getId());- return PullRequestConstants.REFS_PREFIX + getNumber() + "/base";+ return PullRequest.REFS_PREFIX + getNumber() + "/base";}@JsonView(RestView.class)public String getMergeRef() {Preconditions.checkNotNull(getId());- return PullRequestConstants.REFS_PREFIX + getNumber() + "/merge";+ return PullRequest.REFS_PREFIX + getNumber() + "/merge";}@JsonView(RestView.class)public String getHeadRef() {Preconditions.checkNotNull(getId());- return PullRequestConstants.REFS_PREFIX + getNumber() + "/head";+ return PullRequest.REFS_PREFIX + getNumber() + "/head";}/**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 a826e15c3c..88c7ac8b48 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@@ -32,7 +32,6 @@ import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.OrCriteria;import io.onedev.server.search.entity.issue.StateCriteria;-import io.onedev.server.util.IssueConstants;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.Choice;@@ -40,6 +39,7 @@ import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoicimport io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.util.inputspec.showcondition.ShowCondition;import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;+import io.onedev.server.util.query.IssueQueryConstants;import io.onedev.server.web.editable.annotation.Editable;@Editable@@ -254,10 +254,10 @@ public class GlobalIssueSetting implements Serializable {defaultPromptFieldsUponIssueOpen.add("Build");BoardSpec board = new BoardSpec();- board.setName(IssueConstants.FIELD_STATE);- board.setIdentifyField(IssueConstants.FIELD_STATE);+ board.setName(IssueQueryConstants.FIELD_STATE);+ board.setIdentifyField(IssueQueryConstants.FIELD_STATE);board.setColumns(Lists.newArrayList("Open", "Closed"));- board.setDisplayFields(Lists.newArrayList(IssueConstants.FIELD_STATE, "Type", "Priority", "Assignee", "Resolution", "Duplicate With"));+ board.setDisplayFields(Lists.newArrayList(IssueQueryConstants.FIELD_STATE, "Type", "Priority", "Assignee", "Resolution", "Duplicate With"));defaultBoardSpecs.add(board);listFields.add("Type");diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.javaindex 253d182474..810d7a5d2c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java@@ -14,7 +14,7 @@ import io.onedev.server.model.PullRequestBuild;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class AssociatedWithPullRequestCriteria extends EntityCriteria<Build> {@@ -31,9 +31,9 @@ public class AssociatedWithPullRequestCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(BuildConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT);+ From<?, ?> join = root.join(BuildQueryConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT);return builder.and(- builder.equal(root.get(BuildConstants.ATTR_PROJECT), request.getTargetProject()),+ builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), request.getTargetProject()),builder.equal(join.get(PullRequestBuild.ATTR_REQUEST), request));}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.javaindex 812bd3ff01..2f1faed727 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class AssociatedWithPullRequestsCriteria extends EntityCriteria<Build> {@@ -15,7 +15,7 @@ public class AssociatedWithPullRequestsCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- return builder.isNotEmpty(root.get(BuildConstants.ATTR_PULL_REQUEST_BUILDS));+ return builder.isNotEmpty(root.get(BuildQueryConstants.ATTR_PULL_REQUEST_BUILDS));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex db167973fb..a4f26812ff 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -1,15 +1,16 @@package io.onedev.server.search.entity.build;-import static io.onedev.server.util.BuildConstants.FIELD_COMMIT;-import static io.onedev.server.util.BuildConstants.FIELD_FINISH_DATE;-import static io.onedev.server.util.BuildConstants.FIELD_JOB;-import static io.onedev.server.util.BuildConstants.FIELD_NUMBER;-import static io.onedev.server.util.BuildConstants.FIELD_QUEUEING_DATE;-import static io.onedev.server.util.BuildConstants.FIELD_RUNNING_DATE;-import static io.onedev.server.util.BuildConstants.FIELD_SUBMIT_DATE;-import static io.onedev.server.util.BuildConstants.FIELD_VERSION;-import static io.onedev.server.util.BuildConstants.ORDER_FIELDS;-import static io.onedev.server.util.BuildConstants.QUERY_FIELDS;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_COMMIT;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_FINISH_DATE;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_JOB;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_NUMBER;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_PROJECT;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_QUEUEING_DATE;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_RUNNING_DATE;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_SUBMIT_DATE;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_VERSION;+import static io.onedev.server.util.query.BuildQueryConstants.ORDER_FIELDS;+import static io.onedev.server.util.query.BuildQueryConstants.QUERY_FIELDS;import java.util.ArrayList;import java.util.Collection;@@ -177,6 +178,8 @@ public class BuildQuery extends EntityQuery<Build> {throw new IllegalStateException();case BuildQueryLexer.Is:switch (fieldName) {+ case FIELD_PROJECT:+ return new ProjectCriteria(value);case FIELD_COMMIT:ProjectAwareCommitId commitId = getCommitId(project, value);return new CommitCriteria(commitId.getProject(), commitId.getCommitId());@@ -258,7 +261,8 @@ public class BuildQuery extends EntityQuery<Build> {throw newOperatorException(fieldName, operator);break;case BuildQueryLexer.Is:- if (!fieldName.equals(FIELD_COMMIT) && !fieldName.equals(FIELD_JOB) && !fieldName.equals(FIELD_NUMBER)+ if (!fieldName.equals(FIELD_PROJECT) && !fieldName.equals(FIELD_COMMIT)+ && !fieldName.equals(FIELD_JOB) && !fieldName.equals(FIELD_NUMBER)&& !fieldName.equals(FIELD_VERSION) && !paramNames.contains(fieldName)) {throw newOperatorException(fieldName, operator);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.javaindex 6b6dd2bd86..b92b4b4715 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class CancelledByCriteria extends EntityCriteria<Build> {@@ -28,7 +28,7 @@ public class CancelledByCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<User> attribute = root.get(BuildConstants.ATTR_CANCELLER);+ Path<User> attribute = root.get(BuildQueryConstants.ATTR_CANCELLER);return builder.equal(attribute, this.user);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.javaindex 169202f613..526e90275e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class CancelledByMeCriteria extends EntityCriteria<Build> {@@ -17,7 +17,7 @@ public class CancelledByMeCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {if (user != null) {- Path<User> attribute = root.get(BuildConstants.ATTR_CANCELLER);+ Path<User> attribute = root.get(BuildQueryConstants.ATTR_CANCELLER);return builder.equal(attribute, user);} else {return builder.disjunction();diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.javaindex 8b85a0512b..c192d096c2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class CancelledCriteria extends EntityCriteria<Build> {@@ -16,7 +16,7 @@ public class CancelledCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);+ Path<?> attribute = root.get(BuildQueryConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.CANCELLED);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.javaindex 677f72b1a7..6e06e53c6f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class CommitCriteria extends EntityCriteria<Build> {@@ -28,8 +28,8 @@ public class CommitCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<?> projectAttribute = BuildQuery.getPath(root, BuildConstants.ATTR_PROJECT);- Path<?> commitAttribute = BuildQuery.getPath(root, BuildConstants.ATTR_COMMIT);+ Path<?> projectAttribute = BuildQuery.getPath(root, BuildQueryConstants.ATTR_PROJECT);+ Path<?> commitAttribute = BuildQuery.getPath(root, BuildQueryConstants.ATTR_COMMIT);return builder.and(builder.equal(projectAttribute, project),builder.equal(commitAttribute, commitId.name()));@@ -47,7 +47,7 @@ public class CommitCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_COMMIT) + " " + BuildQuery.getRuleName(BuildQueryLexer.Is) + " " + BuildQuery.quote(commitId.name());+ return BuildQuery.quote(BuildQueryConstants.FIELD_COMMIT) + " " + BuildQuery.getRuleName(BuildQueryLexer.Is) + " " + BuildQuery.quote(commitId.name());}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.javaindex e18eabf283..161227d8b4 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java@@ -13,7 +13,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class DependenciesOfCriteria extends EntityCriteria<Build> {@@ -30,7 +30,7 @@ public class DependenciesOfCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(BuildConstants.ATTR_DEPENDENTS, JoinType.LEFT);+ From<?, ?> join = root.join(BuildQueryConstants.ATTR_DEPENDENTS, JoinType.LEFT);return builder.equal(join.get(BuildDependence.ATTR_DEPENDENT), build);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.javaindex dd245c5035..c9dc915568 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java@@ -13,7 +13,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class DependsOnCriteria extends EntityCriteria<Build> {@@ -30,7 +30,7 @@ public class DependsOnCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(BuildConstants.ATTR_DEPENDENCIES, JoinType.LEFT);+ From<?, ?> join = root.join(BuildQueryConstants.ATTR_DEPENDENCIES, JoinType.LEFT);return builder.equal(join.get(BuildDependence.ATTR_DEPENDENCY), build);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.javaindex da193505b8..701eb6600d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class FailedCriteria extends EntityCriteria<Build> {@@ -16,7 +16,7 @@ public class FailedCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);+ Path<?> attribute = root.get(BuildQueryConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.FAILED);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.javaindex 2192be7e04..f694fa1d30 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class FinishDateCriteria extends EntityCriteria<Build> {@@ -31,7 +31,7 @@ public class FinishDateCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<Date> attribute = root.get(BuildConstants.ATTR_FINISH_DATE);+ Path<Date> attribute = root.get(BuildQueryConstants.ATTR_FINISH_DATE);if (operator == BuildQueryLexer.IsBefore)return builder.lessThan(attribute, date);else@@ -53,7 +53,7 @@ public class FinishDateCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_FINISH_DATE) + " "+ return BuildQuery.quote(BuildQueryConstants.FIELD_FINISH_DATE) + " "+ BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.javaindex bc5d514831..4c58b79125 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java@@ -21,7 +21,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class FixedIssueCriteria extends EntityCriteria<Build> {@@ -47,7 +47,7 @@ public class FixedIssueCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<Long> attribute = root.get(BuildConstants.ATTR_ID);+ Path<Long> attribute = root.get(BuildQueryConstants.ATTR_ID);Project project = issue.getProject();Collection<ObjectId> fixCommits = getCommitInfoManager().getFixCommits(project, issue.getNumber());Collection<String> descendents = new HashSet<>();@@ -56,7 +56,7 @@ public class FixedIssueCriteria extends EntityCriteria<Build> {BuildManager buildManager = OneDev.getInstance(BuildManager.class);Collection<Long> inBuildIds = buildManager.filterBuildIds(project.getId(), descendents);return builder.and(- builder.equal(root.get(BuildConstants.ATTR_PROJECT), issue.getProject()),+ builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), issue.getProject()),inManyValues(builder, attribute, inBuildIds, buildManager.getBuildIdsByProject(project.getId())));}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.javaindex b72d6e0ee7..701c1e487f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java@@ -9,7 +9,7 @@ import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class JobCriteria extends EntityCriteria<Build> {@@ -23,15 +23,14 @@ public class JobCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<String> attribute = root.get(BuildConstants.ATTR_JOB);+ Path<String> attribute = root.get(BuildQueryConstants.ATTR_JOB);String normalized = jobName.toLowerCase().replace("*", "%");return builder.like(builder.lower(attribute), normalized);}@Overridepublic boolean matches(Build build, User user) {- String jobName = build.getJobName();- return jobName != null && WildcardUtils.matchString(this.jobName.toLowerCase(), jobName.toLowerCase());+ return WildcardUtils.matchString(jobName.toLowerCase(), build.getJobName().toLowerCase());}@Override@@ -41,7 +40,7 @@ public class JobCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_JOB) + " "+ return BuildQuery.quote(BuildQueryConstants.FIELD_JOB) + " "+ BuildQuery.getRuleName(BuildQueryLexer.Is) + " "+ BuildQuery.quote(jobName);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.javaindex 08b162f349..69d6d7cd04 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java@@ -11,8 +11,8 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.BuildConstants;import io.onedev.server.util.ProjectScopedNumber;+import io.onedev.server.util.query.BuildQueryConstants;public class NumberCriteria extends EntityCriteria<Build> {@@ -32,7 +32,7 @@ public class NumberCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<Long> attribute = root.get(BuildConstants.ATTR_NUMBER);+ Path<Long> attribute = root.get(BuildQueryConstants.ATTR_NUMBER);Predicate numberPredicate;if (operator == BuildQueryLexer.Is)numberPredicate = builder.equal(attribute, number.getNumber());@@ -41,7 +41,7 @@ public class NumberCriteria extends EntityCriteria<Build> {elsenumberPredicate = builder.lessThan(attribute, number.getNumber());return builder.and(- builder.equal(root.get(BuildConstants.ATTR_PROJECT), number.getProject()),+ builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), number.getProject()),numberPredicate);}@@ -66,7 +66,7 @@ public class NumberCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_NUMBER) + " "+ return BuildQuery.quote(BuildQueryConstants.FIELD_NUMBER) + " "+ BuildQuery.getRuleName(operator) + " "+ BuildQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.javaindex 881d927be2..42ab44435e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java@@ -12,7 +12,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.BuildParam;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class ParamCriteria extends EntityCriteria<Build> {@@ -29,7 +29,7 @@ public class ParamCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(BuildConstants.ATTR_PARAMS, JoinType.LEFT);+ From<?, ?> join = root.join(BuildQueryConstants.ATTR_PARAMS, JoinType.LEFT);return builder.and(builder.equal(join.get(BuildParam.ATTR_NAME), name),builder.equal(join.get(BuildParam.ATTR_VALUE), value));diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.javaindex 94a3bc2e0e..5600922fec 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class PendingCriteria extends EntityCriteria<Build> {@@ -16,7 +16,7 @@ public class PendingCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);+ Path<?> attribute = root.get(BuildQueryConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.PENDING);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.javanew file mode 100644index 0000000000..fd7773e907--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java@@ -0,0 +1,53 @@+package io.onedev.server.search.entity.build;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.JoinType;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.commons.utils.match.WildcardUtils;+import io.onedev.server.model.Build;+import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.BuildQueryConstants;+import io.onedev.server.util.query.ProjectQueryConstants;++public class ProjectCriteria extends EntityCriteria<Build> {++ private static final long serialVersionUID = 1L;++ private final String projectName;++ public ProjectCriteria(String projectName) {+ this.projectName = projectName;+ }++ @Override+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {+ Path<String> attribute = root+ .join(BuildQueryConstants.ATTR_PROJECT, JoinType.INNER)+ .get(ProjectQueryConstants.ATTR_NAME);+ String normalized = projectName.toLowerCase().replace("*", "%");+ return builder.like(builder.lower(attribute), normalized);+ }++ @Override+ public boolean matches(Build build, User user) {+ return WildcardUtils.matchString(projectName.toLowerCase(),+ build.getProject().getName().toLowerCase());+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return BuildQuery.quote(BuildQueryConstants.FIELD_PROJECT) + " "+ + BuildQuery.getRuleName(BuildQueryLexer.Is) + " "+ + BuildQuery.quote(projectName);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.javaindex 14a62a777f..b7a83a2572 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/QueueingDateCriteria.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class QueueingDateCriteria extends EntityCriteria<Build> {@@ -31,7 +31,7 @@ public class QueueingDateCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<Date> attribute = root.get(BuildConstants.ATTR_QUEUEING_DATE);+ Path<Date> attribute = root.get(BuildQueryConstants.ATTR_QUEUEING_DATE);if (operator == BuildQueryLexer.IsBefore)return builder.lessThan(attribute, date);else@@ -53,7 +53,7 @@ public class QueueingDateCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_QUEUEING_DATE) + " "+ return BuildQuery.quote(BuildQueryConstants.FIELD_QUEUEING_DATE) + " "+ BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.javaindex 3ab62ca90e..cadb33dd6e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java@@ -14,7 +14,7 @@ import io.onedev.server.model.PullRequestBuild;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class RequiredByPullRequestCriteria extends EntityCriteria<Build> {@@ -31,10 +31,10 @@ public class RequiredByPullRequestCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(BuildConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT);+ From<?, ?> join = root.join(BuildQueryConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT);return builder.and(- builder.equal(root.get(BuildConstants.ATTR_PROJECT), request.getTargetProject()),+ builder.equal(root.get(BuildQueryConstants.ATTR_PROJECT), request.getTargetProject()),builder.equal(join.get(PullRequestBuild.ATTR_REQUEST), request),builder.equal(join.get(PullRequestBuild.ATTR_REQUIRED), true));}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.javaindex 7c164b66bc..5283e4619e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java@@ -10,7 +10,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.PullRequestBuild;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class RequiredByPullRequestsCriteria extends EntityCriteria<Build> {@@ -18,7 +18,7 @@ public class RequiredByPullRequestsCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(BuildConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT);+ From<?, ?> join = root.join(BuildQueryConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT);return builder.equal(join.get(PullRequestBuild.ATTR_REQUIRED), true);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.javaindex a912d44642..c27fe8bbd7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class RunningCriteria extends EntityCriteria<Build> {@@ -16,7 +16,7 @@ public class RunningCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);+ Path<?> attribute = root.get(BuildQueryConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.RUNNING);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.javaindex b7683ec2b8..2ed1810502 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class RunningDateCriteria extends EntityCriteria<Build> {@@ -31,7 +31,7 @@ public class RunningDateCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<Date> attribute = root.get(BuildConstants.ATTR_RUNNING_DATE);+ Path<Date> attribute = root.get(BuildQueryConstants.ATTR_RUNNING_DATE);if (operator == BuildQueryLexer.IsBefore)return builder.lessThan(attribute, date);else@@ -53,7 +53,7 @@ public class RunningDateCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_RUNNING_DATE) + " "+ return BuildQuery.quote(BuildQueryConstants.FIELD_RUNNING_DATE) + " "+ BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.javaindex 3b311a54a6..f7c5c9cb38 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class SubmitDateCriteria extends EntityCriteria<Build> {@@ -31,7 +31,7 @@ public class SubmitDateCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<Date> attribute = root.get(BuildConstants.ATTR_SUBMIT_DATE);+ Path<Date> attribute = root.get(BuildQueryConstants.ATTR_SUBMIT_DATE);if (operator == BuildQueryLexer.IsBefore)return builder.lessThan(attribute, date);else@@ -53,7 +53,7 @@ public class SubmitDateCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_SUBMIT_DATE) + " "+ return BuildQuery.quote(BuildQueryConstants.FIELD_SUBMIT_DATE) + " "+ BuildQuery.getRuleName(operator) + " " + BuildQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.javaindex 79f13027a6..b2a5d92340 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class SubmittedByCriteria extends EntityCriteria<Build> {@@ -28,7 +28,7 @@ public class SubmittedByCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<User> attribute = root.get(BuildConstants.ATTR_SUBMITTER);+ Path<User> attribute = root.get(BuildQueryConstants.ATTR_SUBMITTER);return builder.equal(attribute, this.user);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.javaindex 96368aeb7e..33f0fb470a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class SubmittedByMeCriteria extends EntityCriteria<Build> {@@ -17,7 +17,7 @@ public class SubmittedByMeCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {if (user != null) {- Path<User> attribute = root.get(BuildConstants.ATTR_SUBMITTER);+ Path<User> attribute = root.get(BuildQueryConstants.ATTR_SUBMITTER);return builder.equal(attribute, user);} else {return builder.disjunction();diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.javaindex a8ada31544..904b88824f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class SuccessfulCriteria extends EntityCriteria<Build> {@@ -16,7 +16,7 @@ public class SuccessfulCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);+ Path<?> attribute = root.get(BuildQueryConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.SUCCESSFUL);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.javaindex fe72fcf939..b730c49d72 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class TimedOutCriteria extends EntityCriteria<Build> {@@ -16,7 +16,7 @@ public class TimedOutCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);+ Path<?> attribute = root.get(BuildQueryConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.TIMED_OUT);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.javaindex 3516822cb1..f38a83e7e5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java@@ -9,7 +9,7 @@ import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class VersionCriteria extends EntityCriteria<Build> {@@ -23,7 +23,7 @@ public class VersionCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<String> attribute = root.get(BuildConstants.ATTR_VERSION);+ Path<String> attribute = root.get(BuildQueryConstants.ATTR_VERSION);String normalized = value.toLowerCase().replace("*", "%");return builder.like(builder.lower(attribute), normalized);}@@ -41,7 +41,7 @@ public class VersionCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.quote(BuildConstants.FIELD_VERSION) + " "+ return BuildQuery.quote(BuildQueryConstants.FIELD_VERSION) + " "+ BuildQuery.getRuleName(BuildQueryLexer.Is) + " "+ BuildQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.javaindex 54b9fa3244..e8bf72912e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;public class WaitingCriteria extends EntityCriteria<Build> {@@ -16,7 +16,7 @@ public class WaitingCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<?> attribute = root.get(BuildConstants.ATTR_STATUS);+ Path<?> attribute = root.get(BuildQueryConstants.ATTR_STATUS);return builder.equal(attribute, Build.Status.WAITING);}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 f310a1a8d0..1cac02e79e 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@@ -1,13 +1,13 @@package io.onedev.server.search.entity.codecomment;-import static io.onedev.server.util.CodeCommentConstants.FIELD_CONTENT;-import static io.onedev.server.util.CodeCommentConstants.FIELD_CREATE_DATE;-import static io.onedev.server.util.CodeCommentConstants.FIELD_PATH;-import static io.onedev.server.util.CodeCommentConstants.FIELD_REPLY;-import static io.onedev.server.util.CodeCommentConstants.FIELD_REPLY_COUNT;-import static io.onedev.server.util.CodeCommentConstants.FIELD_UPDATE_DATE;-import static io.onedev.server.util.CodeCommentConstants.ORDER_FIELDS;-import static io.onedev.server.util.CodeCommentConstants.QUERY_FIELDS;+import static io.onedev.server.util.query.CodeCommentQueryConstants.FIELD_CONTENT;+import static io.onedev.server.util.query.CodeCommentQueryConstants.FIELD_CREATE_DATE;+import static io.onedev.server.util.query.CodeCommentQueryConstants.FIELD_PATH;+import static io.onedev.server.util.query.CodeCommentQueryConstants.FIELD_REPLY;+import static io.onedev.server.util.query.CodeCommentQueryConstants.FIELD_REPLY_COUNT;+import static io.onedev.server.util.query.CodeCommentQueryConstants.FIELD_UPDATE_DATE;+import static io.onedev.server.util.query.CodeCommentQueryConstants.ORDER_FIELDS;+import static io.onedev.server.util.query.CodeCommentQueryConstants.QUERY_FIELDS;import java.util.ArrayList;import java.util.Date;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.javaindex 74e771ca8e..cc0875ee98 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java@@ -9,7 +9,7 @@ import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.CodeComment;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.CodeCommentConstants;+import io.onedev.server.util.query.CodeCommentQueryConstants;public class ContentCriteria extends EntityCriteria<CodeComment> {@@ -23,7 +23,7 @@ public class ContentCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {- Expression<String> attribute = root.get(CodeCommentConstants.ATTR_CONTENT);+ Expression<String> attribute = root.get(CodeCommentQueryConstants.ATTR_CONTENT);return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");}@@ -40,7 +40,7 @@ public class ContentCriteria extends EntityCriteria<CodeComment> {@Overridepublic String toString() {- return CodeCommentQuery.quote(CodeCommentConstants.FIELD_CONTENT) + " "+ return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_CONTENT) + " "+ CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Contains) + " "+ CodeCommentQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.javaindex d20c82cfc4..6e909cdc25 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.CodeComment;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.CodeCommentConstants;+import io.onedev.server.util.query.CodeCommentQueryConstants;public class CreateDateCriteria extends EntityCriteria<CodeComment> {@@ -30,7 +30,7 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {- Path<Date> attribute = root.get(CodeCommentConstants.ATTR_CREATE_DATE);+ Path<Date> attribute = root.get(CodeCommentQueryConstants.ATTR_CREATE_DATE);if (operator == CodeCommentQueryLexer.IsBefore)return builder.lessThan(attribute, value);else@@ -52,7 +52,7 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {@Overridepublic String toString() {- return CodeCommentQuery.quote(CodeCommentConstants.FIELD_CREATE_DATE) + " "+ return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_CREATE_DATE) + " "+ CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(rawValue);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.javaindex a434463aa2..a736083a52 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java@@ -11,7 +11,7 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.CodeCommentConstants;+import io.onedev.server.util.query.CodeCommentQueryConstants;public class CreatedByCriteria extends EntityCriteria<CodeComment> {@@ -28,7 +28,7 @@ public class CreatedByCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {- Path<User> attribute = root.get(CodeCommentConstants.ATTR_USER);+ Path<User> attribute = root.get(CodeCommentQueryConstants.ATTR_USER);return builder.equal(attribute, this.user);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.javaindex 8eed35e8d3..3c88e0be09 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.CodeComment;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.CodeCommentConstants;+import io.onedev.server.util.query.CodeCommentQueryConstants;public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {@@ -17,7 +17,7 @@ public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {if (user != null) {- Path<?> attribute = root.get(CodeCommentConstants.ATTR_USER);+ Path<?> attribute = root.get(CodeCommentQueryConstants.ATTR_USER);return builder.equal(attribute, user);} else {return builder.disjunction();diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.javaindex e558a2c036..b33278a10e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java@@ -11,7 +11,7 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.CodeCommentConstants;+import io.onedev.server.util.query.CodeCommentQueryConstants;public class OnCommitCriteria extends EntityCriteria<CodeComment> {@@ -28,8 +28,8 @@ public class OnCommitCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {- Path<?> projectAttribute = CodeCommentQuery.getPath(root, CodeCommentConstants.ATTR_PROJECT);- Path<?> commitAttribute = CodeCommentQuery.getPath(root, CodeCommentConstants.ATTR_COMMIT);+ Path<?> projectAttribute = CodeCommentQuery.getPath(root, CodeCommentQueryConstants.ATTR_PROJECT);+ Path<?> commitAttribute = CodeCommentQuery.getPath(root, CodeCommentQueryConstants.ATTR_COMMIT);return builder.and(builder.equal(projectAttribute, project),builder.equal(commitAttribute, commitId.name()));diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.javaindex 149baaa122..c66b257236 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java@@ -9,7 +9,7 @@ import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.CodeComment;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.CodeCommentConstants;+import io.onedev.server.util.query.CodeCommentQueryConstants;public class PathCriteria extends EntityCriteria<CodeComment> {@@ -23,7 +23,7 @@ public class PathCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {- Path<String> attribute = CodeCommentQuery.getPath(root, CodeCommentConstants.ATTR_PATH);+ Path<String> attribute = CodeCommentQuery.getPath(root, CodeCommentQueryConstants.ATTR_PATH);String normalized = value.toLowerCase().replace('*', '%');if (normalized.endsWith("/"))normalized += "%";@@ -42,7 +42,7 @@ public class PathCriteria extends EntityCriteria<CodeComment> {@Overridepublic String toString() {- return CodeCommentQuery.quote(CodeCommentConstants.FIELD_PATH) + " "+ return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_PATH) + " "+ CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Is) + " "+ CodeCommentQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.javaindex 0473ebb8a2..cfe2cd7fef 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.CodeComment;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.CodeCommentConstants;+import io.onedev.server.util.query.CodeCommentQueryConstants;public class ReplyCountCriteria extends EntityCriteria<CodeComment> {@@ -25,7 +25,7 @@ public class ReplyCountCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {- Path<Integer> attribute = root.get(CodeCommentConstants.ATTR_REPLY_COUNT);+ Path<Integer> attribute = root.get(CodeCommentQueryConstants.ATTR_REPLY_COUNT);if (operator == CodeCommentQueryLexer.Is)return builder.equal(attribute, value);else if (operator == CodeCommentQueryLexer.IsLessThan)@@ -51,7 +51,7 @@ public class ReplyCountCriteria extends EntityCriteria<CodeComment> {@Overridepublic String toString() {- return CodeCommentQuery.quote(CodeCommentConstants.FIELD_REPLY_COUNT) + " " + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(String.valueOf(value));+ return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_REPLY_COUNT) + " " + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(String.valueOf(value));}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.javaindex 75ff23c6da..15d79afeda 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java@@ -12,7 +12,7 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.CodeCommentConstants;+import io.onedev.server.util.query.CodeCommentQueryConstants;public class ReplyCriteria extends EntityCriteria<CodeComment> {@@ -26,7 +26,7 @@ public class ReplyCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(CodeCommentConstants.ATTR_REPLIES, JoinType.LEFT);+ From<?, ?> join = root.join(CodeCommentQueryConstants.ATTR_REPLIES, JoinType.LEFT);Path<String> attribute = join.get(CodeCommentReply.ATTR_CONTENT);return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");}@@ -48,7 +48,7 @@ public class ReplyCriteria extends EntityCriteria<CodeComment> {@Overridepublic String toString() {- return CodeCommentQuery.quote(CodeCommentConstants.FIELD_REPLY) + " " + CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Contains) + " " + CodeCommentQuery.quote(value);+ return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_REPLY) + " " + CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Contains) + " " + CodeCommentQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.javaindex ea4d8db3ea..4fef97494e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.CodeComment;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.CodeCommentConstants;+import io.onedev.server.util.query.CodeCommentQueryConstants;public class UpdateDateCriteria extends EntityCriteria<CodeComment> {@@ -30,7 +30,7 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {- Path<Date> attribute = CodeCommentQuery.getPath(root, CodeCommentConstants.ATTR_UPDATE_DATE);+ Path<Date> attribute = CodeCommentQuery.getPath(root, CodeCommentQueryConstants.ATTR_UPDATE_DATE);if (operator == CodeCommentQueryLexer.IsBefore)return builder.lessThan(attribute, value);else@@ -52,7 +52,7 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {@Overridepublic String toString() {- return CodeCommentQuery.quote(CodeCommentConstants.FIELD_UPDATE_DATE) + " " + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(rawValue);+ return CodeCommentQuery.quote(CodeCommentQueryConstants.FIELD_UPDATE_DATE) + " " + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(rawValue);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.javaindex 2ea4054ca1..a59affb62b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java@@ -13,7 +13,7 @@ import io.onedev.server.model.IssueField;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class BuildFieldCriteria extends FieldCriteria {@@ -32,7 +32,7 @@ public class BuildFieldCriteria extends FieldCriteria {@Overrideprotected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {return builder.and(- builder.equal(field.getParent().get(IssueConstants.ATTR_PROJECT), build.getProject()),+ builder.equal(field.getParent().get(IssueQueryConstants.ATTR_PROJECT), build.getProject()),builder.equal(field.get(IssueField.ATTR_ORDINAL), build.getNumber()));}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.javaindex 091bdc2872..448d6db4b0 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.model.User;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class CommentCountCriteria extends IssueCriteria {@@ -24,7 +24,7 @@ public class CommentCountCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- Path<Integer> attribute = root.get(IssueConstants.ATTR_COMMENT_COUNT);+ Path<Integer> attribute = root.get(IssueQueryConstants.ATTR_COMMENT_COUNT);if (operator == IssueQueryLexer.Is)return builder.equal(attribute, value);else if (operator == IssueQueryLexer.IsGreaterThan)@@ -50,7 +50,7 @@ public class CommentCountCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_COMMENT_COUNT) + " "+ return IssueQuery.quote(IssueQueryConstants.FIELD_COMMENT_COUNT) + " "+ IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.javaindex 7e9f241744..653fd88243 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueComment;import io.onedev.server.model.User;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class CommentCriteria extends IssueCriteria {@@ -24,7 +24,7 @@ public class CommentCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(IssueConstants.ATTR_COMMENTS, JoinType.LEFT);+ From<?, ?> join = root.join(IssueQueryConstants.ATTR_COMMENTS, JoinType.LEFT);Path<String> attribute = join.get(IssueComment.PATH_CONTENT);return builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");}@@ -45,7 +45,7 @@ public class CommentCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_COMMENT) + " "+ return IssueQuery.quote(IssueQueryConstants.FIELD_COMMENT) + " "+ IssueQuery.getRuleName(IssueQueryLexer.Contains) + " " + IssueQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.javaindex 4be5751246..7a702cb7b4 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Issue;import io.onedev.server.model.User;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class DescriptionCriteria extends IssueCriteria {@@ -22,7 +22,7 @@ public class DescriptionCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- Expression<String> attribute = root.get(IssueConstants.ATTR_DESCRIPTION);+ Expression<String> attribute = root.get(IssueQueryConstants.ATTR_DESCRIPTION);return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");}@@ -39,7 +39,7 @@ public class DescriptionCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_DESCRIPTION) + " "+ return IssueQuery.quote(IssueQueryConstants.FIELD_DESCRIPTION) + " "+ IssueQuery.getRuleName(IssueQueryLexer.Contains) + " "+ IssueQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.javaindex 5a630daaee..aefce8d9db 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java@@ -16,7 +16,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public abstract class FieldCriteria extends IssueCriteria {@@ -34,7 +34,7 @@ public abstract class FieldCriteria extends IssueCriteria {@Overridepublic final Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- Join<?, ?> join = root.join(IssueConstants.ATTR_FIELDS, JoinType.LEFT);+ Join<?, ?> join = root.join(IssueQueryConstants.ATTR_FIELDS, JoinType.LEFT);Predicate namePredicate = builder.equal(join.get(IssueField.ATTR_NAME), getFieldName());return builder.and(namePredicate, getValuePredicate(join, builder, user));}@@ -45,7 +45,7 @@ public abstract class FieldCriteria extends IssueCriteria {public Collection<String> getUndefinedFields() {Set<String> undefinedFields = new HashSet<>();GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();- if (!IssueConstants.QUERY_FIELDS.contains(fieldName)+ if (!IssueQueryConstants.QUERY_FIELDS.contains(fieldName)&& issueSetting.getFieldSpec(fieldName) == null) {undefinedFields.add(fieldName);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.javaindex 0096eba5f2..54d8cd3629 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java@@ -28,9 +28,9 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.IssueConstants;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.ProjectAwareCommitId;+import io.onedev.server.util.query.IssueQueryConstants;public class FixedBetweenCriteria extends IssueCriteria {@@ -99,17 +99,17 @@ public class FixedBetweenCriteria extends IssueCriteria {}Predicate issuePredicate;- Path<Long> attribute = root.get(IssueConstants.ATTR_NUMBER);+ Path<Long> attribute = root.get(IssueQueryConstants.ATTR_NUMBER);if (fixedIssueNumbers.size() > IN_CLAUSE_LIMIT) {Collection<Long> allIssueNumbers = OneDev.getInstance(IssueManager.class).getIssueNumbers(project.getId());issuePredicate = inManyValues(builder, attribute, fixedIssueNumbers, allIssueNumbers);} else if (!fixedIssueNumbers.isEmpty()) {- issuePredicate = root.get(IssueConstants.ATTR_NUMBER).in(fixedIssueNumbers);+ issuePredicate = root.get(IssueQueryConstants.ATTR_NUMBER).in(fixedIssueNumbers);} else {issuePredicate = builder.disjunction();}return builder.and(- builder.equal(root.get(IssueConstants.ATTR_PROJECT), project),+ builder.equal(root.get(IssueQueryConstants.ATTR_PROJECT), project),issuePredicate);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.javaindex cebe25f846..32da473885 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java@@ -12,7 +12,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class FixedInCriteria extends IssueCriteria {@@ -37,8 +37,8 @@ public class FixedInCriteria extends IssueCriteria {Collection<Long> fixedIssueNumbers = build.getFixedIssueNumbers();if (!fixedIssueNumbers.isEmpty()) {return builder.and(- builder.equal(root.get(IssueConstants.ATTR_PROJECT), build.getProject()),- root.get(IssueConstants.ATTR_NUMBER).in(fixedIssueNumbers));+ builder.equal(root.get(IssueQueryConstants.ATTR_PROJECT), build.getProject()),+ root.get(IssueQueryConstants.ATTR_NUMBER).in(fixedIssueNumbers));} else {return builder.disjunction();}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.javaindex 5f62b5413a..d96fd1eaed 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java@@ -12,7 +12,7 @@ import io.onedev.server.model.IssueField;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class IssueFieldCriteria extends FieldCriteria {@@ -31,7 +31,7 @@ public class IssueFieldCriteria extends FieldCriteria {@Overrideprotected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {return builder.and(- builder.equal(field.getParent().get(IssueConstants.ATTR_PROJECT), issue.getProject()),+ builder.equal(field.getParent().get(IssueQueryConstants.ATTR_PROJECT), issue.getProject()),builder.equal(field.get(IssueField.ATTR_ORDINAL), issue.getNumber()));}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 e883f055db..586f8a2dc8 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@@ -53,8 +53,8 @@ import io.onedev.server.search.entity.issue.IssueQueryParser.OrderContext;import io.onedev.server.search.entity.issue.IssueQueryParser.ParensCriteriaContext;import io.onedev.server.search.entity.issue.IssueQueryParser.QueryContext;import io.onedev.server.search.entity.issue.IssueQueryParser.RevisionCriteriaContext;-import io.onedev.server.util.IssueConstants;import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.util.query.IssueQueryConstants;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;import io.onedev.server.web.util.WicketUtils;@@ -140,7 +140,7 @@ public class IssueQuery extends EntityQuery<Issue> {int operator = ctx.operator.getType();if (validate)checkField(fieldName, operator);- if (fieldName.equals(IssueConstants.FIELD_MILESTONE))+ if (fieldName.equals(IssueQueryConstants.FIELD_MILESTONE))return new MilestoneIsEmptyCriteria();elsereturn new FieldOperatorCriteria(fieldName, operator);@@ -185,18 +185,18 @@ public class IssueQuery extends EntityQuery<Issue> {switch (operator) {case IssueQueryLexer.IsBefore:case IssueQueryLexer.IsAfter:- if (fieldName.equals(IssueConstants.FIELD_SUBMIT_DATE))+ if (fieldName.equals(IssueQueryConstants.FIELD_SUBMIT_DATE))return new SubmitDateCriteria(value, operator);- else if (fieldName.equals(IssueConstants.FIELD_UPDATE_DATE))+ else if (fieldName.equals(IssueQueryConstants.FIELD_UPDATE_DATE))return new UpdateDateCriteria(value, operator);elsereturn new DateFieldCriteria(fieldName, value, operator);case IssueQueryLexer.Contains:- if (fieldName.equals(IssueConstants.FIELD_TITLE)) {+ if (fieldName.equals(IssueQueryConstants.FIELD_TITLE)) {return new TitleCriteria(value);- } else if (fieldName.equals(IssueConstants.FIELD_DESCRIPTION)) {+ } else if (fieldName.equals(IssueQueryConstants.FIELD_DESCRIPTION)) {return new DescriptionCriteria(value);- } else if (fieldName.equals(IssueConstants.FIELD_COMMENT)) {+ } else if (fieldName.equals(IssueQueryConstants.FIELD_COMMENT)) {return new CommentCriteria(value);} else {FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);@@ -212,15 +212,17 @@ public class IssueQuery extends EntityQuery<Issue> {}}case IssueQueryLexer.Is:- if (fieldName.equals(IssueConstants.FIELD_MILESTONE)) {+ if (fieldName.equals(IssueQueryConstants.FIELD_PROJECT)) {+ return new ProjectCriteria(value);+ } else if (fieldName.equals(IssueQueryConstants.FIELD_MILESTONE)) {return new MilestoneCriteria(value);- } else if (fieldName.equals(IssueConstants.FIELD_STATE)) {+ } else if (fieldName.equals(IssueQueryConstants.FIELD_STATE)) {return new StateCriteria(value);- } else if (fieldName.equals(IssueConstants.FIELD_VOTE_COUNT)) {+ } else if (fieldName.equals(IssueQueryConstants.FIELD_VOTE_COUNT)) {return new VoteCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(IssueConstants.FIELD_COMMENT_COUNT)) {+ } else if (fieldName.equals(IssueQueryConstants.FIELD_COMMENT_COUNT)) {return new CommentCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(IssueConstants.FIELD_NUMBER)) {+ } else if (fieldName.equals(IssueQueryConstants.FIELD_NUMBER)) {return new NumberCriteria(project, value, operator);} else {FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);@@ -246,11 +248,11 @@ public class IssueQuery extends EntityQuery<Issue> {}case IssueQueryLexer.IsLessThan:case IssueQueryLexer.IsGreaterThan:- if (fieldName.equals(IssueConstants.FIELD_VOTE_COUNT)) {+ if (fieldName.equals(IssueQueryConstants.FIELD_VOTE_COUNT)) {return new VoteCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(IssueConstants.FIELD_COMMENT_COUNT)) {+ } else if (fieldName.equals(IssueQueryConstants.FIELD_COMMENT_COUNT)) {return new CommentCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(IssueConstants.FIELD_NUMBER)) {+ } else if (fieldName.equals(IssueQueryConstants.FIELD_NUMBER)) {return new NumberCriteria(project, value, operator);} else {FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);@@ -299,7 +301,7 @@ public class IssueQuery extends EntityQuery<Issue> {List<EntitySort> issueSorts = new ArrayList<>();for (OrderContext order: queryContext.order()) {String fieldName = getValue(order.Quoted().getText());- if (validate && !IssueConstants.ORDER_FIELDS.containsKey(fieldName)) {+ if (validate && !IssueQueryConstants.ORDER_FIELDS.containsKey(fieldName)) {FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);if (!(fieldSpec instanceof ChoiceField) && !(fieldSpec instanceof DateField)&& !(fieldSpec instanceof NumberField)) {@@ -335,12 +337,12 @@ public class IssueQuery extends EntityQuery<Issue> {public static void checkField(String fieldName, int operator) {FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);- if (fieldSpec == null && !IssueConstants.QUERY_FIELDS.contains(fieldName))+ if (fieldSpec == null && !IssueQueryConstants.QUERY_FIELDS.contains(fieldName))throw new OneException("Field not found: " + fieldName);switch (operator) {case IssueQueryLexer.IsEmpty:- if (IssueConstants.QUERY_FIELDS.contains(fieldName)- && !fieldName.equals(IssueConstants.FIELD_MILESTONE)) {+ if (IssueQueryConstants.QUERY_FIELDS.contains(fieldName)+ && !fieldName.equals(IssueQueryConstants.FIELD_MILESTONE)) {throw newOperatorException(fieldName, operator);}break;@@ -355,27 +357,28 @@ public class IssueQuery extends EntityQuery<Issue> {break;case IssueQueryLexer.IsBefore:case IssueQueryLexer.IsAfter:- if (!fieldName.equals(IssueConstants.FIELD_SUBMIT_DATE)- && !fieldName.equals(IssueConstants.FIELD_UPDATE_DATE)+ if (!fieldName.equals(IssueQueryConstants.FIELD_SUBMIT_DATE)+ && !fieldName.equals(IssueQueryConstants.FIELD_UPDATE_DATE)&& !(fieldSpec instanceof DateField)) {throw newOperatorException(fieldName, operator);}break;case IssueQueryLexer.Contains:- if (!fieldName.equals(IssueConstants.FIELD_TITLE)- && !fieldName.equals(IssueConstants.FIELD_DESCRIPTION)- && !fieldName.equals(IssueConstants.FIELD_COMMENT)+ if (!fieldName.equals(IssueQueryConstants.FIELD_TITLE)+ && !fieldName.equals(IssueQueryConstants.FIELD_DESCRIPTION)+ && !fieldName.equals(IssueQueryConstants.FIELD_COMMENT)&& !(fieldSpec instanceof TextField)&& !(fieldSpec != null && fieldSpec.isAllowMultiple())) {throw newOperatorException(fieldName, operator);}break;case IssueQueryLexer.Is:- if (!fieldName.equals(IssueConstants.FIELD_STATE)- && !fieldName.equals(IssueConstants.FIELD_VOTE_COUNT)- && !fieldName.equals(IssueConstants.FIELD_COMMENT_COUNT)- && !fieldName.equals(IssueConstants.FIELD_NUMBER)- && !fieldName.equals(IssueConstants.FIELD_MILESTONE)+ if (!fieldName.equals(IssueQueryConstants.FIELD_PROJECT)+ && !fieldName.equals(IssueQueryConstants.FIELD_STATE)+ && !fieldName.equals(IssueQueryConstants.FIELD_VOTE_COUNT)+ && !fieldName.equals(IssueQueryConstants.FIELD_COMMENT_COUNT)+ && !fieldName.equals(IssueQueryConstants.FIELD_NUMBER)+ && !fieldName.equals(IssueQueryConstants.FIELD_MILESTONE)&& !(fieldSpec instanceof IssueChoiceField)&& !(fieldSpec instanceof PullRequestChoiceField)&& !(fieldSpec instanceof BuildChoiceField)@@ -390,9 +393,9 @@ public class IssueQuery extends EntityQuery<Issue> {break;case IssueQueryLexer.IsLessThan:case IssueQueryLexer.IsGreaterThan:- if (!fieldName.equals(IssueConstants.FIELD_VOTE_COUNT)- && !fieldName.equals(IssueConstants.FIELD_COMMENT_COUNT)- && !fieldName.equals(IssueConstants.FIELD_NUMBER)+ if (!fieldName.equals(IssueQueryConstants.FIELD_VOTE_COUNT)+ && !fieldName.equals(IssueQueryConstants.FIELD_COMMENT_COUNT)+ && !fieldName.equals(IssueQueryConstants.FIELD_NUMBER)&& !(fieldSpec instanceof NumberField)&& !(fieldSpec instanceof ChoiceField))throw newOperatorException(fieldName, operator);@@ -439,7 +442,7 @@ public class IssueQuery extends EntityQuery<Issue> {if (criteria != null)undefinedFields.addAll(criteria.getUndefinedFields());for (EntitySort sort: sorts) {- if (!IssueConstants.QUERY_FIELDS.contains(sort.getField())+ if (!IssueQueryConstants.QUERY_FIELDS.contains(sort.getField())&& getGlobalIssueSetting().getFieldSpec(sort.getField()) == null) {undefinedFields.add(sort.getField());}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.javaindex 70e8f86696..218d74ac2d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java@@ -12,7 +12,7 @@ import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.User;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class MilestoneCriteria extends IssueCriteria {@@ -26,7 +26,7 @@ public class MilestoneCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- Path<String> attribute = root.join(IssueConstants.ATTR_MILESTONE, JoinType.LEFT).get(Milestone.ATTR_NAME);+ Path<String> attribute = root.join(IssueQueryConstants.ATTR_MILESTONE, JoinType.LEFT).get(Milestone.ATTR_NAME);String normalized = milestoneName.toLowerCase().replace("*", "%");return builder.like(builder.lower(attribute), normalized);}@@ -46,7 +46,7 @@ public class MilestoneCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_MILESTONE) + " "+ return IssueQuery.quote(IssueQueryConstants.FIELD_MILESTONE) + " "+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "+ IssueQuery.quote(milestoneName);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.javaindex 390c7de22b..3ce41d8e10 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.model.User;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class MilestoneIsEmptyCriteria extends IssueCriteria {@@ -15,7 +15,7 @@ public class MilestoneIsEmptyCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- return builder.isNull(root.join(IssueConstants.ATTR_MILESTONE, JoinType.LEFT));+ return builder.isNull(root.join(IssueQueryConstants.ATTR_MILESTONE, JoinType.LEFT));}@Override@@ -30,7 +30,7 @@ public class MilestoneIsEmptyCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_MILESTONE) + " "+ return IssueQuery.quote(IssueQueryConstants.FIELD_MILESTONE) + " "+ IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.javaindex e14b62aae3..def5ed63dc 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java@@ -10,8 +10,8 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.IssueConstants;import io.onedev.server.util.ProjectScopedNumber;+import io.onedev.server.util.query.IssueQueryConstants;public class NumberCriteria extends IssueCriteria {@@ -31,7 +31,7 @@ public class NumberCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- Path<Long> attribute = root.get(IssueConstants.ATTR_NUMBER);+ Path<Long> attribute = root.get(IssueQueryConstants.ATTR_NUMBER);Predicate numberPredicate;if (operator == IssueQueryLexer.Is)@@ -42,7 +42,7 @@ public class NumberCriteria extends IssueCriteria {numberPredicate = builder.lessThan(attribute, number.getNumber());return builder.and(- builder.equal(root.get(IssueConstants.ATTR_PROJECT), number.getProject()),+ builder.equal(root.get(IssueQueryConstants.ATTR_PROJECT), number.getProject()),numberPredicate);}@@ -67,7 +67,7 @@ public class NumberCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_NUMBER) + " "+ return IssueQuery.quote(IssueQueryConstants.FIELD_NUMBER) + " "+ IssueQuery.getRuleName(operator) + " "+ IssueQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.javanew file mode 100644index 0000000000..af7a332fbc--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java@@ -0,0 +1,52 @@+package io.onedev.server.search.entity.issue;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.JoinType;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.commons.utils.match.WildcardUtils;+import io.onedev.server.model.Issue;+import io.onedev.server.model.User;+import io.onedev.server.util.query.IssueQueryConstants;+import io.onedev.server.util.query.ProjectQueryConstants;++public class ProjectCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ private final String projectName;++ public ProjectCriteria(String projectName) {+ this.projectName = projectName;+ }++ @Override+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ Path<String> attribute = root+ .join(IssueQueryConstants.ATTR_PROJECT, JoinType.INNER)+ .get(ProjectQueryConstants.ATTR_NAME);+ String normalized = projectName.toLowerCase().replace("*", "%");+ return builder.like(builder.lower(attribute), normalized);+ }++ @Override+ public boolean matches(Issue issue, User user) {+ return WildcardUtils.matchString(projectName.toLowerCase(),+ issue.getProject().getName().toLowerCase());+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return IssueQuery.quote(IssueQueryConstants.FIELD_PROJECT) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Is) + " "+ + IssueQuery.quote(projectName);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.javaindex b9b14e9e4b..9a8a9f4007 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java@@ -13,7 +13,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class PullRequestFieldCriteria extends FieldCriteria {@@ -32,7 +32,7 @@ public class PullRequestFieldCriteria extends FieldCriteria {@Overrideprotected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {return builder.and(- builder.equal(field.getParent().get(IssueConstants.ATTR_PROJECT), request.getTargetProject()),+ builder.equal(field.getParent().get(IssueQueryConstants.ATTR_PROJECT), request.getTargetProject()),builder.equal(field.get(IssueField.ATTR_ORDINAL), request.getNumber()));}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.javaindex 3a1f6963bd..d2a25acc76 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java@@ -14,7 +14,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.User;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class StateCriteria extends IssueCriteria {@@ -28,7 +28,7 @@ public class StateCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- Path<?> attribute = root.get(IssueConstants.ATTR_STATE);+ Path<?> attribute = root.get(IssueQueryConstants.ATTR_STATE);return builder.equal(attribute, value);}@@ -49,7 +49,7 @@ public class StateCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_STATE) + " "+ return IssueQuery.quote(IssueQueryConstants.FIELD_STATE) + " "+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.javaindex 21ae20e123..dce2745024 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class SubmitDateCriteria extends IssueCriteria {@@ -30,7 +30,7 @@ public class SubmitDateCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- Path<Date> attribute = root.get(IssueConstants.ATTR_SUBMIT_DATE);+ Path<Date> attribute = root.get(IssueQueryConstants.ATTR_SUBMIT_DATE);if (operator == IssueQueryLexer.IsBefore)return builder.lessThan(attribute, date);else@@ -52,7 +52,7 @@ public class SubmitDateCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_SUBMIT_DATE) + " "+ return IssueQuery.quote(IssueQueryConstants.FIELD_SUBMIT_DATE) + " "+ IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.javaindex d56e728c74..be96bae622 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class SubmittedByCriteria extends IssueCriteria {@@ -27,7 +27,7 @@ public class SubmittedByCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- Path<User> attribute = root.get(IssueConstants.ATTR_SUBMITTER);+ Path<User> attribute = root.get(IssueQueryConstants.ATTR_SUBMITTER);return builder.equal(attribute, this.user);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.javaindex 066aab12dd..2e83e0dbc7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.model.User;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class SubmittedByMeCriteria extends IssueCriteria {@@ -16,7 +16,7 @@ public class SubmittedByMeCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {if (user != null) {- Path<User> attribute = root.get(IssueConstants.ATTR_SUBMITTER);+ Path<User> attribute = root.get(IssueQueryConstants.ATTR_SUBMITTER);return builder.equal(attribute, user);} else {return builder.disjunction();diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.javaindex ec065b5aaa..605d462b23 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Issue;import io.onedev.server.model.User;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class TitleCriteria extends IssueCriteria {@@ -22,7 +22,7 @@ public class TitleCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- Expression<String> attribute = root.get(IssueConstants.ATTR_TITLE);+ Expression<String> attribute = root.get(IssueQueryConstants.ATTR_TITLE);return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");}@@ -39,7 +39,7 @@ public class TitleCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_TITLE) + " "+ return IssueQuery.quote(IssueQueryConstants.FIELD_TITLE) + " "+ IssueQuery.getRuleName(IssueQueryLexer.Contains) + " "+ IssueQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.javaindex afdddbcf96..6757a5b8ee 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java@@ -10,7 +10,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class UpdateDateCriteria extends IssueCriteria {@@ -30,7 +30,7 @@ public class UpdateDateCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- Path<Date> attribute = IssueQuery.getPath(root, IssueConstants.ATTR_UPDATE_DATE);+ Path<Date> attribute = IssueQuery.getPath(root, IssueQueryConstants.ATTR_UPDATE_DATE);if (operator == IssueQueryLexer.IsBefore)return builder.lessThan(attribute, date);else@@ -52,7 +52,7 @@ public class UpdateDateCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_UPDATE_DATE) + " "+ return IssueQuery.quote(IssueQueryConstants.FIELD_UPDATE_DATE) + " "+ IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.javaindex 37553d7dc9..cc722afee5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.model.User;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;public class VoteCountCriteria extends IssueCriteria {@@ -24,7 +24,7 @@ public class VoteCountCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- Path<Integer> attribute = root.get(IssueConstants.ATTR_VOTE_COUNT);+ Path<Integer> attribute = root.get(IssueQueryConstants.ATTR_VOTE_COUNT);if (operator == IssueQueryLexer.Is)return builder.equal(attribute, value);else if (operator == IssueQueryLexer.IsGreaterThan)@@ -50,7 +50,7 @@ public class VoteCountCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(IssueConstants.FIELD_VOTE_COUNT) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(IssueQueryConstants.FIELD_VOTE_COUNT) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.javaindex 5443ce1110..332e51bdc4 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java@@ -9,7 +9,7 @@ import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.ProjectConstants;+import io.onedev.server.util.query.ProjectQueryConstants;public class DescriptionCriteria extends EntityCriteria<Project> {@@ -23,7 +23,7 @@ public class DescriptionCriteria extends EntityCriteria<Project> {@Overridepublic Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {- Expression<String> attribute = root.get(ProjectConstants.ATTR_DESCRIPTION);+ Expression<String> attribute = root.get(ProjectQueryConstants.ATTR_DESCRIPTION);return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");}@@ -40,7 +40,7 @@ public class DescriptionCriteria extends EntityCriteria<Project> {@Overridepublic String toString() {- return ProjectQuery.quote(ProjectConstants.FIELD_DESCRIPTION) + " "+ return ProjectQuery.quote(ProjectQueryConstants.FIELD_DESCRIPTION) + " "+ ProjectQuery.getRuleName(ProjectQueryLexer.Contains) + " "+ ProjectQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.javaindex 7b955afc22..13bb31e460 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java@@ -1,36 +1,45 @@package io.onedev.server.search.entity.project;import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.JoinType;+import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.ProjectConstants;+import io.onedev.server.util.query.ProjectQueryConstants;public class ForksOfCriteria extends EntityCriteria<Project> {private static final long serialVersionUID = 1L;- private final Project project;+ private final String projectName;- private final String value;-- public ForksOfCriteria(String value) {- project = EntityQuery.getProject(value);- this.value = value;+ public ForksOfCriteria(String projectName) {+ this.projectName = projectName;}@Overridepublic Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {- return builder.equal(root.get(ProjectConstants.ATTR_FORKED_FROM), project);+ Path<String> attribute = root+ .join(ProjectQueryConstants.ATTR_FORKED_FROM, JoinType.INNER)+ .get(ProjectQueryConstants.ATTR_NAME);+ String normalized = projectName.toLowerCase().replace("*", "%");+ return builder.like(builder.lower(attribute), normalized);}@Overridepublic boolean matches(Project project, User user) {- return this.project.equals(project.getForkedFrom());+ Project forkedFrom = project.getForkedFrom();+ if (forkedFrom != null) {+ return WildcardUtils.matchString(projectName.toLowerCase(),+ forkedFrom.getName().toLowerCase());+ } else {+ return false;+ }}@Override@@ -40,7 +49,7 @@ public class ForksOfCriteria extends EntityCriteria<Project> {@Overridepublic String toString() {- return ProjectQuery.getRuleName(ProjectQueryLexer.ForksOf) + " " + ProjectQuery.quote(value);+ return ProjectQuery.getRuleName(ProjectQueryLexer.ForksOf) + " " + ProjectQuery.quote(projectName);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.javaindex 42a6b4cdd5..160bf1523b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java@@ -9,7 +9,7 @@ import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.ProjectConstants;+import io.onedev.server.util.query.ProjectQueryConstants;public class NameCriteria extends EntityCriteria<Project> {@@ -23,7 +23,7 @@ public class NameCriteria extends EntityCriteria<Project> {@Overridepublic Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {- Path<String> attribute = root.get(ProjectConstants.ATTR_NAME);+ Path<String> attribute = root.get(ProjectQueryConstants.ATTR_NAME);String normalized = value.toLowerCase().replace("*", "%");return builder.like(builder.lower(attribute), normalized);}@@ -41,7 +41,7 @@ public class NameCriteria extends EntityCriteria<Project> {@Overridepublic String toString() {- return ProjectQuery.quote(ProjectConstants.FIELD_NAME) + " "+ return ProjectQuery.quote(ProjectQueryConstants.FIELD_NAME) + " "+ ProjectQuery.getRuleName(ProjectQueryLexer.Is) + " "+ ProjectQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnerCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnerCriteria.javaindex b306c7045b..a79c026f9d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnerCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnerCriteria.java@@ -9,7 +9,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.ProjectConstants;+import io.onedev.server.util.query.ProjectQueryConstants;public class OwnerCriteria extends EntityCriteria<Project> {@@ -26,7 +26,7 @@ public class OwnerCriteria extends EntityCriteria<Project> {@Overridepublic Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {- Expression<String> attribute = root.get(ProjectConstants.ATTR_OWNER);+ Expression<String> attribute = root.get(ProjectQueryConstants.ATTR_OWNER);return builder.equal(attribute, this.user);}@@ -42,7 +42,7 @@ public class OwnerCriteria extends EntityCriteria<Project> {@Overridepublic String toString() {- return ProjectQuery.quote(ProjectConstants.FIELD_OWNER) + " "+ return ProjectQuery.quote(ProjectQueryConstants.FIELD_OWNER) + " "+ ProjectQuery.getRuleName(ProjectQueryLexer.Is) + " " + ProjectQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnerIsMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnerIsMeCriteria.javaindex e3b79a1bf1..95901b9ded 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnerIsMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnerIsMeCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.ProjectConstants;+import io.onedev.server.util.query.ProjectQueryConstants;public class OwnerIsMeCriteria extends EntityCriteria<Project> {@@ -16,7 +16,7 @@ public class OwnerIsMeCriteria extends EntityCriteria<Project> {@Overridepublic Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {- Expression<String> attribute = root.get(ProjectConstants.ATTR_OWNER);+ Expression<String> attribute = root.get(ProjectQueryConstants.ATTR_OWNER);if (user != null)return builder.equal(attribute, user);else@@ -38,7 +38,7 @@ public class OwnerIsMeCriteria extends EntityCriteria<Project> {@Overridepublic String toString() {- return ProjectQuery.quote(ProjectConstants.FIELD_OWNER) + " "+ return ProjectQuery.quote(ProjectQueryConstants.FIELD_OWNER) + " "+ ProjectQuery.getRuleName(ProjectQueryLexer.IsMe);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.javaindex 280add912d..19c145fa4f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java@@ -31,7 +31,7 @@ import io.onedev.server.search.entity.project.ProjectQueryParser.OrCriteriaConteimport io.onedev.server.search.entity.project.ProjectQueryParser.OrderContext;import io.onedev.server.search.entity.project.ProjectQueryParser.ParensCriteriaContext;import io.onedev.server.search.entity.project.ProjectQueryParser.QueryContext;-import io.onedev.server.util.ProjectConstants;+import io.onedev.server.util.query.ProjectQueryConstants;public class ProjectQuery extends EntityQuery<Project> {@@ -118,7 +118,7 @@ public class ProjectQuery extends EntityQuery<Project> {switch (operator) {case ProjectQueryLexer.Is:- if (fieldName.equals(ProjectConstants.FIELD_NAME))+ if (fieldName.equals(ProjectQueryConstants.FIELD_NAME))return new NameCriteria(value);elsereturn new OwnerCriteria(value);@@ -161,7 +161,7 @@ public class ProjectQuery extends EntityQuery<Project> {List<EntitySort> projectSorts = new ArrayList<>();for (OrderContext order: queryContext.order()) {String fieldName = getValue(order.Quoted().getText());- if (!ProjectConstants.ORDER_FIELDS.containsKey(fieldName))+ if (!ProjectQueryConstants.ORDER_FIELDS.containsKey(fieldName))throw new OneException("Can not order by field: " + fieldName);EntitySort projectSort = new EntitySort();@@ -184,24 +184,24 @@ public class ProjectQuery extends EntityQuery<Project> {}public static void checkField(String fieldName, int operator) {- if (!ProjectConstants.QUERY_FIELDS.contains(fieldName))+ if (!ProjectQueryConstants.QUERY_FIELDS.contains(fieldName))throw new OneException("Field not found: " + fieldName);switch (operator) {case ProjectQueryLexer.Contains:- if (!fieldName.equals(ProjectConstants.FIELD_DESCRIPTION))+ if (!fieldName.equals(ProjectQueryConstants.FIELD_DESCRIPTION))throw newOperatorException(fieldName, operator);break;case ProjectQueryLexer.Is:- if (!fieldName.equals(ProjectConstants.FIELD_OWNER) && !fieldName.equals(ProjectConstants.FIELD_NAME))+ if (!fieldName.equals(ProjectQueryConstants.FIELD_OWNER) && !fieldName.equals(ProjectQueryConstants.FIELD_NAME))throw newOperatorException(fieldName, operator);break;case ProjectQueryLexer.IsMe:- if (!fieldName.equals(ProjectConstants.FIELD_OWNER))+ if (!fieldName.equals(ProjectQueryConstants.FIELD_OWNER))throw newOperatorException(fieldName, operator);break;case ProjectQueryLexer.IsBefore:case ProjectQueryLexer.IsAfter:- if (!fieldName.equals(ProjectConstants.FIELD_UPDATE_DATE))+ if (!fieldName.equals(ProjectQueryConstants.FIELD_UPDATE_DATE))throw newOperatorException(fieldName, operator);break;}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.javaindex 0d50b46969..1a1bbca1c5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.ProjectConstants;+import io.onedev.server.util.query.ProjectQueryConstants;public class UpdateDateCriteria extends EntityCriteria<Project> {@@ -31,7 +31,7 @@ public class UpdateDateCriteria extends EntityCriteria<Project> {@Overridepublic Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {- Path<Date> attribute = ProjectQuery.getPath(root, ProjectConstants.ATTR_UPDATE_DATE);+ Path<Date> attribute = ProjectQuery.getPath(root, ProjectQueryConstants.ATTR_UPDATE_DATE);if (operator == ProjectQueryLexer.IsBefore)return builder.lessThan(attribute, date);else@@ -53,7 +53,7 @@ public class UpdateDateCriteria extends EntityCriteria<Project> {@Overridepublic String toString() {- return ProjectQuery.quote(ProjectConstants.FIELD_UPDATE_DATE) + " "+ return ProjectQuery.quote(ProjectQueryConstants.FIELD_UPDATE_DATE) + " "+ ProjectQuery.getRuleName(operator) + " " + ProjectQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.javaindex 6539cfef31..d4b2b41d1e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AndCriteria.java@@ -9,15 +9,16 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.search.entity.AndCriteriaHelper;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.ParensAware;-public class AndCriteria extends PullRequestCriteria implements ParensAware {+public class AndCriteria extends EntityCriteria<PullRequest> implements ParensAware {private static final long serialVersionUID = 1L;- private final List<PullRequestCriteria> criterias;+ private final List<EntityCriteria<PullRequest>> criterias;- public AndCriteria(List<PullRequestCriteria> criterias) {+ public AndCriteria(List<EntityCriteria<PullRequest>> criterias) {this.criterias = criterias;}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.javaindex 2bc705b181..2847e54686 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java@@ -10,10 +10,11 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class ApprovedByCriteria extends PullRequestCriteria {+public class ApprovedByCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -28,7 +29,7 @@ public class ApprovedByCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);+ From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.javaindex fe5e3e4fde..18c89cd5af 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java@@ -10,17 +10,18 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class ApprovedByMeCriteria extends PullRequestCriteria {+public class ApprovedByMeCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {if (user != null) {- From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);+ From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.javaindex 857892e21f..f638079d25 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java@@ -9,10 +9,11 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class CloseDateCriteria extends PullRequestCriteria {+public class CloseDateCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -30,7 +31,7 @@ public class CloseDateCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Path<Date> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_CLOSE_DATE);+ Path<Date> attribute = PullRequestQuery.getPath(root, PullRequestQueryConstants.ATTR_CLOSE_DATE);if (operator == PullRequestQueryLexer.IsBefore)return builder.lessThan(attribute, date);else@@ -56,7 +57,7 @@ public class CloseDateCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_CLOSE_DATE) + " "+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_CLOSE_DATE) + " "+ PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.javaindex d1d8b466da..0c3de8b654 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java@@ -7,9 +7,10 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class CommentCountCriteria extends PullRequestCriteria {+public class CommentCountCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -24,7 +25,7 @@ public class CommentCountCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Path<Long> attribute = root.get(PullRequestConstants.ATTR_COMMENT_COUNT);+ Path<Long> attribute = root.get(PullRequestQueryConstants.ATTR_COMMENT_COUNT);if (operator == PullRequestQueryLexer.Is)return builder.equal(attribute, value);else if (operator == PullRequestQueryLexer.IsGreaterThan)@@ -50,7 +51,7 @@ public class CommentCountCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_COMMENT_COUNT) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(String.valueOf(value));+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_COMMENT_COUNT) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(String.valueOf(value));}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.javaindex 1298ccdaa2..68beeed6ff 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java@@ -12,10 +12,11 @@ import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;import io.onedev.server.model.User;-import io.onedev.server.util.CodeCommentConstants;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.CodeCommentQueryConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class CommentCriteria extends PullRequestCriteria {+public class CommentCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -27,20 +28,20 @@ public class CommentCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(PullRequestConstants.ATTR_COMMENTS, JoinType.LEFT);+ From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_COMMENTS, JoinType.LEFT);Path<String> attribute = join.get(PullRequestComment.ATTR_CONTENT);Predicate commentPredicate = builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");join = root- .join(PullRequestConstants.ATTR_CODE_COMMENT_RELATIONS, JoinType.LEFT)+ .join(PullRequestQueryConstants.ATTR_CODE_COMMENT_RELATIONS, JoinType.LEFT).join(CodeCommentRelation.ATTR_COMMENT, JoinType.LEFT);- attribute = join.get(CodeCommentConstants.ATTR_CONTENT);+ attribute = join.get(CodeCommentQueryConstants.ATTR_CONTENT);Predicate codeCommentPredicate = builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");join = root- .join(PullRequestConstants.ATTR_CODE_COMMENT_RELATIONS, JoinType.LEFT)+ .join(PullRequestQueryConstants.ATTR_CODE_COMMENT_RELATIONS, JoinType.LEFT).join(CodeCommentRelation.ATTR_COMMENT, JoinType.LEFT)- .join(CodeCommentConstants.ATTR_REPLIES, JoinType.LEFT);+ .join(CodeCommentQueryConstants.ATTR_REPLIES, JoinType.LEFT);attribute = join.get(CodeCommentReply.ATTR_CONTENT);Predicate codeCommentReplyPredicate = builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%");@@ -71,7 +72,7 @@ public class CommentCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_COMMENT) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " " + PullRequestQuery.quote(value);+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_COMMENT) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " " + PullRequestQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.javaindex 46ff41ad36..4a42ca0e91 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java@@ -8,9 +8,10 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class DescriptionCriteria extends PullRequestCriteria {+public class DescriptionCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -22,7 +23,7 @@ public class DescriptionCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Expression<String> attribute = root.get(PullRequestConstants.ATTR_DESCRIPTION);+ Expression<String> attribute = root.get(PullRequestQueryConstants.ATTR_DESCRIPTION);return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");}@@ -39,7 +40,7 @@ public class DescriptionCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_DESCRIPTION) + " "+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_DESCRIPTION) + " "+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " " + PullRequestQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.javaindex 421c861e03..6168f53bb5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java@@ -9,10 +9,11 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class DiscardedByCriteria extends PullRequestCriteria {+public class DiscardedByCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -27,7 +28,7 @@ public class DiscardedByCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Path<User> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_CLOSE_USER);+ Path<User> attribute = PullRequestQuery.getPath(root, PullRequestQueryConstants.ATTR_CLOSE_USER);return builder.equal(attribute, this.user);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.javaindex d280c9629b..f21abe146a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java@@ -7,16 +7,17 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class DiscardedByMeCriteria extends PullRequestCriteria {+public class DiscardedByMeCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {if (user != null) {- Path<User> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_CLOSE_USER);+ Path<User> attribute = PullRequestQuery.getPath(root, PullRequestQueryConstants.ATTR_CLOSE_USER);return builder.equal(attribute, user);} else {return builder.disjunction();diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.javaindex a62b9a11f2..12421dc38d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java@@ -7,12 +7,13 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.search.entity.EntityCriteria;-public class DiscardedCriteria extends PullRequestCriteria {+public class DiscardedCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;- private PullRequestCriteria getCriteria() {+ private EntityCriteria<PullRequest> getCriteria() {return new StatusCriteria(CloseInfo.Status.DISCARDED.toString());}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.javaindex afd75004b4..792d9c29e6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java@@ -11,16 +11,17 @@ import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestBuild;import io.onedev.server.model.User;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class HasFailedBuildsCriteria extends PullRequestCriteria {+public class HasFailedBuildsCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {From<?, ?> join = root- .join(PullRequestConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT)+ .join(PullRequestQueryConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT).join(PullRequestBuild.ATTR_BUILD, JoinType.INNER);Path<?> status = join.get(Build.STATUS);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.javaindex 1ae1761ca7..b0cb4d3386 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java@@ -8,16 +8,17 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.MergePreview;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class HasMergeConflictsCriteria extends PullRequestCriteria {+public class HasMergeConflictsCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Path<?> requestHead = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_LAST_MERGE_PREVIEW_REQUEST_HEAD);- Path<?> merged = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_LAST_MERGE_PREVIEW_MERGED);+ Path<?> requestHead = PullRequestQuery.getPath(root, PullRequestQueryConstants.ATTR_LAST_MERGE_PREVIEW_REQUEST_HEAD);+ Path<?> merged = PullRequestQuery.getPath(root, PullRequestQueryConstants.ATTR_LAST_MERGE_PREVIEW_MERGED);return builder.and(builder.isNotNull(requestHead),builder.isNull(merged));diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.javaindex 061ad1f58d..115cbcae12 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java@@ -10,16 +10,17 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class HasPendingReviewsCriteria extends PullRequestCriteria {+public class HasPendingReviewsCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);+ From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.javaindex 52f1da1c5a..944442dfe5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java@@ -14,11 +14,12 @@ import io.onedev.server.infomanager.CodeCommentRelationInfoManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.ProjectAwareCommitId;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class IncludesCommitCriteria extends PullRequestCriteria {+public class IncludesCommitCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -40,8 +41,8 @@ public class IncludesCommitCriteria extends PullRequestCriteria {Collection<Long> pullRequestIds = getPullRequestIds();if (!pullRequestIds.isEmpty()) {return builder.and(- builder.equal(root.get(PullRequestConstants.ATTR_TARGET_PROJECT), project),- root.get(PullRequestConstants.ATTR_ID).in(pullRequestIds));+ builder.equal(root.get(PullRequestQueryConstants.ATTR_TARGET_PROJECT), project),+ root.get(PullRequestQueryConstants.ATTR_ID).in(pullRequestIds));} else {return builder.disjunction();}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.javaindex 9a59e7f908..645655b7cb 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java@@ -17,10 +17,11 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class IncludesIssueCriteria extends PullRequestCriteria {+public class IncludesIssueCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -38,8 +39,8 @@ public class IncludesIssueCriteria extends PullRequestCriteria {Collection<Long> pullRequestIds = getPullRequestIds(issue.getProject());if (!pullRequestIds.isEmpty()) {return builder.and(- builder.equal(root.get(PullRequestConstants.ATTR_TARGET_PROJECT), issue.getProject()),- root.get(PullRequestConstants.ATTR_ID).in(pullRequestIds));+ builder.equal(root.get(PullRequestQueryConstants.ATTR_TARGET_PROJECT), issue.getProject()),+ root.get(PullRequestQueryConstants.ATTR_ID).in(pullRequestIds));} else {return builder.disjunction();}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.javaindex c2cf715350..c4b4424595 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java@@ -8,9 +8,10 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.MergeStrategy;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class MergeStrategyCriteria extends PullRequestCriteria {+public class MergeStrategyCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -22,7 +23,7 @@ public class MergeStrategyCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Path<?> attribute = root.get(PullRequestConstants.ATTR_MERGE_STRATEGY);+ Path<?> attribute = root.get(PullRequestQueryConstants.ATTR_MERGE_STRATEGY);return builder.equal(attribute, value);}@@ -38,7 +39,7 @@ public class MergeStrategyCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_MERGE_STRATEGY) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value.toString());+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_MERGE_STRATEGY) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value.toString());}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.javaindex 273c4e1f2e..64cd5fc0c7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java@@ -7,12 +7,13 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.search.entity.EntityCriteria;-public class MergedCriteria extends PullRequestCriteria {+public class MergedCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;- private PullRequestCriteria getCriteria() {+ private EntityCriteria<PullRequest> getCriteria() {return new StatusCriteria(CloseInfo.Status.MERGED.toString());}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.javaindex ff1dabb2aa..53e62e0170 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NotCriteria.java@@ -6,15 +6,16 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.NotCriteriaHelper;-public class NotCriteria extends PullRequestCriteria {+public class NotCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;- private final PullRequestCriteria criteria;+ private final EntityCriteria<PullRequest> criteria;- public NotCriteria(PullRequestCriteria criteria) {+ public NotCriteria(EntityCriteria<PullRequest> criteria) {this.criteria = criteria;}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.javaindex 39d1c80988..ecdc008318 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java@@ -9,11 +9,12 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.ProjectScopedNumber;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class NumberCriteria extends PullRequestCriteria {+public class NumberCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -31,7 +32,7 @@ public class NumberCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Path<Long> attribute = root.get(PullRequestConstants.ATTR_NUMBER);+ Path<Long> attribute = root.get(PullRequestQueryConstants.ATTR_NUMBER);Predicate numberPredicate;if (operator == PullRequestQueryLexer.Is)@@ -42,7 +43,7 @@ public class NumberCriteria extends PullRequestCriteria {numberPredicate = builder.lessThan(attribute, number.getNumber());return builder.and(- builder.equal(root.get(PullRequestConstants.ATTR_TARGET_PROJECT), number.getProject()),+ builder.equal(root.get(PullRequestQueryConstants.ATTR_TARGET_PROJECT), number.getProject()),numberPredicate);}@@ -67,7 +68,7 @@ public class NumberCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_NUMBER) + " "+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_NUMBER) + " "+ PullRequestQuery.getRuleName(operator) + " "+ PullRequestQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.javaindex 3a21344636..cbf435bab5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java@@ -6,14 +6,14 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.search.entity.EntityCriteria;-public class OpenCriteria extends PullRequestCriteria {+public class OpenCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;- private PullRequestCriteria getCriteria() {- return new StatusCriteria(PullRequestConstants.STATE_OPEN);+ private EntityCriteria<PullRequest> getCriteria() {+ return new StatusCriteria(PullRequest.STATE_OPEN);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.javaindex f7c0f5ab75..64e1f71919 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OrCriteria.java@@ -8,16 +8,17 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.OrCriteriaHelper;import io.onedev.server.search.entity.ParensAware;-public class OrCriteria extends PullRequestCriteria implements ParensAware {+public class OrCriteria extends EntityCriteria<PullRequest> implements ParensAware {private static final long serialVersionUID = 1L;- private final List<PullRequestCriteria> criterias;+ private final List<EntityCriteria<PullRequest>> criterias;- public OrCriteria(List<PullRequestCriteria> criterias) {+ public OrCriteria(List<EntityCriteria<PullRequest>> criterias) {this.criterias = criterias;}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestCriteria.javadeleted file mode 100644index 6cf9be74bf..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestCriteria.java+++ /dev/null@@ -1,10 +0,0 @@-package io.onedev.server.search.entity.pullrequest;--import io.onedev.server.model.PullRequest;-import io.onedev.server.search.entity.EntityCriteria;--public abstract class PullRequestCriteria extends EntityCriteria<PullRequest> {-- private static final long serialVersionUID = 1L;--}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 7f82736cf7..e43c5d2d87 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@@ -14,12 +14,11 @@ import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;import io.onedev.commons.codeassist.AntlrUtils;-import io.onedev.server.OneDev;import io.onedev.server.OneException;-import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergeStrategy;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;@@ -33,17 +32,17 @@ import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.OrCriteimport io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.OrderContext;import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.ParensCriteriaContext;import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.QueryContext;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;public class PullRequestQuery extends EntityQuery<PullRequest> {private static final long serialVersionUID = 1L;- private final PullRequestCriteria criteria;+ private final EntityCriteria<PullRequest> criteria;private final List<EntitySort> sorts;- public PullRequestQuery(@Nullable PullRequestCriteria criteria, List<EntitySort> sorts) {+ public PullRequestQuery(@Nullable EntityCriteria<PullRequest> criteria, List<EntitySort> sorts) {this.criteria = criteria;this.sorts = sorts;}@@ -80,12 +79,12 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {throw new OneException("Malformed query syntax", e);}CriteriaContext criteriaContext = queryContext.criteria();- PullRequestCriteria requestCriteria;+ EntityCriteria<PullRequest> requestCriteria;if (criteriaContext != null) {- requestCriteria = new PullRequestQueryBaseVisitor<PullRequestCriteria>() {+ requestCriteria = new PullRequestQueryBaseVisitor<EntityCriteria<PullRequest>>() {@Override- public PullRequestCriteria visitOperatorCriteria(OperatorCriteriaContext ctx) {+ public EntityCriteria<PullRequest> visitOperatorCriteria(OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {case PullRequestQueryLexer.Open:return new OpenCriteria();@@ -119,7 +118,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {}@Override- public PullRequestCriteria visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {+ public EntityCriteria<PullRequest> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {String value = getValue(ctx.Quoted().getText());switch (ctx.operator.getType()) {case PullRequestQueryLexer.ToBeReviewedBy:@@ -142,12 +141,12 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {}@Override- public PullRequestCriteria visitParensCriteria(ParensCriteriaContext ctx) {+ public EntityCriteria<PullRequest> visitParensCriteria(ParensCriteriaContext ctx) {return visit(ctx.criteria());}@Override- public PullRequestCriteria visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {+ public EntityCriteria<PullRequest> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {String fieldName = getValue(ctx.Quoted(0).getText());String value = getValue(ctx.Quoted(1).getText());int operator = ctx.operator.getType();@@ -157,42 +156,41 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {case PullRequestQueryLexer.IsBefore:case PullRequestQueryLexer.IsAfter:switch (fieldName) {- case PullRequestConstants.FIELD_SUBMIT_DATE:+ case PullRequestQueryConstants.FIELD_SUBMIT_DATE:return new SubmitDateCriteria(value, operator);- case PullRequestConstants.FIELD_UPDATE_DATE:+ case PullRequestQueryConstants.FIELD_UPDATE_DATE:return new UpdateDateCriteria(value, operator);- case PullRequestConstants.FIELD_CLOSE_DATE:+ case PullRequestQueryConstants.FIELD_CLOSE_DATE:return new CloseDateCriteria(value, operator);default:throw new IllegalStateException();}case PullRequestQueryLexer.Contains:switch (fieldName) {- case PullRequestConstants.FIELD_TITLE:+ case PullRequestQueryConstants.FIELD_TITLE:return new TitleCriteria(value);- case PullRequestConstants.FIELD_DESCRIPTION:+ case PullRequestQueryConstants.FIELD_DESCRIPTION:return new DescriptionCriteria(value);- case PullRequestConstants.FIELD_COMMENT:+ case PullRequestQueryConstants.FIELD_COMMENT:return new CommentCriteria(value);default:throw new IllegalStateException();}case PullRequestQueryLexer.Is:switch (fieldName) {- case PullRequestConstants.FIELD_NUMBER:+ case PullRequestQueryConstants.FIELD_NUMBER:return new NumberCriteria(project, value, operator);- case PullRequestConstants.FIELD_MERGE_STRATEGY:+ case PullRequestQueryConstants.FIELD_MERGE_STRATEGY:return new MergeStrategyCriteria(MergeStrategy.fromString(value));- case PullRequestConstants.FIELD_SOURCE_BRANCH:+ case PullRequestQueryConstants.FIELD_SOURCE_BRANCH:return new SourceBranchCriteria(value);- case PullRequestConstants.FIELD_SOURCE_PROJECT:- Project project = OneDev.getInstance(ProjectManager.class).find(value);- if (project == null)- throw new OneException("Unable to find project: " + value);- return new SourceProjectCriteria(project);- case PullRequestConstants.FIELD_TARGET_BRANCH:+ case PullRequestQueryConstants.FIELD_SOURCE_PROJECT:+ return new SourceProjectCriteria(value);+ case PullRequestQueryConstants.FIELD_TARGET_BRANCH:return new TargetBranchCriteria(value);- case PullRequestConstants.FIELD_COMMENT_COUNT:+ case PullRequestQueryConstants.FIELD_TARGET_PROJECT:+ return new TargetProjectCriteria(value);+ case PullRequestQueryConstants.FIELD_COMMENT_COUNT:return new CommentCountCriteria(getIntValue(value), operator);default:throw new IllegalStateException();@@ -200,9 +198,9 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {case PullRequestQueryLexer.IsLessThan:case PullRequestQueryLexer.IsGreaterThan:switch (fieldName) {- case PullRequestConstants.FIELD_NUMBER:+ case PullRequestQueryConstants.FIELD_NUMBER:return new NumberCriteria(project, value, operator);- case PullRequestConstants.FIELD_COMMENT_COUNT:+ case PullRequestQueryConstants.FIELD_COMMENT_COUNT:return new CommentCountCriteria(getIntValue(value), operator);default:throw new IllegalStateException();@@ -213,23 +211,23 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {}@Override- public PullRequestCriteria visitOrCriteria(OrCriteriaContext ctx) {- List<PullRequestCriteria> childCriterias = new ArrayList<>();+ public EntityCriteria<PullRequest> visitOrCriteria(OrCriteriaContext ctx) {+ List<EntityCriteria<PullRequest>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));return new OrCriteria(childCriterias);}@Override- public PullRequestCriteria visitAndCriteria(AndCriteriaContext ctx) {- List<PullRequestCriteria> childCriterias = new ArrayList<>();+ public EntityCriteria<PullRequest> visitAndCriteria(AndCriteriaContext ctx) {+ List<EntityCriteria<PullRequest>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));return new AndCriteria(childCriterias);}@Override- public PullRequestCriteria visitNotCriteria(NotCriteriaContext ctx) {+ public EntityCriteria<PullRequest> visitNotCriteria(NotCriteriaContext ctx) {return new NotCriteria(visit(ctx.criteria()));}@@ -241,7 +239,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {List<EntitySort> requestSorts = new ArrayList<>();for (OrderContext order: queryContext.order()) {String fieldName = getValue(order.Quoted().getText());- if (!PullRequestConstants.ORDER_FIELDS.containsKey(fieldName))+ if (!PullRequestQueryConstants.ORDER_FIELDS.containsKey(fieldName))throw new OneException("Can not order by field: " + fieldName);EntitySort requestSort = new EntitySort();@@ -260,38 +258,41 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {}public static void checkField(String fieldName, int operator) {- if (!PullRequestConstants.QUERY_FIELDS.contains(fieldName))+ if (!PullRequestQueryConstants.QUERY_FIELDS.contains(fieldName))throw new OneException("Field not found: " + fieldName);switch (operator) {case PullRequestQueryLexer.IsBefore:case PullRequestQueryLexer.IsAfter:- if (!fieldName.equals(PullRequestConstants.FIELD_SUBMIT_DATE)- && !fieldName.equals(PullRequestConstants.FIELD_UPDATE_DATE)- && !fieldName.equals(PullRequestConstants.FIELD_CLOSE_DATE)) {+ if (!fieldName.equals(PullRequestQueryConstants.FIELD_SUBMIT_DATE)+ && !fieldName.equals(PullRequestQueryConstants.FIELD_UPDATE_DATE)+ && !fieldName.equals(PullRequestQueryConstants.FIELD_CLOSE_DATE)) {throw newOperatorException(fieldName, operator);}break;case PullRequestQueryLexer.Contains:- if (!fieldName.equals(PullRequestConstants.FIELD_TITLE)- && !fieldName.equals(PullRequestConstants.FIELD_DESCRIPTION)- && !fieldName.equals(PullRequestConstants.FIELD_COMMENT)) {+ if (!fieldName.equals(PullRequestQueryConstants.FIELD_TITLE)+ && !fieldName.equals(PullRequestQueryConstants.FIELD_DESCRIPTION)+ && !fieldName.equals(PullRequestQueryConstants.FIELD_COMMENT)) {throw newOperatorException(fieldName, operator);}break;case PullRequestQueryLexer.Is:- if (!fieldName.equals(PullRequestConstants.FIELD_NUMBER)- && !fieldName.equals(PullRequestConstants.FIELD_MERGE_STRATEGY)- && !fieldName.equals(PullRequestConstants.FIELD_TARGET_BRANCH)- && !fieldName.equals(PullRequestConstants.FIELD_SOURCE_PROJECT)- && !fieldName.equals(PullRequestConstants.FIELD_SOURCE_BRANCH)- && !fieldName.equals(PullRequestConstants.FIELD_COMMENT_COUNT)) {+ if (!fieldName.equals(PullRequestQueryConstants.FIELD_NUMBER)+ && !fieldName.equals(PullRequestQueryConstants.FIELD_MERGE_STRATEGY)+ && !fieldName.equals(PullRequestQueryConstants.FIELD_TARGET_PROJECT)+ && !fieldName.equals(PullRequestQueryConstants.FIELD_TARGET_BRANCH)+ && !fieldName.equals(PullRequestQueryConstants.FIELD_SOURCE_PROJECT)+ && !fieldName.equals(PullRequestQueryConstants.FIELD_SOURCE_BRANCH)+ && !fieldName.equals(PullRequestQueryConstants.FIELD_COMMENT_COUNT)) {throw newOperatorException(fieldName, operator);}break;case PullRequestQueryLexer.IsLessThan:case PullRequestQueryLexer.IsGreaterThan:- if (!fieldName.equals(PullRequestConstants.FIELD_NUMBER) && !fieldName.equals(PullRequestConstants.FIELD_COMMENT_COUNT))+ if (!fieldName.equals(PullRequestQueryConstants.FIELD_NUMBER)+ && !fieldName.equals(PullRequestQueryConstants.FIELD_COMMENT_COUNT)) {throw newOperatorException(fieldName, operator);+ }break;}}@@ -309,7 +310,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {}@Override- public PullRequestCriteria getCriteria() {+ public EntityCriteria<PullRequest> getCriteria() {return criteria;}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.javaindex 0dc8d9fc0f..7b820c039e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java@@ -10,10 +10,11 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class RequestedForChangesByCriteria extends PullRequestCriteria {+public class RequestedForChangesByCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -28,7 +29,7 @@ public class RequestedForChangesByCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);+ From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.javaindex 4f27458b50..bfca377f22 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java@@ -10,17 +10,18 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class RequestedForChangesByMeCriteria extends PullRequestCriteria {+public class RequestedForChangesByMeCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {if (user != null) {- From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);+ From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.javaindex bb772626f1..81d4a9115e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java@@ -10,16 +10,17 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class SomeoneRequestedForChangesCriteria extends PullRequestCriteria {+public class SomeoneRequestedForChangesCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);+ From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.javaindex 6e93824a1e..3d7a720ec7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java@@ -1,17 +1,17 @@package io.onedev.server.search.entity.pullrequest;-import java.util.Objects;-import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class SourceBranchCriteria extends PullRequestCriteria {+public class SourceBranchCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -23,13 +23,14 @@ public class SourceBranchCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Path<User> attribute = root.get(PullRequestConstants.ATTR_SOURCE_BRANCH);- return builder.equal(attribute, branch);+ Path<String> attribute = root.get(PullRequestQueryConstants.ATTR_SOURCE_BRANCH);+ String normalized = branch.toLowerCase().replace("*", "%");+ return builder.like(builder.lower(attribute), normalized);}@Overridepublic boolean matches(PullRequest request, User user) {- return Objects.equals(request.getSourceBranch(), branch);+ return WildcardUtils.matchString(branch.toLowerCase(), request.getSourceBranch().toLowerCase());}@Override@@ -39,7 +40,7 @@ public class SourceBranchCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_SOURCE_BRANCH) + " "+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_SOURCE_BRANCH) + " "+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "+ PullRequestQuery.quote(branch);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.javaindex dcfd79c48e..9c2d4a72eb 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java@@ -1,36 +1,47 @@package io.onedev.server.search.entity.pullrequest;-import java.util.Objects;-import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.ProjectQueryConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class SourceProjectCriteria extends PullRequestCriteria {+public class SourceProjectCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;- private final Project value;+ private final String projectName;- public SourceProjectCriteria(Project value) {- this.value = value;+ public SourceProjectCriteria(String projectName) {+ this.projectName = projectName;}@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Path<User> attribute = root.get(PullRequestConstants.ATTR_SOURCE_PROJECT);- return builder.equal(attribute, value);+ Path<String> attribute = root+ .join(PullRequestQueryConstants.ATTR_SOURCE_PROJECT, JoinType.INNER)+ .get(ProjectQueryConstants.ATTR_NAME);+ String normalized = projectName.toLowerCase().replace("*", "%");+ return builder.like(builder.lower(attribute), normalized);}@Overridepublic boolean matches(PullRequest request, User user) {- return Objects.equals(request.getSourceProject(), value);+ Project project = request.getSourceProject();+ if (project != null) {+ return WildcardUtils.matchString(projectName.toLowerCase(),+ project.getName().toLowerCase());+ } else {+ return false;+ }}@Override@@ -40,7 +51,9 @@ public class SourceProjectCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_SOURCE_PROJECT) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value.getName());+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_SOURCE_PROJECT) + " "+ + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "+ + PullRequestQuery.quote(projectName);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.javaindex 70edf5f5e4..b227f1f808 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java@@ -8,9 +8,10 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.CloseInfo;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class StatusCriteria extends PullRequestCriteria {+public class StatusCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -22,8 +23,8 @@ public class StatusCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Path<?> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_CLOSE_STATUS);- if (value.equalsIgnoreCase(PullRequestConstants.STATE_OPEN))+ Path<?> attribute = PullRequestQuery.getPath(root, PullRequestQueryConstants.ATTR_CLOSE_STATUS);+ if (value.equalsIgnoreCase(PullRequest.STATE_OPEN))return builder.isNull(attribute);elsereturn builder.equal(attribute, CloseInfo.Status.valueOf(value.toUpperCase()));@@ -31,7 +32,7 @@ public class StatusCriteria extends PullRequestCriteria {@Overridepublic boolean matches(PullRequest request, User user) {- if (value.equalsIgnoreCase(PullRequestConstants.STATE_OPEN))+ if (value.equalsIgnoreCase(PullRequest.STATE_OPEN))return request.getCloseInfo() == null;elsereturn request.getCloseInfo() != null && request.getCloseInfo().getStatus().name().equalsIgnoreCase(value);@@ -44,7 +45,7 @@ public class StatusCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_STATUS) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value);+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_STATUS) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.javaindex 697108dcef..bad65c4510 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java@@ -9,10 +9,11 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class SubmitDateCriteria extends PullRequestCriteria {+public class SubmitDateCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -30,7 +31,7 @@ public class SubmitDateCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Path<Date> attribute = root.get(PullRequestConstants.ATTR_SUBMIT_DATE);+ Path<Date> attribute = root.get(PullRequestQueryConstants.ATTR_SUBMIT_DATE);if (operator == PullRequestQueryLexer.IsBefore)return builder.lessThan(attribute, date);else@@ -52,7 +53,7 @@ public class SubmitDateCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_SUBMIT_DATE) + " "+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_SUBMIT_DATE) + " "+ PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.javaindex 2305cc3e81..cfe798c0ad 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java@@ -9,10 +9,11 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class SubmittedByCriteria extends PullRequestCriteria {+public class SubmittedByCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -27,7 +28,7 @@ public class SubmittedByCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Path<User> attribute = root.get(PullRequestConstants.ATTR_SUBMITTER);+ Path<User> attribute = root.get(PullRequestQueryConstants.ATTR_SUBMITTER);return builder.equal(attribute, this.user);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.javaindex c1eefff516..7a409943c9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java@@ -7,16 +7,17 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class SubmittedByMeCriteria extends PullRequestCriteria {+public class SubmittedByMeCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {if (user != null) {- Path<?> attribute = root.get(PullRequestConstants.ATTR_SUBMITTER);+ Path<?> attribute = root.get(PullRequestQueryConstants.ATTR_SUBMITTER);return builder.equal(attribute, user);} else {return builder.disjunction();diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.javaindex 2fbf26bc3d..ace2d17c2e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java@@ -1,17 +1,17 @@package io.onedev.server.search.entity.pullrequest;-import java.util.Objects;-import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class TargetBranchCriteria extends PullRequestCriteria {+public class TargetBranchCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -23,13 +23,14 @@ public class TargetBranchCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Path<User> attribute = root.get(PullRequestConstants.ATTR_TARGET_BRANCH);- return builder.equal(attribute, branch);+ Path<String> attribute = root.get(PullRequestQueryConstants.ATTR_TARGET_BRANCH);+ String normalized = branch.toLowerCase().replace("*", "%");+ return builder.like(builder.lower(attribute), normalized);}@Overridepublic boolean matches(PullRequest request, User user) {- return Objects.equals(request.getTargetBranch(), branch);+ return WildcardUtils.matchString(branch.toLowerCase(), request.getTargetBranch().toLowerCase());}@Override@@ -39,7 +40,7 @@ public class TargetBranchCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_TARGET_BRANCH) + " "+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_TARGET_BRANCH) + " "+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "+ PullRequestQuery.quote(branch);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.javanew file mode 100644index 0000000000..234d763cd4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java@@ -0,0 +1,53 @@+package io.onedev.server.search.entity.pullrequest;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.JoinType;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.commons.utils.match.WildcardUtils;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.ProjectQueryConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;++public class TargetProjectCriteria extends EntityCriteria<PullRequest> {++ private static final long serialVersionUID = 1L;++ private final String projectName;++ public TargetProjectCriteria(String projectName) {+ this.projectName = projectName;+ }++ @Override+ public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {+ Path<String> attribute = root+ .join(PullRequestQueryConstants.ATTR_TARGET_PROJECT, JoinType.INNER)+ .get(ProjectQueryConstants.ATTR_NAME);+ String normalized = projectName.toLowerCase().replace("*", "%");+ return builder.like(builder.lower(attribute), normalized);+ }++ @Override+ public boolean matches(PullRequest request, User user) {+ return WildcardUtils.matchString(projectName.toLowerCase(),+ request.getTargetProject().getName().toLowerCase());+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_TARGET_PROJECT) + " "+ + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "+ + PullRequestQuery.quote(projectName);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.javaindex e396c5d98f..cc0d80f1de 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java@@ -8,9 +8,10 @@ import javax.persistence.criteria.Root;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class TitleCriteria extends PullRequestCriteria {+public class TitleCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -22,7 +23,7 @@ public class TitleCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Expression<String> attribute = root.get(PullRequestConstants.ATTR_TITLE);+ Expression<String> attribute = root.get(PullRequestQueryConstants.ATTR_TITLE);return builder.like(builder.lower(attribute), "%" + value.toLowerCase().replace('*', '%') + "%");}@@ -39,7 +40,7 @@ public class TitleCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_TITLE) + " "+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_TITLE) + " "+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " "+ PullRequestQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.javaindex ffa481ac17..42b71194b6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java@@ -10,10 +10,11 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class ToBeReviewedByCriteria extends PullRequestCriteria {+public class ToBeReviewedByCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -28,7 +29,7 @@ public class ToBeReviewedByCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);+ From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.javaindex 77f5a5c687..ef3878c429 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java@@ -10,17 +10,18 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class ToBeReviewedByMeCriteria extends PullRequestCriteria {+public class ToBeReviewedByMeCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {if (user != null) {- From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);+ From<?, ?> join = root.join(PullRequestQueryConstants.ATTR_REVIEWS, JoinType.LEFT);Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.javaindex d2625a025e..cd4c9ee581 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java@@ -11,16 +11,17 @@ import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestBuild;import io.onedev.server.model.User;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class ToBeVerifiedByBuildsCriteria extends PullRequestCriteria {+public class ToBeVerifiedByBuildsCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {From<?, ?> join = root- .join(PullRequestConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT)+ .join(PullRequestQueryConstants.ATTR_PULL_REQUEST_BUILDS, JoinType.LEFT).join(PullRequestBuild.ATTR_BUILD, JoinType.INNER);Path<?> status = join.get(Build.STATUS);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.javaindex a558332fb5..3e566ac1da 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java@@ -9,10 +9,11 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.query.PullRequestQueryConstants;-public class UpdateDateCriteria extends PullRequestCriteria {+public class UpdateDateCriteria extends EntityCriteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -30,7 +31,7 @@ public class UpdateDateCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Path<Date> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_UPDATE_DATE);+ Path<Date> attribute = PullRequestQuery.getPath(root, PullRequestQueryConstants.ATTR_UPDATE_DATE);if (operator == PullRequestQueryLexer.IsBefore)return builder.lessThan(attribute, date);else@@ -52,7 +53,7 @@ public class UpdateDateCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequestConstants.FIELD_UPDATE_DATE) + " "+ return PullRequestQuery.quote(PullRequestQueryConstants.FIELD_UPDATE_DATE) + " "+ PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(value);}diff --git a/server-core/src/main/java/io/onedev/server/util/BuildConstants.java b/server-core/src/main/java/io/onedev/server/util/query/BuildQueryConstants.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/util/BuildConstants.javarename to server-core/src/main/java/io/onedev/server/util/query/BuildQueryConstants.javaindex 99fdaea7a5..66c3c61e4f 100644--- a/server-core/src/main/java/io/onedev/server/util/BuildConstants.java+++ b/server-core/src/main/java/io/onedev/server/util/query/BuildQueryConstants.java@@ -1,4 +1,4 @@-package io.onedev.server.util;+package io.onedev.server.util.query;import java.util.List;import java.util.Map;@@ -9,7 +9,7 @@ import com.google.common.collect.Sets;import io.onedev.commons.utils.Maps;-public class BuildConstants {+public class BuildQueryConstants {public static final String ATTR_ID = "id";@@ -21,7 +21,7 @@ public class BuildConstants {public static final String ATTR_VERSION = "version";- public static final String FIELD_PROJECT = "project";+ public static final String FIELD_PROJECT = "Project";public static final String ATTR_PROJECT = "project";@@ -80,13 +80,13 @@ public class BuildConstants {public static final String FIELD_LOG = "Log";public static final Set<String> ALL_FIELDS = Sets.newHashSet(- FIELD_NUMBER, FIELD_JOB, FIELD_STATUS, FIELD_SUBMITTER, FIELD_CANCELLER,+ FIELD_PROJECT, FIELD_NUMBER, FIELD_JOB, FIELD_STATUS, FIELD_SUBMITTER, FIELD_CANCELLER,FIELD_SUBMIT_DATE, FIELD_QUEUEING_DATE, FIELD_RUNNING_DATE, FIELD_FINISH_DATE,- FIELD_COMMIT, FIELD_PROJECT, FIELD_VERSION, FIELD_DEPENDENCIES, FIELD_DEPENDENTS,- FIELD_ERROR_MESSAGE, FIELD_LOG);+ FIELD_COMMIT, FIELD_VERSION, FIELD_DEPENDENCIES, FIELD_DEPENDENTS, FIELD_ERROR_MESSAGE,+ FIELD_LOG);public static final List<String> QUERY_FIELDS = Lists.newArrayList(- FIELD_JOB, FIELD_NUMBER, FIELD_VERSION, FIELD_COMMIT, FIELD_SUBMIT_DATE,+ FIELD_PROJECT, FIELD_JOB, FIELD_NUMBER, FIELD_VERSION, FIELD_COMMIT, FIELD_SUBMIT_DATE,FIELD_QUEUEING_DATE, FIELD_RUNNING_DATE, FIELD_FINISH_DATE);public static final Map<String, String> ORDER_FIELDS = Maps.newLinkedHashMap(@@ -97,6 +97,7 @@ public class BuildConstants {FIELD_QUEUEING_DATE, ATTR_QUEUEING_DATE,FIELD_RUNNING_DATE, ATTR_RUNNING_DATE,FIELD_FINISH_DATE, ATTR_FINISH_DATE,+ FIELD_PROJECT, ATTR_PROJECT,FIELD_COMMIT, ATTR_COMMIT);}diff --git a/server-core/src/main/java/io/onedev/server/util/CodeCommentConstants.java b/server-core/src/main/java/io/onedev/server/util/query/CodeCommentQueryConstants.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/util/CodeCommentConstants.javarename to server-core/src/main/java/io/onedev/server/util/query/CodeCommentQueryConstants.javaindex f4bdd83b39..23d9d04008 100644--- a/server-core/src/main/java/io/onedev/server/util/CodeCommentConstants.java+++ b/server-core/src/main/java/io/onedev/server/util/query/CodeCommentQueryConstants.java@@ -1,4 +1,4 @@-package io.onedev.server.util;+package io.onedev.server.util.query;import java.util.List;import java.util.Map;@@ -7,7 +7,7 @@ import com.google.common.collect.Lists;import io.onedev.commons.utils.Maps;-public class CodeCommentConstants {+public class CodeCommentQueryConstants {public static final String ATTR_PROJECT = "project";diff --git a/server-core/src/main/java/io/onedev/server/util/IssueConstants.java b/server-core/src/main/java/io/onedev/server/util/query/IssueQueryConstants.javasimilarity index 83%rename from server-core/src/main/java/io/onedev/server/util/IssueConstants.javarename to server-core/src/main/java/io/onedev/server/util/query/IssueQueryConstants.javaindex b3e7a6cf41..3bc67fa549 100644--- a/server-core/src/main/java/io/onedev/server/util/IssueConstants.java+++ b/server-core/src/main/java/io/onedev/server/util/query/IssueQueryConstants.java@@ -1,4 +1,4 @@-package io.onedev.server.util;+package io.onedev.server.util.query;import java.util.List;import java.util.Map;@@ -9,7 +9,7 @@ import com.google.common.collect.Sets;import io.onedev.commons.utils.Maps;-public class IssueConstants {+public class IssueQueryConstants {public static final String FIELD_NUMBER = "Number";@@ -64,20 +64,21 @@ public class IssueConstants {public static final String ATTR_ID = "id";public static final Set<String> ALL_FIELDS = Sets.newHashSet(- FIELD_NUMBER, FIELD_STATE, FIELD_TITLE, FIELD_SUBMITTER, FIELD_DESCRIPTION,- FIELD_COMMENT, FIELD_SUBMIT_DATE, FIELD_UPDATE_DATE, FIELD_VOTE_COUNT,- FIELD_COMMENT_COUNT, FIELD_MILESTONE, FIELD_PROJECT);+ FIELD_PROJECT, FIELD_NUMBER, FIELD_STATE, FIELD_TITLE, FIELD_SUBMITTER,+ FIELD_DESCRIPTION, FIELD_COMMENT, FIELD_SUBMIT_DATE, FIELD_UPDATE_DATE,+ FIELD_VOTE_COUNT, FIELD_COMMENT_COUNT, FIELD_MILESTONE);public static final List<String> QUERY_FIELDS = Lists.newArrayList(- FIELD_NUMBER, FIELD_STATE, FIELD_TITLE, FIELD_DESCRIPTION, FIELD_COMMENT,- FIELD_SUBMIT_DATE, FIELD_UPDATE_DATE, FIELD_VOTE_COUNT, FIELD_COMMENT_COUNT,- FIELD_MILESTONE);+ FIELD_PROJECT, FIELD_NUMBER, FIELD_STATE, FIELD_TITLE, FIELD_DESCRIPTION,+ FIELD_COMMENT, FIELD_SUBMIT_DATE, FIELD_UPDATE_DATE, FIELD_VOTE_COUNT,+ FIELD_COMMENT_COUNT, FIELD_MILESTONE);public static final Map<String, String> ORDER_FIELDS = Maps.newLinkedHashMap(FIELD_VOTE_COUNT, ATTR_VOTE_COUNT,FIELD_COMMENT_COUNT, ATTR_COMMENT_COUNT,FIELD_NUMBER, ATTR_NUMBER,FIELD_SUBMIT_DATE, ATTR_SUBMIT_DATE,+ FIELD_PROJECT, ATTR_PROJECT,FIELD_UPDATE_DATE, ATTR_UPDATE_DATE);}diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectConstants.java b/server-core/src/main/java/io/onedev/server/util/query/ProjectQueryConstants.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/util/ProjectConstants.javarename to server-core/src/main/java/io/onedev/server/util/query/ProjectQueryConstants.javaindex 0c783196df..1b8a97afc9 100644--- a/server-core/src/main/java/io/onedev/server/util/ProjectConstants.java+++ b/server-core/src/main/java/io/onedev/server/util/query/ProjectQueryConstants.java@@ -1,4 +1,4 @@-package io.onedev.server.util;+package io.onedev.server.util.query;import java.util.List;import java.util.Map;@@ -7,7 +7,7 @@ import com.google.common.collect.Lists;import io.onedev.commons.utils.Maps;-public class ProjectConstants {+public class ProjectQueryConstants {public static final String FIELD_NAME = "Name";diff --git a/server-core/src/main/java/io/onedev/server/util/PullRequestConstants.java b/server-core/src/main/java/io/onedev/server/util/query/PullRequestQueryConstants.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/util/PullRequestConstants.javarename to server-core/src/main/java/io/onedev/server/util/query/PullRequestQueryConstants.javaindex a64b9f30c3..a91a9a92b6 100644--- a/server-core/src/main/java/io/onedev/server/util/PullRequestConstants.java+++ b/server-core/src/main/java/io/onedev/server/util/query/PullRequestQueryConstants.java@@ -1,4 +1,4 @@-package io.onedev.server.util;+package io.onedev.server.util.query;import java.util.List;import java.util.Map;@@ -7,7 +7,7 @@ import com.google.common.collect.Lists;import io.onedev.commons.utils.Maps;-public class PullRequestConstants {+public class PullRequestQueryConstants {public static final String FIELD_NUMBER = "Number";@@ -15,6 +15,8 @@ public class PullRequestConstants {public static final String FIELD_STATUS = "Status";+ public static final String FIELD_TARGET_PROJECT = "Target Project";+public static final String ATTR_TARGET_PROJECT = "targetProject";public static final String FIELD_TARGET_BRANCH = "Target Branch";@@ -81,14 +83,8 @@ public class PullRequestConstants {public static final String ATTR_PULL_REQUEST_BUILDS = "pullRequestBuilds";- public static final String STATE_OPEN = "Open";-- public static final String REFS_PREFIX = "refs/pull/";-- public static final int MAX_CODE_COMMENTS = 1000;-public static final List<String> QUERY_FIELDS = Lists.newArrayList(- FIELD_NUMBER, FIELD_TITLE, FIELD_TARGET_BRANCH,+ FIELD_NUMBER, FIELD_TITLE, FIELD_TARGET_PROJECT, FIELD_TARGET_BRANCH,FIELD_SOURCE_PROJECT, FIELD_SOURCE_BRANCH, FIELD_DESCRIPTION,FIELD_COMMENT, FIELD_SUBMIT_DATE, FIELD_UPDATE_DATE,FIELD_CLOSE_DATE, FIELD_MERGE_STRATEGY, FIELD_COMMENT_COUNT);@@ -99,6 +95,10 @@ public class PullRequestConstants {FIELD_CLOSE_DATE, ATTR_CLOSE_DATE,FIELD_NUMBER, ATTR_NUMBER,FIELD_STATUS, ATTR_CLOSE_STATUS,+ FIELD_TARGET_PROJECT, ATTR_TARGET_PROJECT,+ FIELD_TARGET_BRANCH, ATTR_TARGET_BRANCH,+ FIELD_SOURCE_PROJECT, ATTR_SOURCE_PROJECT,+ FIELD_SOURCE_BRANCH, ATTR_SOURCE_BRANCH,FIELD_COMMENT_COUNT, ATTR_COMMENT_COUNT);}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/FieldNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/FieldNameValidator.javaindex f20b53d674..1023a8f62e 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/FieldNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/FieldNameValidator.java@@ -3,7 +3,7 @@ package io.onedev.server.util.validation;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;-import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.query.IssueQueryConstants;import io.onedev.server.util.validation.annotation.FieldName;public class FieldNameValidator implements ConstraintValidator<FieldName, String> {@@ -20,7 +20,7 @@ public class FieldNameValidator implements ConstraintValidator<FieldName, Stringif (value == null)return true;- if (IssueConstants.ALL_FIELDS.contains(value)) {+ if (IssueQueryConstants.ALL_FIELDS.contains(value)) {constraintContext.disableDefaultConstraintViolation();String message = this.message;if (message.length() == 0)diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.javaindex af4d5edc2c..5b8dca0452 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.java@@ -4,7 +4,7 @@ import javax.lang.model.SourceVersion;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;import io.onedev.server.util.validation.annotation.ParamName;public class ParamNameValidator implements ConstraintValidator<ParamName, String> {@@ -30,7 +30,7 @@ public class ParamNameValidator implements ConstraintValidator<ParamName, String}constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;- } else if (BuildConstants.ALL_FIELDS.contains(value)) {+ } else if (BuildQueryConstants.ALL_FIELDS.contains(value)) {constraintContext.disableDefaultConstraintViolation();if (message.length() == 0)message = "'" + value + "' is reserved";diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.javaindex fa17628aa2..7de9dafb83 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java@@ -26,7 +26,7 @@ import io.onedev.server.buildspec.job.action.condition.ActionConditionParser;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.model.Project;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -48,8 +48,8 @@ public class ActionConditionBehavior extends ANTLRAssistBehavior {protected List<InputSuggestion> match(String matchWith) {if ("criteriaField".equals(spec.getLabel())) {List<String> fields = Lists.newArrayList(- BuildConstants.FIELD_LOG,- BuildConstants.FIELD_ERROR_MESSAGE);+ BuildQueryConstants.FIELD_LOG,+ BuildQueryConstants.FIELD_ERROR_MESSAGE);JobAware jobAware = getComponent().findParent(JobAware.class);Job job = jobAware.getJob();fields.addAll(job.getParamSpecMap().keySet());diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex 4fbe88052a..edf9aab4f8 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -27,9 +27,9 @@ import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.search.entity.build.BuildQueryLexer;import io.onedev.server.search.entity.build.BuildQueryParser;import io.onedev.server.search.entity.project.ProjectQuery;-import io.onedev.server.util.BuildConstants;import io.onedev.server.util.DateUtils;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.query.BuildQueryConstants;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -66,14 +66,19 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {protected List<InputSuggestion> match(String matchWith) {Project project = getProject();if ("criteriaField".equals(spec.getLabel())) {- List<String> fields = new ArrayList<>(BuildConstants.QUERY_FIELDS);+ List<String> fields = new ArrayList<>(BuildQueryConstants.QUERY_FIELDS);+ if (getProject() != null)+ fields.remove(BuildQueryConstants.FIELD_PROJECT);BuildParamManager buildParamManager = OneDev.getInstance(BuildParamManager.class);List<String> paramNames = new ArrayList<>(buildParamManager.getBuildParamNames(project));Collections.sort(paramNames);fields.addAll(paramNames);return SuggestionUtils.suggest(fields, matchWith);} else if ("orderField".equals(spec.getLabel())) {- return SuggestionUtils.suggest(new ArrayList<>(BuildConstants.ORDER_FIELDS.keySet()), matchWith);+ List<String> candidates = new ArrayList<>(BuildQueryConstants.ORDER_FIELDS.keySet());+ if (getProject() != null)+ candidates.remove(BuildQueryConstants.FIELD_PROJECT);+ return SuggestionUtils.suggest(candidates, matchWith);} else if ("criteriaValue".equals(spec.getLabel())) {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);@@ -93,20 +98,25 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {String fieldName = BuildQuery.getValue(fieldElements.get(0).getMatchedText());try {BuildQuery.checkField(project, fieldName, operator);- if (fieldName.equals(BuildConstants.FIELD_SUBMIT_DATE)- || fieldName.equals(BuildConstants.FIELD_QUEUEING_DATE)- || fieldName.equals(BuildConstants.FIELD_RUNNING_DATE)- || fieldName.equals(BuildConstants.FIELD_FINISH_DATE)) {+ if (fieldName.equals(BuildQueryConstants.FIELD_SUBMIT_DATE)+ || fieldName.equals(BuildQueryConstants.FIELD_QUEUEING_DATE)+ || fieldName.equals(BuildQueryConstants.FIELD_RUNNING_DATE)+ || fieldName.equals(BuildQueryConstants.FIELD_FINISH_DATE)) {List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);return !suggestions.isEmpty()? suggestions: null;- } else if (fieldName.equals(BuildConstants.FIELD_JOB)) {+ } else if (fieldName.equals(BuildQueryConstants.FIELD_PROJECT)) {+ if (!matchWith.contains("*"))+ return SuggestionUtils.suggestProjects(matchWith);+ else+ return null;+ } else if (fieldName.equals(BuildQueryConstants.FIELD_JOB)) {if (project != null && !matchWith.contains("*"))return SuggestionUtils.suggestJobs(project, matchWith);elsereturn null;- } else if (fieldName.equals(BuildConstants.FIELD_NUMBER)) {+ } else if (fieldName.equals(BuildQueryConstants.FIELD_NUMBER)) {return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);- } else if (fieldName.equals(BuildConstants.FIELD_VERSION)) {+ } else if (fieldName.equals(BuildQueryConstants.FIELD_VERSION)) {if (project != null && !matchWith.contains("*"))return SuggestionUtils.suggestBuildVersions(project, matchWith);else@@ -164,8 +174,9 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());- if (fieldName.equals(BuildConstants.FIELD_VERSION)- || fieldName.equals(BuildConstants.FIELD_JOB)) {+ if (fieldName.equals(BuildQueryConstants.FIELD_PROJECT)+ || fieldName.equals(BuildQueryConstants.FIELD_VERSION)+ || fieldName.equals(BuildQueryConstants.FIELD_JOB)) {hints.add("Use * for wildcard match");hints.add("Use '\\' to escape quotes");}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 a438a3a8b8..fbfcb3b1d5 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@@ -22,8 +22,8 @@ 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.CodeCommentConstants;import io.onedev.server.util.DateUtils;+import io.onedev.server.util.query.CodeCommentQueryConstants;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -58,9 +58,9 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {protected List<InputSuggestion> match(String matchWith) {Project project = getProject();if ("criteriaField".equals(spec.getLabel())) {- return SuggestionUtils.suggest(CodeCommentConstants.QUERY_FIELDS, matchWith);+ return SuggestionUtils.suggest(CodeCommentQueryConstants.QUERY_FIELDS, matchWith);} else if ("orderField".equals(spec.getLabel())) {- return SuggestionUtils.suggest(new ArrayList<>(CodeCommentConstants.ORDER_FIELDS.keySet()), matchWith);+ return SuggestionUtils.suggest(new ArrayList<>(CodeCommentQueryConstants.ORDER_FIELDS.keySet()), matchWith);} else if ("criteriaValue".equals(spec.getLabel())) {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);@@ -76,11 +76,11 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {String fieldName = CodeCommentQuery.getValue(fieldElements.get(0).getMatchedText());try {CodeCommentQuery.checkField(project, fieldName, operator);- if (fieldName.equals(CodeCommentConstants.FIELD_CREATE_DATE)- || fieldName.equals(CodeCommentConstants.FIELD_UPDATE_DATE)) {+ if (fieldName.equals(CodeCommentQueryConstants.FIELD_CREATE_DATE)+ || fieldName.equals(CodeCommentQueryConstants.FIELD_UPDATE_DATE)) {List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);return !suggestions.isEmpty()? suggestions: null;- } else if (fieldName.equals(CodeCommentConstants.FIELD_PATH)) {+ } else if (fieldName.equals(CodeCommentQueryConstants.FIELD_PATH)) {return SuggestionUtils.suggestBlobs(projectModel.getObject(), matchWith);} else {return null;@@ -129,7 +129,7 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());- if (fieldName.equals(CodeCommentConstants.FIELD_CONTENT)) {+ if (fieldName.equals(CodeCommentQueryConstants.FIELD_CONTENT)) {hints.add("Use * for wildcard match");hints.add("Use '\\' to escape quotes");}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 28fed92759..10cdc8b2f8 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@@ -7,16 +7,17 @@ import static io.onedev.server.search.entity.issue.IssueQuery.getRuleName;import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsMe;import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedBy;import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedByMe;-import static io.onedev.server.util.IssueConstants.FIELD_COMMENT;-import static io.onedev.server.util.IssueConstants.FIELD_COMMENT_COUNT;-import static io.onedev.server.util.IssueConstants.FIELD_DESCRIPTION;-import static io.onedev.server.util.IssueConstants.FIELD_MILESTONE;-import static io.onedev.server.util.IssueConstants.FIELD_NUMBER;-import static io.onedev.server.util.IssueConstants.FIELD_STATE;-import static io.onedev.server.util.IssueConstants.FIELD_SUBMIT_DATE;-import static io.onedev.server.util.IssueConstants.FIELD_TITLE;-import static io.onedev.server.util.IssueConstants.FIELD_UPDATE_DATE;-import static io.onedev.server.util.IssueConstants.FIELD_VOTE_COUNT;+import static io.onedev.server.util.query.IssueQueryConstants.FIELD_COMMENT;+import static io.onedev.server.util.query.IssueQueryConstants.FIELD_COMMENT_COUNT;+import static io.onedev.server.util.query.IssueQueryConstants.FIELD_DESCRIPTION;+import static io.onedev.server.util.query.IssueQueryConstants.FIELD_MILESTONE;+import static io.onedev.server.util.query.IssueQueryConstants.FIELD_NUMBER;+import static io.onedev.server.util.query.IssueQueryConstants.FIELD_PROJECT;+import static io.onedev.server.util.query.IssueQueryConstants.FIELD_STATE;+import static io.onedev.server.util.query.IssueQueryConstants.FIELD_SUBMIT_DATE;+import static io.onedev.server.util.query.IssueQueryConstants.FIELD_TITLE;+import static io.onedev.server.util.query.IssueQueryConstants.FIELD_UPDATE_DATE;+import static io.onedev.server.util.query.IssueQueryConstants.FIELD_VOTE_COUNT;import java.util.ArrayList;import java.util.List;@@ -59,8 +60,8 @@ import io.onedev.server.search.entity.issue.IssueQueryParser;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.IssueConstants;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.query.IssueQueryConstants;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -99,12 +100,16 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {protected List<InputSuggestion> match(String matchWith) {Project project = getProject();if ("criteriaField".equals(spec.getLabel())) {- List<String> candidates = new ArrayList<>(IssueConstants.QUERY_FIELDS);+ List<String> candidates = new ArrayList<>(IssueQueryConstants.QUERY_FIELDS);+ if (getProject() != null)+ candidates.remove(IssueQueryConstants.FIELD_PROJECT);for (FieldSpec field: issueSetting.getFieldSpecs())candidates.add(field.getName());return SuggestionUtils.suggest(candidates, matchWith);} else if ("orderField".equals(spec.getLabel())) {- List<String> candidates = new ArrayList<>(IssueConstants.ORDER_FIELDS.keySet());+ List<String> candidates = new ArrayList<>(IssueQueryConstants.ORDER_FIELDS.keySet());+ if (getProject() != null)+ candidates.remove(IssueQueryConstants.FIELD_PROJECT);for (FieldSpec field: issueSetting.getFieldSpecs()) {if (field instanceof NumberField || field instanceof ChoiceField || field instanceof DateField)candidates.add(field.getName());@@ -157,13 +162,22 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {} else if (fieldSpec instanceof GroupChoiceField) {List<String> candidates = OneDev.getInstance(GroupManager.class).query().stream().map(it->it.getName()).collect(Collectors.toList());return SuggestionUtils.suggest(candidates, matchWith);+ } else if (fieldName.equals(FIELD_PROJECT)) {+ if (!matchWith.contains("*"))+ return SuggestionUtils.suggestProjects(matchWith);+ else+ return null;} else if (fieldName.equals(FIELD_STATE)) {- List<String> candidates = issueSetting.getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());+ List<String> candidates = issueSetting.getStateSpecs()+ .stream()+ .map(it->it.getName())+ .collect(Collectors.toList());return SuggestionUtils.suggest(candidates, matchWith);} else if (fieldSpec instanceof ChoiceField) {ComponentContext.push(new ComponentContext(getComponent()));try {- List<String> candidates = new ArrayList<>(((ChoiceField)fieldSpec).getChoiceProvider().getChoices(true).keySet());+ List<String> candidates = new ArrayList<>(((ChoiceField)fieldSpec)+ .getChoiceProvider().getChoices(true).keySet());return SuggestionUtils.suggest(candidates, matchWith);} finally {ComponentContext.pop();@@ -171,7 +185,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {} else if (fieldName.equals(FIELD_NUMBER)) {return SuggestionUtils.suggestIssues(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);} else if (fieldName.equals(FIELD_MILESTONE)) {- if (project != null)+ if (project != null && !matchWith.contains("*"))return SuggestionUtils.suggestMilestones(project, matchWith);elsereturn null;@@ -231,10 +245,11 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());- if (fieldName.equals(IssueConstants.FIELD_TITLE)- || fieldName.equals(IssueConstants.FIELD_DESCRIPTION)- || fieldName.equals(IssueConstants.FIELD_COMMENT)- || fieldName.equals(IssueConstants.FIELD_MILESTONE)) {+ if (fieldName.equals(IssueQueryConstants.FIELD_PROJECT)+ || fieldName.equals(IssueQueryConstants.FIELD_TITLE)+ || fieldName.equals(IssueQueryConstants.FIELD_DESCRIPTION)+ || fieldName.equals(IssueQueryConstants.FIELD_COMMENT)+ || fieldName.equals(IssueQueryConstants.FIELD_MILESTONE)) {hints.add("Use * for wildcard match");hints.add("Use '\\' to escape quotes");}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.javaindex 617ae19674..31c7b3b56d 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java@@ -18,7 +18,7 @@ import io.onedev.server.OneException;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.search.entity.project.ProjectQueryParser;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.ProjectConstants;+import io.onedev.server.util.query.ProjectQueryConstants;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -39,9 +39,9 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> match(String matchWith) {if ("criteriaField".equals(spec.getLabel())) {- return SuggestionUtils.suggest(ProjectConstants.QUERY_FIELDS, matchWith);+ return SuggestionUtils.suggest(ProjectQueryConstants.QUERY_FIELDS, matchWith);} else if ("orderField".equals(spec.getLabel())) {- return SuggestionUtils.suggest(new ArrayList<>(ProjectConstants.ORDER_FIELDS.keySet()), matchWith);+ return SuggestionUtils.suggest(new ArrayList<>(ProjectQueryConstants.ORDER_FIELDS.keySet()), matchWith);} else if ("criteriaValue".equals(spec.getLabel())) {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);@@ -54,15 +54,15 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());try {ProjectQuery.checkField(fieldName, operator);- if (fieldName.equals(ProjectConstants.FIELD_UPDATE_DATE)) {+ if (fieldName.equals(ProjectQueryConstants.FIELD_UPDATE_DATE)) {List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);return !suggestions.isEmpty()? suggestions: null;- } else if (fieldName.equals(ProjectConstants.FIELD_NAME)) {+ } else if (fieldName.equals(ProjectQueryConstants.FIELD_NAME)) {if (!matchWith.contains("*"))return SuggestionUtils.suggestProjects(matchWith);elsereturn null;- } else if (fieldName.equals(ProjectConstants.FIELD_OWNER)) {+ } else if (fieldName.equals(ProjectQueryConstants.FIELD_OWNER)) {return SuggestionUtils.suggestUsers(matchWith);} else {return null;@@ -111,11 +111,14 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());- if (fieldName.equals(ProjectConstants.FIELD_NAME)- || fieldName.equals(ProjectConstants.FIELD_DESCRIPTION)) {+ if (fieldName.equals(ProjectQueryConstants.FIELD_NAME)+ || fieldName.equals(ProjectQueryConstants.FIELD_DESCRIPTION)) {hints.add("Use * for wildcard match");hints.add("Use '\\' to escape quotes");}+ } else {+ hints.add("Use * for wildcard match");+ hints.add("Use '\\' to escape quotes");}}}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 12b3c3b504..9d059a3b1f 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@@ -6,7 +6,7 @@ import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.Dimport 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.util.IssueConstants.FIELD_NUMBER;+import static io.onedev.server.util.query.IssueQueryConstants.FIELD_NUMBER;import java.util.ArrayList;import java.util.List;@@ -32,8 +32,8 @@ import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.PullRequestConstants;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.query.PullRequestQueryConstants;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -69,9 +69,15 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {protected List<InputSuggestion> match(String matchWith) {Project project = getProject();if ("criteriaField".equals(spec.getLabel())) {- return SuggestionUtils.suggest(PullRequestConstants.QUERY_FIELDS, matchWith);+ List<String> candidates = new ArrayList<>(PullRequestQueryConstants.QUERY_FIELDS);+ if (getProject() != null)+ candidates.remove(PullRequestQueryConstants.FIELD_TARGET_PROJECT);+ return SuggestionUtils.suggest(candidates, matchWith);} else if ("orderField".equals(spec.getLabel())) {- return SuggestionUtils.suggest(new ArrayList<>(PullRequestConstants.ORDER_FIELDS.keySet()), matchWith);+ List<String> candidates = new ArrayList<>(PullRequestQueryConstants.ORDER_FIELDS.keySet());+ if (getProject() != null)+ candidates.remove(PullRequestQueryConstants.FIELD_TARGET_PROJECT);+ return SuggestionUtils.suggest(candidates, matchWith);} else if ("criteriaValue".equals(spec.getLabel())) {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);@@ -89,30 +95,34 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {String fieldName = PullRequestQuery.getValue(fieldElements.get(0).getMatchedText());try {PullRequestQuery.checkField(fieldName, operator);- if (fieldName.equals(PullRequestConstants.FIELD_SUBMIT_DATE)- || fieldName.equals(PullRequestConstants.FIELD_UPDATE_DATE)- || fieldName.equals(PullRequestConstants.FIELD_CLOSE_DATE)) {+ if (fieldName.equals(PullRequestQueryConstants.FIELD_SUBMIT_DATE)+ || fieldName.equals(PullRequestQueryConstants.FIELD_UPDATE_DATE)+ || fieldName.equals(PullRequestQueryConstants.FIELD_CLOSE_DATE)) {List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);return !suggestions.isEmpty()? suggestions: null;- } else if (fieldName.equals(PullRequestConstants.FIELD_SOURCE_PROJECT)) {- return SuggestionUtils.suggestProjects(matchWith);- } else if (fieldName.equals(PullRequestConstants.FIELD_TARGET_BRANCH)- || fieldName.equals(PullRequestConstants.FIELD_SOURCE_BRANCH)) {- if (project != null)+ } else if (fieldName.equals(PullRequestQueryConstants.FIELD_TARGET_PROJECT)+ || fieldName.equals(PullRequestQueryConstants.FIELD_SOURCE_PROJECT)) {+ if (!matchWith.contains("*"))+ return SuggestionUtils.suggestProjects(matchWith);+ else+ return null;+ } else if (fieldName.equals(PullRequestQueryConstants.FIELD_TARGET_BRANCH)+ || fieldName.equals(PullRequestQueryConstants.FIELD_SOURCE_BRANCH)) {+ if (project != null && !matchWith.contains("*"))return SuggestionUtils.suggestBranches(project, matchWith);elsereturn null;} else if (fieldName.equals(FIELD_NUMBER)) {return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);- } else if (fieldName.equals(PullRequestConstants.FIELD_MERGE_STRATEGY)) {+ } else if (fieldName.equals(PullRequestQueryConstants.FIELD_MERGE_STRATEGY)) {List<String> candidates = new ArrayList<>();for (MergeStrategy strategy: MergeStrategy.values())candidates.add(strategy.toString());return SuggestionUtils.suggest(candidates, matchWith);- } else if (fieldName.equals(PullRequestConstants.FIELD_TITLE)- || fieldName.equals(PullRequestConstants.FIELD_DESCRIPTION)- || fieldName.equals(PullRequestConstants.FIELD_COMMENT_COUNT)- || fieldName.equals(PullRequestConstants.FIELD_COMMENT)) {+ } else if (fieldName.equals(PullRequestQueryConstants.FIELD_TITLE)+ || fieldName.equals(PullRequestQueryConstants.FIELD_DESCRIPTION)+ || fieldName.equals(PullRequestQueryConstants.FIELD_COMMENT_COUNT)+ || fieldName.equals(PullRequestQueryConstants.FIELD_COMMENT)) {return null;}} catch (OneException ex) {@@ -167,9 +177,13 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (!fieldElements.isEmpty()) {String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());- if (fieldName.equals(PullRequestConstants.FIELD_TITLE)- || fieldName.equals(PullRequestConstants.FIELD_DESCRIPTION)- || fieldName.equals(PullRequestConstants.FIELD_COMMENT)) {+ if (fieldName.equals(PullRequestQueryConstants.FIELD_TARGET_PROJECT)+ || fieldName.equals(PullRequestQueryConstants.FIELD_TARGET_BRANCH)+ || fieldName.equals(PullRequestQueryConstants.FIELD_SOURCE_PROJECT)+ || fieldName.equals(PullRequestQueryConstants.FIELD_SOURCE_BRANCH)+ || fieldName.equals(PullRequestQueryConstants.FIELD_TITLE)+ || fieldName.equals(PullRequestQueryConstants.FIELD_DESCRIPTION)+ || fieldName.equals(PullRequestQueryConstants.FIELD_COMMENT)) {hints.add("Use * for wildcard match");hints.add("Use '\\' to escape quotes");}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.javaindex d388038522..1c3767bfae 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java@@ -23,7 +23,7 @@ import io.onedev.server.buildspec.job.paramspec.ParamSpec;import io.onedev.server.buildspec.job.retrycondition.RetryCondition;import io.onedev.server.buildspec.job.retrycondition.RetryConditionLexer;import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser;-import io.onedev.server.util.BuildConstants;+import io.onedev.server.util.query.BuildQueryConstants;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -45,8 +45,8 @@ public class RetryConditionBehavior extends ANTLRAssistBehavior {protected List<InputSuggestion> match(String matchWith) {if ("criteriaField".equals(spec.getLabel())) {List<String> fields = Lists.newArrayList(- BuildConstants.FIELD_LOG,- BuildConstants.FIELD_ERROR_MESSAGE);+ BuildQueryConstants.FIELD_LOG,+ BuildQueryConstants.FIELD_ERROR_MESSAGE);JobAware jobAware = getComponent().findParent(JobAware.class);Job job = jobAware.getJob();fields.addAll(job.getParamSpecMap().keySet());diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 66fcb479e3..1d66e686f3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -59,9 +59,9 @@ import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalBuildSetting;import io.onedev.server.search.entity.build.BuildQuery;-import io.onedev.server.util.BuildConstants;import io.onedev.server.util.Input;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.query.BuildQueryConstants;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.BuildQueryBehavior;import io.onedev.server.web.behavior.WebSocketObserver;@@ -445,7 +445,7 @@ public abstract class BuildListPanel extends Panel {}});- columns.add(new AbstractColumn<Build, Void>(Model.of(BuildConstants.FIELD_STATUS)) {+ columns.add(new AbstractColumn<Build, Void>(Model.of(BuildQueryConstants.FIELD_STATUS)) {@Overridepublic String getCssClass() {@@ -499,7 +499,7 @@ public abstract class BuildListPanel extends Panel {}});- columns.add(new AbstractColumn<Build, Void>(Model.of(BuildConstants.FIELD_JOB)) {+ columns.add(new AbstractColumn<Build, Void>(Model.of(BuildQueryConstants.FIELD_JOB)) {@Overridepublic String getCssClass() {@@ -529,7 +529,7 @@ public abstract class BuildListPanel extends Panel {}});- columns.add(new AbstractColumn<Build, Void>(Model.of(BuildConstants.FIELD_COMMIT)) {+ columns.add(new AbstractColumn<Build, Void>(Model.of(BuildQueryConstants.FIELD_COMMIT)) {@Overridepublic String getCssClass() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex 6b7e16917a..1a461d098b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -39,11 +39,11 @@ import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.util.IssueConstants;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.query.IssueQueryConstants;import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.project.comment.CommentInput;@@ -109,15 +109,15 @@ abstract class BatchEditPanel extends Panel implements InputContext {@Overridepublic Boolean getObject() {- return selectedFields.contains(IssueConstants.FIELD_STATE);+ return selectedFields.contains(IssueQueryConstants.FIELD_STATE);}@Overridepublic void setObject(Boolean object) {if (object)- selectedFields.add(IssueConstants.FIELD_STATE);+ selectedFields.add(IssueQueryConstants.FIELD_STATE);else- selectedFields.remove(IssueConstants.FIELD_STATE);+ selectedFields.remove(IssueQueryConstants.FIELD_STATE);}}).add(newOnChangeBehavior(form)));@@ -130,15 +130,15 @@ abstract class BatchEditPanel extends Panel implements InputContext {@Overridepublic Boolean getObject() {- return selectedFields.contains(IssueConstants.FIELD_MILESTONE);+ return selectedFields.contains(IssueQueryConstants.FIELD_MILESTONE);}@Overridepublic void setObject(Boolean object) {if (object)- selectedFields.add(IssueConstants.FIELD_MILESTONE);+ selectedFields.add(IssueQueryConstants.FIELD_MILESTONE);else- selectedFields.remove(IssueConstants.FIELD_MILESTONE);+ selectedFields.remove(IssueQueryConstants.FIELD_MILESTONE);}}).add(newOnChangeBehavior(form)));@@ -196,10 +196,10 @@ abstract class BatchEditPanel extends Panel implements InputContext {}Set<String> excludedProperties = new HashSet<>();- if (!selectedFields.contains(IssueConstants.FIELD_STATE))- excludedProperties.add(IssueConstants.ATTR_STATE);- if (!selectedFields.contains(IssueConstants.FIELD_MILESTONE))- excludedProperties.add(IssueConstants.ATTR_MILESTONE);+ if (!selectedFields.contains(IssueQueryConstants.FIELD_STATE))+ excludedProperties.add(IssueQueryConstants.ATTR_STATE);+ if (!selectedFields.contains(IssueQueryConstants.FIELD_MILESTONE))+ excludedProperties.add(IssueQueryConstants.ATTR_MILESTONE);builtInFieldsEditor = BeanContext.edit("builtInFieldsEditor", builtInFieldsBean, excludedProperties, true);form.add(builtInFieldsEditor);@@ -246,13 +246,13 @@ abstract class BatchEditPanel extends Panel implements InputContext {@Overrideprotected void runTask(AjaxRequestTarget target) {String state;- if (selectedFields.contains(IssueConstants.FIELD_STATE))+ if (selectedFields.contains(IssueQueryConstants.FIELD_STATE))state = builtInFieldsBean.getState();elsestate = null;Optional<Milestone> milestone;- if (selectedFields.contains(IssueConstants.FIELD_MILESTONE))+ if (selectedFields.contains(IssueQueryConstants.FIELD_MILESTONE))milestone = Optional.fromNullable(getProject().getMilestone(builtInFieldsBean.getMilestone()));elsemilestone = null;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.javaindex 1522bb0c25..01cf938ccd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java@@ -43,9 +43,9 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.Input;-import io.onedev.server.util.IssueConstants;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.query.IssueQueryConstants;import io.onedev.server.web.component.issue.IssueStateLabel;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.project.comment.CommentInput;@@ -182,7 +182,7 @@ public abstract class IssueOperationsPanel extends Panel {List<String> criterias = new ArrayList<>();if (getIssue().getMilestone() != null)- criterias.add(IssueQuery.quote(IssueConstants.FIELD_MILESTONE) + " is " + IssueQuery.quote(getIssue().getMilestoneName()));+ criterias.add(IssueQuery.quote(IssueQueryConstants.FIELD_MILESTONE) + " is " + IssueQuery.quote(getIssue().getMilestoneName()));for (Map.Entry<String, Input> entry: getIssue().getFieldInputs().entrySet()) {if (getIssue().isFieldVisible(entry.getKey())) {List<String> strings = entry.getValue().getValues();diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex 75b641e1ba..8a94864259 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -35,7 +35,6 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.util.DateUtils;-import io.onedev.server.util.PullRequestConstants;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.avatar.AvatarManager;@@ -149,7 +148,7 @@ public class MarkdownViewer extends GenericPanel<String> {String status;CloseInfo closeInfo = request.getCloseInfo();if (closeInfo == null) {- status = PullRequestConstants.STATE_OPEN;+ status = PullRequest.STATE_OPEN;statusCss = "label-warning";} else {status = closeInfo.getStatus().toString();diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusLabel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusLabel.javaindex 4c60b929ff..fb66f58049 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusLabel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusLabel.java@@ -8,7 +8,6 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.CloseInfo;-import io.onedev.server.util.PullRequestConstants;@SuppressWarnings("serial")public class RequestStatusLabel extends Label {@@ -23,7 +22,7 @@ public class RequestStatusLabel extends Label {PullRequest request = requestModel.getObject();CloseInfo closeInfo = request.getCloseInfo();if (closeInfo == null)- return PullRequestConstants.STATE_OPEN;+ return PullRequest.STATE_OPEN;elsereturn closeInfo.getStatus().toString();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 16b18a8fe0..2ac995f32a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -70,8 +70,8 @@ import io.onedev.server.search.entity.pullrequest.OpenCriteria;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;import io.onedev.server.util.ProjectAndBranch;-import io.onedev.server.util.PullRequestConstants;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.query.PullRequestQueryConstants;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.branch.choice.BranchChoiceProvider;import io.onedev.server.web.component.branch.choice.BranchSingleChoice;@@ -644,7 +644,7 @@ public class ProjectBranchesPage extends ProjectPage {if (!pullRequestManager.queryOpen(new ProjectAndBranch(getProject(), branch)).isEmpty()) {Fragment bodyFrag = new Fragment("body", "openRequestsFrag", ProjectBranchesPage.this);String query = String.format("\"%s\" %s \"%s\" %s %s",- PullRequestConstants.FIELD_TARGET_BRANCH, PullRequestQuery.getRuleName(PullRequestQueryLexer.Is),+ PullRequestQueryConstants.FIELD_TARGET_BRANCH, PullRequestQuery.getRuleName(PullRequestQueryLexer.Is),branch, PullRequestQuery.getRuleName(PullRequestQueryLexer.And),new OpenCriteria().toString());PageParameters params = ProjectPullRequestsPage.paramsOf(getProject(), query, 0);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex 46a498517f..d4261b9b6b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -25,8 +25,8 @@ import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Issue;import io.onedev.server.model.User;import io.onedev.server.util.Input;-import io.onedev.server.util.IssueConstants;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.query.IssueQueryConstants;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.issue.IssueStateLabel;@@ -69,14 +69,14 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(displayFields.contains(IssueConstants.FIELD_STATE));+ setVisible(displayFields.contains(IssueQueryConstants.FIELD_STATE));}});RepeatingView fieldsView = new RepeatingView("fields");for (String fieldName: displayFields) {- if (!fieldName.equals(IssueConstants.FIELD_STATE)) {+ if (!fieldName.equals(IssueQueryConstants.FIELD_STATE)) {Input field = getIssue().getFieldInputs().get(fieldName);if (field != null && !field.getType().equals(FieldSpec.USER) && !field.getValues().isEmpty()) {fieldsView.add(new FieldValuesPanel(fieldsView.newChildId()) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex d3305bdcbe..f419ad383b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -57,9 +57,9 @@ import io.onedev.server.search.entity.issue.MilestoneCriteria;import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;-import io.onedev.server.util.IssueConstants;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.query.IssueQueryConstants;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.modal.ModalLink;@@ -83,7 +83,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {if (getMilestone() != null)criterias.add(new MilestoneCriteria(getMilestone().getName()));String identifyField = getBoard().getIdentifyField();- if (identifyField.equals(IssueConstants.FIELD_STATE)) {+ if (identifyField.equals(IssueQueryConstants.FIELD_STATE)) {criterias.add(new StateCriteria(getColumn()));} else if (getColumn() != null) {criterias.add(new ChoiceFieldCriteria(identifyField,@@ -152,7 +152,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {// move issue between board columnsProjectIssueSetting workflow = getProject().getIssueSetting();String identifyField = getBoard().getIdentifyField();- if (identifyField.equals(IssueConstants.FIELD_STATE)) {+ if (identifyField.equals(IssueQueryConstants.FIELD_STATE)) {issue = SerializationUtils.clone(issue);for (TransitionSpec transition: workflow.getTransitionSpecs(true)) {if (transition.canTransite(issue)@@ -221,7 +221,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {String identifyField = getBoard().getIdentifyField();if (getColumn() != null) {title = HtmlEscape.escapeHtml5(getColumn());- if (identifyField.equals(IssueConstants.FIELD_STATE)) {+ if (identifyField.equals(IssueQueryConstants.FIELD_STATE)) {StateSpec stateSpec = getIssueSetting().getStateSpec(getColumn());if (stateSpec != null)color = stateSpec.getColor();@@ -299,7 +299,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {super.onConfigure();setVisible(getQuery() != null&& SecurityUtils.getUser() != null- && (!getBoard().getIdentifyField().equals(IssueConstants.FIELD_STATE)+ && (!getBoard().getIdentifyField().equals(IssueQueryConstants.FIELD_STATE)|| getColumn().equals(getIssueSetting().getInitialStateSpec().getName())));}@@ -339,7 +339,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {OneDev.getInstance(IssueChangeManager.class).changeMilestone(issue, getMilestone(), SecurityUtils.getUser());markAccepted(target, issue, true);- } else if (fieldName.equals(IssueConstants.FIELD_STATE)) {+ } else if (fieldName.equals(IssueQueryConstants.FIELD_STATE)) {ProjectIssueSetting workflow = getProject().getIssueSetting();AtomicReference<TransitionSpec> transitionRef = new AtomicReference<>(null);for (TransitionSpec transition: workflow.getTransitionSpecs(true)) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 8582dfee32..1c665f5c4c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -9,7 +9,7 @@ import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;import static io.onedev.server.search.entity.build.BuildQueryLexer.And;import static io.onedev.server.search.entity.build.BuildQueryLexer.AssociatedWithPullRequest;import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;-import static io.onedev.server.util.BuildConstants.FIELD_JOB;+import static io.onedev.server.util.query.BuildQueryConstants.FIELD_JOB;import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.APPROVE;import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.DELETE_SOURCE_BRANCH;import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.DISCARD;