The Unified and Autonomous Development Platform
feat: Able to specify multiple values for various query criteria (OD-2127)
Robin Shen21485047f4d6
diff --git a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.g4 b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.g4index 9cfa83b333..d00513f1c4 100644--- a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.g4+++ b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.g4@@ -5,14 +5,18 @@ jobMatch;criteria- : operator=(OnBranch|SubmittedByUser|SubmittedByGroup) WS+ criteriaValue=Quoted #OperatorValueCriteria- | criteriaField=Quoted WS+ operator=(Is|IsNot) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ : operator=(OnBranch|SubmittedByUser|SubmittedByGroup) WS+ criteriaValue=multipleQuoted #OperatorValueCriteria+ | criteriaField=Quoted WS+ operator=(Is|IsNot) WS+ criteriaValue=multipleQuoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria| Not WS* LParens WS* criteria WS* RParens #NotCriteria| LParens WS* criteria WS* RParens #ParensCriteria;+multipleQuoted+ : Quoted(','Quoted)*+ ;+OnBranch: 'on' WS+ 'branch';diff --git a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.javaindex 675ff96ddf..c6c4396e71 100644--- a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java+++ b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java@@ -21,6 +21,7 @@ import java.util.ArrayList;import java.util.List;import static io.onedev.commons.codeassist.AntlrUtils.getLexerRuleName;+import static io.onedev.server.job.match.JobMatchParser.*;public class JobMatch extends Criteria<JobMatchContext> {@@ -65,37 +66,49 @@ public class JobMatch extends Criteria<JobMatchContext> {@Overridepublic Criteria<io.onedev.server.job.match.JobMatchContext> visitFieldOperatorValueCriteria(JobMatchParser.FieldOperatorValueCriteriaContext ctx) {int operator = ctx.operator.getType();- String fieldName = getValue(ctx.Quoted(0).getText());- String fieldValue = getValue(ctx.Quoted(1).getText());+ String fieldName = getValue(ctx.criteriaField.getText());checkField(fieldName, withProjectCriteria, withJobCriteria);-- if (fieldName.equals(Build.NAME_PROJECT))- return new ProjectCriteria(fieldValue, operator);- else- return new JobCriteria(fieldValue, operator);++ var criterias = new ArrayList<Criteria<io.onedev.server.job.match.JobMatchContext>>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String fieldValue = getValue(quoted.getText());++ if (fieldName.equals(Build.NAME_PROJECT))+ criterias.add(new ProjectCriteria(fieldValue, operator));+ else+ criterias.add(new JobCriteria(fieldValue, operator));+ }+ return operator == IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);}@Overridepublic Criteria<io.onedev.server.job.match.JobMatchContext> visitOperatorValueCriteria(JobMatchParser.OperatorValueCriteriaContext ctx) {- String fieldValue = getValue(ctx.Quoted().getText());- switch (ctx.operator.getType()) {- case JobMatchParser.OnBranch:- return new OnBranchCriteria(fieldValue);- case JobMatchParser.SubmittedByGroup:- var group = OneDev.getInstance(GroupManager.class).find(fieldValue);- if (group != null)- return new GroupCriteria(group);- else- throw new ExplicitException("Unable to find group: " + fieldValue);- case JobMatchParser.SubmittedByUser:- var user = OneDev.getInstance(UserManager.class).findByName(fieldValue);- if (user != null)- return new UserCriteria(user);- else- throw new ExplicitException("Unable to find user with login: " + fieldValue);- default:- throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());+ var criterias = new ArrayList<Criteria<io.onedev.server.job.match.JobMatchContext>>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String fieldValue = getValue(quoted.getText());+ switch (ctx.operator.getType()) {+ case OnBranch:+ criterias.add(new OnBranchCriteria(fieldValue));+ break;+ case SubmittedByGroup:+ var group = OneDev.getInstance(GroupManager.class).find(fieldValue);+ if (group != null)+ criterias.add(new GroupCriteria(group));+ else+ throw new ExplicitException("Unable to find group: " + fieldValue);+ break;+ case SubmittedByUser:+ var user = OneDev.getInstance(UserManager.class).findByName(fieldValue);+ if (user != null)+ criterias.add(new UserCriteria(user));+ else+ throw new ExplicitException("Unable to find user with login: " + fieldValue);+ break;+ default:+ throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());+ }}+ return new OrCriteria<>(criterias);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.g4 b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.g4index 73b21b1dbf..15682e81ad 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.g4@@ -7,14 +7,18 @@ querycriteria: operator=(BuildIsSuccessful|BuildIsFailed) #OperatorCriteria| criteriaField=Quoted WS+ operator=(IsEmpty|IsNotEmpty) #FieldOperatorCriteria- | operator=(Since|Until) WS+ criteriaValue=Quoted #OperatorValueCriteria- | criteriaField=Quoted WS+ operator=(Is|IsNot) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | operator=(Since|Until) WS+ criteriaValue=multipleQuoted #OperatorValueCriteria+ | criteriaField=Quoted WS+ operator=(Is|IsNot) WS+ criteriaValue=multipleQuoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria| Not WS* LParens WS* criteria WS* RParens #NotCriteria| LParens WS* criteria WS* RParens #ParensCriteria;+multipleQuoted+ : Quoted(','Quoted)*+ ;+BuildIsSuccessful: 'build' WS+ 'is' WS+ 'successful';diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.javaindex 8335ee5593..38b5c3916e 100644--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java@@ -1,42 +1,22 @@package io.onedev.server.search.buildmetric;-import static io.onedev.server.model.Build.METRIC_QUERY_FIELDS;-import static io.onedev.server.model.Build.NAME_BRANCH;-import static io.onedev.server.model.Build.NAME_JOB;-import static io.onedev.server.model.Build.NAME_PULL_REQUEST;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.List;--import javax.annotation.Nullable;--import org.antlr.v4.runtime.BailErrorStrategy;-import org.antlr.v4.runtime.BaseErrorListener;-import org.antlr.v4.runtime.CharStream;-import org.antlr.v4.runtime.CharStreams;-import org.antlr.v4.runtime.CommonTokenStream;-import org.antlr.v4.runtime.RecognitionException;-import org.antlr.v4.runtime.Recognizer;-import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.BuildMetric;-import io.onedev.server.search.buildmetric.BuildMetricQueryParser.AndCriteriaContext;-import io.onedev.server.search.buildmetric.BuildMetricQueryParser.CriteriaContext;-import io.onedev.server.search.buildmetric.BuildMetricQueryParser.FieldOperatorCriteriaContext;-import io.onedev.server.search.buildmetric.BuildMetricQueryParser.FieldOperatorValueCriteriaContext;-import io.onedev.server.search.buildmetric.BuildMetricQueryParser.NotCriteriaContext;-import io.onedev.server.search.buildmetric.BuildMetricQueryParser.OperatorCriteriaContext;-import io.onedev.server.search.buildmetric.BuildMetricQueryParser.OperatorValueCriteriaContext;-import io.onedev.server.search.buildmetric.BuildMetricQueryParser.OrCriteriaContext;-import io.onedev.server.search.buildmetric.BuildMetricQueryParser.ParensCriteriaContext;-import io.onedev.server.search.buildmetric.BuildMetricQueryParser.QueryContext;import io.onedev.server.search.entity.EntityQuery;+import org.antlr.v4.runtime.*;++import javax.annotation.Nullable;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import static io.onedev.server.model.Build.*;+import static io.onedev.server.search.buildmetric.BuildMetricQueryParser.*;public class BuildMetricQuery implements Serializable {@@ -79,9 +59,9 @@ public class BuildMetricQuery implements Serializable {@Overridepublic BuildMetricCriteria visitOperatorCriteria(OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {- case BuildMetricQueryLexer.BuildIsSuccessful:+ case BuildIsSuccessful:return new BuildIsSuccessfulCriteria();- case BuildMetricQueryLexer.BuildIsFailed:+ case BuildIsFailed:return new BuildIsFailedCriteria();default:throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());@@ -106,34 +86,46 @@ public class BuildMetricQuery implements Serializable {@Overridepublic BuildMetricCriteria visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {- String fieldName = EntityQuery.getValue(ctx.Quoted(0).getText());- String value = EntityQuery.getValue(ctx.Quoted(1).getText());+ String fieldName = EntityQuery.getValue(ctx.criteriaField.getText());int operator = ctx.operator.getType();checkField(project, fieldName, operator);-- if (operator == BuildMetricQueryLexer.Is || operator == BuildMetricQueryLexer.IsNot) {- switch (fieldName) {- case BuildMetric.NAME_REPORT:- return new ReportCriteria(value, operator);- case NAME_JOB:- return new JobCriteria(value, operator);- case NAME_BRANCH:- return new BranchCriteria(value, operator);- default:- return new ParamCriteria(fieldName, value, operator);++ var criterias = new ArrayList<BuildMetricCriteria>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String value = EntityQuery.getValue(quoted.getText());+ if (operator == Is || operator == IsNot) {+ switch (fieldName) {+ case BuildMetric.NAME_REPORT:+ criterias.add(new ReportCriteria(value, operator));+ break;+ case NAME_JOB:+ criterias.add(new JobCriteria(value, operator));+ break;+ case NAME_BRANCH:+ criterias.add(new BranchCriteria(value, operator));+ break;+ default:+ criterias.add(new ParamCriteria(fieldName, value, operator));+ }+ } else {+ throw new IllegalStateException();}}- throw new IllegalStateException();+ return operator==IsNot? new AndBuildMetricCriteria(criterias): new OrBuildMetricCriteria(criterias);}@Overridepublic BuildMetricCriteria visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {- int operator = ctx.operator.getType();- String value = EntityQuery.getValue(ctx.Quoted().getText());- if (operator == BuildMetricQueryLexer.Since || operator == BuildMetricQueryLexer.Until)- return new DateCriteria(value, operator);- else- throw new RuntimeException("Unexpected criteria: " + ctx.operator.getText());+ var criterias = new ArrayList<BuildMetricCriteria>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ int operator = ctx.operator.getType();+ String value = EntityQuery.getValue(quoted.getText());+ if (operator == Since || operator == Until)+ criterias.add(new DateCriteria(value, operator));+ else+ throw new RuntimeException("Unexpected criteria: " + ctx.operator.getText());+ }+ return new OrBuildMetricCriteria(criterias);}@Override@@ -173,16 +165,16 @@ public class BuildMetricQuery implements Serializable {if (!METRIC_QUERY_FIELDS.contains(fieldName) && !paramNames.contains(fieldName))throw new ExplicitException("Field not found: " + fieldName);switch (operator) {- case BuildMetricQueryLexer.Is:- case BuildMetricQueryLexer.IsNot:+ case Is:+ case IsNot:if (!fieldName.equals(NAME_JOB) && !fieldName.equals(NAME_BRANCH)&& !fieldName.equals(BuildMetric.NAME_REPORT)&& !paramNames.contains(fieldName)) {throw newOperatorException(fieldName, operator);}break;- case BuildMetricQueryLexer.IsEmpty:- case BuildMetricQueryLexer.IsNotEmpty:+ case IsEmpty:+ case IsNotEmpty:if (!fieldName.equals(NAME_PULL_REQUEST) && !paramNames.contains(fieldName))throw newOperatorException(fieldName, operator);break;diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4 b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4index 8ae4e26303..5ec96e289a 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4@@ -17,9 +17,9 @@ criteria;revisionCriteria- : ((UNTIL|SINCE) WS+)? ((BRANCH|TAG|COMMIT|BUILD) Value | DefaultBranch)+ : ((UNTIL|SINCE) WS+)? ((BRANCH|TAG|COMMIT|BUILD) Value+ | DefaultBranch);-+beforeCriteria: BEFORE Value;@@ -29,21 +29,21 @@ afterCriteria;committerCriteria- : COMMITTER Value+ : COMMITTER Value+| CommittedByMe;authorCriteria- : AUTHOR Value+ : AUTHOR Value+| AuthoredByMe;pathCriteria- : PATH Value+ : PATH Value+;messageCriteria- : MESSAGE Value+ : MESSAGE Value+;SINCEdiff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.javaindex 975ba964c2..4174e4554c 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java@@ -70,7 +70,8 @@ public class CommitQuery implements Serializable {throw new ExplicitException("Criteria '" + criteria.authorCriteria().AuthoredByMe().getText() + "' is not supported here");authorValues.add(null);} else {- authorValues.add(getValue(criteria.authorCriteria().Value()));+ for (var value: criteria.authorCriteria().Value())+ authorValues.add(getValue(value));}} else if (criteria.committerCriteria() != null) {if (criteria.committerCriteria().CommittedByMe() != null) {@@ -78,32 +79,39 @@ public class CommitQuery implements Serializable {throw new ExplicitException("Criteria '" + criteria.committerCriteria().CommittedByMe().getText() + "' is not supported here");committerValues.add(null);} else {- committerValues.add(getValue(criteria.committerCriteria().Value()));+ for (var value: criteria.committerCriteria().Value())+ committerValues.add(getValue(value));}} else if (criteria.messageCriteria() != null) {- messageValues.add(getValue(criteria.messageCriteria().Value()));+ for (var value: criteria.messageCriteria().Value())+ messageValues.add(getValue(value));} else if (criteria.fuzzyCriteria() != null) {fuzzyValues.add(unescape(unfence(criteria.fuzzyCriteria().getText())));} else if (criteria.pathCriteria() != null) {- pathValues.add(getValue(criteria.pathCriteria().Value()));+ for (var value: criteria.pathCriteria().Value())+ pathValues.add(getValue(value));} else if (criteria.beforeCriteria() != null) {beforeValues.add(getValue(criteria.beforeCriteria().Value()));} else if (criteria.afterCriteria() != null) {afterValues.add(getValue(criteria.afterCriteria().Value()));} else if (criteria.revisionCriteria() != null) {- String value;+ List<String> values = new ArrayList<>();Revision.Scope scope;- if (criteria.revisionCriteria().DefaultBranch() != null)- value = project.getDefaultBranch();- else- value = getValue(criteria.revisionCriteria().Value());- if (criteria.revisionCriteria().BUILD() != null) {- var buildReference = BuildReference.of(value, project);- Build build = OneDev.getInstance(BuildManager.class).find(buildReference.getProject(), buildReference.getNumber());- if (build == null)- throw new ExplicitException("Unable to find build: " + value);- else- value = build.getCommitHash();+ if (criteria.revisionCriteria().DefaultBranch() != null) {+ values.add(project.getDefaultBranch());+ } else {+ for (var valueNode: criteria.revisionCriteria().Value()) {+ var value = getValue(valueNode);+ if (criteria.revisionCriteria().BUILD() != null) {+ var buildReference = BuildReference.of(value, project);+ Build build = OneDev.getInstance(BuildManager.class).find(buildReference.getProject(), buildReference.getNumber());+ if (build == null)+ throw new ExplicitException("Unable to find build: " + value);+ else+ value = build.getCommitHash();+ }+ values.add(value);+ }}if (criteria.revisionCriteria().SINCE() != null)scope = Revision.Scope.SINCE;@@ -111,7 +119,7 @@ public class CommitQuery implements Serializable {scope = Revision.Scope.UNTIL;elsescope = null;- if (value != null)+ for (var value: values)revisions.add(new Revision(value, scope, criteria.revisionCriteria().getText()));}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.g4index baceb7ff7a..692e152080 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.g4@@ -8,8 +8,8 @@ querycriteria: operator=(Online|Offline|Paused|HasRunningBuilds) #OperatorCriteria- | operator=(HasAttribute|NotUsedSince|EverUsedSince|RanBuild) WS+ criteriaValue=Quoted #OperatorValueCriteria- | criteriaField=Quoted WS+ operator=(Is|IsNot) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | operator=(HasAttribute|NotUsedSince|EverUsedSince|RanBuild) WS+ criteriaValue=multipleQuoted #OperatorValueCriteria+ | criteriaField=Quoted WS+ operator=(Is|IsNot) WS+ criteriaValue=multipleQuoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria| Not WS* LParens WS* criteria WS* RParens #NotCriteria@@ -21,6 +21,10 @@ order: orderField=Quoted WS* (WS+ direction=(Asc|Desc))?;+multipleQuoted+ : Quoted(','Quoted)*+ ;+Online: 'online';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.javaindex 6db7864d96..83fb813518 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java@@ -77,13 +77,13 @@ public class AgentQuery extends EntityQuery<Agent> {throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");switch (ctx.operator.getType()) {- case AgentQueryLexer.Online:+ case Online:return new OnlineCriteria();- case AgentQueryLexer.Offline:+ case Offline:return new OfflineCriteria();- case AgentQueryLexer.Paused:+ case Paused:return new PausedCriteria();- case AgentQueryLexer.HasRunningBuilds:+ case HasRunningBuilds:return new HasRunningBuildsCriteria();default:throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());@@ -95,48 +95,62 @@ public class AgentQuery extends EntityQuery<Agent> {if (forExecutor && ctx.HasAttribute() == null)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");- String value = getValue(ctx.Quoted().getText());- if (ctx.HasAttribute() != null)- return new HasAttributeCriteria(value);- else if (ctx.NotUsedSince() != null)- return new NotUsedSinceCriteria(value);- else if (ctx.EverUsedSince() != null)- return new EverUsedSinceCriteria(value);- else if (ctx.RanBuild() != null)- return new RanBuildCriteria(value);- else- throw new RuntimeException("Unexpected criteria: " + ctx.operator.getText());+ var criterias = new ArrayList<Criteria<Agent>>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String value = getValue(quoted.getText());+ if (ctx.HasAttribute() != null)+ criterias.add(new HasAttributeCriteria(value));+ else if (ctx.NotUsedSince() != null)+ criterias.add(new NotUsedSinceCriteria(value));+ else if (ctx.EverUsedSince() != null)+ criterias.add(new EverUsedSinceCriteria(value));+ else if (ctx.RanBuild() != null)+ criterias.add(new RanBuildCriteria(value));+ else+ throw new RuntimeException("Unexpected criteria: " + ctx.operator.getText());+ }+ return new OrCriteria<>(criterias);}@Overridepublic Criteria<Agent> visitParensCriteria(ParensCriteriaContext ctx) {- return (Criteria<Agent>) visit(ctx.criteria()).withParens(true);+ return visit(ctx.criteria()).withParens(true);}@Overridepublic Criteria<Agent> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {- String fieldName = getValue(ctx.Quoted(0).getText());- String value = getValue(ctx.Quoted(1).getText());+ String fieldName = getValue(ctx.criteriaField.getText());int operator = ctx.operator.getType();checkField(fieldName, operator);- if (operator == AgentQueryLexer.Is || operator == AgentQueryLexer.IsNot) {- switch (fieldName) {- case NAME_NAME:- return new NameCriteria(value, operator);- case NAME_OS_NAME:- return new OsCriteria(value, operator);- case NAME_OS_VERSION:- return new OsVersionCriteria(value, operator);- case NAME_OS_ARCH:- return new OsArchCriteria(value, operator);- case NAME_IP_ADDRESS:- return new IpAddressCriteria(value, operator);- default:- return new AttributeCriteria(fieldName, value, operator);+ var criterias = new ArrayList<Criteria<Agent>>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String value = getValue(quoted.getText());+ if (operator == Is || operator == IsNot) {+ switch (fieldName) {+ case NAME_NAME:+ criterias.add(new NameCriteria(value, operator));+ break;+ case NAME_OS_NAME:+ criterias.add(new OsCriteria(value, operator));+ break;+ case NAME_OS_VERSION:+ criterias.add(new OsVersionCriteria(value, operator));+ break;+ case NAME_OS_ARCH:+ criterias.add(new OsArchCriteria(value, operator));+ break;+ case NAME_IP_ADDRESS:+ criterias.add(new IpAddressCriteria(value, operator));+ break;+ default:+ criterias.add(new AttributeCriteria(fieldName, value, operator));+ }+ } else {+ throw new IllegalStateException();}}- throw new IllegalStateException();+ return operator==IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);}@Override@@ -144,7 +158,7 @@ public class AgentQuery extends EntityQuery<Agent> {List<Criteria<Agent>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new OrCriteria<Agent>(childCriterias);+ return new OrCriteria<>(childCriterias);}@Override@@ -152,12 +166,12 @@ public class AgentQuery extends EntityQuery<Agent> {List<Criteria<Agent>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new AndCriteria<Agent>(childCriterias);+ return new AndCriteria<>(childCriterias);}@Overridepublic Criteria<Agent> visitNotCriteria(NotCriteriaContext ctx) {- return new NotCriteria<Agent>(visit(ctx.criteria()));+ return new NotCriteria<>(visit(ctx.criteria()));}}.visit(criteriaContext);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4index a9ac8c1e64..aaf096d0a2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4@@ -9,8 +9,8 @@ querycriteria: operator=(Successful|Failed|Cancelled|Running|Finished|Waiting|Pending|TimedOut|SubmittedByMe|CancelledByMe) #OperatorCriteria| criteriaField=Quoted WS+ operator=(IsEmpty|IsNotEmpty) #FieldOperatorCriteria- | operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf|RanOn) WS+ criteriaValue=Quoted #OperatorValueCriteria- | criteriaField=Quoted WS+ operator=(Is|IsNot|IsGreaterThan|IsLessThan|IsUntil|IsSince) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf|RanOn) WS+ criteriaValue=multipleQuoted #OperatorValueCriteria+ | criteriaField=Quoted WS+ operator=(Is|IsNot|IsGreaterThan|IsLessThan|IsUntil|IsSince) WS+ criteriaValue=multipleQuoted #FieldOperatorValueCriteria| Reference #ReferenceCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria@@ -23,6 +23,10 @@ order: orderField=Quoted WS* (WS+ direction=(Asc|Desc))?;+multipleQuoted+ : Quoted(','Quoted)*+ ;+Successful: 'successful';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex 8eadd46360..9ca47c4dbd 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -73,7 +73,7 @@ public class BuildQuery extends EntityQuery<Build> {@Overridepublic Criteria<Build> visitReferenceCriteria(ReferenceCriteriaContext ctx) {- return new ReferenceCriteria(project, ctx.getText(), Is);+ return new ReferenceCriteria(project, ctx.getText(), BuildQueryParser.Is);}@Override@@ -84,35 +84,35 @@ public class BuildQuery extends EntityQuery<Build> {@Overridepublic Criteria<Build> visitOperatorCriteria(OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {- case BuildQueryLexer.Successful:+ case Successful:return new SuccessfulCriteria();- case BuildQueryLexer.Failed:+ case Failed:return new FailedCriteria();- case BuildQueryLexer.Cancelled:+ case Cancelled:return new CancelledCriteria();- case BuildQueryLexer.TimedOut:+ case TimedOut:return new TimedOutCriteria();- case BuildQueryLexer.Finished:+ case Finished:if (!withUnfinishedCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new FinishedCriteria();- case BuildQueryLexer.Waiting:+ case Waiting:if (!withUnfinishedCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new WaitingCriteria();- case BuildQueryLexer.Pending:+ case Pending:if (!withUnfinishedCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new PendingCriteria();- case BuildQueryLexer.Running:+ case Running:if (!withUnfinishedCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new RunningCriteria();- case BuildQueryLexer.SubmittedByMe:+ case SubmittedByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new SubmittedByMeCriteria();- case BuildQueryLexer.CancelledByMe:+ case CancelledByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new CancelledByMeCriteria();@@ -123,21 +123,25 @@ public class BuildQuery extends EntityQuery<Build> {@Overridepublic Criteria<Build> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {- String value = getValue(ctx.Quoted().getText());- if (ctx.SubmittedBy() != null)- return new SubmittedByCriteria(getUser(value));- else if (ctx.CancelledBy() != null)- return new CancelledByCriteria(getUser(value));- else if (ctx.FixedIssue() != null)- return new FixedIssueCriteria(project, value);- else if (ctx.DependsOn() != null)- return new DependsOnCriteria(project, value);- else if (ctx.DependenciesOf() != null)- return new DependenciesOfCriteria(project, value);- else if (ctx.RanOn() != null)- return new RanOnCriteria(value);- else- throw new RuntimeException("Unexpected criteria: " + ctx.operator.getText());+ var criterias = new ArrayList<Criteria<Build>>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String value = getValue(quoted.getText());+ if (ctx.SubmittedBy() != null)+ criterias.add(new SubmittedByCriteria(getUser(value)));+ else if (ctx.CancelledBy() != null)+ criterias.add(new CancelledByCriteria(getUser(value)));+ else if (ctx.FixedIssue() != null)+ criterias.add(new FixedIssueCriteria(project, value));+ else if (ctx.DependsOn() != null)+ criterias.add(new DependsOnCriteria(project, value));+ else if (ctx.DependenciesOf() != null)+ criterias.add(new DependenciesOfCriteria(project, value));+ else if (ctx.RanOn() != null)+ criterias.add(new RanOnCriteria(value));+ else+ throw new RuntimeException("Unexpected criteria: " + ctx.operator.getText());+ }+ return new OrCriteria<>(criterias);}@Override@@ -150,77 +154,100 @@ public class BuildQuery extends EntityQuery<Build> {String fieldName = getValue(ctx.Quoted().getText());int operator = ctx.operator.getType();checkField(project, fieldName, operator);- if (fieldName.equals(NAME_VERSION))- return new VersionEmptyCriteria(operator);- else if (fieldName.equals(NAME_PULL_REQUEST))- return new PullRequestEmptyCriteria(operator);- else if (fieldName.equals(NAME_BRANCH))- return new BranchEmptyCriteria(operator);- else if (fieldName.equals(NAME_TAG))- return new TagEmptyCriteria(operator);- else- return new ParamEmptyCriteria(fieldName, operator);+ switch (fieldName) {+ case NAME_VERSION:+ return new VersionEmptyCriteria(operator);+ case NAME_PULL_REQUEST:+ return new PullRequestEmptyCriteria(operator);+ case NAME_BRANCH:+ return new BranchEmptyCriteria(operator);+ case NAME_TAG:+ return new TagEmptyCriteria(operator);+ default:+ return new ParamEmptyCriteria(fieldName, operator);+ }}@Overridepublic Criteria<Build> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {- String fieldName = getValue(ctx.Quoted(0).getText());- String value = getValue(ctx.Quoted(1).getText());+ String fieldName = getValue(ctx.criteriaField.getText());int operator = ctx.operator.getType();checkField(project, fieldName, operator);-- switch (operator) {- case BuildQueryLexer.IsUntil:- case BuildQueryLexer.IsSince:- switch (fieldName) {- case NAME_SUBMIT_DATE:- return new SubmitDateCriteria(value, operator);- case NAME_PENDING_DATE:- return new PendingDateCriteria(value, operator);- case NAME_RUNNING_DATE:- return new RunningDateCriteria(value, operator);- case NAME_FINISH_DATE:- return new FinishDateCriteria(value, operator);- default:- throw new IllegalStateException();- }- case BuildQueryLexer.Is:- case BuildQueryLexer.IsNot:- switch (fieldName) {- case NAME_PROJECT:- return new ProjectCriteria(value, operator);- case NAME_STATUS:- Build.Status status = Build.Status.of(value);- if (status != null)- return new StatusCriteria(status, operator);- else- throw new ExplicitException("Invalid status: " + value);- case NAME_COMMIT:- ProjectScopedCommit commitId = getCommitId(project, value);- return new CommitCriteria(commitId.getProject(), commitId.getCommitId(), operator);- case NAME_JOB:- return new JobCriteria(value, operator);- case NAME_NUMBER:- return new ReferenceCriteria(project, value, operator);- case NAME_VERSION:- return new VersionCriteria(value, operator);- case NAME_BRANCH:- return new BranchCriteria(value, operator);- case NAME_TAG:- return new TagCriteria(value, operator);- case NAME_LABEL:- return new LabelCriteria(getLabelSpec(value), operator);- case NAME_PULL_REQUEST:- return new PullRequestCriteria(project, value, operator);- default:- return new ParamCriteria(fieldName, value, operator);- }- case BuildQueryLexer.IsLessThan:- case BuildQueryLexer.IsGreaterThan:- return new ReferenceCriteria(project, value, operator);- default:- throw new IllegalStateException();++ var criterias = new ArrayList<Criteria<Build>>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String value = getValue(quoted.getText());+ switch (operator) {+ case IsUntil:+ case IsSince:+ switch (fieldName) {+ case NAME_SUBMIT_DATE:+ criterias.add(new SubmitDateCriteria(value, operator));+ break;+ case NAME_PENDING_DATE:+ criterias.add(new PendingDateCriteria(value, operator));+ break;+ case NAME_RUNNING_DATE:+ criterias.add(new RunningDateCriteria(value, operator));+ break;+ case NAME_FINISH_DATE:+ criterias.add(new FinishDateCriteria(value, operator));+ break;+ default:+ throw new IllegalStateException();+ }+ break;+ case Is:+ case IsNot:+ switch (fieldName) {+ case NAME_PROJECT:+ criterias.add(new ProjectCriteria(value, operator));+ break;+ case NAME_STATUS:+ Status status = Status.of(value);+ if (status != null)+ criterias.add(new StatusCriteria(status, operator));+ else+ throw new ExplicitException("Invalid status: " + value);+ break;+ case NAME_COMMIT:+ ProjectScopedCommit commitId = getCommitId(project, value);+ criterias.add(new CommitCriteria(commitId.getProject(), commitId.getCommitId(), operator));+ break;+ case NAME_JOB:+ criterias.add(new JobCriteria(value, operator));+ break;+ case NAME_NUMBER:+ criterias.add(new ReferenceCriteria(project, value, operator));+ break;+ case NAME_VERSION:+ criterias.add(new VersionCriteria(value, operator));+ break;+ case NAME_BRANCH:+ criterias.add(new BranchCriteria(value, operator));+ break;+ case NAME_TAG:+ criterias.add(new TagCriteria(value, operator));+ break;+ case NAME_LABEL:+ criterias.add(new LabelCriteria(getLabelSpec(value), operator));+ break;+ case NAME_PULL_REQUEST:+ criterias.add(new PullRequestCriteria(project, value, operator));+ break;+ default:+ criterias.add(new ParamCriteria(fieldName, value, operator));+ }+ break;+ case IsLessThan:+ case IsGreaterThan:+ criterias.add(new ReferenceCriteria(project, value, operator));+ break;+ default:+ throw new IllegalStateException();+ }}+ return operator==IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);}@Override@@ -228,7 +255,7 @@ public class BuildQuery extends EntityQuery<Build> {List<Criteria<Build>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new OrCriteria<Build>(childCriterias);+ return new OrCriteria<>(childCriterias);}@Override@@ -236,12 +263,12 @@ public class BuildQuery extends EntityQuery<Build> {List<Criteria<Build>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new AndCriteria<Build>(childCriterias);+ return new AndCriteria<>(childCriterias);}@Overridepublic Criteria<Build> visitNotCriteria(NotCriteriaContext ctx) {- return new NotCriteria<Build>(visit(ctx.criteria()));+ return new NotCriteria<>(visit(ctx.criteria()));}}.visit(criteriaContext);@@ -275,16 +302,16 @@ public class BuildQuery extends EntityQuery<Build> {if (!QUERY_FIELDS.contains(fieldName) && !paramNames.contains(fieldName))throw new ExplicitException("Field not found: " + fieldName);switch (operator) {- case BuildQueryLexer.IsUntil:- case BuildQueryLexer.IsSince:+ case IsUntil:+ case IsSince:if (!fieldName.equals(NAME_SUBMIT_DATE)&& !fieldName.equals(NAME_PENDING_DATE)&& !fieldName.equals(NAME_RUNNING_DATE)&& !fieldName.equals(NAME_FINISH_DATE))throw newOperatorException(fieldName, operator);break;- case BuildQueryLexer.Is:- case BuildQueryLexer.IsNot:+ case Is:+ case IsNot:if (!fieldName.equals(NAME_PROJECT) && !fieldName.equals(NAME_COMMIT)&& !fieldName.equals(NAME_JOB) && !fieldName.equals(NAME_NUMBER)&& !fieldName.equals(NAME_PULL_REQUEST) && !fieldName.equals(NAME_VERSION)@@ -294,16 +321,16 @@ public class BuildQuery extends EntityQuery<Build> {throw newOperatorException(fieldName, operator);}break;- case BuildQueryLexer.IsEmpty:- case BuildQueryLexer.IsNotEmpty:+ case IsEmpty:+ case IsNotEmpty:if (!fieldName.equals(NAME_PULL_REQUEST) && !fieldName.equals(NAME_VERSION)&& !fieldName.equals(NAME_BRANCH) && !fieldName.equals(NAME_TAG)&& !paramNames.contains(fieldName)) {throw newOperatorException(fieldName, operator);}break;- case BuildQueryLexer.IsLessThan:- case BuildQueryLexer.IsGreaterThan:+ case IsLessThan:+ case IsGreaterThan:if (!fieldName.equals(NAME_NUMBER))throw newOperatorException(fieldName, operator);break;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4index 7b7716677c..9bed6bf6d0 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4@@ -8,8 +8,8 @@ querycriteria: operator=(CreatedByMe|RepliedByMe|MentionedMe|Resolved|Unresolved) #OperatorCriteria- | operator=(CreatedBy|RepliedBy|Mentioned|OnCommit) WS+ criteriaValue=Quoted #OperatorValueCriteria- | criteriaField=Quoted WS+ operator=(Is|IsNot|IsUntil|IsSince|IsGreaterThan|IsLessThan|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | operator=(CreatedBy|RepliedBy|Mentioned|OnCommit) WS+ criteriaValue=multipleQuoted #OperatorValueCriteria+ | criteriaField=Quoted WS+ operator=(Is|IsNot|IsUntil|IsSince|IsGreaterThan|IsLessThan|Contains) WS+ criteriaValue=multipleQuoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria| Not WS* LParens WS* criteria WS* RParens #NotCriteria@@ -21,6 +21,10 @@ order: orderField=Quoted WS* (WS+ direction=(Asc|Desc))?;+multipleQuoted+ : Quoted(','Quoted)*+ ;+CreatedByMe: 'created' WS+ 'by' WS+ 'me';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.javaindex 4a8a09fa96..21fa222e0a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java@@ -75,19 +75,19 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {@Overridepublic Criteria<CodeComment> visitOperatorCriteria(OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {- case CodeCommentQueryLexer.Resolved:+ case Resolved:return new ResolvedCriteria();- case CodeCommentQueryLexer.Unresolved:+ case Unresolved:return new UnresolvedCriteria();- case CodeCommentQueryLexer.MentionedMe:+ case MentionedMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new MentionedMeCriteria();- case CodeCommentQueryLexer.CreatedByMe:+ case CreatedByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new CreatedByMeCriteria();- case CodeCommentQueryLexer.RepliedByMe:+ case RepliedByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new RepliedByMeCriteria();@@ -99,68 +99,86 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {@Overridepublic Criteria<CodeComment> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {int operator = ctx.operator.getType();- String value = getValue(ctx.Quoted().getText());- if (operator == CodeCommentQueryLexer.Mentioned) {- return new MentionedCriteria(getUser(value));- } else if (operator == CodeCommentQueryLexer.CreatedBy) {- return new CreatedByCriteria(getUser(value));- } else if (operator == CodeCommentQueryLexer.RepliedBy) {- return new RepliedByCriteria(getUser(value));- } else {- ProjectScopedCommit commitId = getCommitId(project, value);- return new OnCommitCriteria(commitId.getProject(), commitId.getCommitId());+ var criterias = new ArrayList<Criteria<CodeComment>>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String value = getValue(quoted.getText());+ if (operator == Mentioned) {+ criterias.add(new MentionedCriteria(getUser(value)));+ } else if (operator == CreatedBy) {+ criterias.add(new CreatedByCriteria(getUser(value)));+ } else if (operator == RepliedBy) {+ criterias.add(new RepliedByCriteria(getUser(value)));+ } else {+ ProjectScopedCommit commitId = getCommitId(project, value);+ criterias.add(new OnCommitCriteria(commitId.getProject(), commitId.getCommitId()));+ }}+ return new OrCriteria<>(criterias);}@Overridepublic Criteria<CodeComment> visitParensCriteria(ParensCriteriaContext ctx) {- return (Criteria<CodeComment>) visit(ctx.criteria()).withParens(true);+ return visit(ctx.criteria()).withParens(true);}@Overridepublic Criteria<CodeComment> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {- String fieldName = getValue(ctx.Quoted(0).getText());- String value = getValue(ctx.Quoted(1).getText());+ String fieldName = getValue(ctx.criteriaField.getText());int operator = ctx.operator.getType();checkField(project, fieldName, operator);- switch (operator) {- case CodeCommentQueryLexer.IsUntil:- case CodeCommentQueryLexer.IsSince:- Date dateValue = getDateValue(value);- switch (fieldName) {- case NAME_CREATE_DATE:- return new CreateDateCriteria(dateValue, value, operator);- case NAME_LAST_ACTIVITY_DATE:- return new LastActivityDateCriteria(dateValue, value, operator);- default:- throw new IllegalStateException();- }- case CodeCommentQueryLexer.IsLessThan:- case CodeCommentQueryLexer.IsGreaterThan:- return new ReplyCountCriteria(getIntValue(value), operator);- case CodeCommentQueryLexer.Contains:- switch (fieldName) {- case NAME_CONTENT:- return new ContentCriteria(value);- case NAME_REPLY:- return new ReplyCriteria(value);- default:- throw new IllegalStateException();- }- case CodeCommentQueryLexer.Is:- case CodeCommentQueryLexer.IsNot:- switch (fieldName) {- case NAME_PATH:- return new PathCriteria(value, operator);- case NAME_REPLY_COUNT:- return new ReplyCountCriteria(getIntValue(value), operator);- default:- throw new IllegalStateException();- }- default:- throw new IllegalStateException();+ var criterias = new ArrayList<Criteria<CodeComment>>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String value = getValue(quoted.getText());+ switch (operator) {+ case IsUntil:+ case IsSince:+ Date dateValue = getDateValue(value);+ switch (fieldName) {+ case NAME_CREATE_DATE:+ criterias.add(new CreateDateCriteria(dateValue, value, operator));+ break;+ case NAME_LAST_ACTIVITY_DATE:+ criterias.add(new LastActivityDateCriteria(dateValue, value, operator));+ break;+ default:+ throw new IllegalStateException();+ }+ break;+ case IsLessThan:+ case IsGreaterThan:+ criterias.add(new ReplyCountCriteria(getIntValue(value), operator));+ break;+ case Contains:+ switch (fieldName) {+ case NAME_CONTENT:+ criterias.add(new ContentCriteria(value));+ break;+ case NAME_REPLY:+ criterias.add(new ReplyCriteria(value));+ break;+ default:+ throw new IllegalStateException();+ }+ break;+ case Is:+ case IsNot:+ switch (fieldName) {+ case NAME_PATH:+ criterias.add(new PathCriteria(value, operator));+ break;+ case NAME_REPLY_COUNT:+ criterias.add(new ReplyCountCriteria(getIntValue(value), operator));+ break;+ default:+ throw new IllegalStateException();+ }+ break;+ default:+ throw new IllegalStateException();+ }}+ return operator==IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);}@Override@@ -168,7 +186,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {List<Criteria<CodeComment>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx : ctx.criteria())childCriterias.add(visit(childCtx));- return new OrCriteria<CodeComment>(childCriterias);+ return new OrCriteria<>(childCriterias);}@Override@@ -176,12 +194,12 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {List<Criteria<CodeComment>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx : ctx.criteria())childCriterias.add(visit(childCtx));- return new AndCriteria<CodeComment>(childCriterias);+ return new AndCriteria<>(childCriterias);}@Overridepublic Criteria<CodeComment> visitNotCriteria(NotCriteriaContext ctx) {- return new NotCriteria<CodeComment>(visit(ctx.criteria()));+ return new NotCriteria<>(visit(ctx.criteria()));}}.visit(criteriaContext);@@ -214,22 +232,22 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {if (!QUERY_FIELDS.contains(fieldName))throw new ExplicitException("Field not found: " + fieldName);switch (operator) {- case CodeCommentQueryLexer.IsUntil:- case CodeCommentQueryLexer.IsSince:+ case IsUntil:+ case IsSince:if (!fieldName.equals(NAME_CREATE_DATE) && !fieldName.equals(NAME_LAST_ACTIVITY_DATE))throw newOperatorException(fieldName, operator);break;- case CodeCommentQueryLexer.IsGreaterThan:- case CodeCommentQueryLexer.IsLessThan:+ case IsGreaterThan:+ case IsLessThan:if (!fieldName.equals(NAME_REPLY_COUNT))throw newOperatorException(fieldName, operator);break;- case CodeCommentQueryLexer.Contains:+ case Contains:if (!fieldName.equals(NAME_CONTENT) && !fieldName.equals(NAME_REPLY))throw newOperatorException(fieldName, operator);break;- case CodeCommentQueryLexer.Is:- case CodeCommentQueryLexer.IsNot:+ case Is:+ case IsNot:if (!fieldName.equals(NAME_REPLY_COUNT) && !fieldName.equals(NAME_PATH))throw newOperatorException(fieldName, operator);break;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4index 8cfa7974e3..99f5f4343e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4@@ -8,10 +8,10 @@ querycriteria: operator=(Confidential|SubmittedByMe|WatchedByMe|CommentedByMe|MentionedMe|FixedInCurrentCommit|FixedInCurrentBuild|FixedInCurrentPullRequest|CurrentIssue) #OperatorCriteria- | operator=(SubmittedBy|WatchedBy|CommentedBy|Mentioned|FixedInCommit|FixedInBuild|FixedInPullRequest|HasAny) WS+ criteriaValue=Quoted #OperatorValueCriteria+ | operator=(SubmittedBy|WatchedBy|CommentedBy|Mentioned|FixedInCommit|FixedInBuild|FixedInPullRequest|HasAny) WS+ criteriaValue=multipleQuoted #OperatorValueCriteria| FixedBetween WS+ revisionCriteria WS+ And WS+ revisionCriteria #FixedBetweenCriteria| criteriaField=Quoted WS+ operator=(IsMe|IsNotMe|IsEmpty|IsNotEmpty|IsCurrent|IsPrevious) #FieldOperatorCriteria- | criteriaField=Quoted WS+ operator=(Is|IsNot|IsGreaterThan|IsLessThan|IsUntil|IsSince|IsAfter|IsBefore|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | criteriaField=Quoted WS+ operator=(Is|IsNot|IsGreaterThan|IsLessThan|IsUntil|IsSince|IsAfter|IsBefore|Contains) WS+ criteriaValue=multipleQuoted #FieldOperatorValueCriteria| Reference #ReferenceCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria@@ -29,6 +29,10 @@ order: orderField=Quoted WS* (WS+ direction=(Asc|Desc))?;+multipleQuoted+ : Quoted(','Quoted)*+ ;+OrderBy: 'order' WS+ 'by';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 71298d528c..f5749a2ebf 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -2,7 +2,6 @@ package io.onedev.server.search.entity.issue;import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.commons.utils.ExplicitException;-import io.onedev.commons.utils.LinearRange;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;@@ -108,37 +107,37 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>@Overridepublic Criteria<Issue> visitOperatorCriteria(OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {- case IssueQueryLexer.Confidential:+ case Confidential:return new ConfidentialCriteria();- case IssueQueryLexer.MentionedMe:+ case MentionedMe:if (!option.withCurrentUserCriteria())throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new MentionedMeCriteria();- case IssueQueryLexer.SubmittedByMe:+ case SubmittedByMe:if (!option.withCurrentUserCriteria())throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new SubmittedByMeCriteria();- case IssueQueryLexer.WatchedByMe:+ case WatchedByMe:if (!option.withCurrentUserCriteria())throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new WatchedByMeCriteria();- case IssueQueryLexer.CommentedByMe:+ case CommentedByMe:if (!option.withCurrentUserCriteria())throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new CommentedByMeCriteria();- case IssueQueryLexer.FixedInCurrentBuild:+ case FixedInCurrentBuild:if (!option.withCurrentBuildCriteria())throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new FixedInCurrentBuildCriteria();- case IssueQueryLexer.FixedInCurrentPullRequest:+ case FixedInCurrentPullRequest:if (!option.withCurrentPullRequestCriteria())throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new FixedInCurrentPullRequestCriteria();- case IssueQueryLexer.FixedInCurrentCommit:+ case FixedInCurrentCommit:if (!option.withCurrentCommitCriteria())throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new FixedInCurrentCommitCriteria();- case IssueQueryLexer.CurrentIssue:+ case CurrentIssue:if (!option.withCurrentIssueCriteria())throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new CurrentIssueCriteria();@@ -175,25 +174,29 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>}public Criteria<Issue> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {- String value = getValue(ctx.Quoted().getText());- if (ctx.Mentioned() != null)- return new MentionedCriteria(getUser(value));- else if (ctx.SubmittedBy() != null)- return new SubmittedByCriteria(getUser(value));- else if (ctx.WatchedBy() != null)- return new WatchedByCriteria(getUser(value));- else if (ctx.CommentedBy() != null)- return new CommentedByCriteria(getUser(value));- else if (ctx.FixedInBuild() != null)- return new FixedInBuildCriteria(project, value);- else if (ctx.FixedInPullRequest() != null)- return new FixedInPullRequestCriteria(project, value);- else if (ctx.FixedInCommit() != null)- return new FixedInCommitCriteria(project, value);- else if (ctx.HasAny() != null)- return new HasLinkCriteria(value);- else- throw new RuntimeException("Unexpected operator: " + ctx.operator.getText());+ var criterias = new ArrayList<Criteria<Issue>>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String value = getValue(quoted.getText());+ if (ctx.Mentioned() != null)+ criterias.add(new MentionedCriteria(getUser(value)));+ else if (ctx.SubmittedBy() != null)+ criterias.add(new SubmittedByCriteria(getUser(value)));+ else if (ctx.WatchedBy() != null)+ criterias.add(new WatchedByCriteria(getUser(value)));+ else if (ctx.CommentedBy() != null)+ criterias.add(new CommentedByCriteria(getUser(value)));+ else if (ctx.FixedInBuild() != null)+ criterias.add(new FixedInBuildCriteria(project, value));+ else if (ctx.FixedInPullRequest() != null)+ criterias.add(new FixedInPullRequestCriteria(project, value));+ else if (ctx.FixedInCommit() != null)+ criterias.add(new FixedInCommitCriteria(project, value));+ else if (ctx.HasAny() != null)+ criterias.add(new HasLinkCriteria(value));+ else+ throw new RuntimeException("Unexpected operator: " + ctx.operator.getText());+ }+ return new OrCriteria<>(criterias);}@Override@@ -211,124 +214,140 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>@Overridepublic Criteria<Issue> visitParensCriteria(ParensCriteriaContext ctx) {- return (Criteria<Issue>) visit(ctx.criteria()).withParens(true);+ return visit(ctx.criteria()).withParens(true);}@Overridepublic Criteria<Issue> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {- String fieldName = getValue(ctx.Quoted(0).getText());- String value = getValue(ctx.Quoted(1).getText());+ String fieldName = getValue(ctx.criteriaField.getText());int operator = ctx.operator.getType();if (validate)checkField(fieldName, operator, option);-- var timeTrackingSetting = OneDev.getInstance(SettingManager.class)- .getIssueSetting().getTimeTrackingSetting();- switch (operator) {- case IssueQueryLexer.IsUntil:- case IssueQueryLexer.IsSince:- if (fieldName.equals(NAME_SUBMIT_DATE))- return new SubmitDateCriteria(value, operator);- else if (fieldName.equals(NAME_LAST_ACTIVITY_DATE))- return new LastActivityDateCriteria(value, operator);- else- return new DateFieldCriteria(fieldName, value, operator);- case IssueQueryLexer.Contains:- switch (fieldName) {- case NAME_TITLE:- return new TitleCriteria(value);- case NAME_DESCRIPTION:- return new DescriptionCriteria(value);- case NAME_COMMENT:- return new CommentCriteria(value);- default:- return new StringFieldCriteria(fieldName, value, operator);- }- case IssueQueryLexer.Is:- case IssueQueryLexer.IsNot:- if (fieldName.equals(NAME_PROJECT)) {- return new ProjectCriteria(value, operator);- } else if (fieldName.equals(IssueSchedule.NAME_ITERATION)) {- return new IterationCriteria(value, operator);- } else if (fieldName.equals(NAME_STATE)) {- return new StateCriteria(value, operator);- } else if (fieldName.equals(NAME_VOTE_COUNT)) {- return new VoteCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(NAME_COMMENT_COUNT)) {- return new CommentCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.NAME_NUMBER)) {- return new ReferenceCriteria(project, value, operator);- } else if (fieldName.equals(NAME_ESTIMATED_TIME)) {- int intValue = timeTrackingSetting.parseWorkingPeriod(value);- return new EstimatedTimeCriteria(intValue, operator);- } else if (fieldName.equals(NAME_SPENT_TIME)) {- int intValue = timeTrackingSetting.parseWorkingPeriod(value);- return new SpentTimeCriteria(intValue, operator);- } else {- FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);- if (field instanceof IssueChoiceField) {- return new IssueFieldCriteria(fieldName, project, value, operator);- } else if (field instanceof BuildChoiceField) {- return new BuildFieldCriteria(fieldName, project, value, field.isAllowMultiple(), operator);- } else if (field instanceof PullRequestChoiceField) {- return new PullRequestFieldCriteria(fieldName, project, value, operator);- } else if (field instanceof CommitField) {- return new CommitFieldCriteria(fieldName, project, value, operator);- } else if (field instanceof BooleanField) {- return new BooleanFieldCriteria(fieldName, getBooleanValue(value), operator);- } else if (field instanceof IntegerField) {- return new NumericFieldCriteria(fieldName, getIntValue(value), operator);- } else if (field instanceof ChoiceField) {- long ordinal = getValueOrdinal((ChoiceField) field, value);- return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, field.isAllowMultiple());- } else if (field instanceof UserChoiceField- || field instanceof GroupChoiceField) {- return new ChoiceFieldCriteria(fieldName, value, -1, operator, field.isAllowMultiple());- } else if (field instanceof IterationChoiceField) {- return new IterationFieldCriteria(fieldName, value, operator, field.isAllowMultiple());- } else {- return new StringFieldCriteria(fieldName, value, operator);- }- }- case IssueQueryLexer.IsLessThan:- case IssueQueryLexer.IsGreaterThan:- switch (fieldName) {- case NAME_VOTE_COUNT:- return new VoteCountCriteria(getIntValue(value), operator);- case NAME_COMMENT_COUNT:- return new CommentCountCriteria(getIntValue(value), operator);- case Issue.NAME_NUMBER:- return new ReferenceCriteria(project, value, operator);- case NAME_ESTIMATED_TIME: {- int intValue = value.equals(NAME_SPENT_TIME) ? -1 : timeTrackingSetting.parseWorkingPeriod(value);- return new EstimatedTimeCriteria(intValue, operator);++ List<Criteria<Issue>> criterias = new ArrayList<>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String value = getValue(quoted.getText());+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class)+ .getIssueSetting().getTimeTrackingSetting();+ switch (operator) {+ case IsUntil:+ case IsSince:+ if (fieldName.equals(NAME_SUBMIT_DATE))+ criterias.add(new SubmitDateCriteria(value, operator));+ else if (fieldName.equals(NAME_LAST_ACTIVITY_DATE))+ criterias.add(new LastActivityDateCriteria(value, operator));+ else+ criterias.add(new DateFieldCriteria(fieldName, value, operator));+ break;+ case Contains:+ switch (fieldName) {+ case NAME_TITLE:+ criterias.add(new TitleCriteria(value));+ break;+ case NAME_DESCRIPTION:+ criterias.add(new DescriptionCriteria(value));+ break;+ case NAME_COMMENT:+ criterias.add(new CommentCriteria(value));+ break;+ default:+ criterias.add(new StringFieldCriteria(fieldName, value, operator));}- case NAME_SPENT_TIME: {- int intValue = value.equals(NAME_ESTIMATED_TIME) ? -1 : timeTrackingSetting.parseWorkingPeriod(value);- return new SpentTimeCriteria(intValue, operator);- }- case NAME_PROGRESS:- var floatValue = getFloatValue(value);- return new ProgressCriteria(floatValue, operator);- default:+ break;+ case Is:+ case IsNot:+ if (fieldName.equals(NAME_PROJECT)) {+ criterias.add(new ProjectCriteria(value, operator));+ } else if (fieldName.equals(IssueSchedule.NAME_ITERATION)) {+ criterias.add(new IterationCriteria(value, operator));+ } else if (fieldName.equals(NAME_STATE)) {+ criterias.add(new StateCriteria(value, operator));+ } else if (fieldName.equals(NAME_VOTE_COUNT)) {+ criterias.add(new VoteCountCriteria(getIntValue(value), operator));+ } else if (fieldName.equals(NAME_COMMENT_COUNT)) {+ criterias.add(new CommentCountCriteria(getIntValue(value), operator));+ } else if (fieldName.equals(Issue.NAME_NUMBER)) {+ criterias.add(new ReferenceCriteria(project, value, operator));+ } else if (fieldName.equals(NAME_ESTIMATED_TIME)) {+ int intValue = timeTrackingSetting.parseWorkingPeriod(value);+ criterias.add(new EstimatedTimeCriteria(intValue, operator));+ } else if (fieldName.equals(NAME_SPENT_TIME)) {+ int intValue = timeTrackingSetting.parseWorkingPeriod(value);+ criterias.add(new SpentTimeCriteria(intValue, operator));+ } else {FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);- if (field instanceof IntegerField) {- return new NumericFieldCriteria(fieldName, getIntValue(value), operator);+ if (field instanceof IssueChoiceField) {+ criterias.add(new IssueFieldCriteria(fieldName, project, value, operator));+ } else if (field instanceof BuildChoiceField) {+ criterias.add(new BuildFieldCriteria(fieldName, project, value, field.isAllowMultiple(), operator));+ } else if (field instanceof PullRequestChoiceField) {+ criterias.add(new PullRequestFieldCriteria(fieldName, project, value, operator));+ } else if (field instanceof CommitField) {+ criterias.add(new CommitFieldCriteria(fieldName, project, value, operator));+ } else if (field instanceof BooleanField) {+ criterias.add(new BooleanFieldCriteria(fieldName, getBooleanValue(value), operator));+ } else if (field instanceof IntegerField) {+ criterias.add(new NumericFieldCriteria(fieldName, getIntValue(value), operator));+ } else if (field instanceof ChoiceField) {+ long ordinal = getValueOrdinal((ChoiceField) field, value);+ criterias.add(new ChoiceFieldCriteria(fieldName, value, ordinal, operator, field.isAllowMultiple()));+ } else if (field instanceof UserChoiceField+ || field instanceof GroupChoiceField) {+ criterias.add(new ChoiceFieldCriteria(fieldName, value, -1, operator, field.isAllowMultiple()));+ } else if (field instanceof IterationChoiceField) {+ criterias.add(new IterationFieldCriteria(fieldName, value, operator, field.isAllowMultiple()));} else {- long ordinal;- if (validate)- ordinal = getValueOrdinal((ChoiceField) field, value);- else- ordinal = 0;- return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, false);+ criterias.add(new StringFieldCriteria(fieldName, value, operator));}- }- case IssueQueryLexer.IsBefore:- case IssueQueryLexer.IsAfter:- return new StateCriteria(value, operator);- default:- throw new ExplicitException("Unexpected operator " + getRuleName(operator));+ }+ break;+ case IsLessThan:+ case IsGreaterThan:+ switch (fieldName) {+ case NAME_VOTE_COUNT:+ criterias.add(new VoteCountCriteria(getIntValue(value), operator));+ break;+ case NAME_COMMENT_COUNT:+ criterias.add(new CommentCountCriteria(getIntValue(value), operator));+ break;+ case Issue.NAME_NUMBER:+ criterias.add(new ReferenceCriteria(project, value, operator));+ break;+ case NAME_ESTIMATED_TIME:+ int intValue = value.equals(NAME_SPENT_TIME) ? -1 : timeTrackingSetting.parseWorkingPeriod(value);+ criterias.add(new EstimatedTimeCriteria(intValue, operator));+ break;+ case NAME_SPENT_TIME:+ intValue = value.equals(NAME_ESTIMATED_TIME) ? -1 : timeTrackingSetting.parseWorkingPeriod(value);+ criterias.add(new SpentTimeCriteria(intValue, operator));+ break;+ case NAME_PROGRESS:+ var floatValue = getFloatValue(value);+ criterias.add(new ProgressCriteria(floatValue, operator));+ break;+ default:+ FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);+ if (field instanceof IntegerField) {+ criterias.add(new NumericFieldCriteria(fieldName, getIntValue(value), operator));+ } else {+ long ordinal;+ if (validate)+ ordinal = getValueOrdinal((ChoiceField) field, value);+ else+ ordinal = 0;+ criterias.add(new ChoiceFieldCriteria(fieldName, value, ordinal, operator, false));+ }+ }+ break;+ case IsBefore:+ case IsAfter:+ criterias.add(new StateCriteria(value, operator));+ break;+ default:+ throw new ExplicitException("Unexpected operator " + getRuleName(operator));+ }}+ return operator==IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);}@Override@@ -336,7 +355,7 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>List<Criteria<Issue>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx : ctx.criteria())childCriterias.add(visit(childCtx));- return new OrCriteria<Issue>(childCriterias);+ return new OrCriteria<>(childCriterias);}@Override@@ -344,12 +363,12 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>List<Criteria<Issue>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx : ctx.criteria())childCriterias.add(visit(childCtx));- return new AndCriteria<Issue>(childCriterias);+ return new AndCriteria<>(childCriterias);}@Overridepublic Criteria<Issue> visitNotCriteria(NotCriteriaContext ctx) {- return new NotCriteria<Issue>(visit(ctx.criteria()));+ return new NotCriteria<>(visit(ctx.criteria()));}}.visit(criteriaContext);@@ -400,15 +419,15 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>if (fieldSpec == null && !Issue.QUERY_FIELDS.contains(fieldName))throw new ExplicitException("Field not found: " + fieldName);switch (operator) {- case IssueQueryLexer.IsEmpty:- case IssueQueryLexer.IsNotEmpty:+ case IsEmpty:+ case IsNotEmpty:if (Issue.QUERY_FIELDS.contains(fieldName)&& !fieldName.equals(IssueSchedule.NAME_ITERATION)) {throw newOperatorException(fieldName, operator);}break;- case IssueQueryLexer.IsMe:- case IssueQueryLexer.IsNotMe:+ case IsMe:+ case IsNotMe:if (!(fieldSpec instanceof UserChoiceField && option.withCurrentUserCriteria()))throw newOperatorException(fieldName, operator);break;@@ -419,12 +438,12 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>|| fieldSpec instanceof CommitField && option.withCurrentCommitCriteria()))throw newOperatorException(fieldName, operator);break;- case IssueQueryLexer.IsPrevious:+ case IsPrevious:if (!(fieldSpec instanceof BuildChoiceField && option.withCurrentBuildCriteria()))throw newOperatorException(fieldName, operator);break;- case IssueQueryLexer.IsUntil:- case IssueQueryLexer.IsSince:+ case IsUntil:+ case IsSince:if (!fieldName.equals(Issue.NAME_SUBMIT_DATE)&& !fieldName.equals(Issue.NAME_LAST_ACTIVITY_DATE)&& !(fieldSpec instanceof DateField)@@ -432,7 +451,7 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>throw newOperatorException(fieldName, operator);}break;- case IssueQueryLexer.Contains:+ case Contains:if (!fieldName.equals(Issue.NAME_TITLE)&& !fieldName.equals(Issue.NAME_DESCRIPTION)&& !fieldName.equals(Issue.NAME_COMMENT)@@ -440,8 +459,8 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>throw newOperatorException(fieldName, operator);}break;- case IssueQueryLexer.Is:- case IssueQueryLexer.IsNot:+ case Is:+ case IsNot:if (!fieldName.equals(Issue.NAME_PROJECT)&& !fieldName.equals(Issue.NAME_ESTIMATED_TIME)&& !fieldName.equals(NAME_SPENT_TIME)@@ -464,13 +483,13 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>throw newOperatorException(fieldName, operator);}break;- case IssueQueryLexer.IsBefore:- case IssueQueryLexer.IsAfter:+ case IsBefore:+ case IsAfter:if (!fieldName.equals(Issue.NAME_STATE))throw newOperatorException(fieldName, operator);break;- case IssueQueryLexer.IsLessThan:- case IssueQueryLexer.IsGreaterThan:+ case IsLessThan:+ case IsGreaterThan:if (!fieldName.equals(Issue.NAME_VOTE_COUNT)&& !fieldName.equals(Issue.NAME_ESTIMATED_TIME)&& !fieldName.equals(NAME_SPENT_TIME)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.g4index 1f6a6bc8c7..afb6759592 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.g4@@ -8,8 +8,8 @@ querycriteria: operator=PublishedByMe #OperatorCriteria- | operator=(PublishedByUser|PublishedByBuild|PublishedByProject) WS+ criteriaValue=Quoted #OperatorValueCriteria- | criteriaField=Quoted WS+ operator=(Is|IsNot|IsUntil|IsSince) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | operator=(PublishedByUser|PublishedByBuild|PublishedByProject) WS+ criteriaValue=multipleQuoted #OperatorValueCriteria+ | criteriaField=Quoted WS+ operator=(Is|IsNot|IsUntil|IsSince) WS+ criteriaValue=multipleQuoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria| Not WS* LParens WS* criteria WS* RParens #NotCriteria@@ -21,6 +21,10 @@ order: orderField=Quoted WS* (WS+ direction=(Asc|Desc))?;+multipleQuoted+ : Quoted(','Quoted)*+ ;+PublishedByMe: 'published' WS+ 'by' WS+ 'me';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.javaindex b691350b4a..a1565960dd 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.java@@ -72,7 +72,7 @@ public class PackQuery extends EntityQuery<Pack> {public Criteria<Pack> visitOperatorCriteria(PackQueryParser.OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {- case PackQueryLexer.PublishedByMe:+ case PublishedByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new PublishedByMeCriteria();@@ -83,50 +83,65 @@ public class PackQuery extends EntityQuery<Pack> {@Overridepublic Criteria<Pack> visitOperatorValueCriteria(PackQueryParser.OperatorValueCriteriaContext ctx) {- String value = getValue(ctx.Quoted().getText());- if (ctx.PublishedByUser() != null)- return new PublishedByUserCriteria(getUser(value));- else if (ctx.PublishedByBuild() != null)- return new PublishedByBuildCriteria(project, value);- else if (ctx.PublishedByProject() != null)- return new PublishedByProjectCriteria(value);- else- throw new RuntimeException("Unexpected criteria: " + ctx.operator.getText());+ var criterias = new ArrayList<Criteria<Pack>>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String value = getValue(quoted.getText());+ if (ctx.PublishedByUser() != null)+ criterias.add(new PublishedByUserCriteria(getUser(value)));+ else if (ctx.PublishedByBuild() != null)+ criterias.add(new PublishedByBuildCriteria(project, value));+ else if (ctx.PublishedByProject() != null)+ criterias.add(new PublishedByProjectCriteria(value));+ else+ throw new ExplicitException("Unexpected criteria: " + ctx.operator.getText());+ }+ return new OrCriteria<>(criterias);}@Overridepublic Criteria<Pack> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {- String fieldName = getValue(ctx.Quoted(0).getText());- String value = getValue(ctx.Quoted(1).getText());+ String fieldName = getValue(ctx.criteriaField.getText());int operator = ctx.operator.getType();checkField(project, fieldName, operator);- switch (operator) {- case PackQueryLexer.IsUntil:- case PackQueryLexer.IsSince:- if (fieldName.equals(NAME_PUBLISH_DATE))- return new PublishDateCriteria(value, operator);- else- throw new IllegalStateException();- case PackQueryLexer.Is:- case PackQueryLexer.IsNot:- switch (fieldName) {- case NAME_PROJECT:- return new ProjectCriteria(value, operator);- case NAME_NAME:- return new NameCriteria(value, operator);- case NAME_VERSION:- return new VersionCriteria(value, operator);- case NAME_TYPE:- return new TypeCriteria(value, operator);- case NAME_LABEL:- return new LabelCriteria(getLabelSpec(value), operator);- default:+ var criterias = new ArrayList<Criteria<Pack>>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String value = getValue(quoted.getText());+ switch (operator) {+ case IsUntil:+ case IsSince:+ if (fieldName.equals(NAME_PUBLISH_DATE))+ criterias.add(new PublishDateCriteria(value, operator));+ elsethrow new IllegalStateException();- }- default:- throw new IllegalStateException();- }+ break;+ case Is:+ case IsNot:+ switch (fieldName) {+ case NAME_PROJECT:+ criterias.add(new ProjectCriteria(value, operator));+ break;+ case NAME_NAME:+ criterias.add(new NameCriteria(value, operator));+ break;+ case NAME_VERSION:+ criterias.add(new VersionCriteria(value, operator));+ break;+ case NAME_TYPE:+ criterias.add(new TypeCriteria(value, operator));+ break;+ case NAME_LABEL:+ criterias.add(new LabelCriteria(getLabelSpec(value), operator));+ break;+ default:+ throw new IllegalStateException();+ }+ break;+ default:+ throw new IllegalStateException();+ }+ }+ return operator==IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);}@Override@@ -185,13 +200,13 @@ public class PackQuery extends EntityQuery<Pack> {if (!QUERY_FIELDS.contains(fieldName))throw new ExplicitException("Field not found: " + fieldName);switch (operator) {- case PackQueryLexer.IsUntil:- case PackQueryLexer.IsSince:+ case IsUntil:+ case IsSince:if (!fieldName.equals(NAME_PUBLISH_DATE))throw newOperatorException(fieldName, operator);break;- case PackQueryLexer.Is:- case PackQueryLexer.IsNot:+ case Is:+ case IsNot:if (!fieldName.equals(NAME_PROJECT) && !fieldName.equals(NAME_TYPE)&& !fieldName.equals(NAME_NAME) && !fieldName.equals(NAME_VERSION)&& !fieldName.equals(NAME_LABEL)) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4index 992eb52856..244ddff933 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4@@ -8,8 +8,8 @@ querycriteria: operator=(Roots|Leafs|ForkRoots|OwnedByMe|OwnedByNone|HasOutdatedReplicas|WithoutEnoughReplicas|MissingStorage|PendingDelete) #OperatorCriteria- | operator=(OwnedBy|ForksOf|ChildrenOf) WS+ criteriaValue=Quoted #OperatorValueCriteria- | criteriaField=Quoted WS+ operator=(Is|IsNot|Contains|IsUntil|IsSince) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | operator=(OwnedBy|ForksOf|ChildrenOf) WS+ criteriaValue=multipleQuoted #OperatorValueCriteria+ | criteriaField=Quoted WS+ operator=(Is|IsNot|Contains|IsUntil|IsSince) WS+ criteriaValue=multipleQuoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria| Not WS* LParens WS* criteria WS* RParens #NotCriteria@@ -21,6 +21,10 @@ order: orderField=Quoted WS* (WS+ direction=(Asc|Desc))?;+multipleQuoted+ : Quoted(','Quoted)*+ ;+OrderBy: 'order' WS+ 'by';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.javaindex aa9dc02b66..f8dbee3517 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java@@ -16,21 +16,6 @@ import javax.annotation.Nullable;import java.util.ArrayList;import java.util.List;-import static io.onedev.server.search.entity.project.ProjectQueryLexer.ChildrenOf;-import static io.onedev.server.search.entity.project.ProjectQueryLexer.Contains;-import static io.onedev.server.search.entity.project.ProjectQueryLexer.ForkRoots;-import static io.onedev.server.search.entity.project.ProjectQueryLexer.ForksOf;-import static io.onedev.server.search.entity.project.ProjectQueryLexer.HasOutdatedReplicas;-import static io.onedev.server.search.entity.project.ProjectQueryLexer.Is;-import static io.onedev.server.search.entity.project.ProjectQueryLexer.IsSince;-import static io.onedev.server.search.entity.project.ProjectQueryLexer.IsUntil;-import static io.onedev.server.search.entity.project.ProjectQueryLexer.Leafs;-import static io.onedev.server.search.entity.project.ProjectQueryLexer.MissingStorage;-import static io.onedev.server.search.entity.project.ProjectQueryLexer.OwnedByMe;-import static io.onedev.server.search.entity.project.ProjectQueryLexer.OwnedByNone;-import static io.onedev.server.search.entity.project.ProjectQueryLexer.Roots;-import static io.onedev.server.search.entity.project.ProjectQueryLexer.WithoutEnoughReplicas;-import static io.onedev.server.search.entity.project.ProjectQueryLexer.ruleNames;import static io.onedev.server.search.entity.project.ProjectQueryParser.*;public class ProjectQuery extends EntityQuery<Project> {@@ -119,13 +104,17 @@ public class ProjectQuery extends EntityQuery<Project> {}public Criteria<Project> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {- String value = getValue(ctx.Quoted().getText());- if (ctx.operator.getType() == ChildrenOf)- return new ChildrenOfCriteria(value);- else if (ctx.operator.getType() == ForksOf)- return new ForksOfCriteria(value);- else- return new OwnedByCriteria(getUser(value));+ var criterias = new ArrayList<Criteria<Project>>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String value = getValue(quoted.getText());+ if (ctx.operator.getType() == ChildrenOf)+ criterias.add(new ChildrenOfCriteria(value));+ else if (ctx.operator.getType() == ForksOf)+ criterias.add(new ForksOfCriteria(value));+ else+ criterias.add(new OwnedByCriteria(getUser(value)));+ }+ return new OrCriteria<>(criterias);}@Override@@ -135,39 +124,51 @@ public class ProjectQuery extends EntityQuery<Project> {@Overridepublic Criteria<Project> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {- String fieldName = getValue(ctx.Quoted(0).getText());- String value = getValue(ctx.Quoted(1).getText());+ String fieldName = getValue(ctx.criteriaField.getText());int operator = ctx.operator.getType();checkField(fieldName, operator);-- switch (operator) {- case Is:- case IsNot:- switch (fieldName) {- case Project.NAME_ID:- return new IdCriteria(getLongValue(value), operator);- case Project.NAME_NAME:- return new NameCriteria(value, operator);- case Project.NAME_KEY:- return new KeyCriteria(value, operator);- case Project.NAME_SERVICE_DESK_NAME:- return new ServiceDeskNameCriteria(value, operator);- case Project.NAME_PATH:- return new PathCriteria(value, operator);- default:- return new LabelCriteria(getLabelSpec(value), operator);- }- case Contains:- return new DescriptionCriteria(value);- case IsUntil:- case IsSince:- if (fieldName.equals(Project.NAME_LAST_ACTIVITY_DATE))- return new LastActivityDateCriteria(value, operator);- else- return new CommitDateCriteria(value, operator);- default:- throw new ExplicitException("Unexpected operator " + getRuleName(operator));++ var criterias = new ArrayList<Criteria<Project>>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String value = getValue(quoted.getText());+ switch (operator) {+ case Is:+ case IsNot:+ switch (fieldName) {+ case Project.NAME_ID:+ criterias.add(new IdCriteria(getLongValue(value), operator));+ break;+ case Project.NAME_NAME:+ criterias.add(new NameCriteria(value, operator));+ break;+ case Project.NAME_KEY:+ criterias.add(new KeyCriteria(value, operator));+ break;+ case Project.NAME_SERVICE_DESK_NAME:+ criterias.add(new ServiceDeskNameCriteria(value, operator));+ break;+ case Project.NAME_PATH:+ criterias.add(new PathCriteria(value, operator));+ break;+ default:+ criterias.add(new LabelCriteria(getLabelSpec(value), operator));+ }+ break;+ case Contains:+ criterias.add(new DescriptionCriteria(value));+ break;+ case IsUntil:+ case IsSince:+ if (fieldName.equals(Project.NAME_LAST_ACTIVITY_DATE))+ criterias.add(new LastActivityDateCriteria(value, operator));+ else+ criterias.add(new CommitDateCriteria(value, operator));+ break;+ default:+ throw new ExplicitException("Unexpected operator " + getRuleName(operator));+ }}+ return operator==IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);}@Override@@ -175,7 +176,7 @@ public class ProjectQuery extends EntityQuery<Project> {List<Criteria<Project>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new OrCriteria<Project>(childCriterias);+ return new OrCriteria<>(childCriterias);}@Override@@ -183,12 +184,12 @@ public class ProjectQuery extends EntityQuery<Project> {List<Criteria<Project>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new AndCriteria<Project>(childCriterias);+ return new AndCriteria<>(childCriterias);}@Overridepublic Criteria<Project> visitNotCriteria(NotCriteriaContext ctx) {- return new NotCriteria<Project>(visit(ctx.criteria()));+ return new NotCriteria<>(visit(ctx.criteria()));}}.visit(criteriaContext);@@ -268,11 +269,11 @@ public class ProjectQuery extends EntityQuery<Project> {}public static String getRuleName(int rule) {- return AntlrUtils.getLexerRuleName(ruleNames, rule);+ return AntlrUtils.getLexerRuleName(ProjectQueryLexer.ruleNames, rule);}public static int getOperator(String operatorName) {- return AntlrUtils.getLexerRule(ruleNames, operatorName);+ return AntlrUtils.getLexerRule(ProjectQueryLexer.ruleNames, operatorName);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4index 207f8984fb..a05b295ec9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4@@ -8,8 +8,8 @@ querycriteria: operator=(Open|Merged|Discarded|NeedMyAction|AssignedToMe|SubmittedByMe|WatchedByMe|CommentedByMe|ToBeReviewedByMe|ToBeChangedByMe|ToBeMergedByMe|RequestedForChangesByMe|ApprovedByMe|MentionedMe|ReadyToMerge|SomeoneRequestedForChanges|HasPendingReviews|HasUnsuccessfulBuilds|HasUnfinishedBuilds|HasMergeConflicts) #OperatorCriteria- | operator=(NeedActionOf|ToBeReviewedBy|ToBeChangedBy|ToBeMergedBy|AssignedTo|ApprovedBy|RequestedForChangesBy|SubmittedBy|WatchedBy|CommentedBy|Mentioned|IncludesCommit|IncludesIssue) WS+ criteriaValue=Quoted #OperatorValueCriteria- | criteriaField=Quoted WS+ operator=(Is|IsNot|IsGreaterThan|IsLessThan|IsUntil|IsSince|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | operator=(NeedActionOf|ToBeReviewedBy|ToBeChangedBy|ToBeMergedBy|AssignedTo|ApprovedBy|RequestedForChangesBy|SubmittedBy|WatchedBy|CommentedBy|Mentioned|IncludesCommit|IncludesIssue) WS+ criteriaValue=multipleQuoted #OperatorValueCriteria+ | criteriaField=Quoted WS+ operator=(Is|IsNot|IsGreaterThan|IsLessThan|IsUntil|IsSince|Contains) WS+ criteriaValue=multipleQuoted #FieldOperatorValueCriteria| Reference #ReferenceCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria@@ -22,6 +22,10 @@ order: orderField=Quoted WS* (WS+ direction=(Asc|Desc))?;+multipleQuoted+ : Quoted(','Quoted)*+ ;+Open: 'open';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.javaindex 1a15e56902..14535a7614 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java@@ -1,5 +1,6 @@package io.onedev.server.search.entity.pullrequest;+import java.sql.Array;import java.util.ArrayList;import java.util.List;@@ -96,67 +97,67 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {@Overridepublic Criteria<PullRequest> visitOperatorCriteria(OperatorCriteriaContext ctx) {switch (ctx.operator.getType()) {- case PullRequestQueryLexer.Open:+ case Open:return new OpenCriteria();- case PullRequestQueryLexer.Merged:+ case Merged:return new MergedCriteria();- case PullRequestQueryLexer.Discarded:+ case Discarded:return new DiscardedCriteria();- case PullRequestQueryLexer.ReadyToMerge:+ case ReadyToMerge:return new ReadyToMergeCriteria();- case PullRequestQueryLexer.NeedMyAction:+ case NeedMyAction:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new NeedMyActionCriteria();- case PullRequestQueryLexer.ToBeMergedByMe:+ case ToBeMergedByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new ToBeMergedByMeCriteria();- case PullRequestQueryLexer.ToBeChangedByMe:+ case ToBeChangedByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new ToBeChangedByMeCriteria();- case PullRequestQueryLexer.MentionedMe:+ case MentionedMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new MentionedMeCriteria();- case PullRequestQueryLexer.SubmittedByMe:+ case SubmittedByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new SubmittedByMeCriteria();- case PullRequestQueryLexer.WatchedByMe:+ case WatchedByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new WatchedByMeCriteria();- case PullRequestQueryLexer.CommentedByMe:+ case CommentedByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new CommentedByMeCriteria();- case PullRequestQueryLexer.ToBeReviewedByMe:+ case ToBeReviewedByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new ToBeReviewedByMeCriteria();- case PullRequestQueryLexer.RequestedForChangesByMe:+ case RequestedForChangesByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new RequestedForChangesByMeCriteria();- case PullRequestQueryLexer.ApprovedByMe:+ case ApprovedByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new ApprovedByMeCriteria();- case PullRequestQueryLexer.AssignedToMe:+ case AssignedToMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new AssignedToMeCriteria();- case PullRequestQueryLexer.SomeoneRequestedForChanges:+ case SomeoneRequestedForChanges:return new SomeoneRequestedForChangesCriteria();- case PullRequestQueryLexer.HasUnsuccessfulBuilds:+ case HasUnsuccessfulBuilds:return new HasUnsuccessfulBuilds();- case PullRequestQueryLexer.HasMergeConflicts:+ case HasMergeConflicts:return new HasMergeConflictsCriteria();- case PullRequestQueryLexer.HasUnfinishedBuilds:+ case HasUnfinishedBuilds:return new HasUnfinishedBuildsCriteria();- case PullRequestQueryLexer.HasPendingReviews:+ case HasPendingReviews:return new HasPendingReviewsCriteria();default:throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());@@ -165,116 +166,158 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {@Overridepublic Criteria<PullRequest> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {- String value = getValue(ctx.Quoted().getText());- switch (ctx.operator.getType()) {- case PullRequestQueryLexer.ToBeReviewedBy:- return new ToBeReviewedByCriteria(getUser(value));- case PullRequestQueryLexer.ToBeChangedBy:- return new ToBeChangedByCriteria(getUser(value));- case PullRequestQueryLexer.ToBeMergedBy:- return new ToBeMergedByCriteria(getUser(value));- case PullRequestQueryLexer.ApprovedBy:- return new ApprovedByCriteria(getUser(value));- case PullRequestQueryLexer.AssignedTo:- return new AssignedToCriteria(getUser(value));- case PullRequestQueryLexer.RequestedForChangesBy:- return new RequestedForChangesByCriteria(getUser(value));- case PullRequestQueryLexer.Mentioned:- return new MentionedCriteria(getUser(value));- case PullRequestQueryLexer.SubmittedBy:- return new SubmittedByCriteria(getUser(value));- case PullRequestQueryLexer.WatchedBy:- return new WatchedByCriteria(getUser(value));- case PullRequestQueryLexer.NeedActionOf:- return new NeedActionOfCriteria(getUser(value));- case PullRequestQueryLexer.CommentedBy:- return new CommentedByCriteria(getUser(value));- case PullRequestQueryLexer.IncludesCommit:- return new IncludesCommitCriteria(project, value);- case PullRequestQueryLexer.IncludesIssue:- return new IncludesIssueCriteria(project, value);- default:- throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());- }+ List<Criteria<PullRequest>> criterias = new ArrayList<>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String value = getValue(quoted.getText());+ switch (ctx.operator.getType()) {+ case ToBeReviewedBy:+ criterias.add(new ToBeReviewedByCriteria(getUser(value)));+ break;+ case ToBeChangedBy:+ criterias.add(new ToBeChangedByCriteria(getUser(value)));+ break;+ case ToBeMergedBy:+ criterias.add(new ToBeMergedByCriteria(getUser(value)));+ break;+ case ApprovedBy:+ criterias.add(new ApprovedByCriteria(getUser(value)));+ break;+ case AssignedTo:+ criterias.add(new AssignedToCriteria(getUser(value)));+ break;+ case RequestedForChangesBy:+ criterias.add(new RequestedForChangesByCriteria(getUser(value)));+ break;+ case Mentioned:+ criterias.add(new MentionedCriteria(getUser(value)));+ break;+ case SubmittedBy:+ criterias.add(new SubmittedByCriteria(getUser(value)));+ break;+ case WatchedBy:+ criterias.add(new WatchedByCriteria(getUser(value)));+ break;+ case NeedActionOf:+ criterias.add(new NeedActionOfCriteria(getUser(value)));+ break;+ case CommentedBy:+ criterias.add(new CommentedByCriteria(getUser(value)));+ break;+ case IncludesCommit:+ criterias.add(new IncludesCommitCriteria(project, value));+ break;+ case IncludesIssue:+ criterias.add(new IncludesIssueCriteria(project, value));+ break;+ default:+ throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());+ }+ }+ return new OrCriteria<>(criterias);}@Overridepublic Criteria<PullRequest> visitParensCriteria(ParensCriteriaContext ctx) {- return (Criteria<PullRequest>) visit(ctx.criteria()).withParens(true);+ return visit(ctx.criteria()).withParens(true);}@Overridepublic Criteria<PullRequest> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {- String fieldName = getValue(ctx.Quoted(0).getText());- String value = getValue(ctx.Quoted(1).getText());+ String fieldName = getValue(ctx.criteriaField.getText());int operator = ctx.operator.getType();checkField(fieldName, operator);- switch (operator) {- case PullRequestQueryLexer.IsUntil:- case PullRequestQueryLexer.IsSince:- switch (fieldName) {- case PullRequest.NAME_SUBMIT_DATE:- return new SubmitDateCriteria(value, operator);- case PullRequest.NAME_CLOSE_DATE:- return new CloseDateCriteria(value, operator);- case PullRequest.NAME_LAST_ACTIVITY_DATE:- return new LastActivityDateCriteria(value, operator);- default:- throw new IllegalStateException();- }- case PullRequestQueryLexer.Contains:- switch (fieldName) {- case PullRequest.NAME_TITLE:- return new TitleCriteria(value);- case PullRequest.NAME_DESCRIPTION:- return new DescriptionCriteria(value);- case PullRequest.NAME_COMMENT:- return new CommentCriteria(value);- default:- throw new IllegalStateException();- }- case PullRequestQueryLexer.Is:- case PullRequestQueryLexer.IsNot:- switch (fieldName) {- case PullRequest.NAME_NUMBER:- return new ReferenceCriteria(project, value, operator);- case PullRequest.NAME_STATUS:- try {- return new StatusCriteria(PullRequest.Status.valueOf(value.toUpperCase()), operator);- } catch (IllegalArgumentException e) {- throw new ExplicitException("Invalid status: " + value);- }- case PullRequest.NAME_MERGE_STRATEGY:- return new MergeStrategyCriteria(MergeStrategy.fromString(value), operator);- case PullRequest.NAME_SOURCE_BRANCH:- return new SourceBranchCriteria(value, operator);- case PullRequest.NAME_SOURCE_PROJECT:- return new SourceProjectCriteria(value, operator);- case PullRequest.NAME_TARGET_BRANCH:- return new TargetBranchCriteria(value, operator);- case PullRequest.NAME_TARGET_PROJECT:- return new TargetProjectCriteria(value, operator);- case PullRequest.NAME_LABEL:- return new LabelCriteria(getLabelSpec(value), operator);- case PullRequest.NAME_COMMENT_COUNT:- return new CommentCountCriteria(getIntValue(value), operator);- default:- throw new IllegalStateException();- }- case PullRequestQueryLexer.IsLessThan:- case PullRequestQueryLexer.IsGreaterThan:- switch (fieldName) {- case PullRequest.NAME_NUMBER:- return new ReferenceCriteria(project, value, operator);- case PullRequest.NAME_COMMENT_COUNT:- return new CommentCountCriteria(getIntValue(value), operator);- default:- throw new IllegalStateException();- }- default:- throw new IllegalStateException();+ var criterias = new ArrayList<Criteria<PullRequest>>();+ for (var quoted: ctx.criteriaValue.Quoted()) {+ String value = getValue(quoted.getText());+ switch (operator) {+ case PullRequestQueryLexer.IsUntil:+ case PullRequestQueryLexer.IsSince:+ switch (fieldName) {+ case PullRequest.NAME_SUBMIT_DATE:+ criterias.add(new SubmitDateCriteria(value, operator));+ break;+ case PullRequest.NAME_CLOSE_DATE:+ criterias.add(new CloseDateCriteria(value, operator));+ break;+ case PullRequest.NAME_LAST_ACTIVITY_DATE:+ criterias.add(new LastActivityDateCriteria(value, operator));+ break;+ default:+ throw new IllegalStateException();+ }+ break;+ case PullRequestQueryLexer.Contains:+ switch (fieldName) {+ case PullRequest.NAME_TITLE:+ criterias.add(new TitleCriteria(value));+ break;+ case PullRequest.NAME_DESCRIPTION:+ criterias.add(new DescriptionCriteria(value));+ break;+ case PullRequest.NAME_COMMENT:+ criterias.add(new CommentCriteria(value));+ break;+ default:+ throw new IllegalStateException();+ }+ break;+ case Is:+ case IsNot:+ switch (fieldName) {+ case PullRequest.NAME_NUMBER:+ criterias.add(new ReferenceCriteria(project, value, operator));+ break;+ case PullRequest.NAME_STATUS:+ try {+ criterias.add(new StatusCriteria(PullRequest.Status.valueOf(value.toUpperCase()), operator));+ break;+ } catch (IllegalArgumentException e) {+ throw new ExplicitException("Invalid status: " + value);+ }+ case PullRequest.NAME_MERGE_STRATEGY:+ criterias.add(new MergeStrategyCriteria(MergeStrategy.fromString(value), operator));+ break;+ case PullRequest.NAME_SOURCE_BRANCH:+ criterias.add(new SourceBranchCriteria(value, operator));+ break;+ case PullRequest.NAME_SOURCE_PROJECT:+ criterias.add(new SourceProjectCriteria(value, operator));+ break;+ case PullRequest.NAME_TARGET_BRANCH:+ criterias.add(new TargetBranchCriteria(value, operator));+ break;+ case PullRequest.NAME_TARGET_PROJECT:+ criterias.add(new TargetProjectCriteria(value, operator));+ break;+ case PullRequest.NAME_LABEL:+ criterias.add(new LabelCriteria(getLabelSpec(value), operator));+ break;+ case PullRequest.NAME_COMMENT_COUNT:+ criterias.add(new CommentCountCriteria(getIntValue(value), operator));+ break;+ default:+ throw new IllegalStateException();+ }+ break;+ case IsLessThan:+ case IsGreaterThan:+ switch (fieldName) {+ case PullRequest.NAME_NUMBER:+ criterias.add(new ReferenceCriteria(project, value, operator));+ break;+ case PullRequest.NAME_COMMENT_COUNT:+ criterias.add(new CommentCountCriteria(getIntValue(value), operator));+ break;+ default:+ throw new IllegalStateException();+ }+ break;+ default:+ throw new IllegalStateException();+ }}+ return operator==IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);}@Override@@ -282,7 +325,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {List<Criteria<PullRequest>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx : ctx.criteria())childCriterias.add(visit(childCtx));- return new OrCriteria<PullRequest>(childCriterias);+ return new OrCriteria<>(childCriterias);}@Override@@ -290,12 +333,12 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {List<Criteria<PullRequest>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx : ctx.criteria())childCriterias.add(visit(childCtx));- return new AndCriteria<PullRequest>(childCriterias);+ return new AndCriteria<>(childCriterias);}@Overridepublic Criteria<PullRequest> visitNotCriteria(NotCriteriaContext ctx) {- return new NotCriteria<PullRequest>(visit(ctx.criteria()));+ return new NotCriteria<>(visit(ctx.criteria()));}}.visit(criteriaContext);@@ -328,23 +371,23 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {if (!PullRequest.QUERY_FIELDS.contains(fieldName))throw new ExplicitException("Field not found: " + fieldName);switch (operator) {- case PullRequestQueryLexer.IsUntil:- case PullRequestQueryLexer.IsSince:+ case IsUntil:+ case IsSince:if (!fieldName.equals(PullRequest.NAME_SUBMIT_DATE)&& !fieldName.equals(PullRequest.NAME_LAST_ACTIVITY_DATE)&& !fieldName.equals(PullRequest.NAME_CLOSE_DATE)) {throw newOperatorException(fieldName, operator);}break;- case PullRequestQueryLexer.Contains:+ case Contains:if (!fieldName.equals(PullRequest.NAME_TITLE)&& !fieldName.equals(PullRequest.NAME_DESCRIPTION)&& !fieldName.equals(PullRequest.NAME_COMMENT)) {throw newOperatorException(fieldName, operator);}break;- case PullRequestQueryLexer.Is:- case PullRequestQueryLexer.IsNot:+ case Is:+ case IsNot:if (!fieldName.equals(PullRequest.NAME_NUMBER)&& !fieldName.equals(PullRequest.NAME_STATUS)&& !fieldName.equals(PullRequest.NAME_MERGE_STRATEGY)@@ -357,8 +400,8 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {throw newOperatorException(fieldName, operator);}break;- case PullRequestQueryLexer.IsLessThan:- case PullRequestQueryLexer.IsGreaterThan:+ case IsLessThan:+ case IsGreaterThan:if (!fieldName.equals(PullRequest.NAME_NUMBER)&& !fieldName.equals(PullRequest.NAME_COMMENT_COUNT)) {throw newOperatorException(fieldName, operator);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.javaindex dd1d5a8f95..1d3a1a512b 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@@ -1,27 +1,7 @@package io.onedev.server.util.criteria;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;-import java.util.List;-import java.util.Map;--import javax.annotation.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.From;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;-import com.google.common.base.CharMatcher;-import com.google.common.base.Joiner;import com.google.common.base.Splitter;-import org.apache.lucene.document.LongPoint;-import org.apache.lucene.search.BooleanClause.Occur;-import org.apache.lucene.search.BooleanQuery;-import org.apache.lucene.search.Query;-import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.RangeBuilder;@@ -29,6 +9,15 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResoimport io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;+import org.apache.lucene.document.LongPoint;+import org.apache.lucene.search.BooleanClause.Occur;+import org.apache.lucene.search.BooleanQuery;+import org.apache.lucene.search.Query;++import javax.annotation.Nullable;+import javax.persistence.criteria.*;+import java.io.Serializable;+import java.util.*;public abstract class Criteria<T> implements Serializable {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.javaindex 53b2c2775d..8ba4058c60 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java@@ -55,6 +55,7 @@ public class AgentQueryBehavior extends ANTLRAssistBehavior {protected List<InputSuggestion> match(String matchWith) {AgentManager agentManager = OneDev.getInstance(AgentManager.class);AgentAttributeManager attributeManager = OneDev.getInstance(AgentAttributeManager.class);+ ParseExpect criteriaValueExpect;if ("criteriaField".equals(spec.getLabel())) {var fields = new ArrayList<>(Agent.QUERY_FIELDS);var attributeNames = new ArrayList<>(attributeManager.getAttributeNames());@@ -64,9 +65,9 @@ public class AgentQueryBehavior extends ANTLRAssistBehavior {} else if ("orderField".equals(spec.getLabel())) {List<String> candidates = new ArrayList<>(Agent.ORDER_FIELDS.keySet());return SuggestionUtils.suggest(candidates, matchWith);- } else if ("criteriaValue".equals(spec.getLabel())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);- List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);+ } else if ((criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue")) != null) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ List<Element> operatorElements = criteriaValueExpect.getState().findMatchedElementsByLabel("operator", true);Preconditions.checkState(operatorElements.size() == 1);String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = AgentQuery.getOperator(operatorName);@@ -84,20 +85,21 @@ public class AgentQueryBehavior extends ANTLRAssistBehavior {String fieldName = AgentQuery.getValue(fieldElements.get(0).getMatchedText());try {AgentQuery.checkField(fieldName, operator);- if (fieldName.equals(Agent.NAME_OS_NAME)) {- var osNames = new ArrayList<>(agentManager.getOsNames());- sort(osNames);- return SuggestionUtils.suggest(osNames, matchWith);- } else if (fieldName.equals(Agent.NAME_NAME)) {- return SuggestionUtils.suggestAgents(matchWith);- } else if (fieldName.equals(Agent.NAME_OS_ARCH)) {- var osArchs = new ArrayList<>(agentManager.getOsArchs());- sort(osArchs);- return SuggestionUtils.suggest(osArchs, matchWith);- } else {- return null;+ switch (fieldName) {+ case Agent.NAME_OS_NAME:+ var osNames = new ArrayList<>(agentManager.getOsNames());+ sort(osNames);+ return SuggestionUtils.suggest(osNames, matchWith);+ case Agent.NAME_NAME:+ return SuggestionUtils.suggestAgents(matchWith);+ case Agent.NAME_OS_ARCH:+ var osArchs = new ArrayList<>(agentManager.getOsArchs());+ sort(osArchs);+ return SuggestionUtils.suggest(osArchs, matchWith);+ default:+ return null;}- } catch (ExplicitException ex) {+ } catch (ExplicitException ignored) {}}}@@ -144,6 +146,8 @@ public class AgentQueryBehavior extends ANTLRAssistBehavior {return null;}}+ if (suggestedLiteral.equals(","))+ return Optional.of("add another value");parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.javaindex 63ccc95f24..4ec6ef16a9 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java@@ -122,6 +122,9 @@ public class BuildMetricQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {+ if (suggestedLiteral.equals(","))+ return Optional.of("add another value");+parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex 0da9145d23..3a91fd993a 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -82,6 +82,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> match(String matchWith) {Project project = getProject();+ ParseExpect criteriaValueExpect;if ("criteriaField".equals(spec.getLabel())) {List<String> fields = new ArrayList<>(Build.QUERY_FIELDS);if (getProject() != null)@@ -96,9 +97,9 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {if (getProject() != null)candidates.remove(Build.NAME_PROJECT);return SuggestionUtils.suggest(candidates, matchWith);- } else if ("criteriaValue".equals(spec.getLabel())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);- List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);+ } else if ((criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue")) != null) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ List<Element> operatorElements = criteriaValueExpect.getState().findMatchedElementsByLabel("operator", true);Preconditions.checkState(operatorElements.size() == 1);String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = BuildQuery.getOperator(operatorName);@@ -118,52 +119,53 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {String fieldName = BuildQuery.getValue(fieldElements.get(0).getMatchedText());try {BuildQuery.checkField(project, fieldName, operator);- if (fieldName.equals(Build.NAME_SUBMIT_DATE)- || fieldName.equals(Build.NAME_PENDING_DATE)- || fieldName.equals(Build.NAME_RUNNING_DATE)- || fieldName.equals(Build.NAME_FINISH_DATE)) {- List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);- return !suggestions.isEmpty()? suggestions: null;- } else if (fieldName.equals(Build.NAME_PROJECT)) {- if (!matchWith.contains("*"))- return SuggestionUtils.suggestProjectPaths(matchWith);- else+ switch (fieldName) {+ case Build.NAME_SUBMIT_DATE:+ case Build.NAME_PENDING_DATE:+ case Build.NAME_RUNNING_DATE:+ case Build.NAME_FINISH_DATE:+ List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);+ return !suggestions.isEmpty() ? suggestions : null;+ case Build.NAME_PROJECT:+ if (!matchWith.contains("*"))+ return SuggestionUtils.suggestProjectPaths(matchWith);+ else+ return null;+ case Build.NAME_JOB:+ if (project != null && !matchWith.contains("*"))+ return SuggestionUtils.suggestJobs(project, matchWith);+ else+ return null;+ case Build.NAME_STATUS:+ List<String> candidates = new ArrayList<>();+ for (Build.Status status : Build.Status.values())+ candidates.add(status.toString());+ return SuggestionUtils.suggest(candidates, matchWith);+ case Build.NAME_NUMBER:+ return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);+ case Build.NAME_VERSION:+ if (project != null && !matchWith.contains("*"))+ return SuggestionUtils.suggestBuildVersions(project, matchWith);+ else+ return null;+ case Build.NAME_BRANCH:+ if (project != null && !matchWith.contains("*"))+ return SuggestionUtils.suggestBranches(project, matchWith);+ else+ return null;+ case Build.NAME_TAG:+ if (project != null && !matchWith.contains("*"))+ return SuggestionUtils.suggestTags(project, matchWith);+ else+ return null;+ case Build.NAME_LABEL:+ return SuggestionUtils.suggestLabels(matchWith);+ case Build.NAME_PULL_REQUEST:+ return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);+ default:return null;- } else if (fieldName.equals(Build.NAME_JOB)) {- if (project != null && !matchWith.contains("*"))- return SuggestionUtils.suggestJobs(project, matchWith);- else- return null;- } else if (fieldName.equals(Build.NAME_STATUS)) {- List<String> candidates = new ArrayList<>();- for (Build.Status status: Build.Status.values())- candidates.add(status.toString());- return SuggestionUtils.suggest(candidates, matchWith);- } else if (fieldName.equals(Build.NAME_NUMBER)) {- return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);- } else if (fieldName.equals(Build.NAME_VERSION)) {- if (project != null && !matchWith.contains("*"))- return SuggestionUtils.suggestBuildVersions(project, matchWith);- else- return null;- } else if (fieldName.equals(Build.NAME_BRANCH)) {- if (project != null && !matchWith.contains("*"))- return SuggestionUtils.suggestBranches(project, matchWith);- else- return null;- } else if (fieldName.equals(Build.NAME_TAG)) {- if (project != null && !matchWith.contains("*"))- return SuggestionUtils.suggestTags(project, matchWith);- else- return null;- } else if (fieldName.equals(Build.NAME_LABEL)) {- return SuggestionUtils.suggestLabels(matchWith);- } else if (fieldName.equals(Build.NAME_PULL_REQUEST)) {- return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);- } else {- return null;}- } catch (ExplicitException ex) {+ } catch (ExplicitException ignored) {}}}@@ -212,7 +214,10 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {return null;}}- if (suggestedLiteral.equals("#")) {++ if (suggestedLiteral.equals(",")) {+ return Optional.of("add another value");+ } else if (suggestedLiteral.equals("#")) {if (getProject() != null)return Optional.of("find build by number");elsediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.javaindex bb8c773f9f..6c6cc423e7 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java@@ -72,13 +72,14 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> match(String matchWith) {Project project = getProject();+ ParseExpect criteriaValueExpect;if ("criteriaField".equals(spec.getLabel())) {return SuggestionUtils.suggest(CodeComment.QUERY_FIELDS, matchWith);} else if ("orderField".equals(spec.getLabel())) {return SuggestionUtils.suggest(new ArrayList<>(CodeComment.ORDER_FIELDS.keySet()), matchWith);- } else if ("criteriaValue".equals(spec.getLabel())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);- List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);+ } else if ((criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue")) != null) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ List<Element> operatorElements = criteriaValueExpect.getState().findMatchedElementsByLabel("operator", true);Preconditions.checkState(operatorElements.size() == 1);String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = CodeCommentQuery.getOperator(operatorName);@@ -100,7 +101,7 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {} else {return null;}- } catch (ExplicitException ex) {+ } catch (ExplicitException ignored) {}}}@@ -137,6 +138,8 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {if (!withOrder && suggestedLiteral.equals(getRuleName(OrderBy))|| !withCurrentUserCriteria && (suggestedLiteral.equals(getRuleName(CreatedByMe)) || suggestedLiteral.equals(getRuleName(RepliedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)))) {return null;+ } else if (suggestedLiteral.equals(",")) {+ return Optional.of("add another value");}parseExpect = parseExpect.findExpectByLabel("operator");diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.javaindex 5edadf14a9..d30ee2ddb8 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java@@ -1,35 +1,33 @@package io.onedev.server.web.behavior;-import java.util.ArrayList;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;--import io.onedev.commons.codeassist.InputCompletion;-import org.apache.wicket.Component;-import org.apache.wicket.model.IModel;-import com.google.common.base.Optional;import com.google.common.collect.Lists;-import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.codeassist.InputCompletion;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.LinearRange;import io.onedev.commons.utils.StringUtils;+import io.onedev.commons.utils.match.PatternApplied;+import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.OneDev;-import io.onedev.server.xodus.CommitInfoManager;import io.onedev.server.model.Project;import io.onedev.server.search.commit.CommitQueryParser;import io.onedev.server.util.Constants;import io.onedev.server.util.NameAndEmail;-import io.onedev.commons.utils.match.PatternApplied;-import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;+import io.onedev.server.xodus.CommitInfoManager;+import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;++import java.util.ArrayList;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;@SuppressWarnings("serial")public class CommitQueryBehavior extends ANTLRAssistBehavior {@@ -70,47 +68,47 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> match(String matchWith) {- int tokenType = terminalExpect.getState().getLastMatchedToken().getType();+ int tokenType = terminalExpect.getState().getFirstMatchedToken().getType();Project project = projectModel.getObject();switch (tokenType) {- case CommitQueryParser.BRANCH:- return SuggestionUtils.suggestBranches(project, matchWith);- case CommitQueryParser.TAG:- return SuggestionUtils.suggestTags(project, matchWith);- case CommitQueryParser.BUILD:- return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);- case CommitQueryParser.AUTHOR:- case CommitQueryParser.COMMITTER:- Map<String, LinearRange> suggestedInputs = new LinkedHashMap<>();- CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);- List<NameAndEmail> users = commitInfoManager.getUsers(project.getId());- for (NameAndEmail user: users) {- String content;- if (StringUtils.isNotBlank(user.getEmailAddress()))- content = user.getName() + " <" + user.getEmailAddress() + ">";- else- content = user.getName() + " <>";- content = content.trim();- PatternApplied applied = WildcardUtils.applyStringPattern(matchWith, content, false);- if (applied != null)- suggestedInputs.put(applied.getText(), applied.getMatch());- }-- List<InputSuggestion> suggestions = new ArrayList<>();- for (Map.Entry<String, LinearRange> entry: suggestedInputs.entrySet())- suggestions.add(new InputSuggestion(entry.getKey(), -1, null, entry.getValue()));- return suggestions;- case CommitQueryParser.BEFORE:- case CommitQueryParser.AFTER:- List<String> candidates = new ArrayList<>(DATE_EXAMPLES);- candidates.add(Constants.DATETIME_FORMATTER.print(System.currentTimeMillis()));- candidates.add(Constants.DATE_FORMATTER.print(System.currentTimeMillis()));- suggestions = SuggestionUtils.suggest(candidates, matchWith);- return !suggestions.isEmpty()? suggestions: null;- case CommitQueryParser.PATH:- return SuggestionUtils.suggestBlobs(projectModel.getObject(), matchWith);- default:- return null;+ case CommitQueryParser.BRANCH:+ return SuggestionUtils.suggestBranches(project, matchWith);+ case CommitQueryParser.TAG:+ return SuggestionUtils.suggestTags(project, matchWith);+ case CommitQueryParser.BUILD:+ return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);+ case CommitQueryParser.AUTHOR:+ case CommitQueryParser.COMMITTER:+ Map<String, LinearRange> suggestedInputs = new LinkedHashMap<>();+ CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);+ List<NameAndEmail> users = commitInfoManager.getUsers(project.getId());+ for (NameAndEmail user: users) {+ String content;+ if (StringUtils.isNotBlank(user.getEmailAddress()))+ content = user.getName() + " <" + user.getEmailAddress() + ">";+ else+ content = user.getName() + " <>";+ content = content.trim();+ PatternApplied applied = WildcardUtils.applyStringPattern(matchWith, content, false);+ if (applied != null)+ suggestedInputs.put(applied.getText(), applied.getMatch());+ }++ List<InputSuggestion> suggestions = new ArrayList<>();+ for (Map.Entry<String, LinearRange> entry: suggestedInputs.entrySet())+ suggestions.add(new InputSuggestion(entry.getKey(), -1, null, entry.getValue()));+ return suggestions;+ case CommitQueryParser.BEFORE:+ case CommitQueryParser.AFTER:+ List<String> candidates = new ArrayList<>(DATE_EXAMPLES);+ candidates.add(Constants.DATETIME_FORMATTER.print(System.currentTimeMillis()));+ candidates.add(Constants.DATE_FORMATTER.print(System.currentTimeMillis()));+ suggestions = SuggestionUtils.suggest(candidates, matchWith);+ return !suggestions.isEmpty()? suggestions: null;+ case CommitQueryParser.PATH:+ return SuggestionUtils.suggestBlobs(projectModel.getObject(), matchWith);+ default:+ return null;}}@@ -167,29 +165,29 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {}String description;switch (suggestedLiteral) {- case "committer":- description = "committed by";- break;- case "author":- description = "authored by";- break;- case "message":- description = "commit message contains";- break;- case "before":- description = "before specified date";- break;- case "after":- description = "after specified date";- break;- case "path":- description = "touching specified path";- break;- case " ":- description = "space";- break;- default:- description = null;+ case "committer":+ description = "committed by";+ break;+ case "author":+ description = "authored by";+ break;+ case "message":+ description = "commit message contains";+ break;+ case "before":+ description = "before specified date";+ break;+ case "after":+ description = "after specified date";+ break;+ case "path":+ description = "touching specified path";+ break;+ case " ":+ description = "space";+ break;+ default:+ description = null;}return Optional.fromNullable(description);}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex d151b125bd..7408887c87 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -2,6 +2,7 @@ package io.onedev.server.web.behavior;import com.google.common.base.Optional;import com.google.common.base.Preconditions;+import com.google.common.collect.Lists;import io.onedev.commons.codeassist.FenceAware;import io.onedev.commons.codeassist.InputCompletion;import io.onedev.commons.codeassist.InputSuggestion;@@ -85,11 +86,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();- if (spec.getRuleName().equals("Number")) {- return SuggestionUtils.suggestNumber(- terminalExpect.getUnmatchedText(),- "find issue with this number");- } else if (spec.getRuleName().equals("Quoted")) {+ if (spec.getRuleName().equals("Quoted")) {return new FenceAware(codeAssist.getGrammar(), '"', '"') {private Map<String, String> getFieldCandidates(Collection<String> fields) {@@ -115,6 +112,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> match(String matchWith) {Project project = getProject();+ ParseExpect criteriaValueExpect;if ("criteriaField".equals(spec.getLabel())) {Map<String, String> candidates = getFieldCandidates(QUERY_FIELDS);if (!option.withProjectCriteria())@@ -161,9 +159,11 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {case "build":return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);}- } else if ("criteriaValue".equals(spec.getLabel())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);- List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);+ } else if ("linkSpec".equals(spec.getLabel())) {+ return SuggestionUtils.suggestLinkSpecs(matchWith);+ } else if ((criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue")) != null) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ List<Element> operatorElements = criteriaValueExpect.getState().findMatchedElementsByLabel("operator", true);Preconditions.checkState(operatorElements.size() == 1);String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = getOperator(operatorName);@@ -259,8 +259,6 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {} catch (ExplicitException ex) {}}- } else if ("linkSpec".equals(spec.getLabel())) {- return SuggestionUtils.suggestLinkSpecs(matchWith);}return new ArrayList<>();}@@ -290,7 +288,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {}return null;}-+@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {if (!option.withOrder() && suggestedLiteral.equals(getRuleName(OrderBy))@@ -300,6 +298,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {|| !option.withCurrentCommitCriteria() && suggestedLiteral.equals(getRuleName(FixedInCurrentCommit))|| !option.withCurrentIssueCriteria() && suggestedLiteral.equals(getRuleName(CurrentIssue))) {return null;+ } else if (suggestedLiteral.equals(",")) {+ return Optional.of("add another value");} else if (suggestedLiteral.equals("#")) {if (getProject() != null)return Optional.of("find issue by number");diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.javaindex 99f5d58685..42a7e63642 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java@@ -48,6 +48,7 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> match(String matchWith) {+ ParseExpect criteriaValueExpect;if ("criteriaField".equals(spec.getLabel())) {List<String> fields = new ArrayList<>();if (withProjectCriteria)@@ -55,13 +56,13 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {if (withJobCriteria)fields.add(Build.NAME_JOB);return SuggestionUtils.suggest(fields, matchWith);- } else if ("criteriaValue".equals(spec.getLabel())) {- List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);+ } else if ((criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue")) != null) {+ List<Element> operatorElements = criteriaValueExpect.getState().findMatchedElementsByLabel("operator", true);Preconditions.checkState(operatorElements.size() == 1);String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = getLexerRule(ruleNames, operatorName);if (operator == Is || operator == IsNot) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);Preconditions.checkState(fieldElements.size() == 1);String fieldName = JobMatch.getValue(fieldElements.get(0).getMatchedText());if (fieldName.equals(Build.NAME_PROJECT)) {@@ -97,6 +98,9 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {if (suggestedLiteral.equals(getLexerRuleName(ruleNames, OnBranch)))return Optional.of("branch the build commit is merged into");+ else if (suggestedLiteral.equals(","))+ return Optional.of("add another value");+parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.javaindex 6ea3ec6c66..1e6d71c4f7 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java@@ -78,6 +78,7 @@ public class PackQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> match(String matchWith) {Project project = getProject();+ ParseExpect criteriaValueExpect;if ("criteriaField".equals(spec.getLabel())) {List<String> fields = new ArrayList<>(Pack.QUERY_FIELDS);if (getProject() != null)@@ -90,9 +91,9 @@ public class PackQueryBehavior extends ANTLRAssistBehavior {if (getProject() != null)candidates.remove(Pack.NAME_PROJECT);return SuggestionUtils.suggest(candidates, matchWith);- } else if ("criteriaValue".equals(spec.getLabel())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);- List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);+ } else if ((criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue")) != null) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ List<Element> operatorElements = criteriaValueExpect.getState().findMatchedElementsByLabel("operator", true);Preconditions.checkState(operatorElements.size() == 1);String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = PackQuery.getOperator(operatorName);@@ -174,6 +175,9 @@ public class PackQueryBehavior extends ANTLRAssistBehavior {return null;if (!withCurrentUserCriteria && suggestedLiteral.equals(PackQuery.getRuleName(PackQueryLexer.PublishedByMe)))return null;+ if (suggestedLiteral.equals(","))+ return Optional.of("add another value");+parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.javaindex e2bc6d608b..f8531e9755 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java@@ -59,6 +59,7 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> match(String matchWith) {+ ParseExpect criteriaValueExpect;if ("criteriaField".equals(spec.getLabel())) {List<String> candidates = new ArrayList<>(Project.QUERY_FIELDS);if (childQuery)@@ -71,9 +72,9 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {if (OneDev.getInstance(SettingManager.class).getServiceDeskSetting() == null)candidates.remove(Project.NAME_SERVICE_DESK_NAME);return SuggestionUtils.suggest(candidates, matchWith);- } else if ("criteriaValue".equals(spec.getLabel())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);- List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);+ } else if ((criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue")) != null) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ List<Element> operatorElements = criteriaValueExpect.getState().findMatchedElementsByLabel("operator", true);Preconditions.checkState(operatorElements.size() == 1);String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = ProjectQuery.getOperator(operatorName);@@ -127,7 +128,7 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {} else {return null;}- } catch (ExplicitException ex) {+ } catch (ExplicitException ignored) {}}}@@ -164,7 +165,10 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {if (!OneDev.getInstance(ClusterManager.class).isClusteringSupported()&& (suggestedLiteral.equals(getRuleName(WithoutEnoughReplicas)) || suggestedLiteral.equals(getRuleName(HasOutdatedReplicas)))) {return null;+ } else if (suggestedLiteral.equals(",")) {+ return Optional.of("add another value");}+if (childQuery) {if (suggestedLiteral.equals(getRuleName(ChildrenOf))|| suggestedLiteral.equals(getRuleName(Roots))) {@@ -183,6 +187,7 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {}}}+return super.describe(parseExpect, suggestedLiteral);}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex 7719110ef1..970daa6544 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -79,6 +79,7 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> match(String matchWith) {Project project = getProject();+ ParseExpect criteriaValueExpect;if ("criteriaField".equals(spec.getLabel())) {List<String> candidates = new ArrayList<>(PullRequest.QUERY_FIELDS);if (getProject() != null)@@ -89,9 +90,9 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {if (getProject() != null)candidates.remove(PullRequest.NAME_TARGET_PROJECT);return SuggestionUtils.suggest(candidates, matchWith);- } else if ("criteriaValue".equals(spec.getLabel())) {- List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);- List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);+ } else if ((criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue")) != null) {+ List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);+ List<Element> operatorElements = criteriaValueExpect.getState().findMatchedElementsByLabel("operator", true);Preconditions.checkState(operatorElements.size() == 1);String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = getOperator(operatorName);@@ -106,44 +107,47 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {String fieldName = getValue(fieldElements.get(0).getMatchedText());try {checkField(fieldName, operator);- if (fieldName.equals(PullRequest.NAME_SUBMIT_DATE)- || fieldName.equals(PullRequest.NAME_LAST_ACTIVITY_DATE)- || fieldName.equals(PullRequest.NAME_CLOSE_DATE)) {- List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);- return !suggestions.isEmpty() ? suggestions : null;- } else if (fieldName.equals(PullRequest.NAME_STATUS)) {- List<String> candidates = new ArrayList<>();- for (PullRequest.Status status : PullRequest.Status.values())- candidates.add(status.toString());- return SuggestionUtils.suggest(candidates, matchWith);- } else if (fieldName.equals(PullRequest.NAME_TARGET_PROJECT)- || fieldName.equals(PullRequest.NAME_SOURCE_PROJECT)) {- if (!matchWith.contains("*"))- return SuggestionUtils.suggestProjectPaths(matchWith);- else+ switch (fieldName) {+ case PullRequest.NAME_SUBMIT_DATE:+ case PullRequest.NAME_LAST_ACTIVITY_DATE:+ case PullRequest.NAME_CLOSE_DATE:+ List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);+ return !suggestions.isEmpty() ? suggestions : null;+ case PullRequest.NAME_STATUS: {+ List<String> candidates = new ArrayList<>();+ for (PullRequest.Status status : PullRequest.Status.values())+ candidates.add(status.toString());+ return SuggestionUtils.suggest(candidates, matchWith);+ }+ case PullRequest.NAME_TARGET_PROJECT:+ case PullRequest.NAME_SOURCE_PROJECT:+ if (!matchWith.contains("*"))+ return SuggestionUtils.suggestProjectPaths(matchWith);+ else+ return null;+ case PullRequest.NAME_TARGET_BRANCH:+ case PullRequest.NAME_SOURCE_BRANCH:+ if (project != null && !matchWith.contains("*"))+ return SuggestionUtils.suggestBranches(project, matchWith);+ else+ return null;+ case NAME_NUMBER:+ return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);+ case PullRequest.NAME_MERGE_STRATEGY: {+ List<String> candidates = new ArrayList<>();+ for (MergeStrategy strategy : MergeStrategy.values())+ candidates.add(strategy.toString());+ return SuggestionUtils.suggest(candidates, matchWith);+ }+ case PullRequest.NAME_LABEL:+ return SuggestionUtils.suggestLabels(matchWith);+ case PullRequest.NAME_TITLE:+ case PullRequest.NAME_DESCRIPTION:+ case PullRequest.NAME_COMMENT_COUNT:+ case PullRequest.NAME_COMMENT:return null;- } else if (fieldName.equals(PullRequest.NAME_TARGET_BRANCH)- || fieldName.equals(PullRequest.NAME_SOURCE_BRANCH)) {- if (project != null && !matchWith.contains("*"))- return SuggestionUtils.suggestBranches(project, matchWith);- else- return null;- } else if (fieldName.equals(NAME_NUMBER)) {- return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);- } else if (fieldName.equals(PullRequest.NAME_MERGE_STRATEGY)) {- List<String> candidates = new ArrayList<>();- for (MergeStrategy strategy : MergeStrategy.values())- candidates.add(strategy.toString());- return SuggestionUtils.suggest(candidates, matchWith);- } else if (fieldName.equals(PullRequest.NAME_LABEL)) {- return SuggestionUtils.suggestLabels(matchWith);- } else if (fieldName.equals(PullRequest.NAME_TITLE)- || fieldName.equals(PullRequest.NAME_DESCRIPTION)- || fieldName.equals(PullRequest.NAME_COMMENT_COUNT)- || fieldName.equals(PullRequest.NAME_COMMENT)) {- return null;}- } catch (ExplicitException ex) {+ } catch (ExplicitException ignored) {}}}@@ -180,6 +184,8 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {if (!withOrder && suggestedLiteral.equals(getRuleName(OrderBy))|| !withCurrentUserCriteria && (suggestedLiteral.equals(getRuleName(SubmittedByMe)) || suggestedLiteral.equals(getRuleName(WatchedByMe)) || suggestedLiteral.equals(getRuleName(NeedMyAction)) || suggestedLiteral.equals(getRuleName(CommentedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)) || suggestedLiteral.equals(getRuleName(ToBeReviewedByMe)) || suggestedLiteral.equals(getRuleName(RequestedForChangesByMe)) || suggestedLiteral.equals(getRuleName(ApprovedByMe)) || suggestedLiteral.equals(getRuleName(AssignedToMe)) || suggestedLiteral.equals(getRuleName(ToBeChangedByMe)) || suggestedLiteral.equals(getRuleName(ToBeMergedByMe)))) {return null;+ } else if (suggestedLiteral.equals(",")) {+ return Optional.of("add another value");} else if (suggestedLiteral.equals("#")) {if (getProject() != null)return Optional.of("find pull request by number");diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.cssindex 43581d5872..fc170febba 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css@@ -1,3 +1,6 @@+input.input-assist {+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+}.floating>.content>.input-assist {padding: 1rem;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.javaindex d5a432fd0d..6cfcd6e76f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java@@ -6,6 +6,7 @@ import io.onedev.server.entitymanager.AgentManager;import io.onedev.server.model.Agent;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.agent.AgentQuery;+import io.onedev.server.search.entity.agent.FuzzyCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.AgentQueryBehavior;@@ -72,11 +73,12 @@ class AgentListPanel extends Panel {try {return AgentQuery.parse(queryString, false);} catch (Exception e) {- if (e instanceof ExplicitException)+ if (e instanceof ExplicitException) {error(e.getMessage());- else- error("Malformed query");- return null;+ return null;+ } else {+ return new AgentQuery(new FuzzyCriteria(queryString));+ }}}diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex b52d101077..1ca23bb70e 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -54,7 +54,7 @@ public class SuggestionUtils {return sortAndTruncate(suggestions, matchWith);}-+public static List<InputSuggestion> suggestLabels(String matchWith) {var labelNames = OneDev.getInstance(LabelSpecManager.class).query().stream().map(it->it.getName())