The Unified and Autonomous Development Platform
Enhance pull request query syntax with ability query comments
robin shen0a13fb84e79f
diff --git a/core/src/main/java/io/onedev/server/entityquery/EntityQuery.java b/core/src/main/java/io/onedev/server/entityquery/EntityQuery.javaindex f6a397dd7f..17efae4946 100644--- a/core/src/main/java/io/onedev/server/entityquery/EntityQuery.java+++ b/core/src/main/java/io/onedev/server/entityquery/EntityQuery.java@@ -1,16 +1,22 @@package io.onedev.server.entityquery;+import java.io.IOException;import java.io.Serializable;+import java.util.Date;import java.util.List;import javax.persistence.criteria.Path;+import org.eclipse.jgit.errors.RevisionSyntaxException;+import org.eclipse.jgit.lib.ObjectId;import org.unbescape.java.JavaEscape;import com.google.common.base.Splitter;import io.onedev.server.exception.OneException;import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.Project;+import io.onedev.server.util.DateUtils;import io.onedev.utils.WordUtils;public abstract class EntityQuery<T extends AbstractEntity> implements Serializable {@@ -42,6 +48,24 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializaelsethrow new OneException("Invalid boolean: " + value);}++ public static Date getDateValue(String value) {+ Date dateValue = DateUtils.parseRelaxed(value);+ if (dateValue == null)+ throw new OneException("Unrecognized date: " + value);+ return dateValue;+ }++ public static ObjectId getCommitId(Project project, String value) {+ try {+ ObjectId commitId = project.getRepository().resolve(value);+ if (commitId == null)+ throw new RevisionSyntaxException("");+ return commitId;+ } catch (RevisionSyntaxException | IOException e) {+ throw new OneException("Invalid revision string: " + value);+ }+ }public boolean needsLogin() {return getCriteria() != null && getCriteria().needsLogin();diff --git a/core/src/main/java/io/onedev/server/entityquery/QueryBuildContext.java b/core/src/main/java/io/onedev/server/entityquery/QueryBuildContext.javaindex e85360c690..eaa4336c89 100644--- a/core/src/main/java/io/onedev/server/entityquery/QueryBuildContext.java+++ b/core/src/main/java/io/onedev/server/entityquery/QueryBuildContext.java@@ -1,10 +1,12 @@package io.onedev.server.entityquery;import java.util.HashMap;+import java.util.List;import java.util.Map;import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;+import javax.persistence.criteria.From;+import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Root;public abstract class QueryBuildContext<T> {@@ -13,23 +15,30 @@ public abstract class QueryBuildContext<T> {private final CriteriaBuilder builder;- private final Map<String, Join<?, ?>> joins = new HashMap<>();+ private final Map<String, From<?, ?>> joins = new HashMap<>();public QueryBuildContext(Root<T> root, CriteriaBuilder builder) {this.root = root;this.builder = builder;}- public Join<?, ?> getJoin(String joinPath) {- Join<?, ?> join = joins.get(joinPath);+ public From<?, ?> getJoin(String joinName) {+ From<?, ?> join = joins.get(joinName);if (join == null) {- join = newJoin(joinPath);- joins.put(joinPath, join);+ join = newJoin(joinName);+ joins.put(joinName, join);}return join;}- protected abstract Join<?, ?> newJoin(String joinPath);+ protected From<?, ?> joinByAttrs(List<String> joinAttrs) {+ From<?, ?> from = root;+ for (String attr: joinAttrs)+ from = from.join(attr, JoinType.LEFT);+ return from;+ }++ protected abstract From<?, ?> newJoin(String joinName);public Root<T> getRoot() {return root;diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.g4 b/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.g4index 50419a73c0..f8e37a9783 100644--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.g4+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.g4@@ -9,7 +9,7 @@ querycriteria: CreatedByMe #OperatorCriteria| CreatedBy WS+ criteriaValue=Quoted #OperatorValueCriteria- | criteriaField=Quoted WS+ operator=(Is|IsBefore|IsAfter|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | criteriaField=Quoted WS+ operator=(Is|IsBefore|IsAfter|IsGreaterThan|IsLessThan|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria| Not WS* LParens WS* criteria WS* RParens #NotCriteria@@ -39,7 +39,7 @@ OrderByIs: 'is';-+Contains: 'contains';@@ -51,6 +51,14 @@ IsAfterIsBefore: 'is before';++IsGreaterThan+ : 'is' WS+ 'greater' WS+ 'than'+ ;++IsLessThan+ : 'is' WS+ 'less' WS+ 'than'+ ;And: 'and'diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.javaindex b7a1d275aa..9772506894 100644--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.java+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.java@@ -1,6 +1,13 @@package io.onedev.server.entityquery.codecomment;-import java.io.IOException;+import static io.onedev.server.model.support.CodeCommentConstants.FIELD_COMMIT;+import static io.onedev.server.model.support.CodeCommentConstants.FIELD_CONTENT;+import static io.onedev.server.model.support.CodeCommentConstants.FIELD_CREATE_DATE;+import static io.onedev.server.model.support.CodeCommentConstants.FIELD_PATH;+import static io.onedev.server.model.support.CodeCommentConstants.FIELD_REPLY;+import static io.onedev.server.model.support.CodeCommentConstants.FIELD_REPLY_COUNT;+import static io.onedev.server.model.support.CodeCommentConstants.FIELD_UPDATE_DATE;+import java.util.ArrayList;import java.util.Date;import java.util.List;@@ -13,8 +20,6 @@ import org.antlr.v4.runtime.BaseErrorListener;import org.antlr.v4.runtime.CommonTokenStream;import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;-import org.eclipse.jgit.errors.RevisionSyntaxException;-import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;import io.onedev.server.entityquery.AndCriteriaHelper;@@ -39,7 +44,7 @@ import io.onedev.server.manager.UserManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.util.DateUtils;+import io.onedev.server.model.support.CodeCommentConstants;public class CodeCommentQuery extends EntityQuery<CodeComment> {@@ -124,37 +129,35 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {switch (operator) {case CodeCommentQueryLexer.IsBefore:case CodeCommentQueryLexer.IsAfter:- Date dateValue = DateUtils.parseRelaxed(value);- if (dateValue == null)- throw new OneException("Unrecognized date: " + value);+ Date dateValue = getDateValue(value);switch (fieldName) {- case CodeComment.FIELD_CREATE_DATE:+ case FIELD_CREATE_DATE:return new CreateDateCriteria(dateValue, value, operator);- case CodeComment.FIELD_UPDATE_DATE:+ case FIELD_UPDATE_DATE:return new UpdateDateCriteria(dateValue, value, operator);default:throw new IllegalStateException();}+ case CodeCommentQueryLexer.IsLessThan:+ case CodeCommentQueryLexer.IsGreaterThan:+ return new ReplyCountCriteria(getIntValue(value), operator);case CodeCommentQueryLexer.Contains:switch (fieldName) {- case CodeComment.FIELD_CONTENT:+ case FIELD_CONTENT:return new ContentCriteria(value);+ case FIELD_REPLY:+ return new ReplyCriteria(value);default:throw new IllegalStateException();}case CodeCommentQueryLexer.Is:switch (fieldName) {- case CodeComment.FIELD_COMMIT:- try {- ObjectId commitId = project.getRepository().resolve(value);- if (commitId == null)- throw new RevisionSyntaxException("");- return new CommitCriteria(commitId.name());- } catch (RevisionSyntaxException | IOException e) {- throw new OneException("Invalid revision string: " + value);- }- case CodeComment.FIELD_PATH:+ case FIELD_COMMIT:+ return new CommitCriteria(getCommitId(project, value));+ case FIELD_PATH:return new PathCriteria(value);+ case FIELD_REPLY_COUNT:+ return new ReplyCountCriteria(getIntValue(value), operator);default:throw new IllegalStateException();}@@ -189,14 +192,11 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {commentCriteria = null;}- List<EntitySort> requestSorts = new ArrayList<>();+ List<EntitySort> commentSorts = new ArrayList<>();for (OrderContext order: queryContext.order()) {String fieldName = getValue(order.Quoted().getText());- if (validate- && !fieldName.equals(CodeComment.FIELD_CREATE_DATE)- && !fieldName.equals(CodeComment.FIELD_UPDATE_DATE)) {+ if (validate && !CodeCommentConstants.ORDER_FIELDS.containsKey(fieldName))throw new OneException("Can not order by field: " + fieldName);- }EntitySort commentSort = new EntitySort();commentSort.setField(fieldName);@@ -204,35 +204,36 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {commentSort.setDirection(Direction.ASCENDING);elsecommentSort.setDirection(Direction.DESCENDING);- requestSorts.add(commentSort);+ commentSorts.add(commentSort);}- return new CodeCommentQuery(commentCriteria, requestSorts);+ return new CodeCommentQuery(commentCriteria, commentSorts);} else {return new CodeCommentQuery();}}public static void checkField(Project project, String fieldName, int operator) {- if (!CodeComment.FIELD_PATHS.containsKey(fieldName))+ if (!CodeCommentConstants.QUERY_FIELDS.contains(fieldName))throw new OneException("Field not found: " + fieldName);switch (operator) {case CodeCommentQueryLexer.IsBefore:case CodeCommentQueryLexer.IsAfter:- if (!fieldName.equals(CodeComment.FIELD_CREATE_DATE)- && !fieldName.equals(CodeComment.FIELD_UPDATE_DATE)) {+ if (!fieldName.equals(FIELD_CREATE_DATE) && !fieldName.equals(FIELD_UPDATE_DATE))+ throw newOperatorException(fieldName, operator);+ break;+ case CodeCommentQueryLexer.IsGreaterThan:+ case CodeCommentQueryLexer.IsLessThan:+ if (!fieldName.equals(FIELD_REPLY_COUNT))throw newOperatorException(fieldName, operator);- }break;case CodeCommentQueryLexer.Contains:- if (!fieldName.equals(CodeComment.FIELD_CONTENT))+ if (!fieldName.equals(FIELD_CONTENT) && !fieldName.equals(FIELD_REPLY))throw newOperatorException(fieldName, operator);break;case CodeCommentQueryLexer.Is:- if (!fieldName.equals(CodeComment.FIELD_COMMIT)- && !fieldName.equals(CodeComment.FIELD_PATH)) {+ if (!fieldName.equals(FIELD_COMMIT) && !fieldName.equals(FIELD_REPLY_COUNT) && !fieldName.equals(FIELD_PATH))throw newOperatorException(fieldName, operator);- }break;}}diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryBuildContext.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryBuildContext.javaindex dc195dc0a6..a69fe8afce 100644--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryBuildContext.java+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryBuildContext.java@@ -15,8 +15,8 @@ public class CodeCommentQueryBuildContext extends QueryBuildContext<CodeComment>}@Override- public Join<?, ?> newJoin(String joinPath) {- return getRoot().join(joinPath, JoinType.LEFT);+ public Join<?, ?> newJoin(String joinName) {+ return getRoot().join(joinName, JoinType.LEFT);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CommitCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/CommitCriteria.javaindex c3cea06db4..71182f3456 100644--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/CommitCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/CommitCriteria.java@@ -3,24 +3,27 @@ package io.onedev.server.entityquery.codecomment;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import org.eclipse.jgit.lib.ObjectId;+import io.onedev.server.entityquery.EntityCriteria;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;+import io.onedev.server.model.support.CodeCommentConstants;public class CommitCriteria extends EntityCriteria<CodeComment> {private static final long serialVersionUID = 1L;- private final String value;+ private final ObjectId value;- public CommitCriteria(String value) {+ public CommitCriteria(ObjectId value) {this.value = value;}@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {- Path<?> attribute = CodeCommentQuery.getPath(context.getRoot(), CodeComment.FIELD_PATHS.get(CodeComment.FIELD_COMMIT));+ Path<?> attribute = CodeCommentQuery.getPath(context.getRoot(), CodeCommentConstants.ATTR_COMMIT);return context.getBuilder().equal(attribute, value);}@@ -36,7 +39,7 @@ public class CommitCriteria extends EntityCriteria<CodeComment> {@Overridepublic String toString() {- return CodeCommentQuery.quote(CodeComment.FIELD_COMMIT) + " " + CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Is) + " " + CodeCommentQuery.quote(value);+ return CodeCommentQuery.quote(CodeCommentConstants.FIELD_COMMIT) + " " + CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Is) + " " + CodeCommentQuery.quote(value.name());}}diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/ContentCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/ContentCriteria.javaindex 0f918c1562..ee94f65446 100644--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/ContentCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/ContentCriteria.java@@ -7,6 +7,7 @@ import io.onedev.server.entityquery.EntityCriteria;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;+import io.onedev.server.model.support.CodeCommentConstants;import io.onedev.server.entityquery.codecomment.CodeCommentQueryLexer;public class ContentCriteria extends EntityCriteria<CodeComment> {@@ -21,7 +22,7 @@ public class ContentCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {- Path<String> attribute = context.getRoot().get(CodeComment.FIELD_PATHS.get(CodeComment.FIELD_CONTENT));+ Path<String> attribute = context.getRoot().get(CodeCommentConstants.ATTR_CONTENT);return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");}@@ -37,7 +38,7 @@ public class ContentCriteria extends EntityCriteria<CodeComment> {@Overridepublic String toString() {- return CodeCommentQuery.quote(CodeComment.FIELD_CONTENT) + " " + CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Contains) + " " + CodeCommentQuery.quote(value);+ return CodeCommentQuery.quote(CodeCommentConstants.FIELD_CONTENT) + " " + CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Contains) + " " + CodeCommentQuery.quote(value);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CreateDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/CreateDateCriteria.javaindex 314f968fc0..166972b6c9 100644--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/CreateDateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/CreateDateCriteria.java@@ -9,6 +9,7 @@ import io.onedev.server.entityquery.EntityCriteria;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;+import io.onedev.server.model.support.CodeCommentConstants;public class CreateDateCriteria extends EntityCriteria<CodeComment> {@@ -28,7 +29,7 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {- Path<Date> attribute = context.getRoot().get(CodeComment.FIELD_PATHS.get(CodeComment.FIELD_CREATE_DATE));+ Path<Date> attribute = context.getRoot().get(CodeCommentConstants.ATTR_CREATE_DATE);if (operator == CodeCommentQueryLexer.IsBefore)return context.getBuilder().lessThan(attribute, value);else@@ -50,7 +51,7 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {@Overridepublic String toString() {- return CodeCommentQuery.quote(CodeComment.FIELD_CREATE_DATE) + " " + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(rawValue);+ return CodeCommentQuery.quote(CodeCommentConstants.FIELD_CREATE_DATE) + " " + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(rawValue);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByCriteria.javaindex e78b1657b2..163e414c60 100644--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByCriteria.java@@ -10,6 +10,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.User;+import io.onedev.server.model.support.CodeCommentConstants;public class CreatedByCriteria extends EntityCriteria<CodeComment> {@@ -23,7 +24,7 @@ public class CreatedByCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {- Path<User> attribute = context.getRoot().get(CodeComment.PATH_CREATOR);+ Path<User> attribute = context.getRoot().get(CodeCommentConstants.ATTR_USER);return context.getBuilder().equal(attribute, value);}diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByMeCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByMeCriteria.javaindex b75b3e1b0a..2f2a0fa8b5 100644--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByMeCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByMeCriteria.java@@ -9,6 +9,7 @@ import io.onedev.server.entityquery.EntityCriteria;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;+import io.onedev.server.model.support.CodeCommentConstants;import io.onedev.server.security.SecurityUtils;public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {@@ -17,7 +18,7 @@ public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {- Path<?> attribute = context.getRoot().get(CodeComment.PATH_CREATOR);+ Path<?> attribute = context.getRoot().get(CodeCommentConstants.ATTR_USER);return context.getBuilder().equal(attribute, SecurityUtils.getUser());}diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/PathCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/PathCriteria.javaindex 3b47b97b3e..d61599129f 100644--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/PathCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/PathCriteria.java@@ -7,6 +7,7 @@ import io.onedev.server.entityquery.EntityCriteria;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;+import io.onedev.server.model.support.CodeCommentConstants;import io.onedev.utils.stringmatch.WildcardUtils;public class PathCriteria extends EntityCriteria<CodeComment> {@@ -21,7 +22,7 @@ public class PathCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {- Path<String> attribute = CodeCommentQuery.getPath(context.getRoot(), CodeComment.FIELD_PATHS.get(CodeComment.FIELD_PATH));+ Path<String> attribute = CodeCommentQuery.getPath(context.getRoot(), CodeCommentConstants.ATTR_PATH);String normalized = value.toLowerCase().replace('*', '%');if (normalized.endsWith("/"))normalized += "%";@@ -43,7 +44,7 @@ public class PathCriteria extends EntityCriteria<CodeComment> {@Overridepublic String toString() {- return CodeCommentQuery.quote(CodeComment.FIELD_COMMIT) + " " + CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Is) + " " + CodeCommentQuery.quote(value);+ return CodeCommentQuery.quote(CodeCommentConstants.FIELD_PATH) + " " + CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Is) + " " + CodeCommentQuery.quote(value);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/ReplyCountCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/ReplyCountCriteria.javanew file mode 100644index 0000000000..78772262db--- /dev/null+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/ReplyCountCriteria.java@@ -0,0 +1,56 @@+package io.onedev.server.entityquery.codecomment;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.entityquery.EntityCriteria;+import io.onedev.server.entityquery.QueryBuildContext;+import io.onedev.server.model.CodeComment;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.CodeCommentConstants;++public class ReplyCountCriteria extends EntityCriteria<CodeComment> {++ private static final long serialVersionUID = 1L;++ private final int operator;++ private final int value;++ public ReplyCountCriteria(int value, int operator) {+ this.operator = operator;+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {+ Path<Integer> attribute = context.getRoot().get(CodeCommentConstants.ATTR_REPLY_COUNT);+ if (operator == CodeCommentQueryLexer.Is)+ return context.getBuilder().equal(attribute, value);+ else if (operator == CodeCommentQueryLexer.IsLessThan)+ return context.getBuilder().lessThan(attribute, value);+ else+ return context.getBuilder().greaterThan(attribute, value);+ }++ @Override+ public boolean matches(CodeComment comment) {+ if (operator == CodeCommentQueryLexer.Is)+ return comment.getReplyCount() == value;+ else if (operator == CodeCommentQueryLexer.IsLessThan)+ return comment.getReplyCount() < value;+ else+ return comment.getReplyCount() > value;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return CodeCommentQuery.quote(CodeCommentConstants.FIELD_REPLY_COUNT) + " " + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(String.valueOf(value));+ }++}diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/ReplyCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/ReplyCriteria.javanew file mode 100644index 0000000000..3cf0cd4f09--- /dev/null+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/ReplyCriteria.java@@ -0,0 +1,50 @@+package io.onedev.server.entityquery.codecomment;++import javax.persistence.criteria.From;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.entityquery.EntityCriteria;+import io.onedev.server.entityquery.QueryBuildContext;+import io.onedev.server.model.CodeComment;+import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.CodeCommentConstants;++public class ReplyCriteria extends EntityCriteria<CodeComment> {++ private static final long serialVersionUID = 1L;++ private final String value;++ public ReplyCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {+ From<?, ?> join = context.getJoin(CodeCommentConstants.ATTR_REPLIES);+ Path<String> attribute = join.get(CodeCommentReply.ATTR_CONTENT);+ return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");+ }++ @Override+ public boolean matches(CodeComment comment) {+ for (CodeCommentReply reply: comment.getReplies()) {+ if (reply.getContent().toLowerCase().contains(value.toLowerCase()))+ return true;+ }+ return false;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return CodeCommentQuery.quote(CodeCommentConstants.FIELD_REPLY) + " " + CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Contains) + " " + CodeCommentQuery.quote(value);+ }++}diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/UpdateDateCriteria.javaindex ac8cfef152..aef8ae6b8e 100644--- a/core/src/main/java/io/onedev/server/entityquery/codecomment/UpdateDateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/UpdateDateCriteria.java@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.EntityCriteria;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.CodeComment;-import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.CodeCommentConstants;public class UpdateDateCriteria extends EntityCriteria<CodeComment> {@@ -29,7 +29,7 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {- Path<Date> attribute = CodeCommentQuery.getPath(context.getRoot(), CodeComment.FIELD_PATHS.get(CodeComment.FIELD_UPDATE_DATE));+ Path<Date> attribute = CodeCommentQuery.getPath(context.getRoot(), CodeCommentConstants.ATTR_UPDATE_DATE);if (operator == CodeCommentQueryLexer.IsBefore)return context.getBuilder().lessThan(attribute, value);else@@ -51,7 +51,7 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {@Overridepublic String toString() {- return CodeCommentQuery.quote(Issue.FIELD_UPDATE_DATE) + " " + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(rawValue);+ return CodeCommentQuery.quote(CodeCommentConstants.FIELD_UPDATE_DATE) + " " + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(rawValue);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/BooleanFieldCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/BooleanFieldCriteria.javaindex 2e89873b11..9916738d92 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/BooleanFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/BooleanFieldCriteria.java@@ -25,7 +25,7 @@ public class BooleanFieldCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.VALUE);+ Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.FIELD_ATTR_VALUE);return context.getBuilder().equal(attribute, String.valueOf(value));}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/ChoiceFieldCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/ChoiceFieldCriteria.javaindex ea54334750..ad28b7174e 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/ChoiceFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/ChoiceFieldCriteria.java@@ -7,14 +7,13 @@ import java.util.List;import java.util.Objects;import java.util.Set;-import javax.persistence.criteria.Join;+import javax.persistence.criteria.From;import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;-import io.onedev.server.entityquery.issue.IssueQueryLexer;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;@@ -40,16 +39,16 @@ public class ChoiceFieldCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Join<?, ?> join = context.getJoin(getFieldName());+ From<?, ?> join = context.getJoin(getFieldName());if (allowMultiple) {- return context.getBuilder().equal(join.get(IssueFieldUnary.VALUE), value);+ return context.getBuilder().equal(join.get(IssueFieldUnary.FIELD_ATTR_VALUE), value);} else {if (operator == IssueQueryLexer.Is)- return context.getBuilder().equal(join.get(IssueFieldUnary.VALUE), value);+ return context.getBuilder().equal(join.get(IssueFieldUnary.FIELD_ATTR_VALUE), value);else if (operator == IssueQueryLexer.IsGreaterThan)- return context.getBuilder().greaterThan(join.get(IssueFieldUnary.ORDINAL), ordinal);+ return context.getBuilder().greaterThan(join.get(IssueFieldUnary.FIELD_ATTR_ORDINAL), ordinal);else- return context.getBuilder().lessThan(join.get(IssueFieldUnary.ORDINAL), ordinal);+ return context.getBuilder().lessThan(join.get(IssueFieldUnary.FIELD_ATTR_ORDINAL), ordinal);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/CommentCountCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/CommentCountCriteria.javaindex 9e6cba8604..5d45e787a9 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/CommentCountCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/CommentCountCriteria.java@@ -6,6 +6,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.entityquery.issue.IssueQueryLexer;public class CommentCountCriteria extends IssueCriteria {@@ -23,7 +24,7 @@ public class CommentCountCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Path<Integer> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_COMMENT_COUNT));+ Path<Integer> attribute = context.getRoot().get(IssueConstants.ATTR_COMMENT_COUNT);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);else if (operator == IssueQueryLexer.IsGreaterThan)@@ -49,7 +50,7 @@ public class CommentCountCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.FIELD_COMMENT_COUNT) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(IssueConstants.FIELD_COMMENT_COUNT) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));}}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/CommentCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/CommentCriteria.javanew file mode 100644index 0000000000..bb9fc34cfd--- /dev/null+++ b/core/src/main/java/io/onedev/server/entityquery/issue/CommentCriteria.java@@ -0,0 +1,49 @@+package io.onedev.server.entityquery.issue;++import javax.persistence.criteria.From;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.entityquery.QueryBuildContext;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueComment;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueConstants;++public class CommentCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ private final String value;++ public CommentCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ From<?, ?> join = context.getJoin(IssueConstants.FIELD_COMMENT);+ Path<String> attribute = join.get(IssueComment.PATH_CONTENT);+ return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");+ }++ @Override+ public boolean matches(Issue issue) {+ for (IssueComment comment: issue.getComments()) {+ if (comment.getContent().toLowerCase().contains(value.toLowerCase()))+ return true;+ }+ return false;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return IssueQuery.quote(IssueConstants.FIELD_COMMENT) + " " + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " " + IssueQuery.quote(value);+ }++}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/DateFieldCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/DateFieldCriteria.javaindex 5ceae3b0ca..58ebc41543 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/DateFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/DateFieldCriteria.java@@ -2,14 +2,13 @@ package io.onedev.server.entityquery.issue;import java.util.Date;-import javax.persistence.criteria.Join;+import javax.persistence.criteria.From;import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;-import io.onedev.server.entityquery.issue.IssueQueryLexer;public class DateFieldCriteria extends FieldCriteria {@@ -30,11 +29,11 @@ public class DateFieldCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Join<?, ?> join = context.getJoin(getFieldName());+ From<?, ?> join = context.getJoin(getFieldName());if (operator == IssueQueryLexer.IsBefore)- return context.getBuilder().lessThan(join.get(IssueFieldUnary.ORDINAL), value.getTime());+ return context.getBuilder().lessThan(join.get(IssueFieldUnary.FIELD_ATTR_ORDINAL), value.getTime());else- return context.getBuilder().greaterThan(join.get(IssueFieldUnary.ORDINAL), value.getTime());+ return context.getBuilder().greaterThan(join.get(IssueFieldUnary.FIELD_ATTR_ORDINAL), value.getTime());}@Overridediff --git a/core/src/main/java/io/onedev/server/entityquery/issue/DescriptionCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/DescriptionCriteria.javaindex a3a178900c..dc9165e5ee 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/DescriptionCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/DescriptionCriteria.java@@ -7,6 +7,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.entityquery.issue.IssueQueryLexer;public class DescriptionCriteria extends IssueCriteria {@@ -21,7 +22,7 @@ public class DescriptionCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Expression<String> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_DESCRIPTION));+ Expression<String> attribute = context.getRoot().get(IssueConstants.ATTR_DESCRIPTION);if (value != null)return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");else@@ -44,9 +45,9 @@ public class DescriptionCriteria extends IssueCriteria {@Overridepublic String toString() {if (value != null)- return IssueQuery.quote(Issue.FIELD_DESCRIPTION) + " " + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " " + IssueQuery.quote(value);+ return IssueQuery.quote(IssueConstants.FIELD_DESCRIPTION) + " " + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " " + IssueQuery.quote(value);else- return IssueQuery.quote(Issue.FIELD_DESCRIPTION) + " " + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);+ return IssueQuery.quote(IssueConstants.FIELD_DESCRIPTION) + " " + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/FieldCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/FieldCriteria.javaindex 6bf17534cd..af2c5bfac3 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/FieldCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/FieldCriteria.java@@ -4,8 +4,8 @@ import java.util.Collection;import java.util.HashSet;import java.util.Set;-import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueConstants;public abstract class FieldCriteria extends IssueCriteria {@@ -24,7 +24,7 @@ public abstract class FieldCriteria extends IssueCriteria {@Overridepublic Collection<String> getUndefinedFields(Project project) {Set<String> undefinedFields = new HashSet<>();- if (!Issue.FIELD_PATHS.containsKey(fieldName)+ if (!IssueConstants.QUERY_FIELDS.contains(fieldName)&& project.getIssueWorkflow().getFieldSpec(fieldName) == null) {undefinedFields.add(fieldName);}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/FieldOperatorCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/FieldOperatorCriteria.javaindex 6fc5190c24..8dfcf5dd34 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/FieldOperatorCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/FieldOperatorCriteria.java@@ -26,7 +26,7 @@ public class FieldOperatorCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Path<?> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.VALUE);+ Path<?> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.FIELD_ATTR_VALUE);if (operator == IssueQueryLexer.IsEmpty)return context.getBuilder().isNull(attribute);elsediff --git a/core/src/main/java/io/onedev/server/entityquery/issue/IssueFieldCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/IssueFieldCriteria.javaindex 4a8a433cae..aa5f5aa1b9 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/IssueFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/IssueFieldCriteria.java@@ -24,7 +24,7 @@ public class IssueFieldCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Path<Long> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.ORDINAL);+ Path<Long> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.FIELD_ATTR_ORDINAL);return context.getBuilder().equal(attribute, value);}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.java b/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.javaindex 9fc98c387f..c22a184fd0 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.java@@ -1,5 +1,17 @@package io.onedev.server.entityquery.issue;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_COMMENT;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_COMMENT_COUNT;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_DESCRIPTION;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_MILESTONE;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_NUMBER;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_STATE;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_SUBMITTER;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_SUBMIT_DATE;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_TITLE;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_UPDATE_DATE;+import static io.onedev.server.model.support.issue.IssueConstants.FIELD_VOTE_COUNT;+import java.util.ArrayList;import java.util.Collection;import java.util.Date;@@ -21,14 +33,6 @@ import io.onedev.server.OneDev;import io.onedev.server.entityquery.EntityQuery;import io.onedev.server.entityquery.EntitySort;import io.onedev.server.entityquery.EntitySort.Direction;-import io.onedev.server.exception.OneException;-import io.onedev.server.manager.UserManager;-import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.entityquery.issue.IssueQueryBaseVisitor;-import io.onedev.server.entityquery.issue.IssueQueryLexer;-import io.onedev.server.entityquery.issue.IssueQueryParser;import io.onedev.server.entityquery.issue.IssueQueryParser.AndCriteriaContext;import io.onedev.server.entityquery.issue.IssueQueryParser.CriteriaContext;import io.onedev.server.entityquery.issue.IssueQueryParser.FieldOperatorCriteriaContext;@@ -40,7 +44,12 @@ import io.onedev.server.entityquery.issue.IssueQueryParser.OrCriteriaContext;import io.onedev.server.entityquery.issue.IssueQueryParser.OrderContext;import io.onedev.server.entityquery.issue.IssueQueryParser.ParensCriteriaContext;import io.onedev.server.entityquery.issue.IssueQueryParser.QueryContext;-import io.onedev.server.util.DateUtils;+import io.onedev.server.exception.OneException;+import io.onedev.server.manager.UserManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.util.EditContext;import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputContext;@@ -58,7 +67,7 @@ import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldpublic class IssueQuery extends EntityQuery<Issue> {private static final long serialVersionUID = 1L;-+private final IssueCriteria criteria;private final List<EntitySort> sorts;@@ -169,11 +178,11 @@ public class IssueQuery extends EntityQuery<Issue> {int operator = ctx.operator.getType();if (validate)checkField(project, fieldName, operator);- if (fieldName.equals(Issue.FIELD_MILESTONE))+ if (fieldName.equals(FIELD_MILESTONE))return new MilestoneCriteria(null);- else if (fieldName.equals(Issue.FIELD_DESCRIPTION))+ else if (fieldName.equals(FIELD_DESCRIPTION))return new DescriptionCriteria(null);- else if (fieldName.equals(Issue.FIELD_SUBMITTER))+ else if (fieldName.equals(FIELD_SUBMITTER))return new SubmittedByMeCriteria();elsereturn new FieldOperatorCriteria(fieldName, operator);@@ -203,20 +212,20 @@ public class IssueQuery extends EntityQuery<Issue> {switch (operator) {case IssueQueryLexer.IsBefore:case IssueQueryLexer.IsAfter:- Date dateValue = DateUtils.parseRelaxed(value);- if (dateValue == null)- throw new OneException("Unrecognized date: " + value);- if (fieldName.equals(Issue.FIELD_SUBMIT_DATE))+ Date dateValue = getDateValue(value);+ if (fieldName.equals(FIELD_SUBMIT_DATE))return new SubmitDateCriteria(dateValue, value, operator);- else if (fieldName.equals(Issue.FIELD_UPDATE_DATE))+ else if (fieldName.equals(FIELD_UPDATE_DATE))return new UpdateDateCriteria(dateValue, value, operator);elsereturn new DateFieldCriteria(fieldName, dateValue, value, operator);case IssueQueryLexer.Contains:- if (fieldName.equals(Issue.FIELD_TITLE)) {+ if (fieldName.equals(FIELD_TITLE)) {return new TitleCriteria(value);- } else if (fieldName.equals(Issue.FIELD_DESCRIPTION)) {+ } else if (fieldName.equals(FIELD_DESCRIPTION)) {return new DescriptionCriteria(value);+ } else if (fieldName.equals(FIELD_COMMENT)) {+ return new CommentCriteria(value);} else {if (validate) {InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);@@ -231,15 +240,15 @@ public class IssueQuery extends EntityQuery<Issue> {}}case IssueQueryLexer.Is:- if (fieldName.equals(Issue.FIELD_MILESTONE)) {+ if (fieldName.equals(FIELD_MILESTONE)) {return new MilestoneCriteria(value);- } else if (fieldName.equals(Issue.FIELD_STATE)) {+ } else if (fieldName.equals(FIELD_STATE)) {return new StateCriteria(value);- } else if (fieldName.equals(Issue.FIELD_VOTE_COUNT)) {+ } else if (fieldName.equals(FIELD_VOTE_COUNT)) {return new VoteCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.FIELD_COMMENT_COUNT)) {+ } else if (fieldName.equals(FIELD_COMMENT_COUNT)) {return new CommentCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.FIELD_NUMBER)) {+ } else if (fieldName.equals(FIELD_NUMBER)) {return new NumberCriteria(getIntValue(value), operator);} else {InputSpec field = project.getIssueWorkflow().getFieldSpec(fieldName);@@ -264,11 +273,11 @@ public class IssueQuery extends EntityQuery<Issue> {}case IssueQueryLexer.IsLessThan:case IssueQueryLexer.IsGreaterThan:- if (fieldName.equals(Issue.FIELD_VOTE_COUNT)) {+ if (fieldName.equals(FIELD_VOTE_COUNT)) {return new VoteCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.FIELD_COMMENT_COUNT)) {+ } else if (fieldName.equals(FIELD_COMMENT_COUNT)) {return new CommentCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.FIELD_NUMBER)) {+ } else if (fieldName.equals(FIELD_NUMBER)) {return new NumberCriteria(getIntValue(value), operator);} else {if (validate) {@@ -317,12 +326,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- && !fieldName.equals(Issue.FIELD_SUBMIT_DATE)- && !fieldName.equals(Issue.FIELD_UPDATE_DATE)- && !fieldName.equals(Issue.FIELD_VOTE_COUNT)- && !fieldName.equals(Issue.FIELD_COMMENT_COUNT)- && !fieldName.equals(Issue.FIELD_NUMBER)) {+ if (validate && !IssueConstants.ORDER_FIELDS.containsKey(fieldName)) {InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);if (!(fieldSpec instanceof ChoiceInput) && !(fieldSpec instanceof DateInput)&& !(fieldSpec instanceof NumberInput)) {@@ -351,14 +355,12 @@ public class IssueQuery extends EntityQuery<Issue> {public static void checkField(Project project, String fieldName, int operator) {InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);- if (fieldSpec == null && !Issue.FIELD_PATHS.containsKey(fieldName))+ if (fieldSpec == null && !IssueConstants.QUERY_FIELDS.contains(fieldName))throw new OneException("Field not found: " + fieldName);switch (operator) {case IssueQueryLexer.IsEmpty:- if (Issue.FIELD_PATHS.containsKey(fieldName) && !fieldName.equals(Issue.FIELD_DESCRIPTION)- && !fieldName.equals(Issue.FIELD_MILESTONE)) {+ if (IssueConstants.QUERY_FIELDS.contains(fieldName) && !fieldName.equals(FIELD_DESCRIPTION) && !fieldName.equals(FIELD_MILESTONE))throw newOperatorException(fieldName, operator);- }break;case IssueQueryLexer.IsMe:if (!(fieldSpec instanceof UserChoiceInput))@@ -366,23 +368,24 @@ public class IssueQuery extends EntityQuery<Issue> {break;case IssueQueryLexer.IsBefore:case IssueQueryLexer.IsAfter:- if (!fieldName.equals(Issue.FIELD_SUBMIT_DATE) && !fieldName.equals(Issue.FIELD_UPDATE_DATE) && !(fieldSpec instanceof DateInput))+ if (!fieldName.equals(FIELD_SUBMIT_DATE) && !fieldName.equals(FIELD_UPDATE_DATE) && !(fieldSpec instanceof DateInput))throw newOperatorException(fieldName, operator);break;case IssueQueryLexer.Contains:- if (!fieldName.equals(Issue.FIELD_TITLE)- && !fieldName.equals(Issue.FIELD_DESCRIPTION)+ if (!fieldName.equals(FIELD_TITLE)+ && !fieldName.equals(FIELD_DESCRIPTION)+ && !fieldName.equals(FIELD_COMMENT)&& !(fieldSpec instanceof TextInput)&& !(fieldSpec != null && fieldSpec.isAllowMultiple())) {throw newOperatorException(fieldName, operator);}break;case IssueQueryLexer.Is:- if (!fieldName.equals(Issue.FIELD_STATE)- && !fieldName.equals(Issue.FIELD_VOTE_COUNT)- && !fieldName.equals(Issue.FIELD_COMMENT_COUNT)- && !fieldName.equals(Issue.FIELD_NUMBER)- && !fieldName.equals(Issue.FIELD_MILESTONE)+ if (!fieldName.equals(FIELD_STATE)+ && !fieldName.equals(FIELD_VOTE_COUNT)+ && !fieldName.equals(FIELD_COMMENT_COUNT)+ && !fieldName.equals(FIELD_NUMBER)+ && !fieldName.equals(FIELD_MILESTONE)&& !(fieldSpec instanceof IssueChoiceInput)&& !(fieldSpec instanceof BooleanInput)&& !(fieldSpec instanceof NumberInput)@@ -395,9 +398,9 @@ public class IssueQuery extends EntityQuery<Issue> {break;case IssueQueryLexer.IsLessThan:case IssueQueryLexer.IsGreaterThan:- if (!fieldName.equals(Issue.FIELD_VOTE_COUNT)- && !fieldName.equals(Issue.FIELD_COMMENT_COUNT)- && !fieldName.equals(Issue.FIELD_NUMBER)+ if (!fieldName.equals(FIELD_VOTE_COUNT)+ && !fieldName.equals(FIELD_COMMENT_COUNT)+ && !fieldName.equals(FIELD_NUMBER)&& !(fieldSpec instanceof NumberInput)&& !(fieldSpec instanceof ChoiceInput))throw newOperatorException(fieldName, operator);@@ -453,7 +456,7 @@ public class IssueQuery extends EntityQuery<Issue> {if (criteria != null)undefinedFields.addAll(criteria.getUndefinedFields(project));for (EntitySort sort: sorts) {- if (!Issue.FIELD_PATHS.containsKey(sort.getField())+ if (!IssueConstants.QUERY_FIELDS.contains(sort.getField())&& project.getIssueWorkflow().getFieldSpec(sort.getField()) == null) {undefinedFields.add(sort.getField());}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/IssueQueryBuildContext.java b/core/src/main/java/io/onedev/server/entityquery/issue/IssueQueryBuildContext.javaindex 115f94f0f7..be44656a01 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/IssueQueryBuildContext.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/IssueQueryBuildContext.java@@ -7,6 +7,8 @@ import javax.persistence.criteria.Root;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;+import io.onedev.server.model.support.issue.IssueConstants;+import io.onedev.server.model.IssueFieldUnary;public class IssueQueryBuildContext extends QueryBuildContext<Issue> {@@ -15,12 +17,15 @@ public class IssueQueryBuildContext extends QueryBuildContext<Issue> {}@Override- public Join<?, ?> newJoin(String joinPath) {- if (joinPath.equals(Issue.FIELD_MILESTONE)) {- return getRoot().join("milestone", JoinType.LEFT);- } else {- Join<Issue, ?> join = getRoot().join("fieldUnaries", JoinType.LEFT);- join.on(getBuilder().equal(join.get("name"), joinPath));+ public Join<?, ?> newJoin(String joinName) {+ switch (joinName) {+ case IssueConstants.FIELD_COMMENT:+ return getRoot().join(IssueConstants.ATTR_COMMENTS, JoinType.LEFT);+ case IssueConstants.FIELD_MILESTONE:+ return getRoot().join(IssueConstants.ATTR_MILESTONE, JoinType.LEFT);+ default:+ Join<Issue, ?> join = getRoot().join(IssueConstants.ATTR_FIELD_UNARIES, JoinType.LEFT);+ join.on(getBuilder().equal(join.get(IssueFieldUnary.FIELD_ATTR_NAME), joinName));return join;}}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/MilestoneCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/MilestoneCriteria.javaindex 90974a295f..ee3d70eadb 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/MilestoneCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/MilestoneCriteria.java@@ -10,6 +10,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.entityquery.issue.IssueQueryLexer;public class MilestoneCriteria extends IssueCriteria {@@ -28,7 +29,7 @@ public class MilestoneCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Path<?> attribute = context.getJoin(Issue.FIELD_MILESTONE).get(Milestone.NAME);+ Path<?> attribute = context.getJoin(IssueConstants.FIELD_MILESTONE).get(Milestone.FIELD_ATTR_NAME);if (value != null)return context.getBuilder().equal(attribute, value);else@@ -48,9 +49,9 @@ public class MilestoneCriteria extends IssueCriteria {@Overridepublic String toString() {if (value != null)- return IssueQuery.quote(Issue.FIELD_MILESTONE) + " " + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(value);+ return IssueQuery.quote(IssueConstants.FIELD_MILESTONE) + " " + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(value);else- return IssueQuery.quote(Issue.FIELD_MILESTONE) + " " + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);+ return IssueQuery.quote(IssueConstants.FIELD_MILESTONE) + " " + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);}@Overridediff --git a/core/src/main/java/io/onedev/server/entityquery/issue/NumberCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/NumberCriteria.javaindex fc91ed2def..f9d6cbadc6 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/NumberCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/NumberCriteria.java@@ -6,6 +6,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.entityquery.issue.IssueQueryLexer;public class NumberCriteria extends IssueCriteria {@@ -23,7 +24,7 @@ public class NumberCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Path<Long> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_NUMBER));+ Path<Long> attribute = context.getRoot().get(IssueConstants.ATTR_NUMBER);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);else if (operator == IssueQueryLexer.IsGreaterThan)@@ -49,7 +50,7 @@ public class NumberCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.FIELD_NUMBER) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(IssueConstants.FIELD_NUMBER) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));}}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/NumberFieldCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/NumberFieldCriteria.javaindex 7ce201a579..ea4b782270 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/NumberFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/NumberFieldCriteria.java@@ -28,7 +28,7 @@ public class NumberFieldCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Path<Integer> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.ORDINAL);+ Path<Integer> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.FIELD_ATTR_ORDINAL);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);else if (operator == IssueQueryLexer.IsGreaterThan)diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/StateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/StateCriteria.javaindex 882f809595..9ba39c7206 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/StateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/StateCriteria.java@@ -11,6 +11,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.entityquery.issue.IssueQueryLexer;public class StateCriteria extends IssueCriteria {@@ -25,7 +26,7 @@ public class StateCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Path<?> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_STATE));+ Path<?> attribute = context.getRoot().get(IssueConstants.ATTR_STATE);return context.getBuilder().equal(attribute, value);}@@ -46,7 +47,7 @@ public class StateCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.FIELD_STATE) + " " + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(value);+ return IssueQuery.quote(IssueConstants.FIELD_STATE) + " " + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(value);}@Overridediff --git a/core/src/main/java/io/onedev/server/entityquery/issue/StringFieldCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/StringFieldCriteria.javaindex d90b44d399..7139c59002 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/StringFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/StringFieldCriteria.java@@ -30,7 +30,7 @@ public class StringFieldCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.VALUE);+ Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.FIELD_ATTR_VALUE);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(context.getBuilder().lower(attribute), value.toLowerCase());elsediff --git a/core/src/main/java/io/onedev/server/entityquery/issue/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/SubmitDateCriteria.javaindex 72dc899495..eebfb5051c 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/SubmitDateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/SubmitDateCriteria.java@@ -8,6 +8,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.entityquery.issue.IssueQueryLexer;public class SubmitDateCriteria extends IssueCriteria {@@ -28,7 +29,7 @@ public class SubmitDateCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Path<Date> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_SUBMIT_DATE));+ Path<Date> attribute = context.getRoot().get(IssueConstants.ATTR_SUBMIT_DATE);if (operator == IssueQueryLexer.IsBefore)return context.getBuilder().lessThan(attribute, value);else@@ -50,7 +51,7 @@ public class SubmitDateCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.FIELD_SUBMIT_DATE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(rawValue);+ return IssueQuery.quote(IssueConstants.FIELD_SUBMIT_DATE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(rawValue);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByCriteria.javaindex b15b8914cf..647fbda625 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByCriteria.java@@ -9,6 +9,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.entityquery.issue.IssueQueryLexer;public class SubmittedByCriteria extends IssueCriteria {@@ -23,7 +24,7 @@ public class SubmittedByCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Path<User> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_SUBMITTER));+ Path<User> attribute = context.getRoot().get(IssueConstants.ATTR_SUBMITTER);return context.getBuilder().equal(attribute, value);}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByMeCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByMeCriteria.javaindex 9fd7e94555..a28abe1495 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByMeCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/SubmittedByMeCriteria.java@@ -9,6 +9,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.entityquery.issue.IssueQueryLexer;import io.onedev.server.security.SecurityUtils;@@ -18,7 +19,7 @@ public class SubmittedByMeCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Path<User> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_SUBMITTER));+ Path<User> attribute = context.getRoot().get(IssueConstants.ATTR_SUBMITTER);return context.getBuilder().equal(attribute, SecurityUtils.getUser());}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/TitleCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/TitleCriteria.javaindex 8e440a9c14..ba29934998 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/TitleCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/TitleCriteria.java@@ -6,6 +6,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.entityquery.issue.IssueQueryLexer;public class TitleCriteria extends IssueCriteria {@@ -20,7 +21,7 @@ public class TitleCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Path<String> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_TITLE));+ Path<String> attribute = context.getRoot().get(IssueConstants.ATTR_TITLE);return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");}@@ -36,7 +37,7 @@ public class TitleCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.FIELD_TITLE) + " " + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " " + IssueQuery.quote(value);+ return IssueQuery.quote(IssueConstants.FIELD_TITLE) + " " + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " " + IssueQuery.quote(value);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/UpdateDateCriteria.javaindex 0bc1609d2f..da7e24430b 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/UpdateDateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/UpdateDateCriteria.java@@ -8,6 +8,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.entityquery.issue.IssueQueryLexer;public class UpdateDateCriteria extends IssueCriteria {@@ -28,7 +29,7 @@ public class UpdateDateCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Path<Date> attribute = IssueQuery.getPath(context.getRoot(), Issue.FIELD_PATHS.get(Issue.FIELD_UPDATE_DATE));+ Path<Date> attribute = IssueQuery.getPath(context.getRoot(), IssueConstants.ATTR_UPDATE_DATE);if (operator == IssueQueryLexer.IsBefore)return context.getBuilder().lessThan(attribute, value);else@@ -50,7 +51,7 @@ public class UpdateDateCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.FIELD_UPDATE_DATE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(rawValue);+ return IssueQuery.quote(IssueConstants.FIELD_UPDATE_DATE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(rawValue);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/VoteCountCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/VoteCountCriteria.javaindex 0e585827e7..da857a7b4f 100644--- a/core/src/main/java/io/onedev/server/entityquery/issue/VoteCountCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/issue/VoteCountCriteria.java@@ -6,6 +6,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.entityquery.issue.IssueQueryLexer;public class VoteCountCriteria extends IssueCriteria {@@ -23,7 +24,7 @@ public class VoteCountCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {- Path<Integer> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_VOTE_COUNT));+ Path<Integer> attribute = context.getRoot().get(IssueConstants.ATTR_VOTE_COUNT);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);else if (operator == IssueQueryLexer.IsGreaterThan)@@ -49,7 +50,7 @@ public class VoteCountCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.FIELD_VOTE_COUNT) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(IssueConstants.FIELD_VOTE_COUNT) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));}}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByCriteria.javaindex 48a1173d9c..4a76ef6ff4 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByCriteria.java@@ -1,6 +1,6 @@package io.onedev.server.entityquery.pullrequest;-import javax.persistence.criteria.Join;+import javax.persistence.criteria.From;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -10,7 +10,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;public class ApprovedByCriteria extends PullRequestCriteria {@@ -24,10 +24,10 @@ public class ApprovedByCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);- Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);return context.getBuilder().and(context.getBuilder().equal(user, value),context.getBuilder().isNull(excludeDate),diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByMeCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByMeCriteria.javaindex faf2ff8aeb..f55f734ca4 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByMeCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ApprovedByMeCriteria.java@@ -1,6 +1,6 @@package io.onedev.server.entityquery.pullrequest;-import javax.persistence.criteria.Join;+import javax.persistence.criteria.From;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -9,7 +9,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.security.SecurityUtils;public class ApprovedByMeCriteria extends PullRequestCriteria {@@ -18,10 +18,10 @@ public class ApprovedByMeCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);- Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);return context.getBuilder().and(context.getBuilder().equal(user, SecurityUtils.getUser()),context.getBuilder().isNull(excludeDate),diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/CloseDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/CloseDateCriteria.javaindex 078df1ff20..296270d5b3 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/CloseDateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/CloseDateCriteria.java@@ -8,6 +8,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class CloseDateCriteria extends PullRequestCriteria {@@ -28,7 +29,7 @@ public class CloseDateCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<Date> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequest.FIELD_PATHS.get(PullRequest.FIELD_CLOSE_DATE));+ Path<Date> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_CLOSE_DATE);if (operator == PullRequestQueryLexer.IsBefore)return context.getBuilder().lessThan(attribute, value);else@@ -50,7 +51,7 @@ public class CloseDateCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequest.FIELD_CLOSE_DATE) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(rawValue);+ return PullRequestQuery.quote(PullRequestConstants.FIELD_CLOSE_DATE) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(rawValue);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/CommentCountCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/CommentCountCriteria.javanew file mode 100644index 0000000000..3e3f5ff2dd--- /dev/null+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/CommentCountCriteria.java@@ -0,0 +1,56 @@+package io.onedev.server.entityquery.pullrequest;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.entityquery.QueryBuildContext;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;++public class CommentCountCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final int operator;++ private final long value;++ public CommentCountCriteria(int value, int operator) {+ this.operator = operator;+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<Long> attribute = context.getRoot().get(PullRequestConstants.ATTR_COMMENT_COUNT);+ if (operator == PullRequestQueryLexer.Is)+ return context.getBuilder().equal(attribute, value);+ else if (operator == PullRequestQueryLexer.IsGreaterThan)+ return context.getBuilder().greaterThan(attribute, value);+ else+ return context.getBuilder().lessThan(attribute, value);+ }++ @Override+ public boolean matches(PullRequest request) {+ if (operator == PullRequestQueryLexer.Is)+ return request.getCommentCount() == value;+ else if (operator == PullRequestQueryLexer.IsGreaterThan)+ return request.getCommentCount() > value;+ else+ return request.getCommentCount() < value;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.quote(PullRequestConstants.FIELD_COMMENT_COUNT) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(String.valueOf(value));+ }++}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/CommentCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/CommentCriteria.javanew file mode 100644index 0000000000..cdc522240b--- /dev/null+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/CommentCriteria.java@@ -0,0 +1,73 @@+package io.onedev.server.entityquery.pullrequest;++import javax.persistence.criteria.From;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.entityquery.QueryBuildContext;+import io.onedev.server.model.CodeCommentRelation;+import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestComment;+import io.onedev.server.model.support.CodeCommentConstants;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;++public class CommentCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final String value;++ public CommentCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_COMMENTS);+ Path<String> attribute = join.get(PullRequestComment.ATTR_CONTENT);+ Predicate commentPredicate = context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");++ join = context.getJoin(PullRequestConstants.ATTR_CODE_COMMENT_RELATIONS ++ "." + CodeCommentRelation.ATTR_COMMENT);+ attribute = join.get(CodeCommentConstants.ATTR_CONTENT);+ Predicate codeCommentPredicate = context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");++ join = context.getJoin(PullRequestConstants.ATTR_CODE_COMMENT_RELATIONS ++ "." + CodeCommentRelation.ATTR_COMMENT ++ "." + CodeCommentConstants.ATTR_REPLIES);+ attribute = join.get(CodeCommentReply.ATTR_CONTENT);+ Predicate codeCommentReplyPredicate = context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");++ return context.getBuilder().or(commentPredicate, codeCommentPredicate, codeCommentReplyPredicate);+ }++ @Override+ public boolean matches(PullRequest request) {+ for (PullRequestComment comment: request.getComments()) {+ if (comment.getContent().toLowerCase().contains(value.toLowerCase()))+ return true;+ }+ for (CodeCommentRelation relation: request.getCodeCommentRelations()) {+ if (relation.getComment().getContent().toLowerCase().contains(value.toLowerCase()))+ return true;+ for (CodeCommentReply reply: relation.getComment().getReplies()) {+ if (reply.getContent().toLowerCase().contains(value.toLowerCase()))+ return true;+ }+ }+ return false;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.quote(PullRequestConstants.FIELD_COMMENT) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " " + PullRequestQuery.quote(value);+ }++}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ContainsCommitCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/CommitCriteria.javasimilarity index 76%rename from core/src/main/java/io/onedev/server/entityquery/pullrequest/ContainsCommitCriteria.javarename to core/src/main/java/io/onedev/server/entityquery/pullrequest/CommitCriteria.javaindex f944b42643..69d82bc287 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ContainsCommitCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/CommitCriteria.java@@ -14,15 +14,15 @@ import io.onedev.server.manager.CodeCommentRelationInfoManager;import io.onedev.server.manager.PullRequestManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;-public class ContainsCommitCriteria extends PullRequestCriteria {+public class CommitCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;private final ObjectId commitId;- public ContainsCommitCriteria(ObjectId commitId) {+ public CommitCriteria(ObjectId commitId) {this.commitId = commitId;}@@ -35,7 +35,7 @@ public class ContainsCommitCriteria extends PullRequestCriteria {ids.add(request.getId());}if (!ids.isEmpty())- return context.getRoot().get(PullRequest.PATH_ID).in(ids);+ return context.getRoot().get(PullRequestConstants.ATTR_ID).in(ids);elsereturn context.getBuilder().disjunction();}@@ -56,7 +56,9 @@ public class ContainsCommitCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.getRuleName(PullRequestQueryLexer.ContainsCommit) + " " + PullRequestQuery.quote(commitId.name());+ return PullRequestQuery.quote(PullRequestConstants.FIELD_COMMIT) + " "+ + PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " "+ + PullRequestQuery.quote(commitId.name());}}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DescriptionCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DescriptionCriteria.javaindex 921e5c64dc..70d5a868e8 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DescriptionCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DescriptionCriteria.java@@ -6,6 +6,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class DescriptionCriteria extends PullRequestCriteria {@@ -20,7 +21,7 @@ public class DescriptionCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<String> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_DESCRIPTION));+ Path<String> attribute = context.getRoot().get(PullRequestConstants.ATTR_DESCRIPTION);return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");}@@ -36,7 +37,7 @@ public class DescriptionCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequest.FIELD_DESCRIPTION) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " " + PullRequestQuery.quote(value);+ return PullRequestQuery.quote(PullRequestConstants.FIELD_DESCRIPTION) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " " + PullRequestQuery.quote(value);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByCriteria.javaindex 69965899a5..d48a338fd0 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByCriteria.java@@ -9,7 +9,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;public class DiscardedByCriteria extends PullRequestCriteria {@@ -23,7 +23,7 @@ public class DiscardedByCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<User> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequest.PATH_CLOSE_USER);+ Path<User> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_CLOSE_USER);return context.getBuilder().equal(attribute, value);}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByMeCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByMeCriteria.javaindex 8b4aa3c67e..1f11cdd855 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByMeCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DiscardedByMeCriteria.java@@ -9,7 +9,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.security.SecurityUtils;public class DiscardedByMeCriteria extends PullRequestCriteria {@@ -18,7 +18,7 @@ public class DiscardedByMeCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<User> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequest.PATH_CLOSE_USER);+ Path<User> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_CLOSE_USER);return context.getBuilder().equal(attribute, SecurityUtils.getUser());}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasFailedBuildsCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasFailedBuildsCriteria.javaindex a266db15cf..87d0a06281 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasFailedBuildsCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasFailedBuildsCriteria.java@@ -1,6 +1,6 @@package io.onedev.server.entityquery.pullrequest;-import javax.persistence.criteria.Join;+import javax.persistence.criteria.From;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -9,7 +9,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestBuild;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;public class HasFailedBuildsCriteria extends PullRequestCriteria {@@ -17,7 +17,7 @@ public class HasFailedBuildsCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Join<?, ?> join = context.getJoin(PullRequest.PATH_BUILDS + "." + PullRequestBuild.PATH_BUILD);+ From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_BUILDS + "." + PullRequestBuild.ATTR_BUILD);Path<?> status = join.get(Build.STATUS);return context.getBuilder().or(diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasMergeConflictsCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasMergeConflictsCriteria.javaindex feeed74788..a1b72d9465 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasMergeConflictsCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasMergeConflictsCriteria.java@@ -7,7 +7,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergePreview;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;public class HasMergeConflictsCriteria extends PullRequestCriteria {@@ -15,8 +15,8 @@ public class HasMergeConflictsCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<?> requestHead = PullRequestQuery.getPath(context.getRoot(), PullRequest.PATH_LAST_MERGE_PREVIEW_REQUEST_HEAD);- Path<?> merged = PullRequestQuery.getPath(context.getRoot(), PullRequest.PATH_LAST_MERGE_PREVIEW_MERGED);+ Path<?> requestHead = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_LAST_MERGE_PREVIEW_REQUEST_HEAD);+ Path<?> merged = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_LAST_MERGE_PREVIEW_MERGED);return context.getBuilder().and(context.getBuilder().isNotNull(requestHead),context.getBuilder().isNull(merged));diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingBuildsCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingBuildsCriteria.javaindex 851bbbfc76..8ed707360c 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingBuildsCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingBuildsCriteria.java@@ -1,6 +1,6 @@package io.onedev.server.entityquery.pullrequest;-import javax.persistence.criteria.Join;+import javax.persistence.criteria.From;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -9,7 +9,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestBuild;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;public class HasPendingBuildsCriteria extends PullRequestCriteria {@@ -17,7 +17,7 @@ public class HasPendingBuildsCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Join<?, ?> join = context.getJoin(PullRequest.PATH_BUILDS + "." + PullRequestBuild.PATH_BUILD);+ From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_BUILDS + "." + PullRequestBuild.ATTR_BUILD);Path<?> status = join.get(Build.STATUS);return context.getBuilder().or(diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingReviewsCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingReviewsCriteria.javaindex d443abfbc6..65fe73ca76 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingReviewsCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/HasPendingReviewsCriteria.java@@ -1,6 +1,6 @@package io.onedev.server.entityquery.pullrequest;-import javax.persistence.criteria.Join;+import javax.persistence.criteria.From;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -9,7 +9,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;public class HasPendingReviewsCriteria extends PullRequestCriteria {@@ -17,10 +17,10 @@ public class HasPendingReviewsCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);- Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);return context.getBuilder().and(context.getBuilder().isNotNull(user),context.getBuilder().isNull(excludeDate),diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/MergeStrategyCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/MergeStrategyCriteria.javaindex fefe22daec..07e2df7d11 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/MergeStrategyCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/MergeStrategyCriteria.java@@ -7,6 +7,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergeStrategy;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class MergeStrategyCriteria extends PullRequestCriteria {@@ -21,7 +22,7 @@ public class MergeStrategyCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<?> attribute = context.getRoot().get(PullRequest.FIELD_MERGE_STRATEGY);+ Path<?> attribute = context.getRoot().get(PullRequestConstants.ATTR_MERGE_STRATEGY);return context.getBuilder().equal(attribute, value);}@@ -37,7 +38,7 @@ public class MergeStrategyCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequest.FIELD_MERGE_STRATEGY) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value.toString());+ return PullRequestQuery.quote(PullRequestConstants.FIELD_MERGE_STRATEGY) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value.toString());}}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/NumberCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/NumberCriteria.javaindex 80194a0182..87813aca09 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/NumberCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/NumberCriteria.java@@ -6,6 +6,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class NumberCriteria extends PullRequestCriteria {@@ -23,7 +24,7 @@ public class NumberCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<Long> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_NUMBER));+ Path<Long> attribute = context.getRoot().get(PullRequestConstants.ATTR_NUMBER);if (operator == PullRequestQueryLexer.Is)return context.getBuilder().equal(attribute, value);else if (operator == PullRequestQueryLexer.IsGreaterThan)@@ -49,7 +50,7 @@ public class NumberCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequest.FIELD_NUMBER) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(String.valueOf(value));+ return PullRequestQuery.quote(PullRequestConstants.FIELD_NUMBER) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(String.valueOf(value));}}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/OpenCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/OpenCriteria.javaindex 7cb14a590c..ed5d0964ab 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/OpenCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/OpenCriteria.java@@ -5,14 +5,14 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;public class OpenCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;private PullRequestCriteria getCriteria(Project project) {- return new StateCriteria(PullRequest.STATE_OPEN);+ return new StateCriteria(PullRequestConstants.STATE_OPEN);}@Overridediff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.g4 b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.g4index b55d21adad..c3a5d3c9e3 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.g4+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.g4@@ -8,7 +8,7 @@ querycriteria: operator=(Open|Merged|Discarded|SubmittedByMe|ToBeReviewedByMe|RequestedForChangesByMe|ApprovedByMe|DiscardedByMe|SomeoneRequestedForChanges|HasPendingReviews|HasFailedBuilds|HasPendingBuilds|HasMergeConflicts) #OperatorCriteria- | operator=(ToBeReviewedBy|ApprovedBy|RequestedForChangesBy|SubmittedBy|DiscardedBy|ContainsCommit) WS+ criteriaValue=Quoted #OperatorValueCriteria+ | operator=(ToBeReviewedBy|ApprovedBy|RequestedForChangesBy|SubmittedBy|DiscardedBy) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria@@ -96,10 +96,6 @@ DiscardedBy: 'discarded' WS+ 'by';-ContainsCommit- : 'contains' WS+ 'commit'- ;-OrderBy: 'order' WS+ 'by';diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.javaindex 8f0a4b6801..e5306dab06 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.java@@ -1,6 +1,5 @@package io.onedev.server.entityquery.pullrequest;-import java.io.IOException;import java.util.ArrayList;import java.util.Date;import java.util.List;@@ -13,8 +12,6 @@ import org.antlr.v4.runtime.BaseErrorListener;import org.antlr.v4.runtime.CommonTokenStream;import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;-import org.eclipse.jgit.errors.RevisionSyntaxException;-import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;import io.onedev.server.entityquery.EntityQuery;@@ -37,7 +34,7 @@ import io.onedev.server.model.Project;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.DateUtils;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;public class PullRequestQuery extends EntityQuery<PullRequest> {@@ -143,15 +140,6 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {return new SubmittedByCriteria(getUser(value));case PullRequestQueryLexer.DiscardedBy:return new DiscardedByCriteria(getUser(value));- case PullRequestQueryLexer.ContainsCommit:- try {- ObjectId commitId = project.getRepository().resolve(value);- if (commitId == null)- throw new RevisionSyntaxException("");- return new ContainsCommitCriteria(commitId);- } catch (RevisionSyntaxException | IOException e) {- throw new OneException("Invalid revision string: " + value);- }default:throw new OneException("Unexpected operator: " + ctx.operator.getText());}@@ -173,53 +161,59 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {switch (operator) {case PullRequestQueryLexer.IsBefore:case PullRequestQueryLexer.IsAfter:- Date dateValue = DateUtils.parseRelaxed(value);- if (dateValue == null)- throw new OneException("Unrecognized date: " + value);+ Date dateValue = getDateValue(value);switch (fieldName) {- case PullRequest.FIELD_SUBMIT_DATE:+ case PullRequestConstants.FIELD_SUBMIT_DATE:return new SubmitDateCriteria(dateValue, value, operator);- case PullRequest.FIELD_UPDATE_DATE:+ case PullRequestConstants.FIELD_UPDATE_DATE:return new UpdateDateCriteria(dateValue, value, operator);- case PullRequest.FIELD_CLOSE_DATE:+ case PullRequestConstants.FIELD_CLOSE_DATE:return new CloseDateCriteria(dateValue, value, operator);default:throw new IllegalStateException();}case PullRequestQueryLexer.Contains:switch (fieldName) {- case PullRequest.FIELD_TITLE:+ case PullRequestConstants.FIELD_TITLE:return new TitleCriteria(value);- case PullRequest.FIELD_DESCRIPTION:+ case PullRequestConstants.FIELD_DESCRIPTION:return new DescriptionCriteria(value);+ case PullRequestConstants.FIELD_COMMENT:+ return new CommentCriteria(value);+ case PullRequestConstants.FIELD_COMMIT:+ return new CommitCriteria(getCommitId(project, value));default:throw new IllegalStateException();}case PullRequestQueryLexer.Is:switch (fieldName) {- case PullRequest.FIELD_STATE:+ case PullRequestConstants.FIELD_STATE:return new StateCriteria(value);- case PullRequest.FIELD_NUMBER:+ case PullRequestConstants.FIELD_NUMBER:return new NumberCriteria(getIntValue(value), operator);- case PullRequest.FIELD_MERGE_STRATEGY:+ case PullRequestConstants.FIELD_MERGE_STRATEGY:return new MergeStrategyCriteria(MergeStrategy.from(value));- case PullRequest.FIELD_SOURCE_BRANCH:+ case PullRequestConstants.FIELD_SOURCE_BRANCH:return new SourceBranchCriteria(value);- case PullRequest.FIELD_SOURCE_PROJECT:+ 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 PullRequest.FIELD_TARGET_BRANCH:+ case PullRequestConstants.FIELD_TARGET_BRANCH:return new TargetBranchCriteria(value);+ case PullRequestConstants.FIELD_COMMENT_COUNT:+ return new CommentCountCriteria(getIntValue(value), operator);default:throw new IllegalStateException();}case PullRequestQueryLexer.IsLessThan:case PullRequestQueryLexer.IsGreaterThan:switch (fieldName) {- case PullRequest.FIELD_NUMBER:+ case PullRequestConstants.FIELD_NUMBER:return new NumberCriteria(getIntValue(value), operator);+ case PullRequestConstants.FIELD_COMMENT_COUNT:+ return new CommentCountCriteria(getIntValue(value), operator);default:throw new IllegalStateException();}@@ -257,13 +251,8 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {List<EntitySort> requestSorts = new ArrayList<>();for (OrderContext order: queryContext.order()) {String fieldName = getValue(order.Quoted().getText());- if (validate- && !fieldName.equals(PullRequest.FIELD_SUBMIT_DATE)- && !fieldName.equals(PullRequest.FIELD_UPDATE_DATE)- && !fieldName.equals(PullRequest.FIELD_CLOSE_DATE)- && !fieldName.equals(PullRequest.FIELD_NUMBER)) {+ if (validate && !PullRequestConstants.ORDER_FIELDS.containsKey(fieldName))throw new OneException("Can not order by field: " + fieldName);- }EntitySort requestSort = new EntitySort();requestSort.setField(fieldName);@@ -281,33 +270,38 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {}public static void checkField(Project project, String fieldName, int operator) {- if (!PullRequest.FIELD_PATHS.containsKey(fieldName))+ if (!PullRequestConstants.QUERY_FIELDS.contains(fieldName))throw new OneException("Field not found: " + fieldName);switch (operator) {case PullRequestQueryLexer.IsBefore:case PullRequestQueryLexer.IsAfter:- if (!fieldName.equals(PullRequest.FIELD_SUBMIT_DATE)- && !fieldName.equals(PullRequest.FIELD_UPDATE_DATE)- && !fieldName.equals(PullRequest.FIELD_CLOSE_DATE)) {+ if (!fieldName.equals(PullRequestConstants.FIELD_SUBMIT_DATE)+ && !fieldName.equals(PullRequestConstants.FIELD_UPDATE_DATE)+ && !fieldName.equals(PullRequestConstants.FIELD_CLOSE_DATE)) {throw newOperatorException(fieldName, operator);}break;case PullRequestQueryLexer.Contains:- if (!fieldName.equals(PullRequest.FIELD_TITLE) && !fieldName.equals(PullRequest.FIELD_DESCRIPTION))+ if (!fieldName.equals(PullRequestConstants.FIELD_TITLE)+ && !fieldName.equals(PullRequestConstants.FIELD_DESCRIPTION)+ && !fieldName.equals(PullRequestConstants.FIELD_COMMENT)+ && !fieldName.equals(PullRequestConstants.FIELD_COMMIT)) {throw newOperatorException(fieldName, operator);+ }break;case PullRequestQueryLexer.Is:- if (!fieldName.equals(PullRequest.FIELD_STATE)- && !fieldName.equals(PullRequest.FIELD_NUMBER)- && !fieldName.equals(PullRequest.FIELD_TARGET_BRANCH)- && !fieldName.equals(PullRequest.FIELD_SOURCE_PROJECT)- && !fieldName.equals(PullRequest.FIELD_SOURCE_BRANCH)) {+ if (!fieldName.equals(PullRequestConstants.FIELD_STATE)+ && !fieldName.equals(PullRequestConstants.FIELD_NUMBER)+ && !fieldName.equals(PullRequestConstants.FIELD_TARGET_BRANCH)+ && !fieldName.equals(PullRequestConstants.FIELD_SOURCE_PROJECT)+ && !fieldName.equals(PullRequestConstants.FIELD_SOURCE_BRANCH)+ && !fieldName.equals(PullRequestConstants.FIELD_COMMENT_COUNT)) {throw newOperatorException(fieldName, operator);}break;case PullRequestQueryLexer.IsLessThan:case PullRequestQueryLexer.IsGreaterThan:- if (!fieldName.equals(PullRequest.FIELD_NUMBER))+ if (!fieldName.equals(PullRequestConstants.FIELD_NUMBER) && !fieldName.equals(PullRequestConstants.FIELD_COMMENT_COUNT))throw newOperatorException(fieldName, operator);break;}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryBuildContext.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryBuildContext.javaindex 460474a04c..21a91ee4e9 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryBuildContext.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryBuildContext.java@@ -1,10 +1,11 @@package io.onedev.server.entityquery.pullrequest;import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;+import javax.persistence.criteria.From;import javax.persistence.criteria.Root;+import com.google.common.base.Splitter;+import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.PullRequest;@@ -15,16 +16,8 @@ public class PullRequestQueryBuildContext extends QueryBuildContext<PullRequest>}@Override- public Join<?, ?> newJoin(String joinPath) {- if (joinPath.startsWith(PullRequest.PATH_BUILDS + ".")) {- Join<?, ?> join = getRoot().join(PullRequest.PATH_BUILDS, JoinType.LEFT);- return join.join(joinPath.substring((PullRequest.PATH_BUILDS+".").length()), JoinType.LEFT);- } else if (joinPath.startsWith(PullRequest.PATH_REVIEWS + ".")) {- Join<?, ?> join = getRoot().join(PullRequest.PATH_REVIEWS, JoinType.LEFT);- return join.join(joinPath.substring((PullRequest.PATH_REVIEWS+".").length()), JoinType.LEFT);- } else {- return getRoot().join(joinPath, JoinType.LEFT);- }+ public From<?, ?> newJoin(String joinName) {+ return joinByAttrs(Splitter.on(".").splitToList(joinName));}}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByCriteria.javaindex 4d64205461..36c9a8aaed 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByCriteria.java@@ -1,6 +1,6 @@package io.onedev.server.entityquery.pullrequest;-import javax.persistence.criteria.Join;+import javax.persistence.criteria.From;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -10,7 +10,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;public class RequestForChangesByCriteria extends PullRequestCriteria {@@ -24,10 +24,10 @@ public class RequestForChangesByCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);- Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);return context.getBuilder().and(context.getBuilder().equal(user, value),context.getBuilder().isNull(excludeDate),diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByMeCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByMeCriteria.javaindex 88b857bfac..0d1a66ec30 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByMeCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/RequestForChangesByMeCriteria.java@@ -1,6 +1,6 @@package io.onedev.server.entityquery.pullrequest;-import javax.persistence.criteria.Join;+import javax.persistence.criteria.From;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -9,7 +9,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.security.SecurityUtils;public class RequestForChangesByMeCriteria extends PullRequestCriteria {@@ -18,10 +18,10 @@ public class RequestForChangesByMeCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);- Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);return context.getBuilder().and(context.getBuilder().equal(user, SecurityUtils.getUser()),context.getBuilder().isNull(excludeDate),diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SomeoneRequestedForChangesCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SomeoneRequestedForChangesCriteria.javaindex ab292df779..45d549d4ee 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SomeoneRequestedForChangesCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SomeoneRequestedForChangesCriteria.java@@ -1,6 +1,6 @@package io.onedev.server.entityquery.pullrequest;-import javax.persistence.criteria.Join;+import javax.persistence.criteria.From;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -9,7 +9,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;public class SomeoneRequestedForChangesCriteria extends PullRequestCriteria {@@ -17,10 +17,10 @@ public class SomeoneRequestedForChangesCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);- Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);return context.getBuilder().and(context.getBuilder().isNotNull(user),context.getBuilder().isNull(excludeDate),diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceBranchCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceBranchCriteria.javaindex bc2b4af6bc..264cb9c2ca 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceBranchCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceBranchCriteria.java@@ -9,6 +9,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class SourceBranchCriteria extends PullRequestCriteria {@@ -23,7 +24,7 @@ public class SourceBranchCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<User> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_SOURCE_BRANCH));+ Path<User> attribute = context.getRoot().get(PullRequestConstants.ATTR_SOURCE_BRANCH);return context.getBuilder().equal(attribute, value);}@@ -39,7 +40,7 @@ public class SourceBranchCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequest.FIELD_SOURCE_BRANCH) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value);+ return PullRequestQuery.quote(PullRequestConstants.FIELD_SOURCE_BRANCH) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceProjectCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceProjectCriteria.javaindex ed8fdfd7e8..c268a0a24d 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceProjectCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SourceProjectCriteria.java@@ -9,6 +9,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class SourceProjectCriteria extends PullRequestCriteria {@@ -23,7 +24,7 @@ public class SourceProjectCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<User> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_SOURCE_PROJECT));+ Path<User> attribute = context.getRoot().get(PullRequestConstants.ATTR_SOURCE_PROJECT);return context.getBuilder().equal(attribute, value);}@@ -39,7 +40,7 @@ public class SourceProjectCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequest.FIELD_SOURCE_PROJECT) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value.getName());+ return PullRequestQuery.quote(PullRequestConstants.FIELD_SOURCE_PROJECT) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value.getName());}}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/StateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/StateCriteria.javaindex 9c6b93eef4..3e544aefe1 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/StateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/StateCriteria.java@@ -7,7 +7,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.CloseInfo;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;public class StateCriteria extends PullRequestCriteria {@@ -21,8 +21,8 @@ public class StateCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<?> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequest.PATH_CLOSE_STATUS);- if (value.equalsIgnoreCase(PullRequest.STATE_OPEN))+ Path<?> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_CLOSE_STATUS);+ if (value.equalsIgnoreCase(PullRequestConstants.STATE_OPEN))return context.getBuilder().isNull(attribute);elsereturn context.getBuilder().equal(attribute, CloseInfo.Status.valueOf(value.toUpperCase()));@@ -30,7 +30,7 @@ public class StateCriteria extends PullRequestCriteria {@Overridepublic boolean matches(PullRequest request) {- if (value.equalsIgnoreCase(PullRequest.STATE_OPEN))+ if (value.equalsIgnoreCase(PullRequestConstants.STATE_OPEN))return request.getCloseInfo() == null;elsereturn request.getCloseInfo() != null && request.getCloseInfo().getStatus().name().equalsIgnoreCase(value);@@ -43,7 +43,7 @@ public class StateCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequest.FIELD_STATE) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value);+ return PullRequestQuery.quote(PullRequestConstants.FIELD_STATE) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmitDateCriteria.javaindex b7dcb861cf..c8ce88f370 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmitDateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmitDateCriteria.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;public class SubmitDateCriteria extends PullRequestCriteria {@@ -28,7 +28,7 @@ public class SubmitDateCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<Date> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_SUBMIT_DATE));+ Path<Date> attribute = context.getRoot().get(PullRequestConstants.ATTR_SUBMIT_DATE);if (operator == PullRequestQueryLexer.IsBefore)return context.getBuilder().lessThan(attribute, value);else@@ -50,7 +50,7 @@ public class SubmitDateCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequest.FIELD_SUBMIT_DATE) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(rawValue);+ return PullRequestQuery.quote(PullRequestConstants.FIELD_SUBMIT_DATE) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(rawValue);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByCriteria.javaindex b9adb23be8..40ae9e0ac2 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByCriteria.java@@ -9,6 +9,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class SubmittedByCriteria extends PullRequestCriteria {@@ -23,7 +24,7 @@ public class SubmittedByCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<User> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_SUBMITTER));+ Path<User> attribute = context.getRoot().get(PullRequestConstants.ATTR_SUBMITTER);return context.getBuilder().equal(attribute, value);}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByMeCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByMeCriteria.javaindex f3c3c68271..d25440ca2f 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByMeCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmittedByMeCriteria.java@@ -8,6 +8,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;import io.onedev.server.security.SecurityUtils;@@ -17,7 +18,7 @@ public class SubmittedByMeCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<?> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_SUBMITTER));+ Path<?> attribute = context.getRoot().get(PullRequestConstants.ATTR_SUBMITTER);return context.getBuilder().equal(attribute, SecurityUtils.getUser());}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/TargetBranchCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/TargetBranchCriteria.javaindex 907eedad7f..f90a50fd27 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/TargetBranchCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/TargetBranchCriteria.java@@ -9,6 +9,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class TargetBranchCriteria extends PullRequestCriteria {@@ -23,7 +24,7 @@ public class TargetBranchCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<User> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_TARGET_BRANCH));+ Path<User> attribute = context.getRoot().get(PullRequestConstants.ATTR_TARGET_BRANCH);return context.getBuilder().equal(attribute, value);}@@ -39,7 +40,7 @@ public class TargetBranchCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequest.FIELD_TARGET_BRANCH) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value);+ return PullRequestQuery.quote(PullRequestConstants.FIELD_TARGET_BRANCH) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/TitleCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/TitleCriteria.javaindex 0e41a99da5..2c22fa64b6 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/TitleCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/TitleCriteria.java@@ -6,6 +6,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class TitleCriteria extends PullRequestCriteria {@@ -20,7 +21,7 @@ public class TitleCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<String> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_TITLE));+ Path<String> attribute = context.getRoot().get(PullRequestConstants.ATTR_TITLE);return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");}@@ -36,7 +37,7 @@ public class TitleCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequest.FIELD_TITLE) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " " + PullRequestQuery.quote(value);+ return PullRequestQuery.quote(PullRequestConstants.FIELD_TITLE) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " " + PullRequestQuery.quote(value);}}diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByCriteria.javaindex f8e31140f5..1339c7c12f 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByCriteria.java@@ -1,6 +1,6 @@package io.onedev.server.entityquery.pullrequest;-import javax.persistence.criteria.Join;+import javax.persistence.criteria.From;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -10,7 +10,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;public class ToBeReviewedByCriteria extends PullRequestCriteria {@@ -24,10 +24,10 @@ public class ToBeReviewedByCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);- Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);return context.getBuilder().and(context.getBuilder().equal(user, value),context.getBuilder().isNull(excludeDate),diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByMeCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByMeCriteria.javaindex 74d840b692..b7e50b73fc 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByMeCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/ToBeReviewedByMeCriteria.java@@ -1,6 +1,6 @@package io.onedev.server.entityquery.pullrequest;-import javax.persistence.criteria.Join;+import javax.persistence.criteria.From;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -9,7 +9,7 @@ import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.security.SecurityUtils;public class ToBeReviewedByMeCriteria extends PullRequestCriteria {@@ -18,10 +18,10 @@ public class ToBeReviewedByMeCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);- Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);- Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);- Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);return context.getBuilder().and(context.getBuilder().equal(user, SecurityUtils.getUser()),context.getBuilder().isNull(excludeDate),diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/UpdateDateCriteria.javaindex df6e9dfbbc..4bdae84c9c 100644--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/UpdateDateCriteria.java+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/UpdateDateCriteria.java@@ -8,6 +8,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.entityquery.QueryBuildContext;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;public class UpdateDateCriteria extends PullRequestCriteria {@@ -28,7 +29,7 @@ public class UpdateDateCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {- Path<Date> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequest.FIELD_PATHS.get(PullRequest.FIELD_UPDATE_DATE));+ Path<Date> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequestConstants.ATTR_UPDATE_DATE);if (operator == PullRequestQueryLexer.IsBefore)return context.getBuilder().lessThan(attribute, value);else@@ -50,7 +51,7 @@ public class UpdateDateCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.quote(PullRequest.FIELD_UPDATE_DATE) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(rawValue);+ return PullRequestQuery.quote(PullRequestConstants.FIELD_UPDATE_DATE) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(rawValue);}}diff --git a/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.javaindex 2c6782dc67..938e3df5a6 100644--- a/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java+++ b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java@@ -25,11 +25,11 @@ import io.onedev.server.manager.SettingManager;import io.onedev.server.manager.ProjectManager;import io.onedev.server.manager.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;import io.onedev.server.model.support.TagProtection;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.security.ProjectPrivilege;@@ -149,7 +149,7 @@ public class GitPreReceiveCallback extends HttpServlet {User user = userManager.getCurrent();Preconditions.checkNotNull(user);- if (refName.startsWith(PullRequest.REFS_PREFIX) || refName.startsWith(PullRequestUpdate.REFS_PREFIX)) {+ if (refName.startsWith(PullRequestConstants.REFS_PREFIX) || refName.startsWith(PullRequestUpdate.REFS_PREFIX)) {if (!user.asSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.ADMIN))) {error(output, refName, "Only project administrators can update onedev refs.");diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.javaindex 0f644449c5..e5679a9a3a 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java@@ -55,6 +55,7 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentRelation;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.CodeCommentConstants;import io.onedev.server.model.support.TextRange;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -94,6 +95,16 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment}}+ @Transactional+ @Override+ public void delete(CodeComment codeComment) {+ super.delete(codeComment);+ for (CodeCommentRelation relation: codeComment.getRelations()) {+ PullRequest request = relation.getRequest();+ request.setCommentCount(request.getCommentCount()-codeComment.getReplyCount()-1);+ }+ }+@Sessional@Overridepublic CodeComment find(String uuid) {@@ -245,8 +256,8 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeCommentPullRequest request, QueryBuildContext<CodeComment> context) {List<Predicate> predicates = new ArrayList<>();if (request != null) {- Join<?, ?> relations = context.getRoot().join(CodeComment.PATH_RELATIONS, JoinType.INNER);- relations.on(context.getBuilder().equal(relations.get(CodeCommentRelation.PATH_REQUEST), request));+ Join<?, ?> relations = context.getRoot().join(CodeCommentConstants.ATTR_RELATIONS, JoinType.INNER);+ relations.on(context.getBuilder().equal(relations.get(CodeCommentRelation.ATTR_REQUEST), request));} else {predicates.add(context.getBuilder().equal(context.getRoot().get("project"), project));}@@ -268,9 +279,9 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeCommentList<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: requestQuery.getSorts()) {if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(CodeCommentQuery.getPath(root, CodeComment.FIELD_PATHS.get(sort.getField()))));+ orders.add(builder.asc(CodeCommentQuery.getPath(root, CodeCommentConstants.ORDER_FIELDS.get(sort.getField()))));else- orders.add(builder.desc(CodeCommentQuery.getPath(root, CodeComment.FIELD_PATHS.get(sort.getField()))));+ orders.add(builder.desc(CodeCommentQuery.getPath(root, CodeCommentConstants.ORDER_FIELDS.get(sort.getField()))));}Path<String> idPath = root.get("id");diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.javaindex 4cf25411e9..3f1f5e8800 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java@@ -12,7 +12,6 @@ import io.onedev.server.event.codecomment.CodeCommentReplied;import io.onedev.server.event.pullrequest.PullRequestCodeCommentAdded;import io.onedev.server.event.pullrequest.PullRequestCodeCommentReplied;import io.onedev.server.manager.CodeCommentRelationManager;-import io.onedev.server.manager.PullRequestManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentRelation;import io.onedev.server.model.PullRequest;@@ -27,14 +26,10 @@ public class DefaultCodeCommentRelationManager extends AbstractEntityManager<Codprivate final ListenerRegistry listenerRegistry;- private final PullRequestManager pullRequestManager;-@Inject- public DefaultCodeCommentRelationManager(Dao dao, ListenerRegistry listenerRegistry,- PullRequestManager pullRequestManager) {+ public DefaultCodeCommentRelationManager(Dao dao, ListenerRegistry listenerRegistry) {super(dao);this.listenerRegistry = listenerRegistry;- this.pullRequestManager = pullRequestManager;}@Override@@ -46,14 +41,15 @@ public class DefaultCodeCommentRelationManager extends AbstractEntityManager<Cod}private void save(CodeCommentRelation relation, boolean derived) {+ PullRequest request = relation.getRequest();+ if (relation.isNew())+ request.setCommentCount(request.getCommentCount() + relation.getComment().getReplyCount() + 1);super.save(relation);CodeComment comment = relation.getComment();- PullRequest request = relation.getRequest();if (request.getLastActivity() == null || comment.getDate().after(request.getLastActivity().getDate())) {PullRequestCodeCommentAdded event = new PullRequestCodeCommentAdded(request, comment, derived);listenerRegistry.post(event);request.setLastActivity(event);- pullRequestManager.save(request);}}@@ -63,6 +59,14 @@ public class DefaultCodeCommentRelationManager extends AbstractEntityManager<Codsave(relation, true);}+ @Transactional+ @Override+ public void delete(CodeCommentRelation relation) {+ super.delete(relation);+ PullRequest request = relation.getRequest();+ request.setCommentCount(request.getCommentCount() - relation.getComment().getReplyCount() - 1);+ }+@Listen@Transactionalpublic void on(CodeCommentAdded event) {@@ -82,7 +86,6 @@ public class DefaultCodeCommentRelationManager extends AbstractEntityManager<Codrelation.getRequest(), event.getReply(), !relation.getRequest().equals(event.getRequest()));listenerRegistry.post(pullRequestCodeCommentReplied);relation.getRequest().setLastActivity(pullRequestCodeCommentReplied);- pullRequestManager.save(relation.getRequest());}}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.javaindex ab21ddff73..46c68ceb7c 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java@@ -5,8 +5,9 @@ import javax.inject.Singleton;import io.onedev.launcher.loader.ListenerRegistry;import io.onedev.server.event.codecomment.CodeCommentReplied;-import io.onedev.server.manager.CodeCommentManager;import io.onedev.server.manager.CodeCommentReplyManager;+import io.onedev.server.model.CodeComment;+import io.onedev.server.model.CodeCommentRelation;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.CompareContext;@@ -20,14 +21,10 @@ public class DefaultCodeCommentReplyManager extends AbstractEntityManager<CodeCoprivate final ListenerRegistry listenerRegistry;- private final CodeCommentManager codeCommentManager;-@Inject- public DefaultCodeCommentReplyManager(Dao dao, ListenerRegistry listenerRegistry,- CodeCommentManager codeCommentManager) {+ public DefaultCodeCommentReplyManager(Dao dao, ListenerRegistry listenerRegistry) {super(dao);this.listenerRegistry = listenerRegistry;- this.codeCommentManager = codeCommentManager;}@Transactional@@ -37,10 +34,23 @@ public class DefaultCodeCommentReplyManager extends AbstractEntityManager<CodeCodao.persist(reply);if (isNew) {CodeCommentReplied event = new CodeCommentReplied(reply, request);- reply.getComment().setCompareContext(compareContext);+ CodeComment comment = reply.getComment();+ comment.setCompareContext(compareContext);+ comment.setReplyCount(comment.getReplyCount()+1);+ for (CodeCommentRelation relation: comment.getRelations())+ relation.getRequest().setCommentCount(relation.getRequest().getCommentCount()+1);listenerRegistry.post(event);- codeCommentManager.save(reply.getComment());}}++ @Transactional+ @Override+ public void delete(CodeCommentReply reply) {+ super.delete(reply);+ CodeComment comment = reply.getComment();+ comment.setReplyCount(comment.getReplyCount()-1);+ for (CodeCommentRelation relation: comment.getRelations())+ relation.getRequest().setCommentCount(relation.getRequest().getCommentCount()-1);+ }}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.javaindex fbb1e679ce..5bd23279a4 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java@@ -49,6 +49,7 @@ import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.issue.IssueBoard;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.persistence.annotation.Sessional;@@ -160,18 +161,18 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsList<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: issueQuery.getSorts()) {- if (Issue.FIELD_PATHS.containsKey(sort.getField())) {+ if (IssueConstants.ORDER_FIELDS.containsKey(sort.getField())) {if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(IssueQuery.getPath(root, Issue.FIELD_PATHS.get(sort.getField()))));+ orders.add(builder.asc(IssueQuery.getPath(root, IssueConstants.ORDER_FIELDS.get(sort.getField()))));else- orders.add(builder.desc(IssueQuery.getPath(root, Issue.FIELD_PATHS.get(sort.getField()))));+ orders.add(builder.desc(IssueQuery.getPath(root, IssueConstants.ORDER_FIELDS.get(sort.getField()))));} else {- Join<Issue, IssueFieldUnary> join = root.join("fieldUnaries", JoinType.LEFT);- join.on(builder.equal(join.get(IssueFieldUnary.NAME), sort.getField()));+ Join<Issue, IssueFieldUnary> join = root.join(IssueConstants.ATTR_FIELD_UNARIES, JoinType.LEFT);+ join.on(builder.equal(join.get(IssueFieldUnary.FIELD_ATTR_NAME), sort.getField()));if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(join.get(IssueFieldUnary.ORDINAL)));+ orders.add(builder.asc(join.get(IssueFieldUnary.FIELD_ATTR_ORDINAL)));else- orders.add(builder.desc(join.get(IssueFieldUnary.ORDINAL)));+ orders.add(builder.desc(join.get(IssueFieldUnary.FIELD_ATTR_ORDINAL)));}}@@ -356,10 +357,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsundefinedFields.add(name);}for (String fieldName: project.getIssueListFields()) {- if (!Issue.FIELD_PATHS.containsKey(fieldName)) {- if (project.getIssueWorkflow().getFieldSpec(fieldName) == null)- undefinedFields.add(fieldName);- }+ if (!IssueConstants.DISPLAY_FIELDS.contains(fieldName) && project.getIssueWorkflow().getFieldSpec(fieldName) == null)+ undefinedFields.add(fieldName);}for (NamedIssueQuery namedQuery: project.getSavedIssueQueries()) {try {diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.javaindex 89f21cf223..7aec25cffe 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java@@ -7,6 +7,7 @@ import io.onedev.launcher.loader.ListenerRegistry;import io.onedev.server.event.pullrequest.PullRequestCommentAdded;import io.onedev.server.manager.PullRequestCommentManager;import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;import io.onedev.server.model.support.LastActivity;import io.onedev.server.persistence.annotation.Transactional;@@ -43,9 +44,20 @@ public class DefaultPullRequestCommentManager extends AbstractEntityManager<PulllastEvent.setDate(event.getDate());lastEvent.setDescription("added comment");lastEvent.setUser(event.getUser());- comment.getRequest().setLastActivity(lastEvent);++ PullRequest request = comment.getRequest();+ request.setCommentCount(request.getCommentCount()+1);+ request.setLastActivity(lastEvent);pullRequestManager.save(event.getRequest());}}+ @Transactional+ @Override+ public void delete(PullRequestComment comment) {+ super.delete(comment);+ PullRequest request = comment.getRequest();+ request.setCommentCount(request.getCommentCount()-1);+ }+}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.javaindex 46cefc6030..1749f0e8fa 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java@@ -100,6 +100,7 @@ import io.onedev.server.model.support.ProjectAndBranch;import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.model.support.pullrequest.actiondata.ActionData;import io.onedev.server.model.support.pullrequest.actiondata.AddedReviewerData;import io.onedev.server.model.support.pullrequest.actiondata.ApprovedData;@@ -997,9 +998,9 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestList<javax.persistence.criteria.Order> orders = new ArrayList<>();for (EntitySort sort: requestQuery.getSorts()) {if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(PullRequestQuery.getPath(root, PullRequest.FIELD_PATHS.get(sort.getField()))));+ orders.add(builder.asc(PullRequestQuery.getPath(root, PullRequestConstants.ORDER_FIELDS.get(sort.getField()))));else- orders.add(builder.desc(PullRequestQuery.getPath(root, PullRequest.FIELD_PATHS.get(sort.getField()))));+ orders.add(builder.desc(PullRequestQuery.getPath(root, PullRequestConstants.ORDER_FIELDS.get(sort.getField()))));}Path<String> idPath = root.get("id");diff --git a/core/src/main/java/io/onedev/server/model/CodeComment.java b/core/src/main/java/io/onedev/server/model/CodeComment.javaindex bab4f39693..2143f5d4b7 100644--- a/core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/core/src/main/java/io/onedev/server/model/CodeComment.java@@ -5,7 +5,6 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.Date;-import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.UUID;@@ -61,30 +60,6 @@ public class CodeComment extends AbstractEntity {private static final long serialVersionUID = 1L;- public static final Map<String, String> FIELD_PATHS = new LinkedHashMap<>();-- public static final String FIELD_CONTENT = "Content";-- public static final String FIELD_PATH = "Path";-- public static final String FIELD_COMMIT = "Commit";-- public static final String FIELD_CREATE_DATE = "Create Date";-- public static final String FIELD_UPDATE_DATE = "Update Date";-- public static final String PATH_CREATOR = "user";-- public static final String PATH_RELATIONS = "relations";-- static {- FIELD_PATHS.put(FIELD_CONTENT, "content");- FIELD_PATHS.put(FIELD_PATH, "markPos.path");- FIELD_PATHS.put(FIELD_COMMIT, "markPos.commit");- FIELD_PATHS.put(FIELD_CREATE_DATE, "date");- FIELD_PATHS.put(FIELD_UPDATE_DATE, "lastActivity.date");- }-@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)private Project project;@@ -104,6 +79,8 @@ public class CodeComment extends AbstractEntity {@Embeddedprivate LastActivity lastActivity;++ private int replyCount;@Embeddedprivate MarkPos markPos;@@ -164,6 +141,14 @@ public class CodeComment extends AbstractEntity {this.date = date;}+ public int getReplyCount() {+ return replyCount;+ }++ public void setReplyCount(int replyCount) {+ this.replyCount = replyCount;+ }+public MarkPos getMarkPos() {return markPos;}diff --git a/core/src/main/java/io/onedev/server/model/CodeCommentRelation.java b/core/src/main/java/io/onedev/server/model/CodeCommentRelation.javaindex 7f0247e108..9fec24adee 100644--- a/core/src/main/java/io/onedev/server/model/CodeCommentRelation.java+++ b/core/src/main/java/io/onedev/server/model/CodeCommentRelation.java@@ -17,7 +17,9 @@ public class CodeCommentRelation extends AbstractEntity {private static final long serialVersionUID = 1L;- public static final String PATH_REQUEST = "request";+ public static final String ATTR_REQUEST = "request";++ public static final String ATTR_COMMENT = "comment";@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)diff --git a/core/src/main/java/io/onedev/server/model/CodeCommentReply.java b/core/src/main/java/io/onedev/server/model/CodeCommentReply.javaindex 6a2311d7d8..8129a2ab2d 100644--- a/core/src/main/java/io/onedev/server/model/CodeCommentReply.java+++ b/core/src/main/java/io/onedev/server/model/CodeCommentReply.java@@ -26,6 +26,8 @@ public class CodeCommentReply extends AbstractEntity {private static final long serialVersionUID = 1L;+ public static final String ATTR_CONTENT = "content";+@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)private CodeComment comment;diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex 20609f842a..f8e818e1dd 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -39,6 +39,7 @@ import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.Referenceable;import io.onedev.server.model.support.issue.IssueField;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.inputspec.InputSpec;@@ -65,42 +66,7 @@ import io.onedev.server.web.editable.annotation.Editable;public class Issue extends AbstractEntity implements Referenceable {private static final long serialVersionUID = 1L;-- public static final Map<String, String> FIELD_PATHS = new LinkedHashMap<>();-- public static final String FIELD_NUMBER = "Number";-- public static final String FIELD_STATE = "State";-- public static final String FIELD_TITLE = "Title";-- public static final String FIELD_DESCRIPTION = "Description";-- public static final String FIELD_SUBMITTER = "Submitter";-- public static final String FIELD_SUBMIT_DATE = "Submit Date";-- public static final String FIELD_VOTE_COUNT = "Vote Count";-- public static final String FIELD_COMMENT_COUNT = "Comment Count";-- public static final String FIELD_UPDATE_DATE = "Update Date";-- public static final String FIELD_MILESTONE = "Milestone";-- static {- FIELD_PATHS.put(FIELD_NUMBER, "number");- FIELD_PATHS.put(FIELD_STATE, "state");- FIELD_PATHS.put(FIELD_TITLE, "title");- FIELD_PATHS.put(FIELD_DESCRIPTION, "description");- FIELD_PATHS.put(FIELD_SUBMITTER, "submitter");- FIELD_PATHS.put(FIELD_SUBMIT_DATE, "submitDate");- FIELD_PATHS.put(FIELD_UPDATE_DATE, "lastActivity.date");- FIELD_PATHS.put(FIELD_VOTE_COUNT, "voteCount");- FIELD_PATHS.put(FIELD_COMMENT_COUNT, "commentCount");- FIELD_PATHS.put(FIELD_MILESTONE, "milestone");- }-+@Versionprivate long version;@@ -411,7 +377,7 @@ public class Issue extends AbstractEntity implements Referenceable {Serializable fieldBean = (Serializable) beanDescriptor.newBeanInstance();for (PropertyDescriptor property: beanDescriptor.getPropertyDescriptors()) {- if (property.getDisplayName().equals(Issue.FIELD_STATE)) {+ if (property.getDisplayName().equals(IssueConstants.FIELD_STATE)) {property.setPropertyValue(fieldBean, getState());} else {IssueField field = getFields().get(property.getDisplayName());@@ -469,7 +435,7 @@ public class Issue extends AbstractEntity implements Referenceable {if (fieldSpec != null) {if (fieldSpec.getShowConditions() != null) {for (ShowCondition condition: fieldSpec.getShowConditions()) {- if (condition.getInputName().equals(Issue.FIELD_STATE)) {+ if (condition.getInputName().equals(IssueConstants.FIELD_STATE)) {if (!condition.getValueMatcher().matches(state))return false;} else {diff --git a/core/src/main/java/io/onedev/server/model/IssueComment.java b/core/src/main/java/io/onedev/server/model/IssueComment.javaindex 3122a73dd2..4dc3134e1a 100644--- a/core/src/main/java/io/onedev/server/model/IssueComment.java+++ b/core/src/main/java/io/onedev/server/model/IssueComment.java@@ -18,6 +18,8 @@ public class IssueComment extends AbstractEntity {private static final long serialVersionUID = 1L;+ public static final String PATH_CONTENT = "content";+@ManyToOne@JoinColumn(nullable=false)private Issue issue;diff --git a/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java b/core/src/main/java/io/onedev/server/model/IssueFieldUnary.javaindex 2ef7540bb2..9068a1dca3 100644--- a/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java+++ b/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java@@ -19,11 +19,11 @@ public class IssueFieldUnary extends AbstractEntity {private static final long serialVersionUID = 1L;- public static final String NAME = "name";+ public static final String FIELD_ATTR_NAME = "name";- public static final String VALUE = "value";+ public static final String FIELD_ATTR_VALUE = "value";- public static final String ORDINAL = "ordinal";+ public static final String FIELD_ATTR_ORDINAL = "ordinal";@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)diff --git a/core/src/main/java/io/onedev/server/model/Milestone.java b/core/src/main/java/io/onedev/server/model/Milestone.javaindex 6f7135be11..00315d3a99 100644--- a/core/src/main/java/io/onedev/server/model/Milestone.java+++ b/core/src/main/java/io/onedev/server/model/Milestone.java@@ -32,7 +32,7 @@ public class Milestone extends AbstractEntity {private static final long serialVersionUID = 1L;- public static final String NAME = "name";+ public static final String FIELD_ATTR_NAME = "name";@ManyToOne@JoinColumn(nullable=false)diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex 0eb1e488ec..d0a4423897 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -85,6 +85,7 @@ import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.CommitMessageTransformSetting;import io.onedev.server.model.support.TagProtection;import io.onedev.server.model.support.issue.IssueBoard;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;@@ -223,12 +224,12 @@ public class Project extends AbstractEntity {private transient Optional<PullRequestQuerySetting> pullRequestQuerySettingOfCurrentUserHolder;public Project() {- issueListFields.add(Issue.FIELD_NUMBER);- issueListFields.add(Issue.FIELD_STATE);- issueListFields.add(Issue.FIELD_TITLE);+ issueListFields.add(IssueConstants.FIELD_NUMBER);+ issueListFields.add(IssueConstants.FIELD_STATE);+ issueListFields.add(IssueConstants.FIELD_TITLE);issueListFields.add("Type");issueListFields.add("Priority");- issueListFields.add(Issue.FIELD_SUBMITTER);+ issueListFields.add(IssueConstants.FIELD_SUBMITTER);issueListFields.add("Assignee");savedIssueQueries.add(new NamedIssueQuery("Open", "open"));diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.javaindex b71d5ca88f..247c0844a6 100644--- a/core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java@@ -7,9 +7,7 @@ import java.util.Collection;import java.util.Collections;import java.util.Date;import java.util.HashSet;-import java.util.LinkedHashMap;import java.util.List;-import java.util.Map;import java.util.Optional;import java.util.UUID;import java.util.stream.Collectors;@@ -57,6 +55,7 @@ import io.onedev.server.model.support.Referenceable;import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.util.jackson.RestView;@@ -82,66 +81,6 @@ public class PullRequest extends AbstractEntity implements Referenceable {private static final long serialVersionUID = 1L;- public static final String REFS_PREFIX = "refs/pull/";-- public static final int MAX_CODE_COMMENTS = 1000;-- public static final Map<String, String> FIELD_PATHS = new LinkedHashMap<>();-- public static final String FIELD_NUMBER = "Number";-- public static final String FIELD_STATE = "State";-- public static final String FIELD_TARGET_BRANCH = "Target Branch";-- public static final String FIELD_SOURCE_PROJECT = "Source Project";-- public static final String FIELD_SOURCE_BRANCH = "Source Branch";-- public static final String FIELD_TITLE = "Title";-- public static final String FIELD_DESCRIPTION = "Description";-- public static final String FIELD_SUBMITTER = "Submitter";-- public static final String FIELD_SUBMIT_DATE = "Submit Date";-- public static final String FIELD_UPDATE_DATE = "Update Date";-- public static final String FIELD_CLOSE_DATE = "Close Date";-- public static final String FIELD_MERGE_STRATEGY = "Merge Strategy";-- public static final String PATH_CLOSE_STATUS = "closeInfo.status";-- public static final String PATH_CLOSE_USER = "closeInfo.user";-- public static final String PATH_LAST_MERGE_PREVIEW_MERGED = "lastMergePreview.merged";-- public static final String PATH_LAST_MERGE_PREVIEW_REQUEST_HEAD = "lastMergePreview.requestHead";-- public static final String PATH_ID = "id";-- public static final String STATE_OPEN = "Open";-- public static final String PATH_REVIEWS = "reviews";-- public static final String PATH_BUILDS = "builds";-- static {- FIELD_PATHS.put(FIELD_NUMBER, "number");- FIELD_PATHS.put(FIELD_TITLE, "title");- FIELD_PATHS.put(FIELD_SUBMITTER, "submitter");- FIELD_PATHS.put(FIELD_TARGET_BRANCH, "targetBranch");- FIELD_PATHS.put(FIELD_SOURCE_PROJECT, "sourceProject");- FIELD_PATHS.put(FIELD_SOURCE_BRANCH, "sourceBranch");- FIELD_PATHS.put(FIELD_DESCRIPTION, "description");- FIELD_PATHS.put(FIELD_SUBMIT_DATE, "submitDate");- FIELD_PATHS.put(FIELD_UPDATE_DATE, "lastActivity.date");- FIELD_PATHS.put(FIELD_CLOSE_DATE, "closeInfo.date");- FIELD_PATHS.put(FIELD_MERGE_STRATEGY, "mergeStrategy");- }-@Embeddedprivate CloseInfo closeInfo;@@ -209,6 +148,8 @@ public class PullRequest extends AbstractEntity implements Referenceable {private long number;+ private int commentCount;+@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)private Collection<PullRequestUpdate> updates = new ArrayList<>();@@ -537,19 +478,19 @@ public class PullRequest extends AbstractEntity implements Referenceable {@JsonView(RestView.class)public String getBaseRef() {Preconditions.checkNotNull(getId());- return REFS_PREFIX + getNumber() + "/base";+ return PullRequestConstants.REFS_PREFIX + getNumber() + "/base";}@JsonView(RestView.class)public String getMergeRef() {Preconditions.checkNotNull(getId());- return REFS_PREFIX + getNumber() + "/merge";+ return PullRequestConstants.REFS_PREFIX + getNumber() + "/merge";}@JsonView(RestView.class)public String getHeadRef() {Preconditions.checkNotNull(getId());- return REFS_PREFIX + getNumber() + "/head";+ return PullRequestConstants.REFS_PREFIX + getNumber() + "/head";}/**@@ -684,6 +625,14 @@ public class PullRequest extends AbstractEntity implements Referenceable {numberStr = String.valueOf(number);}+ public int getCommentCount() {+ return commentCount;+ }++ public void setCommentCount(int commentCount) {+ this.commentCount = commentCount;+ }+public List<RevCommit> getCommits() {List<RevCommit> commits = new ArrayList<>();getSortedUpdates().forEach(update->commits.addAll(update.getCommits()));diff --git a/core/src/main/java/io/onedev/server/model/PullRequestBuild.java b/core/src/main/java/io/onedev/server/model/PullRequestBuild.javaindex f4e2227b2d..b0f93041a0 100644--- a/core/src/main/java/io/onedev/server/model/PullRequestBuild.java+++ b/core/src/main/java/io/onedev/server/model/PullRequestBuild.java@@ -17,7 +17,7 @@ public class PullRequestBuild extends AbstractEntity {private static final long serialVersionUID = 1L;- public static final String PATH_BUILD = "build";+ public static final String ATTR_BUILD = "build";@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)diff --git a/core/src/main/java/io/onedev/server/model/PullRequestComment.java b/core/src/main/java/io/onedev/server/model/PullRequestComment.javaindex 9b507bc9a4..db68837901 100644--- a/core/src/main/java/io/onedev/server/model/PullRequestComment.java+++ b/core/src/main/java/io/onedev/server/model/PullRequestComment.java@@ -27,6 +27,8 @@ public class PullRequestComment extends AbstractEntity {private static final long serialVersionUID = 1L;public static final int DIFF_CONTEXT_SIZE = 3;++ public static final String ATTR_CONTENT = "content";@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)diff --git a/core/src/main/java/io/onedev/server/model/PullRequestReview.java b/core/src/main/java/io/onedev/server/model/PullRequestReview.javaindex 69b3abad7c..f77a3f374b 100644--- a/core/src/main/java/io/onedev/server/model/PullRequestReview.java+++ b/core/src/main/java/io/onedev/server/model/PullRequestReview.java@@ -25,13 +25,13 @@ public class PullRequestReview extends AbstractEntity {private static final long serialVersionUID = 1L;- public static final String PATH_USER = "user";+ public static final String ATTR_USER = "user";public static final String PATH_RESULT = "result";- public static final String PATH_RESULT_APPROVED = "result.approved";+ public static final String ATTR_RESULT_APPROVED = "result.approved";- public static final String PATH_EXCLUDE_DATE = "excludeDate";+ public static final String ATTR_EXCLUDE_DATE = "excludeDate";@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)diff --git a/core/src/main/java/io/onedev/server/model/support/CodeCommentConstants.java b/core/src/main/java/io/onedev/server/model/support/CodeCommentConstants.javanew file mode 100644index 0000000000..0176f0c187--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/CodeCommentConstants.java@@ -0,0 +1,54 @@+package io.onedev.server.model.support;++import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import jersey.repackaged.com.google.common.collect.Lists;++public class CodeCommentConstants {++ public static final String FIELD_CONTENT = "Content";++ public static final String ATTR_CONTENT = "content";++ public static final String FIELD_REPLY = "Reply";++ public static final String FIELD_PATH = "Path";++ public static final String ATTR_PATH = "markPos.path";++ public static final String FIELD_REPLY_COUNT = "Reply Count";++ public static final String ATTR_REPLY_COUNT = "replyCount";++ public static final String FIELD_COMMIT = "Commit";++ public static final String ATTR_COMMIT = "markPos.commit";++ public static final String FIELD_CREATE_DATE = "Create Date";++ public static final String ATTR_CREATE_DATE = "date";++ public static final String FIELD_UPDATE_DATE = "Update Date";++ public static final String ATTR_UPDATE_DATE = "lastActivity.date";++ public static final String ATTR_USER = "user";++ public static final String ATTR_RELATIONS = "relations";++ public static final String ATTR_REPLIES = "replies";++ public static final List<String> QUERY_FIELDS = Lists.newArrayList(+ FIELD_CONTENT, FIELD_REPLY, FIELD_PATH, FIELD_COMMIT, FIELD_CREATE_DATE, FIELD_UPDATE_DATE, FIELD_REPLY_COUNT);++ public static final Map<String, String> ORDER_FIELDS = new LinkedHashMap<>();++ static {+ ORDER_FIELDS.put(FIELD_CREATE_DATE, ATTR_CREATE_DATE);+ ORDER_FIELDS.put(FIELD_UPDATE_DATE, ATTR_UPDATE_DATE);+ ORDER_FIELDS.put(FIELD_REPLY_COUNT, ATTR_REPLY_COUNT);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.javaindex c0de67052b..fd1ec7bcfc 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java@@ -15,7 +15,6 @@ import javax.validation.constraints.Size;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.util.EditContext;@@ -107,7 +106,7 @@ public class IssueBoard implements Serializable {private static List<String> getIdentifyFieldChoices() {List<String> choices = new ArrayList<>();Project project = OneContext.get().getProject();- choices.add(Issue.FIELD_STATE);+ choices.add(IssueConstants.FIELD_STATE);for (InputSpec fieldSpec: project.getIssueWorkflow().getFieldSpecs()) {if (!fieldSpec.isAllowMultiple() && (fieldSpec instanceof ChoiceInput || fieldSpec instanceof UserChoiceInput || fieldSpec instanceof GroupChoiceInput))choices.add(fieldSpec.getName());@@ -120,7 +119,7 @@ public class IssueBoard implements Serializable {Map<String, String> choices = new LinkedHashMap<>();Project project = OneContext.get().getProject();String fieldName = (String) OneContext.get().getEditContext().getInputValue("identifyField");- if (Issue.FIELD_STATE.equals(fieldName)) {+ if (IssueConstants.FIELD_STATE.equals(fieldName)) {for (StateSpec state: project.getIssueWorkflow().getStateSpecs())choices.put(state.getName(), state.getName());} else if (fieldName != null) {@@ -149,7 +148,7 @@ public class IssueBoard implements Serializable {} catch (Exception e) {}}- if (getIdentifyField().equals(Issue.FIELD_STATE)) {+ if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {for (String column: getColumns()) {if (project.getIssueWorkflow().getStateSpec(column) == null)undefinedStates.add(column);@@ -169,7 +168,7 @@ public class IssueBoard implements Serializable {} catch (Exception e) {}}- if (getIdentifyField().equals(Issue.FIELD_STATE)) {+ if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {int index = getColumns().indexOf(entry.getKey());if (index != -1)@@ -186,7 +185,7 @@ public class IssueBoard implements Serializable {} catch (Exception e) {}}- if (!Issue.FIELD_STATE.equals(getIdentifyField())) {+ if (!IssueConstants.FIELD_STATE.equals(getIdentifyField())) {InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(getIdentifyField());if (fieldSpec == null)undefinedFields.add(getIdentifyField());@@ -264,7 +263,7 @@ public class IssueBoard implements Serializable {}}- if (!getIdentifyField().equals(Issue.FIELD_STATE)) {+ if (!getIdentifyField().equals(IssueConstants.FIELD_STATE)) {for (String column: getColumns()) {InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(getIdentifyField());List<String> choices = fieldSpec.getPossibleValues();diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueConstants.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueConstants.javanew file mode 100644index 0000000000..e95369f2dc--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueConstants.java@@ -0,0 +1,83 @@+package io.onedev.server.model.support.issue;++import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.Set;++import com.google.common.collect.Lists;+import com.google.common.collect.Sets;++public class IssueConstants {++ public static final String FIELD_NUMBER = "Number";++ public static final String ATTR_NUMBER = "number";++ public static final String FIELD_STATE = "State";++ public static final String ATTR_STATE = "state";++ public static final String FIELD_TITLE = "Title";++ public static final String ATTR_TITLE = "title";++ public static final String FIELD_DESCRIPTION = "Description";++ public static final String ATTR_DESCRIPTION = "description";++ public static final String FIELD_COMMENT = "Comment";++ public static final String ATTR_COMMENTS = "comments";++ public static final String FIELD_SUBMITTER = "Submitter";++ public static final String ATTR_SUBMITTER = "submitter";++ public static final String FIELD_SUBMIT_DATE = "Submit Date";++ public static final String ATTR_SUBMIT_DATE = "submitDate";++ public static final String FIELD_VOTE_COUNT = "Vote Count";++ public static final String ATTR_VOTE_COUNT = "voteCount";++ public static final String FIELD_COMMENT_COUNT = "Comment Count";++ public static final String ATTR_COMMENT_COUNT = "commentCount";++ public static final String FIELD_UPDATE_DATE = "Update Date";++ public static final String ATTR_UPDATE_DATE = "lastActivity.date";++ public static final String FIELD_MILESTONE = "Milestone";++ public static final String ATTR_MILESTONE = "milestone";++ public static final String ATTR_FIELD_UNARIES = "fieldUnaries";++ 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);++ public static final Set<String> DISPLAY_FIELDS = Sets.newHashSet(+ FIELD_NUMBER, FIELD_STATE, FIELD_TITLE, FIELD_SUBMITTER, 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);++ public static final Map<String, String> ORDER_FIELDS = new LinkedHashMap<>();++ static {+ ORDER_FIELDS.put(FIELD_VOTE_COUNT, ATTR_VOTE_COUNT);+ ORDER_FIELDS.put(FIELD_COMMENT_COUNT, ATTR_COMMENT_COUNT);+ ORDER_FIELDS.put(FIELD_NUMBER, ATTR_NUMBER);+ ORDER_FIELDS.put(FIELD_SUBMIT_DATE, ATTR_SUBMIT_DATE);+ ORDER_FIELDS.put(FIELD_UPDATE_DATE, ATTR_UPDATE_DATE);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.javaindex 7aacc4db94..7ab9108746 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java@@ -17,8 +17,8 @@ import io.onedev.server.entityquery.issue.IssueCriteria;import io.onedev.server.entityquery.issue.OrCriteria;import io.onedev.server.entityquery.issue.StateCriteria;import io.onedev.server.exception.OneException;-import io.onedev.server.model.Issue;import io.onedev.server.model.support.authorized.ProjectWriters;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.model.support.issue.workflow.action.PressButton;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;@@ -305,7 +305,7 @@ public class IssueWorkflow implements Serializable {@Nullablepublic InputSpec getFieldSpec(String fieldName) {- if (fieldName.equals(Issue.FIELD_STATE))+ if (fieldName.equals(IssueConstants.FIELD_STATE))return getFieldSpecOfState();elsereturn getFieldSpecMap().get(fieldName);@@ -405,7 +405,7 @@ public class IssueWorkflow implements Serializable {public InputSpec getFieldSpecOfState() {ChoiceInput inputSpec = new ChoiceInput();- inputSpec.setName(Issue.FIELD_STATE);+ inputSpec.setName(IssueConstants.FIELD_STATE);inputSpec.setAllowEmpty(false);SpecifiedChoices choicesProvider = new SpecifiedChoices();for (StateSpec stateSpec: getStateSpecs()) {diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/PullRequestConstants.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/PullRequestConstants.javanew file mode 100644index 0000000000..4bef7b01e6--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/PullRequestConstants.java@@ -0,0 +1,107 @@+package io.onedev.server.model.support.pullrequest;++import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import com.google.common.collect.Lists;++public class PullRequestConstants {++ public static final String FIELD_NUMBER = "Number";++ public static final String ATTR_NUMBER = "number";++ public static final String FIELD_STATE = "State";++ public static final String ATTR_STATE = "state";++ public static final String FIELD_TARGET_BRANCH = "Target Branch";++ public static final String ATTR_TARGET_BRANCH = "targetBranch";++ public static final String FIELD_SOURCE_PROJECT = "Source Project";++ public static final String ATTR_SOURCE_PROJECT = "sourceProject";++ public static final String FIELD_SOURCE_BRANCH = "Source Branch";++ public static final String ATTR_SOURCE_BRANCH = "sourceBranch";++ public static final String FIELD_TITLE = "Title";++ public static final String ATTR_TITLE = "title";++ public static final String FIELD_COMMIT = "commit";++ public static final String FIELD_DESCRIPTION = "Description";++ public static final String ATTR_DESCRIPTION = "description";++ public static final String FIELD_COMMENT = "Comment";++ public static final String ATTR_COMMENTS = "comments";++ public static final String ATTR_CODE_COMMENT_RELATIONS = "codeCommentRelations";++ public static final String FIELD_COMMENT_COUNT = "Comment Count";++ public static final String ATTR_COMMENT_COUNT = "commentCount";++ public static final String FIELD_SUBMITTER = "Submitter";++ public static final String ATTR_SUBMITTER = "submitter";++ public static final String FIELD_SUBMIT_DATE = "Submit Date";++ public static final String ATTR_SUBMIT_DATE = "submitDate";++ public static final String FIELD_UPDATE_DATE = "Update Date";++ public static final String ATTR_UPDATE_DATE = "lastActivity.date";++ public static final String FIELD_CLOSE_DATE = "Close Date";++ public static final String ATTR_CLOSE_DATE = "closeInfo.date";++ public static final String FIELD_MERGE_STRATEGY = "Merge Strategy";++ public static final String ATTR_MERGE_STRATEGY = "mergeStrategy";++ public static final String ATTR_CLOSE_STATUS = "closeInfo.status";++ public static final String ATTR_CLOSE_USER = "closeInfo.user";++ public static final String ATTR_LAST_MERGE_PREVIEW_MERGED = "lastMergePreview.merged";++ public static final String ATTR_LAST_MERGE_PREVIEW_REQUEST_HEAD = "lastMergePreview.requestHead";++ public static final String ATTR_ID = "id";++ public static final String ATTR_REVIEWS = "reviews";++ public static final String ATTR_BUILDS = "builds";++ 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_SOURCE_PROJECT,+ FIELD_SOURCE_BRANCH, FIELD_DESCRIPTION, FIELD_COMMENT, FIELD_SUBMIT_DATE,+ FIELD_UPDATE_DATE, FIELD_CLOSE_DATE, FIELD_COMMIT, FIELD_MERGE_STRATEGY,+ FIELD_COMMENT_COUNT);++ public static final Map<String, String> ORDER_FIELDS = new LinkedHashMap<>();++ static {+ ORDER_FIELDS.put(FIELD_SUBMIT_DATE, ATTR_SUBMIT_DATE);+ ORDER_FIELDS.put(FIELD_UPDATE_DATE, ATTR_UPDATE_DATE);+ ORDER_FIELDS.put(FIELD_CLOSE_DATE, ATTR_CLOSE_DATE);+ ORDER_FIELDS.put(FIELD_NUMBER, ATTR_NUMBER);+ ORDER_FIELDS.put(FIELD_COMMENT_COUNT, ATTR_COMMENT_COUNT);+ }++}diff --git a/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.javaindex dea9a989b3..7ceae82b61 100644--- a/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java@@ -10,22 +10,21 @@ import org.apache.wicket.model.IModel;import com.google.common.base.Optional;import com.google.common.base.Preconditions;-import com.google.common.collect.Lists;import io.onedev.codeassist.FenceAware;import io.onedev.codeassist.InputSuggestion;import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.codeassist.parser.Element;-import io.onedev.codeassist.parser.TerminalExpect;import io.onedev.codeassist.parser.ParseExpect;+import io.onedev.codeassist.parser.TerminalExpect;import io.onedev.server.OneDev;import io.onedev.server.entityquery.codecomment.CodeCommentQuery;import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser;import io.onedev.server.exception.OneException;import io.onedev.server.manager.UserManager;-import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.User;+import io.onedev.server.model.support.CodeCommentConstants;import io.onedev.server.util.DateUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -87,12 +86,10 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {Project project = getProject();if ("criteriaField".equals(spec.getLabel())) {- List<String> candidates = new ArrayList<>(CodeComment.FIELD_PATHS.keySet());- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));+ suggestions.addAll(getSuggestions(CodeCommentConstants.QUERY_FIELDS, unfencedLowerCaseMatchWith, ESCAPE_CHARS));} else if ("orderField".equals(spec.getLabel())) {- List<String> candidates = Lists.newArrayList(CodeComment.FIELD_CREATE_DATE,- CodeComment.FIELD_UPDATE_DATE);- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));+ suggestions.addAll(getSuggestions(new ArrayList<>(CodeCommentConstants.ORDER_FIELDS.keySet()),+ unfencedLowerCaseMatchWith, ESCAPE_CHARS));} else if ("criteriaValue".equals(spec.getLabel())) {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);if (fieldElements.isEmpty()) {@@ -105,10 +102,10 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {int operator = CodeCommentQuery.getOperator(operatorName);try {CodeCommentQuery.checkField(project, fieldName, operator);- if (fieldName.equals(CodeComment.FIELD_CREATE_DATE) || fieldName.equals(CodeComment.FIELD_UPDATE_DATE)) {+ if (fieldName.equals(CodeCommentConstants.FIELD_CREATE_DATE) || fieldName.equals(CodeCommentConstants.FIELD_UPDATE_DATE)) {suggestions.addAll(getSuggestions(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith, null));CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));- } else if (fieldName.equals(CodeComment.FIELD_PATH)) {+ } else if (fieldName.equals(CodeCommentConstants.FIELD_PATH)) {suggestions.addAll(SuggestionUtils.suggestPath(projectModel.getObject(), unfencedLowerCaseMatchWith, ESCAPE_CHARS));} else {return null;diff --git a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex 9421072671..dd376322db 100644--- a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -1,5 +1,7 @@package io.onedev.server.web.behavior;+import static io.onedev.server.model.support.issue.IssueConstants.*;+import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;@@ -29,6 +31,7 @@ import io.onedev.server.manager.UserManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.EditContext;@@ -105,14 +108,12 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {Project project = getProject();if ("criteriaField".equals(spec.getLabel())) {- List<String> candidates = new ArrayList<>(Issue.FIELD_PATHS.keySet());- candidates.remove(Issue.FIELD_SUBMITTER);+ List<String> candidates = new ArrayList<>(IssueConstants.QUERY_FIELDS);for (InputSpec field: project.getIssueWorkflow().getFieldSpecs())candidates.add(field.getName());suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));} else if ("orderField".equals(spec.getLabel())) {- List<String> candidates = Lists.newArrayList(Issue.FIELD_VOTE_COUNT, Issue.FIELD_COMMENT_COUNT, Issue.FIELD_NUMBER,- Issue.FIELD_SUBMIT_DATE, Issue.FIELD_UPDATE_DATE);+ List<String> candidates = new ArrayList<>(IssueConstants.ORDER_FIELDS.keySet());for (InputSpec field: project.getIssueWorkflow().getFieldSpecs()) {if (field instanceof NumberInput || field instanceof ChoiceInput || field instanceof DateInput)candidates.add(field.getName());@@ -131,8 +132,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {try {IssueQuery.checkField(project, fieldName, IssueQuery.getOperator(operatorName));InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);- if (fieldSpec instanceof DateInput || fieldName.equals(Issue.FIELD_SUBMIT_DATE)- || fieldName.equals(Issue.FIELD_UPDATE_DATE)) {+ if (fieldSpec instanceof DateInput || fieldName.equals(FIELD_SUBMIT_DATE)+ || fieldName.equals(FIELD_UPDATE_DATE)) {suggestions.addAll(getSuggestions(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith, null));CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));} else if (fieldSpec instanceof UserChoiceInput) {@@ -148,7 +149,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {} else if (fieldSpec instanceof GroupChoiceInput) {List<String> candidates = OneDev.getInstance(GroupManager.class).findAll().stream().map(it->it.getName()).collect(Collectors.toList());suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));- } else if (fieldName.equals(Issue.FIELD_STATE)) {+ } else if (fieldName.equals(FIELD_STATE)) {List<String> candidates = project.getIssueWorkflow().getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));} else if (fieldSpec instanceof ChoiceInput) {@@ -159,13 +160,13 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {} finally {OneContext.pop();}- } else if (fieldName.equals(Issue.FIELD_MILESTONE)) {+ } else if (fieldName.equals(FIELD_MILESTONE)) {List<String> candidates = project.getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));- } else if (fieldName.equals(Issue.FIELD_TITLE) || fieldName.equals(Issue.FIELD_DESCRIPTION)- || fieldName.equals(Issue.FIELD_VOTE_COUNT) || fieldName.equals(Issue.FIELD_COMMENT_COUNT)- || fieldName.equals(Issue.FIELD_NUMBER) || fieldSpec instanceof NumberInput- || fieldSpec instanceof TextInput) {+ } else if (fieldName.equals(FIELD_TITLE) || fieldName.equals(FIELD_DESCRIPTION)+ || fieldName.equals(FIELD_COMMENT) || fieldName.equals(FIELD_VOTE_COUNT)+ || fieldName.equals(FIELD_COMMENT_COUNT) || fieldName.equals(FIELD_NUMBER)+ || fieldSpec instanceof NumberInput || fieldSpec instanceof TextInput) {return null;}} catch (OneException ex) {diff --git a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex afde96139b..8468908bb7 100644--- a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -16,11 +16,10 @@ import io.onedev.codeassist.FenceAware;import io.onedev.codeassist.InputSuggestion;import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.codeassist.parser.Element;-import io.onedev.codeassist.parser.TerminalExpect;import io.onedev.codeassist.parser.ParseExpect;+import io.onedev.codeassist.parser.TerminalExpect;import io.onedev.server.OneDev;import io.onedev.server.entityquery.pullrequest.PullRequestQuery;-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser;import io.onedev.server.exception.OneException;import io.onedev.server.git.GitUtils;@@ -28,9 +27,9 @@ import io.onedev.server.git.RefInfo;import io.onedev.server.manager.ProjectManager;import io.onedev.server.manager.UserManager;import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.util.DateUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.utils.Range;@@ -91,13 +90,10 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {Project project = getProject();if ("criteriaField".equals(spec.getLabel())) {- List<String> candidates = new ArrayList<>(PullRequest.FIELD_PATHS.keySet());- candidates.remove(PullRequest.FIELD_SUBMITTER);- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));+ suggestions.addAll(getSuggestions(PullRequestConstants.QUERY_FIELDS, unfencedLowerCaseMatchWith, ESCAPE_CHARS));} else if ("orderField".equals(spec.getLabel())) {- List<String> candidates = Lists.newArrayList(PullRequest.FIELD_NUMBER,- PullRequest.FIELD_SUBMIT_DATE, PullRequest.FIELD_UPDATE_DATE, PullRequest.FIELD_CLOSE_DATE);- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));+ suggestions.addAll(getSuggestions(new ArrayList<>(PullRequestConstants.ORDER_FIELDS.keySet()),+ unfencedLowerCaseMatchWith, ESCAPE_CHARS));} else if ("criteriaValue".equals(spec.getLabel())) {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);@@ -105,36 +101,39 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = PullRequestQuery.getOperator(operatorName);if (fieldElements.isEmpty()) {- if (operator != PullRequestQueryLexer.ContainsCommit)- suggestions.addAll(getUserSuggestions(unfencedLowerCaseMatchWith));- else- return null;+ suggestions.addAll(getUserSuggestions(unfencedLowerCaseMatchWith));} else {String fieldName = PullRequestQuery.getValue(fieldElements.get(0).getMatchedText());try {PullRequestQuery.checkField(project, fieldName, operator);- if (fieldName.equals(PullRequest.FIELD_SUBMIT_DATE) || fieldName.equals(PullRequest.FIELD_UPDATE_DATE)- || fieldName.equals(PullRequest.FIELD_CLOSE_DATE)) {+ if (fieldName.equals(PullRequestConstants.FIELD_SUBMIT_DATE)+ || fieldName.equals(PullRequestConstants.FIELD_UPDATE_DATE)+ || fieldName.equals(PullRequestConstants.FIELD_CLOSE_DATE)) {suggestions.addAll(getSuggestions(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith, null));CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));- } else if (fieldName.equals(PullRequest.FIELD_STATE)) {- List<String> candidates = Lists.newArrayList(PullRequest.STATE_OPEN);+ } else if (fieldName.equals(PullRequestConstants.FIELD_STATE)) {+ List<String> candidates = Lists.newArrayList(PullRequestConstants.STATE_OPEN);for (CloseInfo.Status status: CloseInfo.Status.values())candidates.add(status.toString());suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));- } else if (fieldName.equals(PullRequest.FIELD_SOURCE_PROJECT)) {+ } else if (fieldName.equals(PullRequestConstants.FIELD_SOURCE_PROJECT)) {List<String> candidates = new ArrayList<>();for (Project each: OneDev.getInstance(ProjectManager.class).findAll())candidates.add(each.getName());suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));- } else if (fieldName.equals(PullRequest.FIELD_TARGET_BRANCH) || fieldName.equals(PullRequest.FIELD_SOURCE_BRANCH)) {+ } else if (fieldName.equals(PullRequestConstants.FIELD_TARGET_BRANCH)+ || fieldName.equals(PullRequestConstants.FIELD_SOURCE_BRANCH)) {List<String> candidates = new ArrayList<>();for (RefInfo refInfo: project.getBranches())candidates.add(GitUtils.ref2branch(refInfo.getRef().getName()));suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));- } else if (fieldName.equals(PullRequest.FIELD_TITLE) || fieldName.equals(PullRequest.FIELD_DESCRIPTION)- || fieldName.equals(PullRequest.FIELD_NUMBER)) {+ } else if (fieldName.equals(PullRequestConstants.FIELD_TITLE)+ || fieldName.equals(PullRequestConstants.FIELD_DESCRIPTION)+ || fieldName.equals(PullRequestConstants.FIELD_NUMBER)+ || fieldName.equals(PullRequestConstants.FIELD_COMMENT_COUNT)+ || fieldName.equals(PullRequestConstants.FIELD_COMMENT)+ || fieldName.equals(PullRequestConstants.FIELD_COMMIT)) {return null;}} catch (OneException ex) {diff --git a/core/src/main/java/io/onedev/server/web/component/RequestStateLabel.java b/core/src/main/java/io/onedev/server/web/component/RequestStateLabel.javaindex 32a5d4fc0c..58c4b05118 100644--- a/core/src/main/java/io/onedev/server/web/component/RequestStateLabel.java+++ b/core/src/main/java/io/onedev/server/web/component/RequestStateLabel.java@@ -8,6 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;@SuppressWarnings("serial")public class RequestStateLabel extends Label {@@ -22,7 +23,7 @@ public class RequestStateLabel extends Label {PullRequest request = requestModel.getObject();CloseInfo closeInfo = request.getCloseInfo();if (closeInfo == null)- return PullRequest.STATE_OPEN;+ return PullRequestConstants.STATE_OPEN;elsereturn closeInfo.getStatus().toString();}diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.javaindex ac9f10d248..3f510ad873 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java@@ -35,6 +35,7 @@ import io.onedev.server.manager.IssueActionManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.behavior.RunTaskBehavior;@@ -99,20 +100,20 @@ abstract class BatchEditPanel extends Panel implements InputContext {@Overridepublic Boolean getObject() {- return selectedFields.contains(Issue.FIELD_MILESTONE);+ return selectedFields.contains(IssueConstants.FIELD_MILESTONE);}@Overridepublic void setObject(Boolean object) {if (object)- selectedFields.add(Issue.FIELD_MILESTONE);+ selectedFields.add(IssueConstants.FIELD_MILESTONE);else- selectedFields.remove(Issue.FIELD_MILESTONE);+ selectedFields.remove(IssueConstants.FIELD_MILESTONE);}}).add(newOnChangeBehavior(form)));- List<String> customFieldNames = Lists.newArrayList(Issue.FIELD_STATE);+ List<String> customFieldNames = Lists.newArrayList(IssueConstants.FIELD_STATE);customFieldNames.addAll(getProject().getIssueWorkflow().getFieldNames());form.add(new ListView<String>("customFields", customFieldNames) {@@ -161,8 +162,8 @@ abstract class BatchEditPanel extends Panel implements InputContext {}Set<String> excludedProperties = new HashSet<>();- if (!selectedFields.contains(Issue.FIELD_MILESTONE))- excludedProperties.add(Issue.FIELD_PATHS.get(Issue.FIELD_MILESTONE));+ if (!selectedFields.contains(IssueConstants.FIELD_MILESTONE))+ excludedProperties.add(IssueConstants.ATTR_MILESTONE);builtInFieldsEditor = BeanContext.editBean("builtInFieldsEditor", builtInFieldsBean, excludedProperties);form.add(builtInFieldsEditor);@@ -207,11 +208,11 @@ abstract class BatchEditPanel extends Panel implements InputContext {@Overrideprotected void runTask(AjaxRequestTarget target) {Optional<Milestone> milestone;- if (selectedFields.contains(Issue.FIELD_MILESTONE))+ if (selectedFields.contains(IssueConstants.FIELD_MILESTONE))milestone = Optional.fromNullable(getProject().getMilestone(builtInFieldsBean.getMilestone()));elsemilestone = null;- String state = (String) IssueFieldBeanUtils.getFieldValue(customFieldsBean, Issue.FIELD_STATE);+ String state = (String) IssueFieldBeanUtils.getFieldValue(customFieldsBean, IssueConstants.FIELD_STATE);Map<String, Object> fieldValues = IssueFieldBeanUtils.getFieldValues(customFieldsBean);fieldValues.keySet().retainAll(selectedFields);diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/FieldsEditBean.java b/core/src/main/java/io/onedev/server/web/component/issuelist/FieldsEditBean.javaindex 771696d8e1..5a92456c6f 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/FieldsEditBean.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/FieldsEditBean.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import io.onedev.server.model.Issue;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;@@ -30,8 +30,7 @@ public class FieldsEditBean implements Serializable {@SuppressWarnings("unused")private static List<String> getFieldChoices() {- List<String> fields = new ArrayList<>(Issue.FIELD_PATHS.keySet());- fields.remove(Issue.FIELD_DESCRIPTION);+ List<String> fields = new ArrayList<>(IssueConstants.DISPLAY_FIELDS);ProjectPage page = (ProjectPage) WicketUtils.getPage();for (InputSpec field: page.getProject().getIssueWorkflow().getFieldSpecs())fields.add(field.getName());diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.javaindex c072c675cb..100a2bca7f 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java@@ -47,6 +47,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.IssueField;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.web.WebConstants;@@ -441,7 +442,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {for (String field: getProject().getIssueListFields()) {switch (field) {- case Issue.FIELD_NUMBER:+ case IssueConstants.FIELD_NUMBER:columns.add(new AbstractColumn<Issue, Void>(Model.of("#")) {@Override@@ -451,8 +452,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});break;- case Issue.FIELD_STATE:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_STATE)) {+ case IssueConstants.FIELD_STATE:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_STATE)) {@Overridepublic String getCssClass() {@@ -466,8 +467,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});break;- case Issue.FIELD_TITLE:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_TITLE)) {+ case IssueConstants.FIELD_TITLE:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_TITLE)) {@Overridepublic void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,@@ -484,8 +485,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});break;- case Issue.FIELD_SUBMITTER:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_SUBMITTER)) {+ case IssueConstants.FIELD_SUBMITTER:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_SUBMITTER)) {@Overridepublic String getCssClass() {@@ -504,8 +505,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});break;- case Issue.FIELD_SUBMIT_DATE:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_SUBMIT_DATE)) {+ case IssueConstants.FIELD_SUBMIT_DATE:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_SUBMIT_DATE)) {@Overridepublic void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,@@ -514,8 +515,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});break;- case Issue.FIELD_UPDATE_DATE:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_UPDATE_DATE)) {+ case IssueConstants.FIELD_UPDATE_DATE:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_UPDATE_DATE)) {@Overridepublic void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,@@ -524,8 +525,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});break;- case Issue.FIELD_MILESTONE:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_MILESTONE)) {+ case IssueConstants.FIELD_MILESTONE:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_MILESTONE)) {@Overridepublic void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,@@ -544,8 +545,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});break;- case Issue.FIELD_VOTE_COUNT:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_VOTE_COUNT)) {+ case IssueConstants.FIELD_VOTE_COUNT:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_VOTE_COUNT)) {@Overridepublic void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,@@ -554,8 +555,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});break;- case Issue.FIELD_COMMENT_COUNT:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_COMMENT_COUNT)) {+ case IssueConstants.FIELD_COMMENT_COUNT:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_COMMENT_COUNT)) {@Overridepublic void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,diff --git a/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.javaindex 4e0105d59e..9c975869e3 100644--- a/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java+++ b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java@@ -23,6 +23,7 @@ import com.google.common.collect.Sets;import io.onedev.server.entityquery.issue.IssueCriteria;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;@@ -99,7 +100,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementmilestoneChoice.setRequired(false);add(milestoneChoice);- Collection<String> excludedProperties = IssueFieldBeanUtils.getPropertyNames(fieldBeanClass, Sets.newHashSet(Issue.FIELD_STATE));+ Collection<String> excludedProperties = IssueFieldBeanUtils.getPropertyNames(fieldBeanClass, Sets.newHashSet(IssueConstants.FIELD_STATE));add(fieldEditor = new BeanContext(fieldBean.getClass(), excludedProperties).renderForEdit("fields", Model.of(fieldBean)));}diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 12a79ebaa3..9cc72c90ad 100644--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -64,6 +64,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.ProjectAndBranch;+import io.onedev.server.model.support.pullrequest.PullRequestConstants;import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.OnTypingDoneBehavior;@@ -625,7 +626,7 @@ public class ProjectBranchesPage extends ProjectPage {if (!pullRequestManager.findAllOpen(new ProjectAndBranch(getProject(), branch)).isEmpty()) {Fragment bodyFrag = new Fragment("body", "openRequestsFrag", ProjectBranchesPage.this);String query = String.format("\"%s\" %s \"%s\" %s %s",- PullRequest.FIELD_TARGET_BRANCH, PullRequestQuery.getRuleName(PullRequestQueryLexer.Is),+ PullRequestConstants.FIELD_TARGET_BRANCH, PullRequestQuery.getRuleName(PullRequestQueryLexer.Is),branch, PullRequestQuery.getRuleName(PullRequestQueryLexer.And),PullRequestQuery.getRuleName(PullRequestQueryLexer.Open));PageParameters params = RequestListPage.paramsOf(getProject(), query);diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.javaindex 2329d94c9c..fce67a19a6 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java@@ -32,6 +32,7 @@ import io.onedev.server.entityquery.issue.ChoiceFieldCriteria;import io.onedev.server.entityquery.issue.FieldOperatorCriteria;import io.onedev.server.entityquery.issue.IssueCriteria;import io.onedev.server.entityquery.issue.IssueQuery;+import io.onedev.server.entityquery.issue.IssueQueryLexer;import io.onedev.server.entityquery.issue.MilestoneCriteria;import io.onedev.server.entityquery.issue.StateCriteria;import io.onedev.server.manager.IssueActionManager;@@ -42,7 +43,7 @@ import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.IssueBoard;-import io.onedev.server.entityquery.issue.IssueQueryLexer;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.model.support.issue.workflow.TransitionSpec;import io.onedev.server.security.SecurityUtils;@@ -74,7 +75,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {if (getMilestone() != null)criterias.add(new MilestoneCriteria(getMilestone().getName()));String identifyField = getBoard().getIdentifyField();- if (identifyField.equals(Issue.FIELD_STATE)) {+ if (identifyField.equals(IssueConstants.FIELD_STATE)) {criterias.add(new StateCriteria(getColumn()));} else {if (getColumn() != null) {@@ -128,7 +129,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {// move issue between board columnsIssueWorkflow workflow = getProject().getIssueWorkflow();String identifyField = getBoard().getIdentifyField();- if (identifyField.equals(Issue.FIELD_STATE)) {+ if (identifyField.equals(IssueConstants.FIELD_STATE)) {issue = SerializationUtils.clone(issue);for (TransitionSpec transition: workflow.getTransitionSpecs()) {if (transition.canApplyTo(issue) && transition.getToState().equals(getColumn())) {@@ -185,7 +186,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {String identifyField = getBoard().getIdentifyField();if (getColumn() != null) {title = getColumn();- if (identifyField.equals(Issue.FIELD_STATE)) {+ if (identifyField.equals(IssueConstants.FIELD_STATE)) {color = workflow.getStateSpec(getColumn()).getColor();} else {InputSpec field = workflow.getFieldSpec(identifyField);@@ -274,7 +275,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {super.onConfigure();setVisible(getQuery() != null&& SecurityUtils.getUser() != null- && (!getBoard().getIdentifyField().equals(Issue.FIELD_STATE)+ && (!getBoard().getIdentifyField().equals(IssueConstants.FIELD_STATE)|| getColumn().equals(getProject().getIssueWorkflow().getInitialStateSpec().getName())));}@@ -328,7 +329,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {OneDev.getInstance(IssueActionManager.class).changeMilestone(issue, getMilestone());markAccepted(target, issue, true);checkMatched(target, issue);- } else if (fieldName.equals(Issue.FIELD_STATE)) {+ } else if (fieldName.equals(IssueConstants.FIELD_STATE)) {IssueWorkflow workflow = getProject().getIssueWorkflow();boolean canTransiteIssue = false;for (TransitionSpec transition: workflow.getTransitionSpecs()) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.javaindex 9b14ca81a3..1363ab00cf 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.issues.issueboards;+import static io.onedev.server.model.support.issue.IssueConstants.*;+import java.io.Serializable;import java.util.ArrayList;import java.util.List;@@ -54,16 +56,16 @@ abstract class CardDetailPanel extends GenericPanel<Issue> {add(new Label("title", getIssue().getTitle()));IssueWorkflow workflow = getIssue().getProject().getIssueWorkflow();- List<String> fieldNames = Lists.newArrayList(Issue.FIELD_STATE);- fieldNames.add(Issue.FIELD_SUBMITTER);- fieldNames.add(Issue.FIELD_SUBMIT_DATE);+ List<String> fieldNames = Lists.newArrayList(FIELD_STATE);+ fieldNames.add(FIELD_SUBMITTER);+ fieldNames.add(FIELD_SUBMIT_DATE);for (String fieldName: workflow.getFieldNames()) {if (getIssue().isFieldVisible(fieldName, getIssue().getState()))fieldNames.add(fieldName);}- fieldNames.add(Issue.FIELD_MILESTONE);- fieldNames.add(Issue.FIELD_COMMENT_COUNT);- fieldNames.add(Issue.FIELD_VOTE_COUNT);+ fieldNames.add(FIELD_MILESTONE);+ fieldNames.add(FIELD_COMMENT_COUNT);+ fieldNames.add(FIELD_VOTE_COUNT);if (fieldNames.size() % 2 != 0)fieldNames.add(null);@@ -95,16 +97,16 @@ abstract class CardDetailPanel extends GenericPanel<Issue> {private Component renderField(String componentId, String fieldName) {switch (fieldName) {- case Issue.FIELD_STATE:+ case FIELD_STATE:return new IssueStateLabel(componentId, CardDetailPanel.this.getModel());- case Issue.FIELD_SUBMITTER:+ case FIELD_SUBMITTER:Fragment fragment = new Fragment(componentId, "userFrag", CardDetailPanel.this);fragment.add(new UserLink("name", User.getForDisplay(getIssue().getSubmitter(), getIssue().getSubmitterName())));fragment.add(new AvatarLink("avatar", getIssue().getSubmitter()));return fragment;- case Issue.FIELD_SUBMIT_DATE:+ case FIELD_SUBMIT_DATE:return new Label(componentId, DateUtils.formatAge(getIssue().getSubmitDate()));- case Issue.FIELD_MILESTONE:+ case FIELD_MILESTONE:if (getIssue().getMilestone() != null) {return new BookmarkablePageLink<Void>(componentId, MilestoneDetailPage.class,MilestoneDetailPage.paramsOf(getIssue().getMilestone(), null)) {@@ -118,9 +120,9 @@ abstract class CardDetailPanel extends GenericPanel<Issue> {} else {return new Label(componentId, "<i>No milestone</i>").setEscapeModelStrings(false);}- case Issue.FIELD_COMMENT_COUNT:+ case FIELD_COMMENT_COUNT:return new Label(componentId, getIssue().getCommentCount());- case Issue.FIELD_VOTE_COUNT:+ case FIELD_VOTE_COUNT:return new Label(componentId, getIssue().getVoteCount());default:return new FieldValuesPanel(componentId) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.javaindex 4c5a4dede9..24ea3b483b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.java@@ -15,6 +15,7 @@ import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;import io.onedev.server.manager.IssueActionManager;import io.onedev.server.model.Issue;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.BeanContext;@@ -36,7 +37,7 @@ abstract class StateTransitionPanel extends Panel implements InputContext {Class<?> fieldBeanClass = IssueFieldBeanUtils.defineBeanClass(getIssue().getProject());Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);IssueFieldBeanUtils.setState(fieldBean, getTargetState());- Collection<String> excludedFields = Sets.newHashSet(Issue.FIELD_STATE);+ Collection<String> excludedFields = Sets.newHashSet(IssueConstants.FIELD_STATE);for (String fieldName: getIssue().getProject().getIssueWorkflow().getFieldNames()) {if (getIssue().isFieldVisible(fieldName, getIssue().getState()))excludedFields.add(fieldName);diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.javaindex c5f03d5b34..1b43f8363a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java@@ -66,6 +66,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.issue.IssueField;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.model.support.issue.workflow.TransitionSpec;import io.onedev.server.security.SecurityUtils;@@ -258,7 +259,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexSerializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);IssueFieldBeanUtils.setState(fieldBean, transition.getToState());- Collection<String> excludedFields = Sets.newHashSet(Issue.FIELD_STATE);+ Collection<String> excludedFields = Sets.newHashSet(IssueConstants.FIELD_STATE);for (String fieldName: getProject().getIssueWorkflow().getFieldNames()) {if (getIssue().isFieldVisible(fieldName, getIssue().getState()))excludedFields.add(fieldName);@@ -336,7 +337,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexList<String> criterias = new ArrayList<>();if (getIssue().getMilestone() != null)- criterias.add(IssueQuery.quote(Issue.FIELD_MILESTONE) + " is " + IssueQuery.quote(getIssue().getMilestoneName()));+ criterias.add(IssueQuery.quote(IssueConstants.FIELD_MILESTONE) + " is " + IssueQuery.quote(getIssue().getMilestoneName()));for (Map.Entry<String, IssueField> entry: getIssue().getFields().entrySet()) {List<String> strings = entry.getValue().getValues();if (strings.isEmpty()) {@@ -543,7 +544,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexClass<?> fieldBeanClass = IssueFieldBeanUtils.defineBeanClass(getProject());Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);- Collection<String> excludedFields = Sets.newHashSet(Issue.FIELD_STATE);+ Collection<String> excludedFields = Sets.newHashSet(IssueConstants.FIELD_STATE);form.add(BeanContext.editBean("editor", fieldBean, IssueFieldBeanUtils.getPropertyNames(fieldBeanClass, excludedFields)));form.add(new AjaxButton("save") {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedActivity.javaindex c08b07f56c..08de5abba6 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedActivity.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedActivity.java@@ -2,6 +2,7 @@ package io.onedev.server.web.page.project.issues.issuedetail.activities.activityimport java.util.Date;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;@@ -29,7 +30,14 @@ public class CommentedActivity implements IssueActivity {return getComment();}- }, deleteCallback);+ }, new DeleteCallback() {++ @Override+ public void onDelete(AjaxRequestTarget target) {+ OneDev.getInstance(IssueCommentManager.class).delete(getComment());+ deleteCallback.onDelete(target);+ }+ });}public Long getCommentId() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/CommentedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/CommentedActivity.javaindex df9ef5a2dd..09c375d89f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/CommentedActivity.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/activity/CommentedActivity.java@@ -3,6 +3,7 @@ package io.onedev.server.web.page.project.pullrequests.requestdetail.activities.import java.util.Date;import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;@@ -30,7 +31,14 @@ public class CommentedActivity implements PullRequestActivity {return getComment();}- }, deleteCallback);+ }, new DeleteCallback() {++ @Override+ public void onDelete(AjaxRequestTarget target) {+ OneDev.getInstance(PullRequestCommentManager.class).delete(getComment());+ deleteCallback.onDelete(target);+ }+ });}public PullRequestComment getComment() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.javaindex 8c4dc9e696..d8492d11b1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java@@ -14,8 +14,8 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;import io.onedev.server.manager.ProjectManager;-import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;@@ -147,7 +147,7 @@ abstract class FieldEditPanel extends Panel implements InputContext {@Overridepublic List<String> getInputNames() {List<String> inputNames = new ArrayList<>();- inputNames.add(Issue.FIELD_STATE);+ inputNames.add(IssueConstants.FIELD_STATE);int currentIndex = 0;for (InputSpec field: getWorkflow().getFieldSpecs()) {if (currentIndex != fieldIndex)@@ -164,11 +164,7 @@ abstract class FieldEditPanel extends Panel implements InputContext {@Overridepublic boolean isReservedName(String inputName) {- for (String displayName: Issue.FIELD_PATHS.keySet()) {- if (displayName.equals(inputName))- return true;- }- return false;+ return IssueConstants.ALL_FIELDS.contains(inputName);}}diff --git a/core/src/main/java/io/onedev/server/web/util/IssueFieldBeanUtils.java b/core/src/main/java/io/onedev/server/web/util/IssueFieldBeanUtils.javaindex 7018c3e53b..306d920965 100644--- a/core/src/main/java/io/onedev/server/web/util/IssueFieldBeanUtils.java+++ b/core/src/main/java/io/onedev/server/web/util/IssueFieldBeanUtils.java@@ -14,8 +14,8 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.exception.OneException;import io.onedev.server.manager.ProjectManager;-import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.IssueConstants;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.BeanDescriptor;@@ -51,7 +51,7 @@ public class IssueFieldBeanUtils {}public static void setState(Serializable fieldBean, String state) {- setFieldValue(fieldBean, Issue.FIELD_STATE, state);+ setFieldValue(fieldBean, IssueConstants.FIELD_STATE, state);}@Nullable