Skip to content

The Unified and Autonomous Development Platform

Job trigger improvements

Robin Shen83f43706f819
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 605c7dfbfa..629eb9ef6a 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
@@ -189,8 +189,8 @@ public class ActionCondition extends Criteria<Build> {
}
@Override
- public String asString() {
- return criteria.asString();
+ public String toStringWithoutParens() {
+ return criteria.toStringWithoutParens();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java
index 2a1e5ab66f..518c54b384 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java
@@ -13,7 +13,7 @@ public class AlwaysCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return ActionCondition.getRuleName(ActionConditionLexer.Always);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.java
index 8ad3d7ec00..264f3600b3 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.java
@@ -13,7 +13,7 @@ public class AssociatedWithPullRequestsCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return ActionCondition.getRuleName(ActionConditionLexer.AssociatedWithPullRequests);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java
index 7efeaeab75..b3d2c5c3c9 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java
@@ -13,7 +13,7 @@ public class CancelledCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return ActionCondition.getRuleName(ActionConditionLexer.Cancelled);
}
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 71902925da..56b29b0512 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
@@ -21,7 +21,7 @@ public class ErrorMessageCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Build.FIELD_ERROR_MESSAGE) + " "
+ ActionCondition.getRuleName(ActionConditionLexer.Contains) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java
index 848accc598..46ce60e8cf 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java
@@ -13,7 +13,7 @@ public class FailedCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return ActionCondition.getRuleName(ActionConditionLexer.Failed);
}
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 a52d4713fa..a2e8206ce0 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
@@ -24,7 +24,7 @@ public class LogCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Build.FIELD_LOG) + " "
+ ActionCondition.getRuleName(ActionConditionLexer.Contains) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java
index c25e33ebc4..d4c8c3766e 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java
@@ -19,7 +19,7 @@ public class OnBranchCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return ActionCondition.getRuleName(ActionConditionLexer.OnBranch) + " "
+ quote(branch);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java
index a8fdf854ec..b929f39a73 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java
@@ -25,7 +25,7 @@ public class ParamCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(name) + " "
+ ActionCondition.getRuleName(ActionConditionLexer.Is) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamIsEmptyCriteria.java
index b02327482e..57ef386007 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamIsEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamIsEmptyCriteria.java
@@ -22,7 +22,7 @@ public class ParamIsEmptyCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(name) + " " + ActionCondition.getRuleName(ActionConditionLexer.IsEmpty);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java
index b06f1ea9a5..f52e840a78 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java
@@ -14,7 +14,7 @@ public class PreviousIsCancelledCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return ActionCondition.getRuleName(ActionConditionLexer.PreviousIsCancelled);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java
index 8e47d93190..54bb3d53e6 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java
@@ -14,7 +14,7 @@ public class PreviousIsFailedCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return ActionCondition.getRuleName(ActionConditionLexer.PreviousIsFailed);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java
index 2561dcbff1..2c623ae0e7 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java
@@ -14,7 +14,7 @@ public class PreviousIsSuccessfulCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return ActionCondition.getRuleName(ActionConditionLexer.PreviousIsSuccessful);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java
index a3e9d552f4..004aa18532 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java
@@ -14,7 +14,7 @@ public class PreviousIsTimedOutCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return ActionCondition.getRuleName(ActionConditionLexer.PreviousIsTimedOut);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.java
index 886df1d861..7516cdb714 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.java
@@ -13,7 +13,7 @@ public class RequiredByPullRequestsCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return ActionCondition.getRuleName(ActionConditionLexer.RequiredByPullRequests);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java
index e0ef0e291e..67ffe4c19d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java
@@ -13,7 +13,7 @@ public class SuccessfulCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return ActionCondition.getRuleName(ActionConditionLexer.Successful);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java
index b244182662..f1e150ca18 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java
@@ -13,7 +13,7 @@ public class TimedOutCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return ActionCondition.getRuleName(ActionConditionLexer.TimedOut);
}
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 3481af5619..877ad80dfd 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
@@ -21,7 +21,7 @@ public class ErrorMessageCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Build.FIELD_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 65f0e33c72..00c59df896 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
@@ -24,7 +24,7 @@ public class LogCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Build.FIELD_LOG) + " "
+ RetryCondition.getRuleName(RetryConditionLexer.Contains) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java
index 8a9a9fbc64..4cf30f2714 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java
@@ -13,7 +13,7 @@ public class NeverCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return RetryCondition.getRuleName(RetryConditionLexer.Never);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java
index 7acca43b47..b801ee2ac8 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java
@@ -25,7 +25,7 @@ public class ParamCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(name) + " "
+ RetryCondition.getRuleName(RetryConditionLexer.Is) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamIsEmptyCriteria.java
index e4b7c304be..9723011dd9 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamIsEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamIsEmptyCriteria.java
@@ -22,7 +22,7 @@ public class ParamIsEmptyCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(name) + " " + RetryCondition.getRuleName(RetryConditionLexer.IsEmpty);
}
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 f997865dc6..52c31a797e 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
@@ -153,8 +153,8 @@ public class RetryCondition extends Criteria<Build> {
}
@Override
- public String asString() {
- return criteria.asString();
+ public String toStringWithoutParens() {
+ return criteria.toStringWithoutParens();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java
index 789e8b4884..afed13b6b1 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java
@@ -28,9 +28,8 @@ public class BranchUpdateTrigger extends JobTrigger {
private String paths;
- @Editable(name="Branches", order=100,
- description="Optionally specify space-separated branches to check. Use * or ? for wildcard match. "
- + "Leave empty to match all branches")
+ @Editable(name="Branches", order=100, description="Optionally specify space-separated branches "
+ + "to check. Use * or ? for wildcard match. Leave empty to match all branches")
@Patterns(suggester = "suggestBranches")
@NameOfEmptyValue("Any branch")
public String getBranches() {
@@ -87,22 +86,20 @@ public class BranchUpdateTrigger extends JobTrigger {
}
@Override
- public boolean matches(ProjectEvent event, Job job) {
+ public boolean matchesWithoutProject(ProjectEvent event, Job job) {
if (event instanceof RefUpdated) {
RefUpdated refUpdated = (RefUpdated) event;
- String branch = GitUtils.ref2branch(refUpdated.getRefName());
- if (branch != null) {
- if ((getBranches() == null || PatternSet.parse(getBranches()).matches(new PathMatcher(), branch))
- && touchedFile(refUpdated)) {
- return true;
- }
- }
+ String updatedBranch = GitUtils.ref2branch(refUpdated.getRefName());
+ Matcher matcher = new PathMatcher();
+ return updatedBranch != null
+ && (branches == null || PatternSet.parse(branches).matches(matcher, updatedBranch))
+ && touchedFile(refUpdated);
}
return false;
}
@Override
- public String getDescription() {
+ public String getDescriptionWithoutProject() {
String description;
if (getBranches() != null && getPaths() != null)
description = String.format("When update branches '%s' and touch files '%s'", getBranches(), getPaths());
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java
index a8bcf86fbd..7805f65a71 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java
@@ -17,7 +17,7 @@ public class DependencyFinishedTrigger extends JobTrigger {
private static final long serialVersionUID = 1L;
@Override
- public boolean matches(ProjectEvent event, Job job) {
+ public boolean matchesWithoutProject(ProjectEvent event, Job job) {
if (event instanceof BuildFinished) {
BuildFinished buildFinished = (BuildFinished) event;
Build build = buildFinished.getBuild();
@@ -39,7 +39,7 @@ public class DependencyFinishedTrigger extends JobTrigger {
}
@Override
- public String getDescription() {
+ public String getDescriptionWithoutProject() {
return "When dependency jobs finished";
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
index 910d2eca28..05a5491f0c 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
@@ -8,15 +8,22 @@ import javax.validation.Valid;
import org.apache.wicket.Component;
+import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobAware;
import io.onedev.server.buildspec.job.paramspec.ParamSpec;
import io.onedev.server.buildspec.job.paramsupply.ParamSupply;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.match.Matcher;
+import io.onedev.server.util.match.StringMatcher;
+import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.ParamSpecProvider;
+import io.onedev.server.web.editable.annotation.Patterns;
+import io.onedev.server.web.util.SuggestionUtils;
import io.onedev.server.web.util.WicketUtils;
@Editable
@@ -24,8 +31,29 @@ public abstract class JobTrigger implements Serializable {
private static final long serialVersionUID = 1L;
+ private String projects;
+
private List<ParamSupply> params = new ArrayList<>();
+ @Editable(name="Applicable Projects", order=900, description="Optionally specify space-separated projects "
+ + "applicable for this trigger. This is useful for instance when you want to prevent "
+ + "the job from being triggered in forked projects. Use * or ? for wildcard match. "
+ + "Leave empty to match all projects")
+ @Patterns(suggester="suggestProjects")
+ @NameOfEmptyValue("Any project")
+ public String getProjects() {
+ return projects;
+ }
+
+ public void setProjects(String projects) {
+ this.projects = projects;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestProjects(String matchWith) {
+ return SuggestionUtils.suggestProjects(matchWith);
+ }
+
@Editable(name="Job Parameters", order=1000)
@ParamSpecProvider("getParamSpecs")
@OmitName
@@ -50,8 +78,21 @@ public abstract class JobTrigger implements Serializable {
return new ArrayList<>();
}
- public abstract boolean matches(ProjectEvent event, Job job);
+ public boolean matches(ProjectEvent event, Job job) {
+ String projectName = event.getProject().getName();
+ Matcher matcher = new StringMatcher();
+ return (projects == null || PatternSet.parse(projects).matches(matcher, projectName))
+ && matchesWithoutProject(event, job);
+ }
- public abstract String getDescription();
+ public String getDescription() {
+ String description = getDescriptionWithoutProject();
+ if (projects != null)
+ description += " in projects '" + projects + "'";
+ return description;
+ }
+ public abstract boolean matchesWithoutProject(ProjectEvent event, Job job);
+
+ public abstract String getDescriptionWithoutProject();
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
index 24ca85ae9e..312750311d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
@@ -29,9 +29,9 @@ public class PullRequestTrigger extends JobTrigger {
private String paths;
- @Editable(name="Target Branches", order=100,
- description="Optionally specify space-separated target branches of the pull requests to check. "
- + "Use * or ? for wildcard match. Leave empty to match all branches")
+ @Editable(name="Target Branches", order=100, description="Optionally specify space-separated "
+ + "target branches of the pull requests to check. Use * or ? for wildcard match. "
+ + "Leave empty to match all branches")
@Patterns(suggester = "suggestBranches")
@NameOfEmptyValue("Any branch")
public String getBranches() {
@@ -82,22 +82,22 @@ public class PullRequestTrigger extends JobTrigger {
}
@Override
- public boolean matches(ProjectEvent event, Job job) {
+ public boolean matchesWithoutProject(ProjectEvent event, Job job) {
if (event instanceof PullRequestMergePreviewCalculated) {
- PullRequestMergePreviewCalculated pullRequestMergePreviewCalculated = (PullRequestMergePreviewCalculated) event;
- String branch = pullRequestMergePreviewCalculated.getRequest().getTargetBranch();
- if (branch != null) {
- if ((getBranches() == null || PatternSet.parse(getBranches()).matches(new PathMatcher(), branch))
- && touchedFile(pullRequestMergePreviewCalculated.getRequest())) {
- return true;
- }
+ PullRequestMergePreviewCalculated mergePreviewCalculated = (PullRequestMergePreviewCalculated) event;
+ PullRequest request = mergePreviewCalculated.getRequest();
+ String targetBranch = request.getTargetBranch();
+ Matcher matcher = new PathMatcher();
+ if ((branches == null || PatternSet.parse(branches).matches(matcher, targetBranch))
+ && touchedFile(request)) {
+ return true;
}
}
return false;
}
@Override
- public String getDescription() {
+ public String getDescriptionWithoutProject() {
String description;
if (getBranches() != null && getPaths() != null)
description = String.format("When open/update pull requests targeting branches '%s' and touching files '%s'", getBranches(), getPaths());
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java
index 5095230e7c..8b141611ba 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java
@@ -24,10 +24,11 @@ public class TagCreateTrigger extends JobTrigger {
private String tags;
- @Editable(name="Tags", order=100,
- description="Optionally specify space-separated tags to check. Use * or ? for wildcard match. "
- + "Leave empty to match all tags")
- @Patterns(suggester = "suggestTags")
+ private String branches;
+
+ @Editable(name="Tags", order=100, description="Optionally specify space-separated tags to check. "
+ + "Use * or ? for wildcard match. Leave empty to match all tags")
+ @Patterns(suggester="suggestTags")
@NameOfEmptyValue("Any tag")
public String getTags() {
return tags;
@@ -42,13 +43,35 @@ public class TagCreateTrigger extends JobTrigger {
return SuggestionUtils.suggestTags(Project.get(), matchWith);
}
+ @Editable(name="On Branches", order=200, description="This trigger will only be applicable "
+ + "if tagged commit is on branches specified here. Multiple branches should be "
+ + "separated with spaces. Use * or ? for wildcard match. Leave empty to match all "
+ + "branches")
+ @Patterns(suggester="suggestBranches")
+ @NameOfEmptyValue("Any branch")
+ public String getBranches() {
+ return branches;
+ }
+
+ public void setBranches(String branches) {
+ this.branches = branches;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestBranches(String matchWith) {
+ return SuggestionUtils.suggestBranches(Project.get(), matchWith);
+ }
+
@Override
- public boolean matches(ProjectEvent event, Job job) {
+ public boolean matchesWithoutProject(ProjectEvent event, Job job) {
if (event instanceof RefUpdated) {
RefUpdated refUpdated = (RefUpdated) event;
- String pushedTag = GitUtils.ref2tag(refUpdated.getRefName());
- if (pushedTag != null && !refUpdated.getNewCommitId().equals(ObjectId.zeroId())
- && (getTags() == null || PatternSet.parse(getTags()).matches(new PathMatcher(), pushedTag))) {
+ String updatedTag = GitUtils.ref2tag(refUpdated.getRefName());
+ ObjectId commitId = refUpdated.getNewCommitId();
+ Project project = event.getProject();
+ if (updatedTag != null && !commitId.equals(ObjectId.zeroId())
+ && (tags == null || PatternSet.parse(tags).matches(new PathMatcher(), updatedTag))
+ && (branches == null || project.isCommitOnBranches(commitId, branches))) {
return true;
}
}
@@ -56,11 +79,13 @@ public class TagCreateTrigger extends JobTrigger {
}
@Override
- public String getDescription() {
- if (getTags() != null)
- return String.format("When create tags '%s'", getTags());
- else
- return "When create tags";
+ public String getDescriptionWithoutProject() {
+ String description = "When create tags";
+ if (tags != null)
+ description += " '" + tags + "'";
+ if (branches != null)
+ description += " on branches '" + branches + "'";
+ return description;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/AndEntityCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/AndEntityCriteria.java
index 30fba9aeb2..5721f2a720 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/AndEntityCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/AndEntityCriteria.java
@@ -59,8 +59,8 @@ public class AndEntityCriteria<T extends AbstractEntity> extends EntityCriteria<
}
@Override
- public String asString() {
- return new AndCriteria<T>(criterias).asString();
+ public String toStringWithoutParens() {
+ return new AndCriteria<T>(criterias).toStringWithoutParens();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/NotEntityCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/NotEntityCriteria.java
index 91dd65cfeb..309df58ef4 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/NotEntityCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/NotEntityCriteria.java
@@ -58,8 +58,8 @@ public class NotEntityCriteria<T extends AbstractEntity> extends EntityCriteria<
}
@Override
- public String asString() {
- return new NotCriteria<T>(criteria).asString();
+ public String toStringWithoutParens() {
+ return new NotCriteria<T>(criteria).toStringWithoutParens();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/OrEntityCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/OrEntityCriteria.java
index bfe87dba2d..cfeda39400 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/OrEntityCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/OrEntityCriteria.java
@@ -64,8 +64,8 @@ public class OrEntityCriteria<T extends AbstractEntity> extends EntityCriteria<T
}
@Override
- public String asString() {
- return new OrCriteria<T>(criterias).asString();
+ public String toStringWithoutParens() {
+ return new OrCriteria<T>(criterias).toStringWithoutParens();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java
index cbbcc2fae8..59193e736a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestCriteria.java
@@ -41,7 +41,7 @@ public class AssociatedWithPullRequestCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.AssociatedWithPullRequest) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java
index c3d7c4e693..3031cd8755 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/AssociatedWithPullRequestsCriteria.java
@@ -23,7 +23,7 @@ public class AssociatedWithPullRequestsCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.AssociatedWithPullRequests);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java
index 9bd933ab1c..5b6588ea8d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java
@@ -37,7 +37,7 @@ public class CancelledByCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.CancelledBy) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java
index e18e0a217c..830d87f62d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java
@@ -33,7 +33,7 @@ public class CancelledByMeCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.CancelledByMe);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java
index 19eb5e65d5..4a08ef7a37 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java
@@ -25,7 +25,7 @@ public class CancelledCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.Cancelled);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java
index 3008e7e70a..d72ce989de 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
@@ -39,7 +39,7 @@ public class CommitCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Build.FIELD_COMMIT) + " "
+ BuildQuery.getRuleName(BuildQueryLexer.Is) + " "
+ quote(commitId.name());
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java
index c39af2866a..7e5c75a207 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/DependenciesOfCriteria.java
@@ -43,7 +43,7 @@ public class DependenciesOfCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.DependenciesOf) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java
index f4d891e6f2..7d2373d3eb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/DependsOnCriteria.java
@@ -43,7 +43,7 @@ public class DependsOnCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.DependsOn) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
index 0daff53d1b..0f9410c467 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
@@ -25,7 +25,7 @@ public class FailedCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.Failed);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FinishDateCriteria.java
index 20b124e5f7..cc8bbd9599 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
@@ -46,7 +46,7 @@ public class FinishDateCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Build.FIELD_FINISH_DATE) + " "
+ BuildQuery.getRuleName(operator) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
index 2ee5f2a160..5f9d62f5f5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
@@ -72,7 +72,7 @@ public class FixedIssueCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.FixedIssue) + " " + 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 3e039f24b1..4398e01acf 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
@@ -32,7 +32,7 @@ public class JobCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Build.FIELD_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 5c46504d1d..6de80bc7a9 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
@@ -58,7 +58,7 @@ public class NumberCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Build.FIELD_NUMBER) + " "
+ BuildQuery.getRuleName(operator) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java
index 5c692ef589..cc27b63664 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamCriteria.java
@@ -41,7 +41,7 @@ public class ParamCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(name) + " "
+ BuildQuery.getRuleName(BuildQueryLexer.Is) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamIsEmptyCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamIsEmptyCriteria.java
index 35eabec396..5741c9798c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/ParamIsEmptyCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/ParamIsEmptyCriteria.java
@@ -40,7 +40,7 @@ public class ParamIsEmptyCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(name) + " " + BuildQuery.getRuleName(BuildQueryLexer.IsEmpty);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java
index 0f28e3e6c9..7330adbc5f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java
@@ -25,7 +25,7 @@ public class PendingCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.Pending);
}
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 f964b50082..9e3b364725 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
@@ -46,7 +46,7 @@ public class PendingDateCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Build.FIELD_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 8c3ee8f163..5cbdc06f83 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
@@ -37,7 +37,7 @@ public class ProjectCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Build.FIELD_PROJECT) + " "
+ BuildQuery.getRuleName(BuildQueryLexer.Is) + " "
+ quote(projectName);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java
index 3331eef788..e7e0891779 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestCriteria.java
@@ -43,7 +43,7 @@ public class RequiredByPullRequestCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.RequiredByPullRequest) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java
index 27128d7db9..72fcd532a4 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RequiredByPullRequestsCriteria.java
@@ -27,7 +27,7 @@ public class RequiredByPullRequestsCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.RequiredByPullRequests);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
index 1449bb70c0..d9ed28ad88 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
@@ -25,7 +25,7 @@ public class RunningCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.Running);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningDateCriteria.java
index 7a2332cf38..9af17c2e67 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
@@ -46,7 +46,7 @@ public class RunningDateCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Build.FIELD_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 11df778baa..39ac9ff511 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
@@ -45,7 +45,7 @@ public class SubmitDateCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Build.FIELD_SUBMIT_DATE) + " "
+ BuildQuery.getRuleName(operator) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java
index 7038182968..90aa5dad06 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java
@@ -37,7 +37,7 @@ public class SubmittedByCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.SubmittedBy) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
index 7c8a3d1c83..65fa2ec9a2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
@@ -33,7 +33,7 @@ public class SubmittedByMeCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.SubmittedByMe);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java
index 64701f0aa3..6255f5c04c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java
@@ -25,7 +25,7 @@ public class SuccessfulCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.Successful);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java
index 236c11546c..5173531f49 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java
@@ -25,7 +25,7 @@ public class TimedOutCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.TimedOut);
}
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 935b707a95..73047a25c7 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
@@ -33,7 +33,7 @@ public class VersionCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Build.FIELD_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 aaaf560af7..679fac8a3c 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
@@ -22,7 +22,7 @@ public class VersionIsEmptyCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Build.FIELD_VERSION) + " " + BuildQuery.getRuleName(BuildQueryLexer.IsEmpty);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java
index a3744acfbc..6837c0c887 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java
@@ -25,7 +25,7 @@ public class WaitingCriteria extends EntityCriteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return BuildQuery.getRuleName(BuildQueryLexer.Waiting);
}
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 25572b650a..149444e09c 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
@@ -32,7 +32,7 @@ public class ContentCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(CodeComment.FIELD_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 6b04c8d042..b5fc92eb66 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
@@ -44,7 +44,7 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(CodeComment.FIELD_CREATE_DATE) + " "
+ CodeCommentQuery.getRuleName(operator) + " "
+ quote(rawValue);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
index 51a62729ec..73aff9b4b8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
@@ -37,7 +37,7 @@ public class CreatedByCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.CreatedBy) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
index 0bfb5d44f1..ae9191fbc5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
@@ -33,7 +33,7 @@ public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.CreatedByMe);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java
index 75fcdaadc7..440b3b73f2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java
@@ -41,7 +41,7 @@ public class OnCommitCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.OnCommit) + " " + quote(commitId.name());
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
index b1bf529e8e..c82b52388c 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
@@ -35,7 +35,7 @@ public class PathCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(CodeComment.FIELD_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 23969a4256..734a055659 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
@@ -43,7 +43,7 @@ public class ReplyCountCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(CodeComment.FIELD_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 fc1978ab79..6e1c3962b3 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
@@ -41,7 +41,7 @@ public class ReplyCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(CodeComment.FIELD_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 9fb1537f1c..e0550c87f3 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
@@ -45,7 +45,7 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(CodeComment.FIELD_UPDATE_DATE) + " "
+ CodeCommentQuery.getRuleName(operator) + " "
+ quote(rawValue);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java
index 3dba71e606..01067d4de2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java
@@ -40,8 +40,8 @@ public class AndIssueCriteria extends IssueCriteria {
}
@Override
- public String asString() {
- return new AndEntityCriteria<Issue>(criterias).asString();
+ public String toStringWithoutParens() {
+ return new AndEntityCriteria<Issue>(criterias).toStringWithoutParens();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
index 6a45743b53..45c3002bc5 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
@@ -32,7 +32,7 @@ public class BooleanFieldCriteria extends FieldCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(getFieldName()) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
+ quote(String.valueOf(value));
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java
index 258ea04b34..f88239747c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/BuildFieldCriteria.java
@@ -60,7 +60,7 @@ public class BuildFieldCriteria extends FieldCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(getFieldName()) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
index 043076a30b..adb114c87c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
@@ -67,7 +67,7 @@ public class ChoiceFieldCriteria extends FieldCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(getFieldName()) + " "
+ IssueQuery.getRuleName(operator) + " "
+ quote(value);
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 a9922a4960..227f16119c 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
@@ -42,7 +42,7 @@ public class CommentCountCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Issue.FIELD_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 2aee8ab202..2229ae8066 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
@@ -38,7 +38,7 @@ public class CommentCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Issue.FIELD_COMMENT) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Contains) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java
index b6d4158c02..8226b9615f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommitFieldCriteria.java
@@ -42,7 +42,7 @@ public class CommitFieldCriteria extends FieldCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(getFieldName()) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
index 7f4cc37629..acab5a5754 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java
@@ -46,7 +46,7 @@ public class DateFieldCriteria extends FieldCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(getFieldName()) + " "
+ IssueQuery.getRuleName(operator) + " "
+ 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 918cf86fa9..7c3b76ffac 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
@@ -31,7 +31,7 @@ public class DescriptionCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Issue.FIELD_DESCRIPTION) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Contains) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
index f387a56b34..b64f47b332 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java
@@ -156,7 +156,7 @@ public class FieldOperatorCriteria extends FieldCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(getFieldName()) + " " + IssueQuery.getRuleName(operator);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
index 956ce39ce5..60cdf380e9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
@@ -136,7 +136,7 @@ public class FixedBetweenCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return getRuleName(IssueQueryLexer.FixedBetween) + " "
+ getRuleName(firstType) + " " + quote(firstValue) + " "
+ getRuleName(IssueQueryLexer.And) + " "
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java
index 181dc7b011..9878fa9a49 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInBuildCriteria.java
@@ -50,7 +50,7 @@ public class FixedInBuildCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return IssueQuery.getRuleName(IssueQueryLexer.FixedInBuild) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java
index e7d8231879..fc8d867cef 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCommitCriteria.java
@@ -46,7 +46,7 @@ public class FixedInCommitCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return IssueQuery.getRuleName(IssueQueryLexer.FixedInCommit) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java
index 2d44620bbe..5e314f2385 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java
@@ -29,7 +29,7 @@ public class FixedInCurrentBuildCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return IssueQuery.getRuleName(IssueQueryLexer.FixedInCurrentBuild);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java
index dd0137d234..0192a74e0a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentCommitCriteria.java
@@ -29,7 +29,7 @@ public class FixedInCurrentCommitCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return IssueQuery.getRuleName(IssueQueryLexer.FixedInCurrentCommit);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java
index 4574681f13..33535838fe 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentPullRequestCriteria.java
@@ -29,7 +29,7 @@ public class FixedInCurrentPullRequestCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return IssueQuery.getRuleName(IssueQueryLexer.FixedInCurrentPullRequest);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java
index 113702d405..e25d58505a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInPullRequestCriteria.java
@@ -49,7 +49,7 @@ public class FixedInPullRequestCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return IssueQuery.getRuleName(IssueQueryLexer.FixedInPullRequest) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java
index 6a080b36c2..f3c2989e6f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueFieldCriteria.java
@@ -45,7 +45,7 @@ public class IssueFieldCriteria extends FieldCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(getFieldName()) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
+ quote(value);
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 3098d3d64c..dbee048b50 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
@@ -36,7 +36,7 @@ public class MilestoneCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Issue.FIELD_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 6f36caedef..baad90c55b 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
@@ -22,7 +22,7 @@ public class MilestoneIsEmptyCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Issue.FIELD_MILESTONE) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NotIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NotIssueCriteria.java
index 129a68d442..9f6681f1b7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NotIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NotIssueCriteria.java
@@ -35,8 +35,8 @@ public class NotIssueCriteria extends IssueCriteria {
}
@Override
- public String asString() {
- return new NotEntityCriteria<Issue>(criteria).asString();
+ public String toStringWithoutParens() {
+ return new NotEntityCriteria<Issue>(criteria).toStringWithoutParens();
}
@Override
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 dd991cac10..02602d2690 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
@@ -60,7 +60,7 @@ public class NumberCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Issue.FIELD_NUMBER) + " "
+ IssueQuery.getRuleName(operator) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java
index 55bde1753b..65d333b507 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NumericFieldCriteria.java
@@ -48,7 +48,7 @@ public class NumericFieldCriteria extends FieldCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(getFieldName()) + " "
+ IssueQuery.getRuleName(operator) + " "
+ quote(String.valueOf(value));
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.java
index 5ac091205b..3d363f2f29 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.java
@@ -40,8 +40,8 @@ public class OrIssueCriteria extends IssueCriteria {
}
@Override
- public String asString() {
- return new OrEntityCriteria<Issue>(criterias).asString();
+ public String toStringWithoutParens() {
+ return new OrEntityCriteria<Issue>(criterias).toStringWithoutParens();
}
@Override
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 fa2be288fb..d38796ff11 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
@@ -36,7 +36,7 @@ public class ProjectCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Issue.FIELD_PROJECT) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
+ quote(projectName);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java
index f3f3bee3d3..cd3e91197c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/PullRequestFieldCriteria.java
@@ -46,7 +46,7 @@ public class PullRequestFieldCriteria extends FieldCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(getFieldName()) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
+ quote(value);
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 20d926de4b..ae908871b6 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
@@ -42,7 +42,7 @@ public class StateCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Issue.FIELD_STATE) + " "
+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
index b714c9033a..9614e0cf5f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java
@@ -46,7 +46,7 @@ public class StringFieldCriteria extends FieldCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(getFieldName()) + " "
+ IssueQuery.getRuleName(operator) + " "
+ 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 7dcbcd8af3..987ed3fccd 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
@@ -44,7 +44,7 @@ public class SubmitDateCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Issue.FIELD_SUBMIT_DATE) + " "
+ IssueQuery.getRuleName(operator) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
index 18a315482f..17a6d189a0 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
@@ -37,7 +37,7 @@ public class SubmittedByCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return IssueQuery.getRuleName(IssueQueryLexer.SubmittedBy) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
index 92b5f583b8..e9c2f70ab8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
@@ -32,7 +32,7 @@ public class SubmittedByMeCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return IssueQuery.getRuleName(IssueQueryLexer.SubmittedByMe);
}
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 9ecf9eeb45..bf770f8ae2 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
@@ -31,7 +31,7 @@ public class TitleCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Issue.FIELD_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 cabdc3f0e0..835c7f307d 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
@@ -45,7 +45,7 @@ public class UpdateDateCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Issue.FIELD_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 c9e8981560..9a9cadf44b 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
@@ -42,7 +42,7 @@ public class VoteCountCriteria extends IssueCriteria {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(Issue.FIELD_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 445be76490..297e6f84c5 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
@@ -33,7 +33,7 @@ public class DescriptionCriteria extends EntityCriteria<Project> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return Criteria.quote(Project.FIELD_DESCRIPTION) + " "
+ ProjectQuery.getRuleName(ProjectQueryLexer.Contains) + " "
+ Criteria.quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java
index 3dd8c48a93..76c53e43f2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java
@@ -42,7 +42,7 @@ public class ForksOfCriteria extends EntityCriteria<Project> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return ProjectQuery.getRuleName(ProjectQueryLexer.ForksOf) + " " + Criteria.quote(projectName);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NameCriteria.java
index 68503b9bbe..5117462785 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
@@ -34,7 +34,7 @@ public class NameCriteria extends EntityCriteria<Project> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return Criteria.quote(Project.FIELD_NAME) + " "
+ ProjectQuery.getRuleName(ProjectQueryLexer.Is) + " "
+ Criteria.quote(value);
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 c76a0b9f26..fefcd0801d 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
@@ -46,7 +46,7 @@ public class UpdateDateCriteria extends EntityCriteria<Project> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return Criteria.quote(Project.FIELD_UPDATE_DATE) + " "
+ ProjectQuery.getRuleName(operator) + " "
+ Criteria.quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
index 91b2c7208a..bddab66513 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
@@ -48,7 +48,7 @@ public class ApprovedByCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.ApprovedBy) + " "
+ quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
index 80a37f3983..c96d9f630d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
@@ -50,7 +50,7 @@ public class ApprovedByMeCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.ApprovedByMe);
}
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 28ad3e493c..24be37f53c 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
@@ -50,7 +50,7 @@ public class CloseDateCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(PullRequest.FIELD_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 9f946eee6a..303b46e793 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
@@ -43,7 +43,7 @@ public class CommentCountCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(PullRequest.FIELD_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 2313a9b0c7..8d1a8a8e50 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
@@ -39,7 +39,7 @@ public class CommentCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(PullRequest.FIELD_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 0a9be836ac..a91b2942c5 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
@@ -32,7 +32,7 @@ public class DescriptionCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(PullRequest.FIELD_DESCRIPTION) + " "
+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java
index b627fec669..b062c2dafb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java
@@ -38,7 +38,7 @@ public class DiscardedByCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.DiscardedBy) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java
index 7331b86e7b..209963f7a6 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java
@@ -34,7 +34,7 @@ public class DiscardedByMeCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.DiscardedByMe);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
index b9e527817e..7332ef748a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
@@ -28,7 +28,7 @@ public class DiscardedCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.Discarded);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java
index 018a13cd87..fff05d7b4d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java
@@ -43,7 +43,7 @@ public class HasFailedBuildsCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.HasFailedBuilds);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
index fff762e14b..43225fa5bb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
@@ -30,7 +30,7 @@ public class HasMergeConflictsCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.HasMergeConflicts);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
index b75d56d81e..ec2baa96c4 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
@@ -40,7 +40,7 @@ public class HasPendingReviewsCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.HasPendingReviews);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
index b3ac3df6c1..4ef3cc1159 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
@@ -56,7 +56,7 @@ public class IncludesCommitCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.IncludesCommit) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
index f6432bd993..a03c660b01 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
@@ -58,7 +58,7 @@ public class IncludesIssueCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.IncludesIssue) + " " + 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 1f294824f4..c134d1b060 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
@@ -31,7 +31,7 @@ public class MergeStrategyCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(PullRequest.FIELD_MERGE_STRATEGY) + " "
+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " "
+ quote(value.toString());
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
index 111c6168fb..cf39c06647 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
@@ -28,7 +28,7 @@ public class MergedCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.Merged);
}
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 c107537b97..d111090ddf 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
@@ -60,7 +60,7 @@ public class NumberCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(PullRequest.FIELD_NUMBER) + " "
+ PullRequestQuery.getRuleName(operator) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
index c1da7c5e9c..4b1b0e0424 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
@@ -27,7 +27,7 @@ public class OpenCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.Open);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java
index ecc9832e3b..759f87e10f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java
@@ -48,7 +48,7 @@ public class RequestedForChangesByCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.RequestedForChangesBy) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
index 7ec8cd61a7..d1578b5593 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
@@ -50,7 +50,7 @@ public class RequestedForChangesByMeCriteria extends EntityCriteria<PullRequest>
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.RequestedForChangesByMe);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
index ba0a37d4fc..b77aa232ff 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
@@ -40,7 +40,7 @@ public class SomeoneRequestedForChangesCriteria extends EntityCriteria<PullReque
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.SomeoneRequestedForChanges);
}
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 226b323e8c..6ad80e996b 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
@@ -32,7 +32,7 @@ public class SourceBranchCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(PullRequest.FIELD_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 eb1bf3ba8f..af9a0b463b 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
@@ -42,7 +42,7 @@ public class SourceProjectCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(PullRequest.FIELD_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 8045ab10eb..8973886de8 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
@@ -37,7 +37,7 @@ public class StatusCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(PullRequest.FIELD_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 78b944268f..1efbce1e36 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
@@ -45,7 +45,7 @@ public class SubmitDateCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(PullRequest.FIELD_SUBMIT_DATE) + " "
+ PullRequestQuery.getRuleName(operator) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
index 892ed483cc..a12ff8919e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
@@ -37,7 +37,7 @@ public class SubmittedByCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.SubmittedBy) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
index 44b85f0d62..12e6a5736a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
@@ -33,7 +33,7 @@ public class SubmittedByMeCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.SubmittedByMe);
}
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 6824f8dd88..46878842c9 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
@@ -32,7 +32,7 @@ public class TargetBranchCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(PullRequest.FIELD_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 7c39912b5a..35d449e9b2 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
@@ -37,7 +37,7 @@ public class TargetProjectCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(PullRequest.FIELD_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 e356a10c51..5ce3420004 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
@@ -32,7 +32,7 @@ public class TitleCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(PullRequest.FIELD_TITLE) + " "
+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
index bd1b57d5e7..95bfd469bd 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
@@ -47,7 +47,7 @@ public class ToBeReviewedByCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.ToBeReviewedBy) + " " + quote(value);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
index 80b047eda7..7393406e61 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
@@ -49,7 +49,7 @@ public class ToBeReviewedByMeCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.ToBeReviewedByMe);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java
index cfd6943390..5f137fc55b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeVerifiedByBuildsCriteria.java
@@ -43,7 +43,7 @@ public class ToBeVerifiedByBuildsCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.ToBeVerifiedByBuilds);
}
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 dda21ef95a..5dead84863 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
@@ -46,7 +46,7 @@ public class UpdateDateCriteria extends EntityCriteria<PullRequest> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(PullRequest.FIELD_UPDATE_DATE) + " "
+ PullRequestQuery.getRuleName(operator) + " "
+ quote(value);
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java
index f1715acebb..b1549e7524 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java
@@ -49,7 +49,7 @@ public class AndCriteria<T> extends Criteria<T> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return criterias.stream().map(it->it.toString()).collect(Collectors.joining(" and "));
}
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java
index 76d44600bd..96ade73d9d 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java
@@ -45,11 +45,11 @@ public abstract class Criteria<T> implements Serializable {
@Override
public String toString() {
if (withParens)
- return "(" + asString() + ")";
+ return "(" + toStringWithoutParens() + ")";
else
- return asString();
+ return toStringWithoutParens();
}
- public abstract String asString();
+ public abstract String toStringWithoutParens();
}
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java
index 8670efd184..ece773c1e6 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java
@@ -46,7 +46,7 @@ public class NotCriteria<T> extends Criteria<T> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return "not(" + criteria.toString() + ")";
}
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java
index d6a165b758..efe0edd7ef 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java
@@ -49,7 +49,7 @@ public class OrCriteria<T> extends Criteria<T> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return criterias.stream().map(it->it.toString()).collect(Collectors.joining(" or "));
}
diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/AlwaysCriteria.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/AlwaysCriteria.java
index a85c0134bb..c9dcbda12b 100644
--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/AlwaysCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/AlwaysCriteria.java
@@ -16,7 +16,7 @@ public class AlwaysCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return getRuleName(All);
}
diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/BranchCriteria.java
index 5c87f3c2f2..2854bc5ebd 100644
--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/BranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/BranchCriteria.java
@@ -2,6 +2,7 @@ package io.onedev.server.util.jobmatch;
import io.onedev.server.model.Build;
import io.onedev.server.util.criteria.Criteria;
+
import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;
import static io.onedev.server.util.jobmatch.JobMatchLexer.OnBranch;
@@ -21,7 +22,7 @@ public class BranchCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return getRuleName(OnBranch) + " " + quote(branch);
}
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 f512af6b27..4083a1f637 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
@@ -24,7 +24,7 @@ public class ImageCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(FIELD_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 ac19a5a203..4704c0a396 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
@@ -170,7 +170,7 @@ public class JobMatch extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return criteria.toString();
}
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 f6f167f99d..99ff4fa13b 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
@@ -25,7 +25,7 @@ public class NameCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(FIELD_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 0f86f29a40..a96d0f2354 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
@@ -35,7 +35,7 @@ public class ProjectCriteria extends Criteria<Build> {
}
@Override
- public String asString() {
+ public String toStringWithoutParens() {
return quote(FIELD_PROJECT) + " " + getRuleName(Is) + " " + quote(projectName);
}