Skip to content

The Unified and Autonomous Development Platform

Minor refactoring of some constant names

Robin Shenb0debc7c0e79
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
index 64c0736222..53f3831a50 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
@@ -1,7 +1,7 @@
package io.onedev.server.buildspec.job;
-import static io.onedev.server.model.Build.FIELD_COMMIT;
-import static io.onedev.server.model.Build.FIELD_JOB;
+import static io.onedev.server.model.Build.NAME_COMMIT;
+import static io.onedev.server.model.Build.NAME_JOB;
import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;
import static io.onedev.server.search.entity.build.BuildQueryLexer.And;
import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;
@@ -490,9 +490,9 @@ public class Job implements Serializable, Validatable {
public static String getBuildQuery(ObjectId commitId, String jobName) {
return ""
- + Criteria.quote(FIELD_COMMIT) + " " + getRuleName(Is) + " " + Criteria.quote(commitId.name())
+ + Criteria.quote(NAME_COMMIT) + " " + getRuleName(Is) + " " + Criteria.quote(commitId.name())
+ " " + getRuleName(And) + " "
- + Criteria.quote(FIELD_JOB) + " " + getRuleName(Is) + " " + Criteria.quote(jobName);
+ + Criteria.quote(NAME_JOB) + " " + getRuleName(Is) + " " + Criteria.quote(jobName);
}
public static List<String> getChoices() {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java
index 629eb9ef6a..e8958f914c 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java
@@ -126,9 +126,9 @@ public class ActionCondition extends Criteria<Build> {
checkField(job, fieldName, operator);
switch (fieldName) {
- case Build.FIELD_LOG:
+ case Build.NAME_LOG:
return new LogCriteria(fieldValue);
- case Build.FIELD_ERROR_MESSAGE:
+ case Build.NAME_ERROR_MESSAGE:
return new ErrorMessageCriteria(fieldValue);
default:
return new ParamCriteria(fieldName, fieldValue);
@@ -168,7 +168,7 @@ public class ActionCondition extends Criteria<Build> {
}
public static void checkField(Job job, String fieldName, int operator) {
- if (fieldName.equals(Build.FIELD_ERROR_MESSAGE) || fieldName.equals(Build.FIELD_LOG)) {
+ if (fieldName.equals(Build.NAME_ERROR_MESSAGE) || fieldName.equals(Build.NAME_LOG)) {
if (operator != ActionConditionLexer.Contains)
throw newOperatorException(fieldName, operator);
} else if (job.getParamSpecMap().containsKey(fieldName)) {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ErrorMessageCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ErrorMessageCriteria.java
index 56b29b0512..db808bfeef 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ErrorMessageCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ErrorMessageCriteria.java
@@ -22,7 +22,7 @@ public class ErrorMessageCriteria extends Criteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(Build.FIELD_ERROR_MESSAGE) + " "
+ return quote(Build.NAME_ERROR_MESSAGE) + " "
+ ActionCondition.getRuleName(ActionConditionLexer.Contains) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java
index a2e8206ce0..1e05043962 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java
@@ -25,7 +25,7 @@ public class LogCriteria extends Criteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(Build.FIELD_LOG) + " "
+ return quote(Build.NAME_LOG) + " "
+ ActionCondition.getRuleName(ActionConditionLexer.Contains) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ErrorMessageCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ErrorMessageCriteria.java
index 877ad80dfd..947e49c483 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ErrorMessageCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ErrorMessageCriteria.java
@@ -22,7 +22,7 @@ public class ErrorMessageCriteria extends Criteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(Build.FIELD_ERROR_MESSAGE) + " "
+ return quote(Build.NAME_ERROR_MESSAGE) + " "
+ RetryCondition.getRuleName(RetryConditionLexer.Contains) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java
index 00c59df896..27352e869c 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java
@@ -25,7 +25,7 @@ public class LogCriteria extends Criteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(Build.FIELD_LOG) + " "
+ return quote(Build.NAME_LOG) + " "
+ RetryCondition.getRuleName(RetryConditionLexer.Contains) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java
index 52c31a797e..e202df3f1f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java
@@ -95,9 +95,9 @@ public class RetryCondition extends Criteria<Build> {
checkField(job, fieldName, operator);
switch (fieldName) {
- case Build.FIELD_LOG:
+ case Build.NAME_LOG:
return new LogCriteria(fieldValue);
- case Build.FIELD_ERROR_MESSAGE:
+ case Build.NAME_ERROR_MESSAGE:
return new ErrorMessageCriteria(fieldValue);
default:
return new ParamCriteria(fieldName, fieldValue);
@@ -132,7 +132,7 @@ public class RetryCondition extends Criteria<Build> {
}
public static void checkField(Job job, String fieldName, int operator) {
- if (fieldName.equals(Build.FIELD_ERROR_MESSAGE) || fieldName.equals(Build.FIELD_LOG)) {
+ if (fieldName.equals(Build.NAME_ERROR_MESSAGE) || fieldName.equals(Build.NAME_LOG)) {
if (operator != RetryConditionLexer.Contains)
throw newOperatorException(fieldName, operator);
} else if (job.getParamSpecMap().containsKey(fieldName)) {
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index 2b0db6a858..802bc2bb52 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -100,96 +100,96 @@ public class Build extends AbstractEntity implements Referenceable {
public static final String PROP_NUMBER_SCOPE = "numberScope";
- public static final String FIELD_NUMBER = "Number";
+ public static final String NAME_NUMBER = "Number";
public static final String PROP_NUMBER = "number";
- public static final String FIELD_VERSION = "Version";
+ public static final String NAME_VERSION = "Version";
public static final String PROP_VERSION = "version";
- public static final String FIELD_PROJECT = "Project";
+ public static final String NAME_PROJECT = "Project";
public static final String PROP_PROJECT = "project";
- public static final String FIELD_JOB = "Job";
+ public static final String NAME_JOB = "Job";
public static final String PROP_JOB = "jobName";
- public static final String FIELD_IMAGE = "Image";
+ public static final String NAME_IMAGE = "Image";
- public static final String FIELD_STATUS = "Status";
+ public static final String NAME_STATUS = "Status";
public static final String PROP_STATUS = "status";
- public static final String FIELD_SUBMITTER = "Submitter";
+ public static final String NAME_SUBMITTER = "Submitter";
public static final String PROP_SUBMITTER = "submitter";
public static final String PROP_SUBMITTER_NAME = "submitterName";
- public static final String FIELD_CANCELLER = "Canceller";
+ public static final String NAME_CANCELLER = "Canceller";
public static final String PROP_CANCELLER = "canceller";
public static final String PROP_CANCELLER_NAME = "cancellerName";
- public static final String FIELD_SUBMIT_DATE = "Submit Date";
+ public static final String NAME_SUBMIT_DATE = "Submit Date";
public static final String PROP_SUBMIT_DATE = "submitDate";
- public static final String FIELD_PENDING_DATE = "Pending Date";
+ public static final String NAME_PENDING_DATE = "Pending Date";
public static final String PROP_PENDING_DATE = "pendingDate";
- public static final String FIELD_RUNNING_DATE = "Running Date";
+ public static final String NAME_RUNNING_DATE = "Running Date";
public static final String PROP_RUNNING_DATE = "runningDate";
- public static final String FIELD_FINISH_DATE = "Finish Date";
+ public static final String NAME_FINISH_DATE = "Finish Date";
public static final String PROP_FINISH_DATE = "finishDate";
- public static final String FIELD_COMMIT = "Commit";
+ public static final String NAME_COMMIT = "Commit";
public static final String PROP_COMMIT = "commitHash";
public static final String PROP_PARAMS = "params";
- public static final String FIELD_DEPENDENCIES = "Dependencies";
+ public static final String NAME_DEPENDENCIES = "Dependencies";
public static final String PROP_DEPENDENCIES = "dependencies";
- public static final String FIELD_DEPENDENTS = "Dependents";
+ public static final String NAME_DEPENDENTS = "Dependents";
public static final String PROP_DEPENDENTS = "dependents";
public static final String PROP_PULL_REQUEST_BUILDS = "pullRequestBuilds";
- public static final String FIELD_ERROR_MESSAGE = "Error Message";
+ public static final String NAME_ERROR_MESSAGE = "Error Message";
- public static final String FIELD_LOG = "Log";
+ public static final String NAME_LOG = "Log";
public static final Set<String> ALL_FIELDS = Sets.newHashSet(
- FIELD_PROJECT, FIELD_NUMBER, FIELD_JOB, FIELD_STATUS, FIELD_SUBMITTER, FIELD_CANCELLER,
- FIELD_SUBMIT_DATE, FIELD_PENDING_DATE, FIELD_RUNNING_DATE, FIELD_FINISH_DATE,
- FIELD_COMMIT, FIELD_VERSION, FIELD_DEPENDENCIES, FIELD_DEPENDENTS, FIELD_ERROR_MESSAGE,
- FIELD_LOG, FIELD_IMAGE);
+ NAME_PROJECT, NAME_NUMBER, NAME_JOB, NAME_STATUS, NAME_SUBMITTER, NAME_CANCELLER,
+ NAME_SUBMIT_DATE, NAME_PENDING_DATE, NAME_RUNNING_DATE, NAME_FINISH_DATE,
+ NAME_COMMIT, NAME_VERSION, NAME_DEPENDENCIES, NAME_DEPENDENTS, NAME_ERROR_MESSAGE,
+ NAME_LOG, NAME_IMAGE);
public static final List<String> QUERY_FIELDS = Lists.newArrayList(
- FIELD_PROJECT, FIELD_JOB, FIELD_NUMBER, FIELD_VERSION, FIELD_COMMIT, FIELD_SUBMIT_DATE,
- FIELD_PENDING_DATE, FIELD_RUNNING_DATE, FIELD_FINISH_DATE);
+ NAME_PROJECT, NAME_JOB, NAME_NUMBER, NAME_VERSION, NAME_COMMIT, NAME_SUBMIT_DATE,
+ NAME_PENDING_DATE, NAME_RUNNING_DATE, NAME_FINISH_DATE);
public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(
- FIELD_JOB, PROP_JOB,
- FIELD_STATUS, PROP_STATUS,
- FIELD_NUMBER, PROP_NUMBER,
- FIELD_SUBMIT_DATE, PROP_SUBMIT_DATE,
- FIELD_PENDING_DATE, PROP_PENDING_DATE,
- FIELD_RUNNING_DATE, PROP_RUNNING_DATE,
- FIELD_FINISH_DATE, PROP_FINISH_DATE,
- FIELD_PROJECT, PROP_PROJECT,
- FIELD_COMMIT, PROP_COMMIT);
+ NAME_JOB, PROP_JOB,
+ NAME_STATUS, PROP_STATUS,
+ NAME_NUMBER, PROP_NUMBER,
+ NAME_SUBMIT_DATE, PROP_SUBMIT_DATE,
+ NAME_PENDING_DATE, PROP_PENDING_DATE,
+ NAME_RUNNING_DATE, PROP_RUNNING_DATE,
+ NAME_FINISH_DATE, PROP_FINISH_DATE,
+ NAME_PROJECT, PROP_PROJECT,
+ NAME_COMMIT, PROP_COMMIT);
private static ThreadLocal<Stack<Build>> stack = new ThreadLocal<Stack<Build>>() {
diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
index 5499040360..26f61d2f07 100644
--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java
+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
@@ -58,25 +58,25 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupp
public static final String PROP_PROJECT = "project";
- public static final String FIELD_CONTENT = "Content";
+ public static final String NAME_CONTENT = "Content";
public static final String PROP_CONTENT = "content";
- public static final String FIELD_REPLY = "Reply";
+ public static final String NAME_REPLY = "Reply";
- public static final String FIELD_PATH = "Path";
+ public static final String NAME_PATH = "Path";
public static final String PROP_MARK_POS = "markPos";
- public static final String FIELD_REPLY_COUNT = "Reply Count";
+ public static final String NAME_REPLY_COUNT = "Reply Count";
public static final String PROP_REPLY_COUNT = "replyCount";
- public static final String FIELD_CREATE_DATE = "Create Date";
+ public static final String NAME_CREATE_DATE = "Create Date";
public static final String PROP_CREATE_DATE = "createDate";
- public static final String FIELD_UPDATE_DATE = "Update Date";
+ public static final String NAME_UPDATE_DATE = "Update Date";
public static final String PROP_LAST_UPDATE = "lastUpdate";
@@ -89,12 +89,12 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupp
public static final String PROP_ID = "id";
public static final List<String> QUERY_FIELDS = Lists.newArrayList(
- FIELD_CONTENT, FIELD_REPLY, FIELD_PATH, FIELD_CREATE_DATE, FIELD_UPDATE_DATE, FIELD_REPLY_COUNT);
+ NAME_CONTENT, NAME_REPLY, NAME_PATH, NAME_CREATE_DATE, NAME_UPDATE_DATE, NAME_REPLY_COUNT);
public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(
- FIELD_CREATE_DATE, PROP_CREATE_DATE,
- FIELD_UPDATE_DATE, PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE,
- FIELD_REPLY_COUNT, PROP_REPLY_COUNT);
+ NAME_CREATE_DATE, PROP_CREATE_DATE,
+ NAME_UPDATE_DATE, PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE,
+ NAME_REPLY_COUNT, PROP_REPLY_COUNT);
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index afad20fdb3..2b31a67449 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -94,51 +94,51 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
public static final String PROP_NUMBER_SCOPE = "numberScope";
- public static final String FIELD_NUMBER = "Number";
+ public static final String NAME_NUMBER = "Number";
public static final String PROP_NUMBER = "number";
- public static final String FIELD_PROJECT = "Project";
+ public static final String NAME_PROJECT = "Project";
public static final String PROP_PROJECT = "project";
- public static final String FIELD_STATE = "State";
+ public static final String NAME_STATE = "State";
public static final String PROP_STATE = "state";
- public static final String FIELD_TITLE = "Title";
+ public static final String NAME_TITLE = "Title";
public static final String PROP_TITLE = "title";
- public static final String FIELD_DESCRIPTION = "Description";
+ public static final String NAME_DESCRIPTION = "Description";
public static final String PROP_DESCRIPTION = "description";
- public static final String FIELD_COMMENT = "Comment";
+ public static final String NAME_COMMENT = "Comment";
public static final String PROP_COMMENTS = "comments";
- public static final String FIELD_SUBMITTER = "Submitter";
+ public static final String NAME_SUBMITTER = "Submitter";
public static final String PROP_SUBMITTER = "submitter";
- public static final String FIELD_SUBMIT_DATE = "Submit Date";
+ public static final String NAME_SUBMIT_DATE = "Submit Date";
public static final String PROP_SUBMIT_DATE = "submitDate";
- public static final String FIELD_VOTE_COUNT = "Vote Count";
+ public static final String NAME_VOTE_COUNT = "Vote Count";
public static final String PROP_VOTE_COUNT = "voteCount";
- public static final String FIELD_COMMENT_COUNT = "Comment Count";
+ public static final String NAME_COMMENT_COUNT = "Comment Count";
public static final String PROP_COMMENT_COUNT = "commentCount";
- public static final String FIELD_UPDATE_DATE = "Update Date";
+ public static final String NAME_UPDATE_DATE = "Update Date";
public static final String PROP_LAST_UPDATE = "lastUpdate";
- public static final String FIELD_MILESTONE = "Milestone";
+ public static final String NAME_MILESTONE = "Milestone";
public static final String PROP_MILESTONE = "milestone";
@@ -149,22 +149,22 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
public static final String PROP_NO_SPACE_TITLE = "noSpaceTitle";
public static final Set<String> ALL_FIELDS = Sets.newHashSet(
- FIELD_PROJECT, FIELD_NUMBER, FIELD_STATE, FIELD_TITLE, FIELD_SUBMITTER,
- FIELD_DESCRIPTION, FIELD_COMMENT, FIELD_SUBMIT_DATE, FIELD_UPDATE_DATE,
- FIELD_VOTE_COUNT, FIELD_COMMENT_COUNT, FIELD_MILESTONE);
+ NAME_PROJECT, NAME_NUMBER, NAME_STATE, NAME_TITLE, NAME_SUBMITTER,
+ NAME_DESCRIPTION, NAME_COMMENT, NAME_SUBMIT_DATE, NAME_UPDATE_DATE,
+ NAME_VOTE_COUNT, NAME_COMMENT_COUNT, NAME_MILESTONE);
public static final List<String> QUERY_FIELDS = Lists.newArrayList(
- FIELD_PROJECT, FIELD_NUMBER, FIELD_STATE, FIELD_TITLE, FIELD_DESCRIPTION,
- FIELD_COMMENT, FIELD_SUBMIT_DATE, FIELD_UPDATE_DATE, FIELD_VOTE_COUNT,
- FIELD_COMMENT_COUNT, FIELD_MILESTONE);
+ NAME_PROJECT, NAME_NUMBER, NAME_STATE, NAME_TITLE, NAME_DESCRIPTION,
+ NAME_COMMENT, NAME_SUBMIT_DATE, NAME_UPDATE_DATE, NAME_VOTE_COUNT,
+ NAME_COMMENT_COUNT, NAME_MILESTONE);
public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(
- FIELD_VOTE_COUNT, PROP_VOTE_COUNT,
- FIELD_COMMENT_COUNT, PROP_COMMENT_COUNT,
- FIELD_NUMBER, PROP_NUMBER,
- FIELD_SUBMIT_DATE, PROP_SUBMIT_DATE,
- FIELD_PROJECT, PROP_PROJECT,
- FIELD_UPDATE_DATE, PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
+ NAME_VOTE_COUNT, PROP_VOTE_COUNT,
+ NAME_COMMENT_COUNT, PROP_COMMENT_COUNT,
+ NAME_NUMBER, PROP_NUMBER,
+ NAME_SUBMIT_DATE, PROP_SUBMIT_DATE,
+ NAME_PROJECT, PROP_PROJECT,
+ NAME_UPDATE_DATE, PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
@Column(nullable=false)
private String state;
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 05f0699377..1ac768a7aa 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -135,15 +135,15 @@ public class Project extends AbstractEntity {
private static final long serialVersionUID = 1L;
- public static final String FIELD_NAME = "Name";
+ public static final String NAME_NAME = "Name";
public static final String PROP_NAME = "name";
- public static final String FIELD_UPDATE_DATE = "Update Date";
+ public static final String NAME_UPDATE_DATE = "Update Date";
public static final String PROP_UPDATE_DATE = "updateDate";
- public static final String FIELD_DESCRIPTION = "Description";
+ public static final String NAME_DESCRIPTION = "Description";
public static final String PROP_DESCRIPTION = "description";
@@ -156,11 +156,11 @@ public class Project extends AbstractEntity {
public static final String PROP_GROUP_AUTHORIZATIONS = "groupAuthorizations";
public static final List<String> QUERY_FIELDS =
- Lists.newArrayList(FIELD_NAME, FIELD_DESCRIPTION, FIELD_UPDATE_DATE);
+ Lists.newArrayList(NAME_NAME, NAME_DESCRIPTION, NAME_UPDATE_DATE);
public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(
- FIELD_NAME, PROP_NAME,
- FIELD_UPDATE_DATE, PROP_UPDATE_DATE);
+ NAME_NAME, PROP_NAME,
+ NAME_UPDATE_DATE, PROP_UPDATE_DATE);
private static final int LAST_COMMITS_CACHE_THRESHOLD = 1000;
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 7b38cbf68d..34da276a44 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -97,61 +97,61 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
public static final String PROP_NUMBER_SCOPE = "numberScope";
- public static final String FIELD_NUMBER = "Number";
+ public static final String NAME_NUMBER = "Number";
public static final String PROP_NUMBER = "number";
- public static final String FIELD_STATUS = "Status";
+ public static final String NAME_STATUS = "Status";
- public static final String FIELD_TARGET_PROJECT = "Target Project";
+ public static final String NAME_TARGET_PROJECT = "Target Project";
public static final String PROP_TARGET_PROJECT = "targetProject";
- public static final String FIELD_TARGET_BRANCH = "Target Branch";
+ public static final String NAME_TARGET_BRANCH = "Target Branch";
public static final String PROP_TARGET_BRANCH = "targetBranch";
- public static final String FIELD_SOURCE_PROJECT = "Source Project";
+ public static final String NAME_SOURCE_PROJECT = "Source Project";
public static final String PROP_SOURCE_PROJECT = "sourceProject";
- public static final String FIELD_SOURCE_BRANCH = "Source Branch";
+ public static final String NAME_SOURCE_BRANCH = "Source Branch";
public static final String PROP_SOURCE_BRANCH = "sourceBranch";
- public static final String FIELD_TITLE = "Title";
+ public static final String NAME_TITLE = "Title";
public static final String PROP_TITLE = "title";
- public static final String FIELD_DESCRIPTION = "Description";
+ public static final String NAME_DESCRIPTION = "Description";
public static final String PROP_DESCRIPTION = "description";
- public static final String FIELD_COMMENT = "Comment";
+ public static final String NAME_COMMENT = "Comment";
public static final String PROP_COMMENTS = "comments";
public static final String PROP_CODE_COMMENT_RELATIONS = "codeCommentRelations";
- public static final String FIELD_COMMENT_COUNT = "Comment Count";
+ public static final String NAME_COMMENT_COUNT = "Comment Count";
public static final String PROP_COMMENT_COUNT = "commentCount";
- public static final String FIELD_SUBMITTER = "Submitter";
+ public static final String NAME_SUBMITTER = "Submitter";
public static final String PROP_SUBMITTER = "submitter";
- public static final String FIELD_SUBMIT_DATE = "Submit Date";
+ public static final String NAME_SUBMIT_DATE = "Submit Date";
public static final String PROP_SUBMIT_DATE = "submitDate";
- public static final String FIELD_UPDATE_DATE = "Update Date";
+ public static final String NAME_UPDATE_DATE = "Update Date";
public static final String PROP_LAST_UPDATE = "lastUpdate";
- public static final String FIELD_CLOSE_DATE = "Close Date";
+ public static final String NAME_CLOSE_DATE = "Close Date";
- public static final String FIELD_MERGE_STRATEGY = "Merge Strategy";
+ public static final String NAME_MERGE_STRATEGY = "Merge Strategy";
public static final String PROP_MERGE_STRATEGY = "mergeStrategy";
@@ -180,22 +180,22 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
private static final int MAX_CHECK_ERROR_LEN = 1024;
public static final List<String> QUERY_FIELDS = Lists.newArrayList(
- FIELD_NUMBER, FIELD_TITLE, FIELD_TARGET_PROJECT, FIELD_TARGET_BRANCH,
- FIELD_SOURCE_PROJECT, FIELD_SOURCE_BRANCH, FIELD_DESCRIPTION,
- FIELD_COMMENT, FIELD_SUBMIT_DATE, FIELD_UPDATE_DATE,
- FIELD_CLOSE_DATE, FIELD_MERGE_STRATEGY, FIELD_COMMENT_COUNT);
+ NAME_NUMBER, NAME_TITLE, NAME_TARGET_PROJECT, NAME_TARGET_BRANCH,
+ NAME_SOURCE_PROJECT, NAME_SOURCE_BRANCH, NAME_DESCRIPTION,
+ NAME_COMMENT, NAME_SUBMIT_DATE, NAME_UPDATE_DATE,
+ NAME_CLOSE_DATE, NAME_MERGE_STRATEGY, NAME_COMMENT_COUNT);
public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(
- FIELD_SUBMIT_DATE, PROP_SUBMIT_DATE,
- FIELD_UPDATE_DATE, PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE,
- FIELD_CLOSE_DATE, PROP_CLOSE_INFO + "." + CloseInfo.PROP_DATE,
- FIELD_NUMBER, PROP_NUMBER,
- FIELD_STATUS, PROP_CLOSE_INFO + "." + CloseInfo.PROP_STATUS,
- FIELD_TARGET_PROJECT, PROP_TARGET_PROJECT,
- FIELD_TARGET_BRANCH, PROP_TARGET_BRANCH,
- FIELD_SOURCE_PROJECT, PROP_SOURCE_PROJECT,
- FIELD_SOURCE_BRANCH, PROP_SOURCE_BRANCH,
- FIELD_COMMENT_COUNT, PROP_COMMENT_COUNT);
+ NAME_SUBMIT_DATE, PROP_SUBMIT_DATE,
+ NAME_UPDATE_DATE, PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE,
+ NAME_CLOSE_DATE, PROP_CLOSE_INFO + "." + CloseInfo.PROP_DATE,
+ NAME_NUMBER, PROP_NUMBER,
+ NAME_STATUS, PROP_CLOSE_INFO + "." + CloseInfo.PROP_STATUS,
+ NAME_TARGET_PROJECT, PROP_TARGET_PROJECT,
+ NAME_TARGET_BRANCH, PROP_TARGET_BRANCH,
+ NAME_SOURCE_PROJECT, PROP_SOURCE_PROJECT,
+ NAME_SOURCE_BRANCH, PROP_SOURCE_BRANCH,
+ NAME_COMMENT_COUNT, PROP_COMMENT_COUNT);
private static ThreadLocal<Stack<PullRequest>> stack = new ThreadLocal<Stack<PullRequest>>() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index 502c2c24b8..f5b3895a48 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -234,13 +234,13 @@ public class GlobalIssueSetting implements Serializable {
promptFieldsUponIssueOpen.add("Failed Build");
BoardSpec board = new BoardSpec();
- board.setName(Issue.FIELD_STATE);
- board.setIdentifyField(Issue.FIELD_STATE);
+ board.setName(Issue.NAME_STATE);
+ board.setIdentifyField(Issue.NAME_STATE);
board.setColumns(Lists.newArrayList("Open", "Closed", "Released"));
- board.setDisplayFields(Lists.newArrayList(Issue.FIELD_STATE, "Type", "Priority", "Assignees"));
+ board.setDisplayFields(Lists.newArrayList(Issue.NAME_STATE, "Type", "Priority", "Assignees"));
boardSpecs.add(board);
- listFields.add(Issue.FIELD_STATE);
+ listFields.add(Issue.NAME_STATE);
listFields.add("Type");
listFields.add("Priority");
listFields.add("Assignees");
@@ -363,7 +363,7 @@ public class GlobalIssueSetting implements Serializable {
public Collection<String> getUndefinedFields() {
Collection<String> undefinedFields = new HashSet<>();
for (String fieldName: listFields) {
- if (!fieldName.equals(Issue.FIELD_STATE) && getFieldSpec(fieldName) == null)
+ if (!fieldName.equals(Issue.NAME_STATE) && getFieldSpec(fieldName) == null)
undefinedFields.add(fieldName);
}
for (String fieldName: promptFieldsUponIssueOpen) {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
index 154a6435e3..4f063b5165 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
@@ -55,7 +55,7 @@ public class BoardSpec implements Serializable {
private List<String> columns = new ArrayList<>();
- private List<String> displayFields = Lists.newArrayList(Issue.FIELD_STATE);
+ private List<String> displayFields = Lists.newArrayList(Issue.NAME_STATE);
private List<String> editColumns;
@@ -152,7 +152,7 @@ public class BoardSpec implements Serializable {
@SuppressWarnings("unused")
private static List<String> getIdentifyFieldChoices() {
List<String> choices = new ArrayList<>();
- choices.add(Issue.FIELD_STATE);
+ choices.add(Issue.NAME_STATE);
for (FieldSpec fieldSpec: getIssueSetting().getFieldSpecs()) {
if (!fieldSpec.isAllowMultiple() && (fieldSpec instanceof ChoiceField || fieldSpec instanceof UserChoiceField || fieldSpec instanceof GroupChoiceField))
choices.add(fieldSpec.getName());
@@ -163,7 +163,7 @@ public class BoardSpec implements Serializable {
@SuppressWarnings("unused")
private static List<String> getDisplayFieldsChoices() {
List<String> choices = new ArrayList<>();
- choices.add(Issue.FIELD_STATE);
+ choices.add(Issue.NAME_STATE);
for (FieldSpec fieldSpec: getIssueSetting().getFieldSpecs()) {
choices.add(fieldSpec.getName());
}
@@ -174,7 +174,7 @@ public class BoardSpec implements Serializable {
private static Map<String, String> getColumnChoices() {
Map<String, String> choices = new LinkedHashMap<>();
String fieldName = (String) EditContext.get().getInputValue("identifyField");
- if (Issue.FIELD_STATE.equals(fieldName)) {
+ if (Issue.NAME_STATE.equals(fieldName)) {
for (StateSpec state: getIssueSetting().getStateSpecs())
choices.put(state.getName(), state.getName());
} else if (fieldName != null) {
@@ -206,7 +206,7 @@ public class BoardSpec implements Serializable {
undefinedStates.addAll(getUndefinedStates(project, getBaseQuery()));
undefinedStates.addAll(getUndefinedStates(project, getBacklogBaseQuery()));
- if (getIdentifyField().equals(Issue.FIELD_STATE)) {
+ if (getIdentifyField().equals(Issue.NAME_STATE)) {
for (String column: getColumns()) {
if (getIssueSetting().getStateSpec(column) == null)
undefinedStates.add(column);
@@ -231,13 +231,13 @@ public class BoardSpec implements Serializable {
Set<String> undefinedFields = new HashSet<>();
undefinedFields.addAll(getUndefinedFields(project, getBaseQuery()));
undefinedFields.addAll(getUndefinedFields(project, getBacklogBaseQuery()));
- if (!Issue.FIELD_STATE.equals(getIdentifyField())) {
+ if (!Issue.NAME_STATE.equals(getIdentifyField())) {
FieldSpec fieldSpec = getIssueSetting().getFieldSpec(getIdentifyField());
if (fieldSpec == null)
undefinedFields.add(getIdentifyField());
}
for (String displayField: getDisplayFields()) {
- if (!Issue.FIELD_STATE.equals(displayField)) {
+ if (!Issue.NAME_STATE.equals(displayField)) {
FieldSpec fieldSpec = getIssueSetting().getFieldSpec(displayField);
if (fieldSpec == null)
undefinedFields.add(displayField);
@@ -260,7 +260,7 @@ public class BoardSpec implements Serializable {
public Collection<UndefinedFieldValue> getUndefinedFieldValues(@Nullable Project project) {
Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
- if (!identifyField.equals(Issue.FIELD_STATE)) {
+ if (!identifyField.equals(Issue.NAME_STATE)) {
SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getIssueSetting().getFieldSpec(identifyField));
if (specifiedChoices != null) {
for (String column: getColumns()) {
@@ -290,7 +290,7 @@ public class BoardSpec implements Serializable {
public boolean fixUndefinedStates(@Nullable Project project, Map<String, UndefinedStateResolution> resolutions) {
setBaseQuery(fixUndefinedStates(project, resolutions, getBaseQuery()));
setBacklogBaseQuery(fixUndefinedStates(project, resolutions, getBacklogBaseQuery()));
- if (getIdentifyField().equals(Issue.FIELD_STATE)) {
+ if (getIdentifyField().equals(Issue.NAME_STATE)) {
for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {
if (entry.getValue().getFixType() == UndefinedStateResolution.FixType.CHANGE_TO_ANOTHER_STATE)
ReconcileUtils.renameItem(getColumns(), entry.getKey(), entry.getValue().getNewState());
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
index 0d61f3d725..3e4620e33d 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
@@ -129,7 +129,7 @@ public class ProjectIssueSetting implements Serializable {
Set<String> undefinedFields = new HashSet<>();
if (listFields != null) {
for (String fieldName: listFields) {
- if (!fieldName.equals(Issue.FIELD_STATE) && getGlobalSetting().getFieldSpec(fieldName) == null)
+ if (!fieldName.equals(Issue.NAME_STATE) && getGlobalSetting().getFieldSpec(fieldName) == null)
undefinedFields.add(fieldName);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
index 1fd2bff202..e47e083204 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
@@ -1,14 +1,14 @@
package io.onedev.server.search.entity.build;
-import static io.onedev.server.model.Build.FIELD_COMMIT;
-import static io.onedev.server.model.Build.FIELD_FINISH_DATE;
-import static io.onedev.server.model.Build.FIELD_JOB;
-import static io.onedev.server.model.Build.FIELD_NUMBER;
-import static io.onedev.server.model.Build.FIELD_PENDING_DATE;
-import static io.onedev.server.model.Build.FIELD_PROJECT;
-import static io.onedev.server.model.Build.FIELD_RUNNING_DATE;
-import static io.onedev.server.model.Build.FIELD_SUBMIT_DATE;
-import static io.onedev.server.model.Build.FIELD_VERSION;
+import static io.onedev.server.model.Build.NAME_COMMIT;
+import static io.onedev.server.model.Build.NAME_FINISH_DATE;
+import static io.onedev.server.model.Build.NAME_JOB;
+import static io.onedev.server.model.Build.NAME_NUMBER;
+import static io.onedev.server.model.Build.NAME_PENDING_DATE;
+import static io.onedev.server.model.Build.NAME_PROJECT;
+import static io.onedev.server.model.Build.NAME_RUNNING_DATE;
+import static io.onedev.server.model.Build.NAME_SUBMIT_DATE;
+import static io.onedev.server.model.Build.NAME_VERSION;
import static io.onedev.server.model.Build.ORDER_FIELDS;
import static io.onedev.server.model.Build.QUERY_FIELDS;
@@ -169,7 +169,7 @@ public class BuildQuery extends EntityQuery<Build> {
String fieldName = getValue(ctx.Quoted().getText());
int operator = ctx.operator.getType();
checkField(project, fieldName, operator);
- if (fieldName.equals(FIELD_VERSION))
+ if (fieldName.equals(NAME_VERSION))
return new VersionIsEmptyCriteria();
else
return new ParamIsEmptyCriteria(fieldName);
@@ -185,28 +185,28 @@ public class BuildQuery extends EntityQuery<Build> {
switch (operator) {
case BuildQueryLexer.IsBefore:
case BuildQueryLexer.IsAfter:
- if (fieldName.equals(FIELD_SUBMIT_DATE))
+ if (fieldName.equals(NAME_SUBMIT_DATE))
return new SubmitDateCriteria(value, operator);
- else if (fieldName.equals(FIELD_PENDING_DATE))
+ else if (fieldName.equals(NAME_PENDING_DATE))
return new PendingDateCriteria(value, operator);
- else if (fieldName.equals(FIELD_RUNNING_DATE))
+ else if (fieldName.equals(NAME_RUNNING_DATE))
return new RunningDateCriteria(value, operator);
- else if (fieldName.equals(FIELD_FINISH_DATE))
+ else if (fieldName.equals(NAME_FINISH_DATE))
return new FinishDateCriteria(value, operator);
else
throw new IllegalStateException();
case BuildQueryLexer.Is:
switch (fieldName) {
- case FIELD_PROJECT:
+ case NAME_PROJECT:
return new ProjectCriteria(value);
- case FIELD_COMMIT:
+ case NAME_COMMIT:
ProjectScopedCommit commitId = getCommitId(project, value);
return new CommitCriteria(commitId.getProject(), commitId.getCommitId());
- case FIELD_JOB:
+ case NAME_JOB:
return new JobCriteria(value);
- case FIELD_NUMBER:
+ case NAME_NUMBER:
return new NumberCriteria(project, value, operator);
- case FIELD_VERSION:
+ case NAME_VERSION:
return new VersionCriteria(value);
default:
return new ParamCriteria(fieldName, value);
@@ -273,26 +273,26 @@ public class BuildQuery extends EntityQuery<Build> {
switch (operator) {
case BuildQueryLexer.IsBefore:
case BuildQueryLexer.IsAfter:
- if (!fieldName.equals(FIELD_SUBMIT_DATE)
- && !fieldName.equals(FIELD_PENDING_DATE)
- && !fieldName.equals(FIELD_RUNNING_DATE)
- && !fieldName.equals(FIELD_FINISH_DATE))
+ if (!fieldName.equals(NAME_SUBMIT_DATE)
+ && !fieldName.equals(NAME_PENDING_DATE)
+ && !fieldName.equals(NAME_RUNNING_DATE)
+ && !fieldName.equals(NAME_FINISH_DATE))
throw newOperatorException(fieldName, operator);
break;
case BuildQueryLexer.Is:
- if (!fieldName.equals(FIELD_PROJECT) && !fieldName.equals(FIELD_COMMIT)
- && !fieldName.equals(FIELD_JOB) && !fieldName.equals(FIELD_NUMBER)
- && !fieldName.equals(FIELD_VERSION) && !paramNames.contains(fieldName)) {
+ if (!fieldName.equals(NAME_PROJECT) && !fieldName.equals(NAME_COMMIT)
+ && !fieldName.equals(NAME_JOB) && !fieldName.equals(NAME_NUMBER)
+ && !fieldName.equals(NAME_VERSION) && !paramNames.contains(fieldName)) {
throw newOperatorException(fieldName, operator);
}
break;
case BuildQueryLexer.IsEmpty:
- if (!fieldName.equals(FIELD_VERSION) && !paramNames.contains(fieldName))
+ if (!fieldName.equals(NAME_VERSION) && !paramNames.contains(fieldName))
throw newOperatorException(fieldName, operator);
break;
case BuildQueryLexer.IsLessThan:
case BuildQueryLexer.IsGreaterThan:
- if (!fieldName.equals(FIELD_NUMBER))
+ if (!fieldName.equals(NAME_NUMBER))
throw newOperatorException(fieldName, operator);
break;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java
index d72ce989de..92a6b576c4 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java
@@ -40,7 +40,7 @@ public class CommitCriteria extends EntityCriteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(Build.FIELD_COMMIT) + " "
+ return quote(Build.NAME_COMMIT) + " "
+ BuildQuery.getRuleName(BuildQueryLexer.Is) + " "
+ quote(commitId.name());
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java
index cc8bbd9599..b9a46df186 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java
@@ -47,7 +47,7 @@ public class FinishDateCriteria extends EntityCriteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(Build.FIELD_FINISH_DATE) + " "
+ return quote(Build.NAME_FINISH_DATE) + " "
+ BuildQuery.getRuleName(operator) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
index 4398e01acf..b10ac4bc9d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
@@ -33,7 +33,7 @@ public class JobCriteria extends EntityCriteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(Build.FIELD_JOB) + " "
+ return quote(Build.NAME_JOB) + " "
+ BuildQuery.getRuleName(BuildQueryLexer.Is) + " "
+ quote(jobName);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java
index 6de80bc7a9..a11423ddb9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/NumberCriteria.java
@@ -59,7 +59,7 @@ public class NumberCriteria extends EntityCriteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(Build.FIELD_NUMBER) + " "
+ return quote(Build.NAME_NUMBER) + " "
+ BuildQuery.getRuleName(operator) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java
index 9e3b364725..ef721f7a18 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingDateCriteria.java
@@ -47,7 +47,7 @@ public class PendingDateCriteria extends EntityCriteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(Build.FIELD_PENDING_DATE) + " "
+ return quote(Build.NAME_PENDING_DATE) + " "
+ BuildQuery.getRuleName(operator) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java
index 5cbdc06f83..8e29d6ad7c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ProjectCriteria.java
@@ -38,7 +38,7 @@ public class ProjectCriteria extends EntityCriteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(Build.FIELD_PROJECT) + " "
+ return quote(Build.NAME_PROJECT) + " "
+ BuildQuery.getRuleName(BuildQueryLexer.Is) + " "
+ quote(projectName);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java
index 9af17c2e67..832053e2a5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java
@@ -47,7 +47,7 @@ public class RunningDateCriteria extends EntityCriteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(Build.FIELD_RUNNING_DATE) + " "
+ return quote(Build.NAME_RUNNING_DATE) + " "
+ BuildQuery.getRuleName(operator) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
index 39ac9ff511..5375431be8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
@@ -46,7 +46,7 @@ public class SubmitDateCriteria extends EntityCriteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(Build.FIELD_SUBMIT_DATE) + " "
+ return quote(Build.NAME_SUBMIT_DATE) + " "
+ BuildQuery.getRuleName(operator) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
index 73047a25c7..f7eac1dd15 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
@@ -34,7 +34,7 @@ public class VersionCriteria extends EntityCriteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(Build.FIELD_VERSION) + " "
+ return quote(Build.NAME_VERSION) + " "
+ BuildQuery.getRuleName(BuildQueryLexer.Is) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionIsEmptyCriteria.java
index 679fac8a3c..7ed1300124 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/VersionIsEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/VersionIsEmptyCriteria.java
@@ -23,7 +23,7 @@ public class VersionIsEmptyCriteria extends EntityCriteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(Build.FIELD_VERSION) + " " + BuildQuery.getRuleName(BuildQueryLexer.IsEmpty);
+ return quote(Build.NAME_VERSION) + " " + BuildQuery.getRuleName(BuildQueryLexer.IsEmpty);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
index e0fa5e5e73..4f9f5d259b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
@@ -1,11 +1,11 @@
package io.onedev.server.search.entity.codecomment;
-import static io.onedev.server.model.CodeComment.FIELD_CONTENT;
-import static io.onedev.server.model.CodeComment.FIELD_CREATE_DATE;
-import static io.onedev.server.model.CodeComment.FIELD_PATH;
-import static io.onedev.server.model.CodeComment.FIELD_REPLY;
-import static io.onedev.server.model.CodeComment.FIELD_REPLY_COUNT;
-import static io.onedev.server.model.CodeComment.FIELD_UPDATE_DATE;
+import static io.onedev.server.model.CodeComment.NAME_CONTENT;
+import static io.onedev.server.model.CodeComment.NAME_CREATE_DATE;
+import static io.onedev.server.model.CodeComment.NAME_PATH;
+import static io.onedev.server.model.CodeComment.NAME_REPLY;
+import static io.onedev.server.model.CodeComment.NAME_REPLY_COUNT;
+import static io.onedev.server.model.CodeComment.NAME_UPDATE_DATE;
import static io.onedev.server.model.CodeComment.ORDER_FIELDS;
import static io.onedev.server.model.CodeComment.QUERY_FIELDS;
@@ -125,9 +125,9 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
case CodeCommentQueryLexer.IsAfter:
Date dateValue = getDateValue(value);
switch (fieldName) {
- case FIELD_CREATE_DATE:
+ case NAME_CREATE_DATE:
return new CreateDateCriteria(dateValue, value, operator);
- case FIELD_UPDATE_DATE:
+ case NAME_UPDATE_DATE:
return new UpdateDateCriteria(dateValue, value, operator);
default:
throw new IllegalStateException();
@@ -137,18 +137,18 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
return new ReplyCountCriteria(getIntValue(value), operator);
case CodeCommentQueryLexer.Contains:
switch (fieldName) {
- case FIELD_CONTENT:
+ case NAME_CONTENT:
return new ContentCriteria(value);
- case FIELD_REPLY:
+ case NAME_REPLY:
return new ReplyCriteria(value);
default:
throw new IllegalStateException();
}
case CodeCommentQueryLexer.Is:
switch (fieldName) {
- case FIELD_PATH:
+ case NAME_PATH:
return new PathCriteria(value);
- case FIELD_REPLY_COUNT:
+ case NAME_REPLY_COUNT:
return new ReplyCountCriteria(getIntValue(value), operator);
default:
throw new IllegalStateException();
@@ -211,20 +211,20 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
switch (operator) {
case CodeCommentQueryLexer.IsBefore:
case CodeCommentQueryLexer.IsAfter:
- if (!fieldName.equals(FIELD_CREATE_DATE) && !fieldName.equals(FIELD_UPDATE_DATE))
+ if (!fieldName.equals(NAME_CREATE_DATE) && !fieldName.equals(NAME_UPDATE_DATE))
throw newOperatorException(fieldName, operator);
break;
case CodeCommentQueryLexer.IsGreaterThan:
case CodeCommentQueryLexer.IsLessThan:
- if (!fieldName.equals(FIELD_REPLY_COUNT))
+ if (!fieldName.equals(NAME_REPLY_COUNT))
throw newOperatorException(fieldName, operator);
break;
case CodeCommentQueryLexer.Contains:
- if (!fieldName.equals(FIELD_CONTENT) && !fieldName.equals(FIELD_REPLY))
+ if (!fieldName.equals(NAME_CONTENT) && !fieldName.equals(NAME_REPLY))
throw newOperatorException(fieldName, operator);
break;
case CodeCommentQueryLexer.Is:
- if (!fieldName.equals(FIELD_REPLY_COUNT) && !fieldName.equals(FIELD_PATH))
+ if (!fieldName.equals(NAME_REPLY_COUNT) && !fieldName.equals(NAME_PATH))
throw newOperatorException(fieldName, operator);
break;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
index 149444e09c..874aa9756a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
@@ -33,7 +33,7 @@ public class ContentCriteria extends EntityCriteria<CodeComment> {
@Override
public String toStringWithoutParens() {
- return quote(CodeComment.FIELD_CONTENT) + " "
+ return quote(CodeComment.NAME_CONTENT) + " "
+ CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Contains) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
index b5fc92eb66..0d1dfdae82 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
@@ -45,7 +45,7 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {
@Override
public String toStringWithoutParens() {
- return quote(CodeComment.FIELD_CREATE_DATE) + " "
+ return quote(CodeComment.NAME_CREATE_DATE) + " "
+ CodeCommentQuery.getRuleName(operator) + " "
+ quote(rawValue);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
index c82b52388c..166f6a7369 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
@@ -36,7 +36,7 @@ public class PathCriteria extends EntityCriteria<CodeComment> {
@Override
public String toStringWithoutParens() {
- return quote(CodeComment.FIELD_PATH) + " "
+ return quote(CodeComment.NAME_PATH) + " "
+ CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Is) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
index 734a055659..e24b95295f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
@@ -44,7 +44,7 @@ public class ReplyCountCriteria extends EntityCriteria<CodeComment> {
@Override
public String toStringWithoutParens() {
- return quote(CodeComment.FIELD_REPLY_COUNT) + " "
+ return quote(CodeComment.NAME_REPLY_COUNT) + " "
+ CodeCommentQuery.getRuleName(operator) + " "
+ quote(String.valueOf(value));
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
index 6e1c3962b3..e4fbabbc4f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
@@ -42,7 +42,7 @@ public class ReplyCriteria extends EntityCriteria<CodeComment> {
@Override
public String toStringWithoutParens() {
- return quote(CodeComment.FIELD_REPLY) + " "
+ return quote(CodeComment.NAME_REPLY) + " "
+ CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Contains) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
index e0550c87f3..4a163ab31e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
@@ -46,7 +46,7 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {
@Override
public String toStringWithoutParens() {
- return quote(CodeComment.FIELD_UPDATE_DATE) + " "
+ return quote(CodeComment.NAME_UPDATE_DATE) + " "
+ CodeCommentQuery.getRuleName(operator) + " "
+ quote(rawValue);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
index 227f16119c..735c3e0399 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
@@ -43,7 +43,7 @@ public class CommentCountCriteria extends IssueCriteria {
@Override
public String toStringWithoutParens() {
- return quote(Issue.FIELD_COMMENT_COUNT) + " "
+ return quote(Issue.NAME_COMMENT_COUNT) + " "
+ IssueQuery.getRuleName(operator) + " "
+ quote(String.valueOf(value));
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
index 2229ae8066..fed4213a71 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
@@ -39,7 +39,7 @@ public class CommentCriteria extends IssueCriteria {
@Override
public String toStringWithoutParens() {
- return quote(Issue.FIELD_COMMENT) + " "
+ return quote(Issue.NAME_COMMENT) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Contains) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
index 7c3b76ffac..8b62f06c6f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
@@ -32,7 +32,7 @@ public class DescriptionCriteria extends IssueCriteria {
@Override
public String toStringWithoutParens() {
- return quote(Issue.FIELD_DESCRIPTION) + " "
+ return quote(Issue.NAME_DESCRIPTION) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Contains) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index f8ac306104..c9f6083d2f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -153,7 +153,7 @@ public class IssueQuery extends EntityQuery<Issue> {
checkField(fieldName, operator, withCurrentUserCriteria, withCurrentBuildCriteria,
withCurrentPullRequestCriteria, withCurrentCommitCriteria);
}
- if (fieldName.equals(Issue.FIELD_MILESTONE)) {
+ if (fieldName.equals(Issue.NAME_MILESTONE)) {
return new MilestoneIsEmptyCriteria();
} else {
FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);
@@ -209,32 +209,32 @@ public class IssueQuery extends EntityQuery<Issue> {
switch (operator) {
case IssueQueryLexer.IsBefore:
case IssueQueryLexer.IsAfter:
- if (fieldName.equals(Issue.FIELD_SUBMIT_DATE))
+ if (fieldName.equals(Issue.NAME_SUBMIT_DATE))
return new SubmitDateCriteria(value, operator);
- else if (fieldName.equals(Issue.FIELD_UPDATE_DATE))
+ else if (fieldName.equals(Issue.NAME_UPDATE_DATE))
return new UpdateDateCriteria(value, operator);
else
return new DateFieldCriteria(fieldName, value, operator);
case IssueQueryLexer.Contains:
- if (fieldName.equals(Issue.FIELD_TITLE)) {
+ if (fieldName.equals(Issue.NAME_TITLE)) {
return new TitleCriteria(value);
- } else if (fieldName.equals(Issue.FIELD_DESCRIPTION)) {
+ } else if (fieldName.equals(Issue.NAME_DESCRIPTION)) {
return new DescriptionCriteria(value);
} else {
return new CommentCriteria(value);
}
case IssueQueryLexer.Is:
- if (fieldName.equals(Issue.FIELD_PROJECT)) {
+ if (fieldName.equals(Issue.NAME_PROJECT)) {
return new ProjectCriteria(value);
- } else if (fieldName.equals(Issue.FIELD_MILESTONE)) {
+ } else if (fieldName.equals(Issue.NAME_MILESTONE)) {
return new MilestoneCriteria(value);
- } else if (fieldName.equals(Issue.FIELD_STATE)) {
+ } else if (fieldName.equals(Issue.NAME_STATE)) {
return new StateCriteria(value);
- } else if (fieldName.equals(Issue.FIELD_VOTE_COUNT)) {
+ } else if (fieldName.equals(Issue.NAME_VOTE_COUNT)) {
return new VoteCountCriteria(getIntValue(value), operator);
- } else if (fieldName.equals(Issue.FIELD_COMMENT_COUNT)) {
+ } else if (fieldName.equals(Issue.NAME_COMMENT_COUNT)) {
return new CommentCountCriteria(getIntValue(value), operator);
- } else if (fieldName.equals(Issue.FIELD_NUMBER)) {
+ } else if (fieldName.equals(Issue.NAME_NUMBER)) {
return new NumberCriteria(project, value, operator);
} else {
FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);
@@ -262,11 +262,11 @@ public class IssueQuery extends EntityQuery<Issue> {
}
case IssueQueryLexer.IsLessThan:
case IssueQueryLexer.IsGreaterThan:
- if (fieldName.equals(Issue.FIELD_VOTE_COUNT)) {
+ if (fieldName.equals(Issue.NAME_VOTE_COUNT)) {
return new VoteCountCriteria(getIntValue(value), operator);
- } else if (fieldName.equals(Issue.FIELD_COMMENT_COUNT)) {
+ } else if (fieldName.equals(Issue.NAME_COMMENT_COUNT)) {
return new CommentCountCriteria(getIntValue(value), operator);
- } else if (fieldName.equals(Issue.FIELD_NUMBER)) {
+ } else if (fieldName.equals(Issue.NAME_NUMBER)) {
return new NumberCriteria(project, value, operator);
} else {
FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);
@@ -358,7 +358,7 @@ public class IssueQuery extends EntityQuery<Issue> {
switch (operator) {
case IssueQueryLexer.IsEmpty:
if (Issue.QUERY_FIELDS.contains(fieldName)
- && !fieldName.equals(Issue.FIELD_MILESTONE)) {
+ && !fieldName.equals(Issue.NAME_MILESTONE)) {
throw newOperatorException(fieldName, operator);
}
break;
@@ -378,27 +378,27 @@ 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)
+ if (!fieldName.equals(Issue.NAME_SUBMIT_DATE)
+ && !fieldName.equals(Issue.NAME_UPDATE_DATE)
&& !(fieldSpec instanceof DateField)) {
throw newOperatorException(fieldName, operator);
}
break;
case IssueQueryLexer.Contains:
- if (!fieldName.equals(Issue.FIELD_TITLE)
- && !fieldName.equals(Issue.FIELD_DESCRIPTION)
- && !fieldName.equals(Issue.FIELD_COMMENT)
+ if (!fieldName.equals(Issue.NAME_TITLE)
+ && !fieldName.equals(Issue.NAME_DESCRIPTION)
+ && !fieldName.equals(Issue.NAME_COMMENT)
&& !(fieldSpec instanceof TextField)) {
throw newOperatorException(fieldName, operator);
}
break;
case IssueQueryLexer.Is:
- if (!fieldName.equals(Issue.FIELD_PROJECT)
- && !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(Issue.NAME_PROJECT)
+ && !fieldName.equals(Issue.NAME_STATE)
+ && !fieldName.equals(Issue.NAME_VOTE_COUNT)
+ && !fieldName.equals(Issue.NAME_COMMENT_COUNT)
+ && !fieldName.equals(Issue.NAME_NUMBER)
+ && !fieldName.equals(Issue.NAME_MILESTONE)
&& !(fieldSpec instanceof IssueChoiceField)
&& !(fieldSpec instanceof PullRequestChoiceField)
&& !(fieldSpec instanceof BuildChoiceField)
@@ -414,9 +414,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(Issue.NAME_VOTE_COUNT)
+ && !fieldName.equals(Issue.NAME_COMMENT_COUNT)
+ && !fieldName.equals(Issue.NAME_NUMBER)
&& !(fieldSpec instanceof NumberField)
&& !(fieldSpec instanceof ChoiceField && !fieldSpec.isAllowMultiple()))
throw newOperatorException(fieldName, operator);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
index dbee048b50..a3ef969d12 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
@@ -37,7 +37,7 @@ public class MilestoneCriteria extends IssueCriteria {
@Override
public String toStringWithoutParens() {
- return quote(Issue.FIELD_MILESTONE) + " "
+ return quote(Issue.NAME_MILESTONE) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
+ quote(milestoneName);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java
index baad90c55b..6513674fcd 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MilestoneIsEmptyCriteria.java
@@ -23,7 +23,7 @@ public class MilestoneIsEmptyCriteria extends IssueCriteria {
@Override
public String toStringWithoutParens() {
- return quote(Issue.FIELD_MILESTONE) + " "
+ return quote(Issue.NAME_MILESTONE) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java
index 02602d2690..2815946f36 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java
@@ -61,7 +61,7 @@ public class NumberCriteria extends IssueCriteria {
@Override
public String toStringWithoutParens() {
- return quote(Issue.FIELD_NUMBER) + " "
+ return quote(Issue.NAME_NUMBER) + " "
+ IssueQuery.getRuleName(operator) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java
index d38796ff11..83e442c662 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ProjectCriteria.java
@@ -37,7 +37,7 @@ public class ProjectCriteria extends IssueCriteria {
@Override
public String toStringWithoutParens() {
- return quote(Issue.FIELD_PROJECT) + " "
+ return quote(Issue.NAME_PROJECT) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
+ quote(projectName);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
index 9514ee70b7..189902c7d5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
@@ -38,7 +38,7 @@ public class StateCriteria extends IssueCriteria {
@Override
public String toStringWithoutParens() {
- return quote(Issue.FIELD_STATE) + " "
+ return quote(Issue.NAME_STATE) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
index 987ed3fccd..72901413bc 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
@@ -45,7 +45,7 @@ public class SubmitDateCriteria extends IssueCriteria {
@Override
public String toStringWithoutParens() {
- return quote(Issue.FIELD_SUBMIT_DATE) + " "
+ return quote(Issue.NAME_SUBMIT_DATE) + " "
+ IssueQuery.getRuleName(operator) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
index bf770f8ae2..39ba97a93f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
@@ -32,7 +32,7 @@ public class TitleCriteria extends IssueCriteria {
@Override
public String toStringWithoutParens() {
- return quote(Issue.FIELD_TITLE) + " "
+ return quote(Issue.NAME_TITLE) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Contains) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
index 835c7f307d..13322ed79a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
@@ -46,7 +46,7 @@ public class UpdateDateCriteria extends IssueCriteria {
@Override
public String toStringWithoutParens() {
- return quote(Issue.FIELD_UPDATE_DATE) + " "
+ return quote(Issue.NAME_UPDATE_DATE) + " "
+ IssueQuery.getRuleName(operator) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
index 9a9cadf44b..1961783293 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
@@ -43,7 +43,7 @@ public class VoteCountCriteria extends IssueCriteria {
@Override
public String toStringWithoutParens() {
- return quote(Issue.FIELD_VOTE_COUNT) + " "
+ return quote(Issue.NAME_VOTE_COUNT) + " "
+ IssueQuery.getRuleName(operator) + " "
+ quote(String.valueOf(value));
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java
index 297e6f84c5..4a938168bb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/DescriptionCriteria.java
@@ -34,7 +34,7 @@ public class DescriptionCriteria extends EntityCriteria<Project> {
@Override
public String toStringWithoutParens() {
- return Criteria.quote(Project.FIELD_DESCRIPTION) + " "
+ return Criteria.quote(Project.NAME_DESCRIPTION) + " "
+ ProjectQuery.getRuleName(ProjectQueryLexer.Contains) + " "
+ Criteria.quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java
index 5117462785..1e804bacbd 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java
@@ -35,7 +35,7 @@ public class NameCriteria extends EntityCriteria<Project> {
@Override
public String toStringWithoutParens() {
- return Criteria.quote(Project.FIELD_NAME) + " "
+ return Criteria.quote(Project.NAME_NAME) + " "
+ ProjectQuery.getRuleName(ProjectQueryLexer.Is) + " "
+ Criteria.quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
index 3f4f755b3a..d5aaa66ae9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
@@ -185,16 +185,16 @@ public class ProjectQuery extends EntityQuery<Project> {
throw new OneException("Field not found: " + fieldName);
switch (operator) {
case ProjectQueryLexer.Contains:
- if (!fieldName.equals(Project.FIELD_DESCRIPTION))
+ if (!fieldName.equals(Project.NAME_DESCRIPTION))
throw newOperatorException(fieldName, operator);
break;
case ProjectQueryLexer.Is:
- if (!fieldName.equals(Project.FIELD_NAME))
+ if (!fieldName.equals(Project.NAME_NAME))
throw newOperatorException(fieldName, operator);
break;
case ProjectQueryLexer.IsBefore:
case ProjectQueryLexer.IsAfter:
- if (!fieldName.equals(Project.FIELD_UPDATE_DATE))
+ if (!fieldName.equals(Project.NAME_UPDATE_DATE))
throw newOperatorException(fieldName, operator);
break;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java
index fefcd0801d..b526f01c31 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java
@@ -47,7 +47,7 @@ public class UpdateDateCriteria extends EntityCriteria<Project> {
@Override
public String toStringWithoutParens() {
- return Criteria.quote(Project.FIELD_UPDATE_DATE) + " "
+ return Criteria.quote(Project.NAME_UPDATE_DATE) + " "
+ ProjectQuery.getRuleName(operator) + " "
+ Criteria.quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
index 24be37f53c..9ced37cb4b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
@@ -51,7 +51,7 @@ public class CloseDateCriteria extends EntityCriteria<PullRequest> {
@Override
public String toStringWithoutParens() {
- return quote(PullRequest.FIELD_CLOSE_DATE) + " "
+ return quote(PullRequest.NAME_CLOSE_DATE) + " "
+ PullRequestQuery.getRuleName(operator) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
index 303b46e793..720d4c7705 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
@@ -44,7 +44,7 @@ public class CommentCountCriteria extends EntityCriteria<PullRequest> {
@Override
public String toStringWithoutParens() {
- return quote(PullRequest.FIELD_COMMENT_COUNT) + " "
+ return quote(PullRequest.NAME_COMMENT_COUNT) + " "
+ PullRequestQuery.getRuleName(operator) + " "
+ quote(String.valueOf(value));
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
index 8d1a8a8e50..d17f24dacd 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
@@ -40,7 +40,7 @@ public class CommentCriteria extends EntityCriteria<PullRequest> {
@Override
public String toStringWithoutParens() {
- return quote(PullRequest.FIELD_COMMENT) + " "
+ return quote(PullRequest.NAME_COMMENT) + " "
+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
index a91b2942c5..4cb6e79b8f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
@@ -33,7 +33,7 @@ public class DescriptionCriteria extends EntityCriteria<PullRequest> {
@Override
public String toStringWithoutParens() {
- return quote(PullRequest.FIELD_DESCRIPTION) + " "
+ return quote(PullRequest.NAME_DESCRIPTION) + " "
+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
index c134d1b060..082eb6152a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
@@ -32,7 +32,7 @@ public class MergeStrategyCriteria extends EntityCriteria<PullRequest> {
@Override
public String toStringWithoutParens() {
- return quote(PullRequest.FIELD_MERGE_STRATEGY) + " "
+ return quote(PullRequest.NAME_MERGE_STRATEGY) + " "
+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "
+ quote(value.toString());
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java
index d111090ddf..70480336c1 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java
@@ -61,7 +61,7 @@ public class NumberCriteria extends EntityCriteria<PullRequest> {
@Override
public String toStringWithoutParens() {
- return quote(PullRequest.FIELD_NUMBER) + " "
+ return quote(PullRequest.NAME_NUMBER) + " "
+ PullRequestQuery.getRuleName(operator) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
index 0c0512c5ae..1e09dbee67 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
@@ -154,41 +154,41 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
case PullRequestQueryLexer.IsBefore:
case PullRequestQueryLexer.IsAfter:
switch (fieldName) {
- case PullRequest.FIELD_SUBMIT_DATE:
+ case PullRequest.NAME_SUBMIT_DATE:
return new SubmitDateCriteria(value, operator);
- case PullRequest.FIELD_UPDATE_DATE:
+ case PullRequest.NAME_UPDATE_DATE:
return new UpdateDateCriteria(value, operator);
- case PullRequest.FIELD_CLOSE_DATE:
+ case PullRequest.NAME_CLOSE_DATE:
return new CloseDateCriteria(value, operator);
default:
throw new IllegalStateException();
}
case PullRequestQueryLexer.Contains:
switch (fieldName) {
- case PullRequest.FIELD_TITLE:
+ case PullRequest.NAME_TITLE:
return new TitleCriteria(value);
- case PullRequest.FIELD_DESCRIPTION:
+ case PullRequest.NAME_DESCRIPTION:
return new DescriptionCriteria(value);
- case PullRequest.FIELD_COMMENT:
+ case PullRequest.NAME_COMMENT:
return new CommentCriteria(value);
default:
throw new IllegalStateException();
}
case PullRequestQueryLexer.Is:
switch (fieldName) {
- case PullRequest.FIELD_NUMBER:
+ case PullRequest.NAME_NUMBER:
return new NumberCriteria(project, value, operator);
- case PullRequest.FIELD_MERGE_STRATEGY:
+ case PullRequest.NAME_MERGE_STRATEGY:
return new MergeStrategyCriteria(MergeStrategy.fromString(value));
- case PullRequest.FIELD_SOURCE_BRANCH:
+ case PullRequest.NAME_SOURCE_BRANCH:
return new SourceBranchCriteria(value);
- case PullRequest.FIELD_SOURCE_PROJECT:
+ case PullRequest.NAME_SOURCE_PROJECT:
return new SourceProjectCriteria(value);
- case PullRequest.FIELD_TARGET_BRANCH:
+ case PullRequest.NAME_TARGET_BRANCH:
return new TargetBranchCriteria(value);
- case PullRequest.FIELD_TARGET_PROJECT:
+ case PullRequest.NAME_TARGET_PROJECT:
return new TargetProjectCriteria(value);
- case PullRequest.FIELD_COMMENT_COUNT:
+ case PullRequest.NAME_COMMENT_COUNT:
return new CommentCountCriteria(getIntValue(value), operator);
default:
throw new IllegalStateException();
@@ -196,9 +196,9 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
case PullRequestQueryLexer.IsLessThan:
case PullRequestQueryLexer.IsGreaterThan:
switch (fieldName) {
- case PullRequest.FIELD_NUMBER:
+ case PullRequest.NAME_NUMBER:
return new NumberCriteria(project, value, operator);
- case PullRequest.FIELD_COMMENT_COUNT:
+ case PullRequest.NAME_COMMENT_COUNT:
return new CommentCountCriteria(getIntValue(value), operator);
default:
throw new IllegalStateException();
@@ -261,34 +261,34 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
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(PullRequest.NAME_SUBMIT_DATE)
+ && !fieldName.equals(PullRequest.NAME_UPDATE_DATE)
+ && !fieldName.equals(PullRequest.NAME_CLOSE_DATE)) {
throw newOperatorException(fieldName, operator);
}
break;
case PullRequestQueryLexer.Contains:
- if (!fieldName.equals(PullRequest.FIELD_TITLE)
- && !fieldName.equals(PullRequest.FIELD_DESCRIPTION)
- && !fieldName.equals(PullRequest.FIELD_COMMENT)) {
+ if (!fieldName.equals(PullRequest.NAME_TITLE)
+ && !fieldName.equals(PullRequest.NAME_DESCRIPTION)
+ && !fieldName.equals(PullRequest.NAME_COMMENT)) {
throw newOperatorException(fieldName, operator);
}
break;
case PullRequestQueryLexer.Is:
- if (!fieldName.equals(PullRequest.FIELD_NUMBER)
- && !fieldName.equals(PullRequest.FIELD_MERGE_STRATEGY)
- && !fieldName.equals(PullRequest.FIELD_TARGET_PROJECT)
- && !fieldName.equals(PullRequest.FIELD_TARGET_BRANCH)
- && !fieldName.equals(PullRequest.FIELD_SOURCE_PROJECT)
- && !fieldName.equals(PullRequest.FIELD_SOURCE_BRANCH)
- && !fieldName.equals(PullRequest.FIELD_COMMENT_COUNT)) {
+ if (!fieldName.equals(PullRequest.NAME_NUMBER)
+ && !fieldName.equals(PullRequest.NAME_MERGE_STRATEGY)
+ && !fieldName.equals(PullRequest.NAME_TARGET_PROJECT)
+ && !fieldName.equals(PullRequest.NAME_TARGET_BRANCH)
+ && !fieldName.equals(PullRequest.NAME_SOURCE_PROJECT)
+ && !fieldName.equals(PullRequest.NAME_SOURCE_BRANCH)
+ && !fieldName.equals(PullRequest.NAME_COMMENT_COUNT)) {
throw newOperatorException(fieldName, operator);
}
break;
case PullRequestQueryLexer.IsLessThan:
case PullRequestQueryLexer.IsGreaterThan:
- if (!fieldName.equals(PullRequest.FIELD_NUMBER)
- && !fieldName.equals(PullRequest.FIELD_COMMENT_COUNT)) {
+ if (!fieldName.equals(PullRequest.NAME_NUMBER)
+ && !fieldName.equals(PullRequest.NAME_COMMENT_COUNT)) {
throw newOperatorException(fieldName, operator);
}
break;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
index 6ad80e996b..8b1ce91020 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
@@ -33,7 +33,7 @@ public class SourceBranchCriteria extends EntityCriteria<PullRequest> {
@Override
public String toStringWithoutParens() {
- return quote(PullRequest.FIELD_SOURCE_BRANCH) + " "
+ return quote(PullRequest.NAME_SOURCE_BRANCH) + " "
+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "
+ quote(branch);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
index af9a0b463b..6d6c6d7d06 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
@@ -43,7 +43,7 @@ public class SourceProjectCriteria extends EntityCriteria<PullRequest> {
@Override
public String toStringWithoutParens() {
- return quote(PullRequest.FIELD_SOURCE_PROJECT) + " "
+ return quote(PullRequest.NAME_SOURCE_PROJECT) + " "
+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "
+ quote(projectName);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java
index 8973886de8..a90b3a7b5f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java
@@ -38,7 +38,7 @@ public class StatusCriteria extends EntityCriteria<PullRequest> {
@Override
public String toStringWithoutParens() {
- return quote(PullRequest.FIELD_STATUS) + " "
+ return quote(PullRequest.NAME_STATUS) + " "
+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
index 1efbce1e36..60e27d81d8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
@@ -46,7 +46,7 @@ public class SubmitDateCriteria extends EntityCriteria<PullRequest> {
@Override
public String toStringWithoutParens() {
- return quote(PullRequest.FIELD_SUBMIT_DATE) + " "
+ return quote(PullRequest.NAME_SUBMIT_DATE) + " "
+ PullRequestQuery.getRuleName(operator) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
index 46878842c9..4e6549bfe2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
@@ -33,7 +33,7 @@ public class TargetBranchCriteria extends EntityCriteria<PullRequest> {
@Override
public String toStringWithoutParens() {
- return quote(PullRequest.FIELD_TARGET_BRANCH) + " "
+ return quote(PullRequest.NAME_TARGET_BRANCH) + " "
+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "
+ quote(branch);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java
index 35d449e9b2..7498123173 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetProjectCriteria.java
@@ -38,7 +38,7 @@ public class TargetProjectCriteria extends EntityCriteria<PullRequest> {
@Override
public String toStringWithoutParens() {
- return quote(PullRequest.FIELD_TARGET_PROJECT) + " "
+ return quote(PullRequest.NAME_TARGET_PROJECT) + " "
+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "
+ quote(projectName);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
index 5ce3420004..fa4474c3da 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
@@ -33,7 +33,7 @@ public class TitleCriteria extends EntityCriteria<PullRequest> {
@Override
public String toStringWithoutParens() {
- return quote(PullRequest.FIELD_TITLE) + " "
+ return quote(PullRequest.NAME_TITLE) + " "
+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
index 5dead84863..b31ccf4144 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
@@ -47,7 +47,7 @@ public class UpdateDateCriteria extends EntityCriteria<PullRequest> {
@Override
public String toStringWithoutParens() {
- return quote(PullRequest.FIELD_UPDATE_DATE) + " "
+ return quote(PullRequest.NAME_UPDATE_DATE) + " "
+ PullRequestQuery.getRuleName(operator) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/ImageCriteria.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/ImageCriteria.java
index 4083a1f637..c77695bfa8 100644
--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/ImageCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/ImageCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.util.jobmatch;
-import static io.onedev.server.model.Build.FIELD_IMAGE;
+import static io.onedev.server.model.Build.NAME_IMAGE;
import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;
import static io.onedev.server.util.jobmatch.JobMatchLexer.Is;
@@ -25,7 +25,7 @@ public class ImageCriteria extends Criteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(FIELD_IMAGE) + " " + getRuleName(Is) + " " + quote(image);
+ return quote(NAME_IMAGE) + " " + getRuleName(Is) + " " + quote(image);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java
index cca3bc4402..fe52e25785 100644
--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java
+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java
@@ -82,9 +82,9 @@ public class JobMatch extends Criteria<Build> {
checkField(fieldName, operator);
switch (fieldName) {
- case Build.FIELD_PROJECT:
+ case Build.NAME_PROJECT:
return new ProjectCriteria(fieldValue);
- case Build.FIELD_JOB:
+ case Build.NAME_JOB:
return new NameCriteria(fieldValue);
default:
return new ImageCriteria(fieldValue);
@@ -124,9 +124,9 @@ public class JobMatch extends Criteria<Build> {
}
public static void checkField(String fieldName, int operator) {
- if (fieldName.equals(Build.FIELD_PROJECT)
- || fieldName.equals(Build.FIELD_JOB)
- || fieldName.equals(Build.FIELD_IMAGE)) {
+ if (fieldName.equals(Build.NAME_PROJECT)
+ || fieldName.equals(Build.NAME_JOB)
+ || fieldName.equals(Build.NAME_IMAGE)) {
if (operator != JobMatchLexer.Is)
throw newOperatorException(fieldName, operator);
} else {
diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/NameCriteria.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/NameCriteria.java
index 99ff4fa13b..5e606894cc 100644
--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/NameCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/NameCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.util.jobmatch;
-import static io.onedev.server.model.Build.FIELD_JOB;
+import static io.onedev.server.model.Build.NAME_JOB;
import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;
import static io.onedev.server.util.jobmatch.JobMatchLexer.Is;
@@ -26,7 +26,7 @@ public class NameCriteria extends Criteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(FIELD_JOB) + " " + getRuleName(Is) + " " + quote(jobName);
+ return quote(NAME_JOB) + " " + getRuleName(Is) + " " + quote(jobName);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectCriteria.java
index a96d0f2354..ebbb06cf61 100644
--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectCriteria.java
@@ -1,6 +1,6 @@
package io.onedev.server.util.jobmatch;
-import static io.onedev.server.model.Build.FIELD_PROJECT;
+import static io.onedev.server.model.Build.NAME_PROJECT;
import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;
import static io.onedev.server.util.jobmatch.JobMatchLexer.Is;
@@ -36,7 +36,7 @@ public class ProjectCriteria extends Criteria<Build> {
@Override
public String toStringWithoutParens() {
- return quote(FIELD_PROJECT) + " " + getRuleName(Is) + " " + quote(projectName);
+ return quote(NAME_PROJECT) + " " + getRuleName(Is) + " " + quote(projectName);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java
index db8da8cd51..54186816ae 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java
@@ -48,8 +48,8 @@ public class ActionConditionBehavior extends ANTLRAssistBehavior {
protected List<InputSuggestion> match(String matchWith) {
if ("criteriaField".equals(spec.getLabel())) {
List<String> fields = Lists.newArrayList(
- Build.FIELD_LOG,
- Build.FIELD_ERROR_MESSAGE);
+ Build.NAME_LOG,
+ Build.NAME_ERROR_MESSAGE);
JobAware jobAware = getComponent().findParent(JobAware.class);
Job job = jobAware.getJob();
fields.addAll(job.getParamSpecMap().keySet());
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
index f1a1eba3bf..7fe1076fbc 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
@@ -77,7 +77,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
if ("criteriaField".equals(spec.getLabel())) {
List<String> fields = new ArrayList<>(Build.QUERY_FIELDS);
if (getProject() != null)
- fields.remove(Build.FIELD_PROJECT);
+ fields.remove(Build.NAME_PROJECT);
BuildParamManager buildParamManager = OneDev.getInstance(BuildParamManager.class);
List<String> paramNames = new ArrayList<>(buildParamManager.getBuildParamNames(project));
Collections.sort(paramNames);
@@ -86,7 +86,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
} else if ("orderField".equals(spec.getLabel())) {
List<String> candidates = new ArrayList<>(Build.ORDER_FIELDS.keySet());
if (getProject() != null)
- candidates.remove(Build.FIELD_PROJECT);
+ candidates.remove(Build.NAME_PROJECT);
return SuggestionUtils.suggest(candidates, matchWith);
} else if ("criteriaValue".equals(spec.getLabel())) {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
@@ -107,25 +107,25 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
String fieldName = BuildQuery.getValue(fieldElements.get(0).getMatchedText());
try {
BuildQuery.checkField(project, fieldName, operator);
- if (fieldName.equals(Build.FIELD_SUBMIT_DATE)
- || fieldName.equals(Build.FIELD_PENDING_DATE)
- || fieldName.equals(Build.FIELD_RUNNING_DATE)
- || fieldName.equals(Build.FIELD_FINISH_DATE)) {
+ if (fieldName.equals(Build.NAME_SUBMIT_DATE)
+ || fieldName.equals(Build.NAME_PENDING_DATE)
+ || fieldName.equals(Build.NAME_RUNNING_DATE)
+ || fieldName.equals(Build.NAME_FINISH_DATE)) {
List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);
return !suggestions.isEmpty()? suggestions: null;
- } else if (fieldName.equals(Build.FIELD_PROJECT)) {
+ } else if (fieldName.equals(Build.NAME_PROJECT)) {
if (!matchWith.contains("*"))
return SuggestionUtils.suggestProjects(matchWith);
else
return null;
- } else if (fieldName.equals(Build.FIELD_JOB)) {
+ } else if (fieldName.equals(Build.NAME_JOB)) {
if (project != null && !matchWith.contains("*"))
return SuggestionUtils.suggestJobs(project, matchWith);
else
return null;
- } else if (fieldName.equals(Build.FIELD_NUMBER)) {
+ } else if (fieldName.equals(Build.NAME_NUMBER)) {
return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
- } else if (fieldName.equals(Build.FIELD_VERSION)) {
+ } else if (fieldName.equals(Build.NAME_VERSION)) {
if (project != null && !matchWith.contains("*"))
return SuggestionUtils.suggestBuildVersions(project, matchWith);
else
@@ -193,9 +193,9 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (!fieldElements.isEmpty()) {
String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
- if (fieldName.equals(Build.FIELD_PROJECT)
- || fieldName.equals(Build.FIELD_VERSION)
- || fieldName.equals(Build.FIELD_JOB)) {
+ if (fieldName.equals(Build.NAME_PROJECT)
+ || fieldName.equals(Build.NAME_VERSION)
+ || fieldName.equals(Build.NAME_JOB)) {
hints.add("Use * for wildcard match");
hints.add("Use '\\' to escape quotes");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
index 7d86e46579..2c575edeec 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
@@ -76,11 +76,11 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {
String fieldName = CodeCommentQuery.getValue(fieldElements.get(0).getMatchedText());
try {
CodeCommentQuery.checkField(project, fieldName, operator);
- if (fieldName.equals(CodeComment.FIELD_CREATE_DATE)
- || fieldName.equals(CodeComment.FIELD_UPDATE_DATE)) {
+ if (fieldName.equals(CodeComment.NAME_CREATE_DATE)
+ || fieldName.equals(CodeComment.NAME_UPDATE_DATE)) {
List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);
return !suggestions.isEmpty()? suggestions: null;
- } else if (fieldName.equals(CodeComment.FIELD_PATH)) {
+ } else if (fieldName.equals(CodeComment.NAME_PATH)) {
return SuggestionUtils.suggestBlobs(projectModel.getObject(), matchWith);
} else {
return null;
@@ -129,7 +129,7 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (!fieldElements.isEmpty()) {
String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
- if (fieldName.equals(CodeComment.FIELD_CONTENT)) {
+ if (fieldName.equals(CodeComment.NAME_CONTENT)) {
hints.add("Use * for wildcard match");
hints.add("Use '\\' to escape quotes");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index 6ef6f340f5..b96954ca75 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -11,17 +11,17 @@ import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInPullRe
import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentCommit;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedBy;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedByMe;
-import static io.onedev.server.model.Issue.FIELD_COMMENT;
-import static io.onedev.server.model.Issue.FIELD_COMMENT_COUNT;
-import static io.onedev.server.model.Issue.FIELD_DESCRIPTION;
-import static io.onedev.server.model.Issue.FIELD_MILESTONE;
-import static io.onedev.server.model.Issue.FIELD_NUMBER;
-import static io.onedev.server.model.Issue.FIELD_PROJECT;
-import static io.onedev.server.model.Issue.FIELD_STATE;
-import static io.onedev.server.model.Issue.FIELD_SUBMIT_DATE;
-import static io.onedev.server.model.Issue.FIELD_TITLE;
-import static io.onedev.server.model.Issue.FIELD_UPDATE_DATE;
-import static io.onedev.server.model.Issue.FIELD_VOTE_COUNT;
+import static io.onedev.server.model.Issue.NAME_COMMENT;
+import static io.onedev.server.model.Issue.NAME_COMMENT_COUNT;
+import static io.onedev.server.model.Issue.NAME_DESCRIPTION;
+import static io.onedev.server.model.Issue.NAME_MILESTONE;
+import static io.onedev.server.model.Issue.NAME_NUMBER;
+import static io.onedev.server.model.Issue.NAME_PROJECT;
+import static io.onedev.server.model.Issue.NAME_STATE;
+import static io.onedev.server.model.Issue.NAME_SUBMIT_DATE;
+import static io.onedev.server.model.Issue.NAME_TITLE;
+import static io.onedev.server.model.Issue.NAME_UPDATE_DATE;
+import static io.onedev.server.model.Issue.NAME_VOTE_COUNT;
import static io.onedev.server.search.entity.issue.IssueQueryLexer.OrderBy;
import java.util.ArrayList;
@@ -124,14 +124,14 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
if ("criteriaField".equals(spec.getLabel())) {
List<String> candidates = new ArrayList<>(Issue.QUERY_FIELDS);
if (getProject() != null)
- candidates.remove(Issue.FIELD_PROJECT);
+ candidates.remove(Issue.NAME_PROJECT);
for (FieldSpec field: issueSetting.getFieldSpecs())
candidates.add(field.getName());
return SuggestionUtils.suggest(candidates, matchWith);
} else if ("orderField".equals(spec.getLabel())) {
List<String> candidates = new ArrayList<>(Issue.ORDER_FIELDS.keySet());
if (getProject() != null)
- candidates.remove(Issue.FIELD_PROJECT);
+ candidates.remove(Issue.NAME_PROJECT);
for (FieldSpec field: issueSetting.getFieldSpecs()) {
if (field instanceof NumberField || field instanceof ChoiceField || field instanceof DateField)
candidates.add(field.getName());
@@ -172,8 +172,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
checkField(fieldName, operator, withCurrentUserCriteria, withCurrentBuildCriteria,
withCurrentPullRequestCriteria, withCurrentCommitCriteria);
FieldSpec fieldSpec = issueSetting.getFieldSpec(fieldName);
- if (fieldSpec instanceof DateField || fieldName.equals(FIELD_SUBMIT_DATE)
- || fieldName.equals(FIELD_UPDATE_DATE)) {
+ if (fieldSpec instanceof DateField || fieldName.equals(NAME_SUBMIT_DATE)
+ || fieldName.equals(NAME_UPDATE_DATE)) {
List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);
return !suggestions.isEmpty()? suggestions: null;
} else if (fieldSpec instanceof UserChoiceField) {
@@ -191,12 +191,12 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
} else if (fieldSpec instanceof GroupChoiceField) {
List<String> candidates = OneDev.getInstance(GroupManager.class).query().stream().map(it->it.getName()).collect(Collectors.toList());
return SuggestionUtils.suggest(candidates, matchWith);
- } else if (fieldName.equals(FIELD_PROJECT)) {
+ } else if (fieldName.equals(NAME_PROJECT)) {
if (!matchWith.contains("*"))
return SuggestionUtils.suggestProjects(matchWith);
else
return null;
- } else if (fieldName.equals(FIELD_STATE)) {
+ } else if (fieldName.equals(NAME_STATE)) {
List<String> candidates = issueSetting.getStateSpecs()
.stream()
.map(it->it.getName())
@@ -211,16 +211,16 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
} finally {
ComponentContext.pop();
}
- } else if (fieldName.equals(FIELD_NUMBER)) {
+ } else if (fieldName.equals(NAME_NUMBER)) {
return SuggestionUtils.suggestIssues(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
- } else if (fieldName.equals(FIELD_MILESTONE)) {
+ } else if (fieldName.equals(NAME_MILESTONE)) {
if (project != null && !matchWith.contains("*"))
return SuggestionUtils.suggestMilestones(project, matchWith);
else
return null;
- } else if (fieldName.equals(FIELD_TITLE) || fieldName.equals(FIELD_DESCRIPTION)
- || fieldName.equals(FIELD_COMMENT) || fieldName.equals(FIELD_VOTE_COUNT)
- || fieldName.equals(FIELD_COMMENT_COUNT) || fieldSpec instanceof NumberField
+ } else if (fieldName.equals(NAME_TITLE) || fieldName.equals(NAME_DESCRIPTION)
+ || fieldName.equals(NAME_COMMENT) || fieldName.equals(NAME_VOTE_COUNT)
+ || fieldName.equals(NAME_COMMENT_COUNT) || fieldSpec instanceof NumberField
|| fieldSpec instanceof TextField) {
return null;
}
@@ -277,11 +277,11 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (!fieldElements.isEmpty()) {
String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
- if (fieldName.equals(Issue.FIELD_PROJECT)
- || fieldName.equals(Issue.FIELD_TITLE)
- || fieldName.equals(Issue.FIELD_DESCRIPTION)
- || fieldName.equals(Issue.FIELD_COMMENT)
- || fieldName.equals(Issue.FIELD_MILESTONE)) {
+ if (fieldName.equals(Issue.NAME_PROJECT)
+ || fieldName.equals(Issue.NAME_TITLE)
+ || fieldName.equals(Issue.NAME_DESCRIPTION)
+ || fieldName.equals(Issue.NAME_COMMENT)
+ || fieldName.equals(Issue.NAME_MILESTONE)) {
hints.add("Use * for wildcard match");
hints.add("Use '\\' to escape quotes");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java
index 550f381d1e..8427f9d250 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java
@@ -42,9 +42,9 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {
protected List<InputSuggestion> match(String matchWith) {
if ("criteriaField".equals(spec.getLabel())) {
List<String> fields = Lists.newArrayList(
- Build.FIELD_PROJECT,
- Build.FIELD_JOB,
- Build.FIELD_IMAGE);
+ Build.NAME_PROJECT,
+ Build.NAME_JOB,
+ Build.NAME_IMAGE);
return SuggestionUtils.suggest(fields, matchWith);
} else if ("criteriaValue".equals(spec.getLabel())) {
List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);
@@ -55,7 +55,7 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
Preconditions.checkState(fieldElements.size() == 1);
String fieldName = JobMatch.getValue(fieldElements.get(0).getMatchedText());
- if (fieldName.equals(Build.FIELD_PROJECT)) {
+ if (fieldName.equals(Build.NAME_PROJECT)) {
if (!matchWith.contains("*"))
return SuggestionUtils.suggestProjects(matchWith);
else
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
index aa727f2829..9b31e17e99 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
@@ -62,10 +62,10 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {
String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
try {
ProjectQuery.checkField(fieldName, operator);
- if (fieldName.equals(Project.FIELD_UPDATE_DATE)) {
+ if (fieldName.equals(Project.NAME_UPDATE_DATE)) {
List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);
return !suggestions.isEmpty()? suggestions: null;
- } else if (fieldName.equals(Project.FIELD_NAME)) {
+ } else if (fieldName.equals(Project.NAME_NAME)) {
if (!matchWith.contains("*"))
return SuggestionUtils.suggestProjects(matchWith);
else
@@ -117,8 +117,8 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (!fieldElements.isEmpty()) {
String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
- if (fieldName.equals(Project.FIELD_NAME)
- || fieldName.equals(Project.FIELD_DESCRIPTION)) {
+ if (fieldName.equals(Project.NAME_NAME)
+ || fieldName.equals(Project.NAME_DESCRIPTION)) {
hints.add("Use * for wildcard match");
hints.add("Use '\\' to escape quotes");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
index 44e7570c53..9f2239efb0 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.behavior;
-import static io.onedev.server.model.Issue.FIELD_NUMBER;
+import static io.onedev.server.model.Issue.NAME_NUMBER;
import java.util.ArrayList;
import java.util.List;
@@ -64,12 +64,12 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
if ("criteriaField".equals(spec.getLabel())) {
List<String> candidates = new ArrayList<>(PullRequest.QUERY_FIELDS);
if (getProject() != null)
- candidates.remove(PullRequest.FIELD_TARGET_PROJECT);
+ candidates.remove(PullRequest.NAME_TARGET_PROJECT);
return SuggestionUtils.suggest(candidates, matchWith);
} else if ("orderField".equals(spec.getLabel())) {
List<String> candidates = new ArrayList<>(PullRequest.ORDER_FIELDS.keySet());
if (getProject() != null)
- candidates.remove(PullRequest.FIELD_TARGET_PROJECT);
+ candidates.remove(PullRequest.NAME_TARGET_PROJECT);
return SuggestionUtils.suggest(candidates, matchWith);
} else if ("criteriaValue".equals(spec.getLabel())) {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
@@ -88,34 +88,34 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
String fieldName = PullRequestQuery.getValue(fieldElements.get(0).getMatchedText());
try {
PullRequestQuery.checkField(fieldName, operator);
- if (fieldName.equals(PullRequest.FIELD_SUBMIT_DATE)
- || fieldName.equals(PullRequest.FIELD_UPDATE_DATE)
- || fieldName.equals(PullRequest.FIELD_CLOSE_DATE)) {
+ if (fieldName.equals(PullRequest.NAME_SUBMIT_DATE)
+ || fieldName.equals(PullRequest.NAME_UPDATE_DATE)
+ || fieldName.equals(PullRequest.NAME_CLOSE_DATE)) {
List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);
return !suggestions.isEmpty()? suggestions: null;
- } else if (fieldName.equals(PullRequest.FIELD_TARGET_PROJECT)
- || fieldName.equals(PullRequest.FIELD_SOURCE_PROJECT)) {
+ } else if (fieldName.equals(PullRequest.NAME_TARGET_PROJECT)
+ || fieldName.equals(PullRequest.NAME_SOURCE_PROJECT)) {
if (!matchWith.contains("*"))
return SuggestionUtils.suggestProjects(matchWith);
else
return null;
- } else if (fieldName.equals(PullRequest.FIELD_TARGET_BRANCH)
- || fieldName.equals(PullRequest.FIELD_SOURCE_BRANCH)) {
+ } else if (fieldName.equals(PullRequest.NAME_TARGET_BRANCH)
+ || fieldName.equals(PullRequest.NAME_SOURCE_BRANCH)) {
if (project != null && !matchWith.contains("*"))
return SuggestionUtils.suggestBranches(project, matchWith);
else
return null;
- } else if (fieldName.equals(FIELD_NUMBER)) {
+ } else if (fieldName.equals(NAME_NUMBER)) {
return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
- } else if (fieldName.equals(PullRequest.FIELD_MERGE_STRATEGY)) {
+ } else if (fieldName.equals(PullRequest.NAME_MERGE_STRATEGY)) {
List<String> candidates = new ArrayList<>();
for (MergeStrategy strategy: MergeStrategy.values())
candidates.add(strategy.toString());
return SuggestionUtils.suggest(candidates, matchWith);
- } else if (fieldName.equals(PullRequest.FIELD_TITLE)
- || fieldName.equals(PullRequest.FIELD_DESCRIPTION)
- || fieldName.equals(PullRequest.FIELD_COMMENT_COUNT)
- || fieldName.equals(PullRequest.FIELD_COMMENT)) {
+ } else if (fieldName.equals(PullRequest.NAME_TITLE)
+ || fieldName.equals(PullRequest.NAME_DESCRIPTION)
+ || fieldName.equals(PullRequest.NAME_COMMENT_COUNT)
+ || fieldName.equals(PullRequest.NAME_COMMENT)) {
return null;
}
} catch (OneException ex) {
@@ -162,13 +162,13 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (!fieldElements.isEmpty()) {
String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
- if (fieldName.equals(PullRequest.FIELD_TARGET_PROJECT)
- || fieldName.equals(PullRequest.FIELD_TARGET_BRANCH)
- || fieldName.equals(PullRequest.FIELD_SOURCE_PROJECT)
- || fieldName.equals(PullRequest.FIELD_SOURCE_BRANCH)
- || fieldName.equals(PullRequest.FIELD_TITLE)
- || fieldName.equals(PullRequest.FIELD_DESCRIPTION)
- || fieldName.equals(PullRequest.FIELD_COMMENT)) {
+ if (fieldName.equals(PullRequest.NAME_TARGET_PROJECT)
+ || fieldName.equals(PullRequest.NAME_TARGET_BRANCH)
+ || fieldName.equals(PullRequest.NAME_SOURCE_PROJECT)
+ || fieldName.equals(PullRequest.NAME_SOURCE_BRANCH)
+ || fieldName.equals(PullRequest.NAME_TITLE)
+ || fieldName.equals(PullRequest.NAME_DESCRIPTION)
+ || fieldName.equals(PullRequest.NAME_COMMENT)) {
hints.add("Use * for wildcard match");
hints.add("Use '\\' to escape quotes");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java
index da994a2c68..3a6e4542d4 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java
@@ -45,8 +45,8 @@ public class RetryConditionBehavior extends ANTLRAssistBehavior {
protected List<InputSuggestion> match(String matchWith) {
if ("criteriaField".equals(spec.getLabel())) {
List<String> fields = Lists.newArrayList(
- Build.FIELD_LOG,
- Build.FIELD_ERROR_MESSAGE);
+ Build.NAME_LOG,
+ Build.NAME_ERROR_MESSAGE);
JobAware jobAware = getComponent().findParent(JobAware.class);
Job job = jobAware.getJob();
fields.addAll(job.getParamSpecMap().keySet());
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index f4c5e938ce..fbc1189607 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -450,7 +450,7 @@ public abstract class BuildListPanel extends Panel {
}
});
- columns.add(new AbstractColumn<Build, Void>(Model.of(Build.FIELD_JOB)) {
+ columns.add(new AbstractColumn<Build, Void>(Model.of(Build.NAME_JOB)) {
@Override
public String getCssClass() {
@@ -480,7 +480,7 @@ public abstract class BuildListPanel extends Panel {
}
});
- columns.add(new AbstractColumn<Build, Void>(Model.of(Build.FIELD_COMMIT)) {
+ columns.add(new AbstractColumn<Build, Void>(Model.of(Build.NAME_COMMIT)) {
@Override
public String getCssClass() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
index ecb4b25075..f61862adc4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
@@ -108,15 +108,15 @@ abstract class BatchEditPanel extends Panel implements InputContext {
@Override
public Boolean getObject() {
- return selectedFields.contains(Issue.FIELD_STATE);
+ return selectedFields.contains(Issue.NAME_STATE);
}
@Override
public void setObject(Boolean object) {
if (object)
- selectedFields.add(Issue.FIELD_STATE);
+ selectedFields.add(Issue.NAME_STATE);
else
- selectedFields.remove(Issue.FIELD_STATE);
+ selectedFields.remove(Issue.NAME_STATE);
}
}).add(newOnChangeBehavior(form)));
@@ -129,15 +129,15 @@ abstract class BatchEditPanel extends Panel implements InputContext {
@Override
public Boolean getObject() {
- return selectedFields.contains(Issue.FIELD_MILESTONE);
+ return selectedFields.contains(Issue.NAME_MILESTONE);
}
@Override
public void setObject(Boolean object) {
if (object)
- selectedFields.add(Issue.FIELD_MILESTONE);
+ selectedFields.add(Issue.NAME_MILESTONE);
else
- selectedFields.remove(Issue.FIELD_MILESTONE);
+ selectedFields.remove(Issue.NAME_MILESTONE);
}
}).add(newOnChangeBehavior(form)));
@@ -195,9 +195,9 @@ abstract class BatchEditPanel extends Panel implements InputContext {
}
Set<String> excludedProperties = new HashSet<>();
- if (!selectedFields.contains(Issue.FIELD_STATE))
+ if (!selectedFields.contains(Issue.NAME_STATE))
excludedProperties.add(Issue.PROP_STATE);
- if (!selectedFields.contains(Issue.FIELD_MILESTONE))
+ if (!selectedFields.contains(Issue.NAME_MILESTONE))
excludedProperties.add(Issue.PROP_MILESTONE);
builtInFieldsEditor = BeanContext.edit("builtInFieldsEditor", builtInFieldsBean, excludedProperties, true);
@@ -245,13 +245,13 @@ abstract class BatchEditPanel extends Panel implements InputContext {
@Override
protected void runTask(AjaxRequestTarget target) {
String state;
- if (selectedFields.contains(Issue.FIELD_STATE))
+ if (selectedFields.contains(Issue.NAME_STATE))
state = builtInFieldsBean.getState();
else
state = null;
Optional<Milestone> milestone;
- if (selectedFields.contains(Issue.FIELD_MILESTONE))
+ if (selectedFields.contains(Issue.NAME_MILESTONE))
milestone = Optional.fromNullable(getProject().getMilestone(builtInFieldsBean.getMilestone()));
else
milestone = null;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 1483c8c07f..0bfb8af365 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -273,7 +273,7 @@ public abstract class IssueListPanel extends Panel {
@Override
protected Map<String, String> load() {
Map<String, String> choices = new LinkedHashMap<>();
- choices.put(Issue.FIELD_STATE, Issue.FIELD_STATE);
+ choices.put(Issue.NAME_STATE, Issue.NAME_STATE);
for (String fieldName: getGlobalIssueSetting().getFieldNames())
choices.put(fieldName, fieldName);
return choices;
@@ -619,7 +619,7 @@ public abstract class IssueListPanel extends Panel {
RepeatingView fieldsView = new RepeatingView("fields");
for (String field: getListFields()) {
- if (field.equals(Issue.FIELD_STATE)) {
+ if (field.equals(Issue.NAME_STATE)) {
Fragment stateFragment = new Fragment(fieldsView.newChildId(),
"stateFrag", IssueListPanel.this);
stateFragment.add(new IssueStateLabel("state", rowModel));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
index 4ef946fd17..ceda155008 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
@@ -154,7 +154,7 @@ public abstract class IssueTitlePanel extends Panel {
GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
List<String> criterias = new ArrayList<>();
if (getIssue().getMilestone() != null) {
- criterias.add(Criteria.quote(Issue.FIELD_MILESTONE) + " "
+ criterias.add(Criteria.quote(Issue.NAME_MILESTONE) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
+ Criteria.quote(getIssue().getMilestoneName()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index 4c1831dab2..d892de635e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -623,7 +623,7 @@ public class ProjectBranchesPage extends ProjectPage {
if (!pullRequestManager.queryOpen(new ProjectAndBranch(getProject(), branch)).isEmpty()) {
Fragment bodyFrag = new Fragment("body", "openRequestsFrag", ProjectBranchesPage.this);
String query = String.format("\"%s\" %s \"%s\" %s %s",
- PullRequest.FIELD_TARGET_BRANCH, PullRequestQuery.getRuleName(PullRequestQueryLexer.Is),
+ PullRequest.NAME_TARGET_BRANCH, PullRequestQuery.getRuleName(PullRequestQueryLexer.Is),
branch, PullRequestQuery.getRuleName(PullRequestQueryLexer.And),
new OpenCriteria().toString());
PageParameters params = ProjectPullRequestsPage.paramsOf(getProject(), query, 0);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
index b02cf65ff7..b81f02bdc7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
@@ -73,14 +73,14 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(displayFields.contains(Issue.FIELD_STATE));
+ setVisible(displayFields.contains(Issue.NAME_STATE));
}
});
RepeatingView fieldsView = new RepeatingView("fields");
for (String fieldName: displayFields) {
- if (!fieldName.equals(Issue.FIELD_STATE)) {
+ if (!fieldName.equals(Issue.NAME_STATE)) {
Input field = getIssue().getFieldInputs().get(fieldName);
if (field != null && !field.getType().equals(FieldSpec.USER) && !field.getValues().isEmpty()) {
fieldsView.add(new FieldValuesPanel(fieldsView.newChildId(), Mode.AVATAR) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
index ec66276518..5c91cf8f0d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
@@ -80,7 +80,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(Issue.NAME_STATE)) {
criterias.add(new StateCriteria(getColumn()));
} else if (getColumn() != null) {
criterias.add(new ChoiceFieldCriteria(identifyField,
@@ -153,7 +153,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
if (Objects.equals(issue.getMilestone(), getMilestone())) {
// move issue between board columns
String identifyField = getBoard().getIdentifyField();
- if (identifyField.equals(Issue.FIELD_STATE)) {
+ if (identifyField.equals(Issue.NAME_STATE)) {
issue = SerializationUtils.clone(issue);
for (TransitionSpec transition: getIssueSetting().getTransitionSpecs()) {
if (transition.canTransitManually(issue, getColumn())) {
@@ -220,7 +220,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
String identifyField = getBoard().getIdentifyField();
if (getColumn() != null) {
title = HtmlEscape.escapeHtml5(getColumn());
- if (identifyField.equals(Issue.FIELD_STATE)) {
+ if (identifyField.equals(Issue.NAME_STATE)) {
StateSpec stateSpec = getIssueSetting().getStateSpec(getColumn());
if (stateSpec != null)
color = stateSpec.getColor();
@@ -298,7 +298,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(Issue.NAME_STATE)
|| getColumn().equals(getIssueSetting().getInitialStateSpec().getName())));
}
@@ -338,7 +338,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
OneDev.getInstance(IssueChangeManager.class).changeMilestone(issue, getMilestone());
markAccepted(target, issue, true);
- } else if (fieldName.equals(Issue.FIELD_STATE)) {
+ } else if (fieldName.equals(Issue.NAME_STATE)) {
AtomicReference<TransitionSpec> transitionRef = new AtomicReference<>(null);
for (TransitionSpec transition: getIssueSetting().getTransitionSpecs()) {
if (transition.canTransitManually(issue, getColumn())) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 76f5134fe1..3162bf9599 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.page.project.pullrequests.detail;
-import static io.onedev.server.model.Build.FIELD_JOB;
+import static io.onedev.server.model.Build.NAME_JOB;
import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;
import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY;
import static io.onedev.server.model.support.pullrequest.MergeStrategy.REBASE_SOURCE_BRANCH_COMMITS;
@@ -567,7 +567,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
String query = ""
+ getRuleName(AssociatedWithPullRequest) + " " + quote("#" + getPullRequest().getNumber())
+ " " + getRuleName(And) + " "
- + quote(FIELD_JOB) + " " + getRuleName(Is) + " " + quote(jobName);
+ + quote(NAME_JOB) + " " + getRuleName(Is) + " " + quote(jobName);
return new BookmarkablePageLink<Void>(componentId, ProjectBuildsPage.class,
ProjectBuildsPage.paramsOf(getPullRequest().getTargetProject(), query, 0));
}