Skip to content

The Unified and Autonomous Development Platform

Fix issue #416 - Able to specify executor when define job

Robin Shen9c2102e8ba19
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
index 4b5239df1e..2905d6092d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
@@ -96,6 +96,9 @@ import io.onedev.server.event.pullrequest.PullRequestEvent;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.RefInfo;
+import io.onedev.server.infomanager.CommitInfoManager;
+import io.onedev.server.job.requirement.JobRequirement;
import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
import io.onedev.server.model.BuildDependence;
@@ -118,6 +121,7 @@ import io.onedev.server.tasklog.JobLogManager;
import io.onedev.server.util.CommitAware;
import io.onedev.server.util.JobSecretAuthorizationContext;
import io.onedev.server.util.MatrixRunner;
+import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.interpolative.VariableInterpolator;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.schedule.SchedulableTask;
@@ -397,27 +401,67 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
}
- private JobExecutor getJobExecutor(Build build, TaskLogger jobLogger) {
- if (!settingManager.getJobExecutors().isEmpty()) {
- for (JobExecutor executor: settingManager.getJobExecutors()) {
- if (executor.isApplicable(build))
- return executor;
+ private boolean isApplicable(JobExecutor executor, Build build) {
+ if (executor.getJobRequirement() != null) {
+ JobRequirement requirement = JobRequirement.parse(executor.getJobRequirement());
+ Collection<ObjectId> descendants = OneDev.getInstance(CommitInfoManager.class)
+ .getDescendants(build.getProject(), Sets.newHashSet(build.getCommitId()));
+ descendants.add(build.getCommitId());
+
+ for (RefInfo ref: build.getProject().getBranchRefInfos()) {
+ if (descendants.contains(ref.getPeeledObj())) {
+ String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getRef().getName()));
+ if (requirement.matches(new ProjectAndBranch(build.getProject(), branchName)))
+ return true;
+ }
}
- throw new ExplicitException("No applicable job executor");
+ return false;
} else {
- jobLogger.log("No job executor defined, auto-discovering...");
- List<JobExecutorDiscoverer> discoverers = new ArrayList<>(OneDev.getExtensions(JobExecutorDiscoverer.class));
- discoverers.sort(Comparator.comparing(JobExecutorDiscoverer::getOrder));
- for (JobExecutorDiscoverer discoverer: discoverers) {
- JobExecutor jobExecutor = discoverer.discover(jobLogger);
- if (jobExecutor != null) {
- jobLogger.log("Discovered job executor type: "
- + EditableUtils.getDisplayName(jobExecutor.getClass()));
- jobExecutor.setName("auto-discovered");
+ return true;
+ }
+ }
+
+ private JobExecutor getJobExecutor(Build build, TaskLogger jobLogger) {
+ if (build.getJob().getJobExecutor() != null) {
+ JobExecutor jobExecutor = null;
+ for (JobExecutor each: settingManager.getJobExecutors()) {
+ if (each.getName().equals(build.getJob().getJobExecutor())) {
+ jobExecutor = each;
+ break;
+ }
+ }
+ if (jobExecutor != null) {
+ if (!jobExecutor.isEnabled())
+ throw new ExplicitException("Specified job executor '" + jobExecutor.getName() + "' is disabled");
+ else if (!isApplicable(jobExecutor, build))
+ throw new ExplicitException("Specified job executor '" + jobExecutor.getName() + "' is not applicable for current job");
+ else
return jobExecutor;
+ } else {
+ throw new ExplicitException("Unable to find specified job executor '" + build.getJob().getJobExecutor() + "'");
+ }
+ } else {
+ if (!settingManager.getJobExecutors().isEmpty()) {
+ for (JobExecutor executor: settingManager.getJobExecutors()) {
+ if (executor.isEnabled() && isApplicable(executor, build))
+ return executor;
+ }
+ throw new ExplicitException("No applicable job executor");
+ } else {
+ jobLogger.log("No job executor defined, auto-discovering...");
+ List<JobExecutorDiscoverer> discoverers = new ArrayList<>(OneDev.getExtensions(JobExecutorDiscoverer.class));
+ discoverers.sort(Comparator.comparing(JobExecutorDiscoverer::getOrder));
+ for (JobExecutorDiscoverer discoverer: discoverers) {
+ JobExecutor jobExecutor = discoverer.discover(jobLogger);
+ if (jobExecutor != null) {
+ jobLogger.log("Discovered job executor type: "
+ + EditableUtils.getDisplayName(jobExecutor.getClass()));
+ jobExecutor.setName("auto-discovered");
+ return jobExecutor;
+ }
}
+ throw new ExplicitException("No job executor discovered");
}
- throw new ExplicitException("No job executor discovered");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
index 2aba5fa707..0400712912 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
@@ -34,6 +34,7 @@ import io.onedev.commons.codeassist.InputStatus;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.k8shelper.CloneInfo;
import io.onedev.k8shelper.KubernetesHelper;
+import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.BuildSpecAware;
import io.onedev.server.buildspec.NamedElement;
@@ -43,17 +44,23 @@ import io.onedev.server.buildspec.job.trigger.JobTrigger;
import io.onedev.server.buildspec.param.ParamUtils;
import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.buildspec.step.Step;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.git.GitUtils;
+import io.onedev.server.job.requirement.JobRequirement;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.RetryCondition;
import io.onedev.server.web.editable.annotation.SuggestionProvider;
+import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.util.WicketUtils;
@Editable
@@ -78,6 +85,8 @@ public class Job implements NamedElement, Serializable, Validatable {
private String name;
+ private String jobExecutor;
+
private List<Step> steps = new ArrayList<>();
private List<ParamSpec> paramSpecs = new ArrayList<>();
@@ -131,6 +140,36 @@ public class Job implements NamedElement, Serializable, Validatable {
return new ArrayList<>();
}
+ @Editable(order=200, description="Optionally specify executor to execute this job. Leave empty to "
+ + "use any executor as long as its job requirement is satisfied")
+ @ChoiceProvider("getJobExecutorChoices")
+ @NameOfEmptyValue("Use Any Applicable Executor")
+ public String getJobExecutor() {
+ return jobExecutor;
+ }
+
+ public void setJobExecutor(String jobExecutor) {
+ this.jobExecutor = jobExecutor;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getJobExecutorChoices() {
+ List<String> applicableJobExecutors = new ArrayList<>();
+ ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();
+ ProjectAndBranch projectAndBranch = new ProjectAndBranch(page.getProject(), page.getBlobIdent().revision);
+ for (JobExecutor executor: OneDev.getInstance(SettingManager.class).getJobExecutors()) {
+ if (executor.isEnabled()) {
+ if (executor.getJobRequirement() == null) {
+ applicableJobExecutors.add(executor.getName());
+ } else {
+ if (JobRequirement.parse(executor.getJobRequirement()).matches(projectAndBranch))
+ applicableJobExecutors.add(executor.getName());
+ }
+ }
+ }
+ return applicableJobExecutors;
+ }
+
@Editable(order=200, description="Steps will be executed serially on same node, sharing the same <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>")
@Size(min=1, max=1000, message="At least one step needs to be configured")
public List<Step> getSteps() {
diff --git a/server-core/src/main/java/io/onedev/server/job/match/AlwaysCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/AlwaysCriteria.java
deleted file mode 100644
index 6ed7f7980c..0000000000
--- a/server-core/src/main/java/io/onedev/server/job/match/AlwaysCriteria.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.onedev.server.job.match;
-
-import static io.onedev.server.job.match.JobMatch.getRuleName;
-import static io.onedev.server.job.match.JobMatchLexer.All;
-
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.Criteria;
-
-public class AlwaysCriteria extends Criteria<Build> {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean matches(Build build) {
- return true;
- }
-
- @Override
- public String toStringWithoutParens() {
- return getRuleName(All);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/job/match/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/BranchCriteria.java
deleted file mode 100644
index 4406e30c5d..0000000000
--- a/server-core/src/main/java/io/onedev/server/job/match/BranchCriteria.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.onedev.server.job.match;
-
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.Criteria;
-
-import static io.onedev.server.job.match.JobMatch.getRuleName;
-import static io.onedev.server.job.match.JobMatchLexer.OnBranch;
-
-public class BranchCriteria extends Criteria<Build> {
-
- private static final long serialVersionUID = 1L;
-
- private final String branch;
-
- public BranchCriteria(String branch) {
- this.branch = branch;
- }
-
- @Override
- public boolean matches(Build build) {
- return build.getProject().isCommitOnBranches(build.getCommitId(), branch);
- }
-
- @Override
- public String toStringWithoutParens() {
- return getRuleName(OnBranch) + " " + quote(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.java
deleted file mode 100644
index 007ed5513e..0000000000
--- a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package io.onedev.server.job.match;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.codeassist.FenceAware;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.job.match.JobMatchParser.AndCriteriaContext;
-import io.onedev.server.job.match.JobMatchParser.CriteriaContext;
-import io.onedev.server.job.match.JobMatchParser.FieldOperatorValueCriteriaContext;
-import io.onedev.server.job.match.JobMatchParser.JobMatchContext;
-import io.onedev.server.job.match.JobMatchParser.NotCriteriaContext;
-import io.onedev.server.job.match.JobMatchParser.OperatorValueCriteriaContext;
-import io.onedev.server.job.match.JobMatchParser.OrCriteriaContext;
-import io.onedev.server.job.match.JobMatchParser.ParensCriteriaContext;
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.AndCriteria;
-import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.criteria.NotCriteria;
-import io.onedev.server.util.criteria.OrCriteria;
-
-public class JobMatch extends Criteria<Build> {
-
- private static final long serialVersionUID = 1L;
-
- private final Criteria<Build> criteria;
-
- public JobMatch(Criteria<Build> criteria) {
- this.criteria = criteria;
- }
-
- public static String getValue(String token) {
- return StringUtils.unescape(FenceAware.unfence(token));
- }
-
- public static JobMatch parse(String jobMatchString) {
- CharStream is = CharStreams.fromString(jobMatchString);
- JobMatchLexer lexer = new JobMatchLexer(is);
- lexer.removeErrorListeners();
- lexer.addErrorListener(new BaseErrorListener() {
-
- @Override
- public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
- int charPositionInLine, String msg, RecognitionException e) {
- throw new RuntimeException("Malformed job match", e);
- }
-
- });
- CommonTokenStream tokens = new CommonTokenStream(lexer);
- JobMatchParser parser = new JobMatchParser(tokens);
- parser.removeErrorListeners();
- parser.setErrorHandler(new BailErrorStrategy());
- JobMatchContext jobMatchContext = parser.jobMatch();
-
- Criteria<Build> criteria;
-
- if (jobMatchContext.All() != null) {
- criteria = new AlwaysCriteria();
- } else {
- criteria = new JobMatchBaseVisitor<Criteria<Build>>() {
-
- @Override
- public Criteria<Build> visitParensCriteria(ParensCriteriaContext ctx) {
- return visit(ctx.criteria()).withParens(true);
- }
-
- @Override
- public Criteria<Build> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {
- String fieldName = getValue(ctx.Quoted(0).getText());
- String fieldValue = getValue(ctx.Quoted(1).getText());
- int operator = ctx.operator.getType();
- checkField(fieldName, operator);
-
- switch (fieldName) {
- case Build.NAME_PROJECT:
- return new ProjectCriteria(fieldValue);
- case Build.NAME_JOB:
- return new NameCriteria(fieldValue);
- default:
- throw new RuntimeException("Unknown job match field: " + fieldName);
- }
- }
-
- @Override
- public Criteria<Build> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {
- String fieldValue = getValue(ctx.Quoted().getText());
- return new BranchCriteria(fieldValue);
- }
-
- @Override
- public Criteria<Build> visitOrCriteria(OrCriteriaContext ctx) {
- List<Criteria<Build>> childCriterias = new ArrayList<>();
- for (CriteriaContext childCtx: ctx.criteria())
- childCriterias.add(visit(childCtx));
- return new OrCriteria<Build>(childCriterias);
- }
-
- @Override
- public Criteria<Build> visitAndCriteria(AndCriteriaContext ctx) {
- List<Criteria<Build>> childCriterias = new ArrayList<>();
- for (CriteriaContext childCtx: ctx.criteria())
- childCriterias.add(visit(childCtx));
- return new AndCriteria<Build>(childCriterias);
- }
-
- @Override
- public Criteria<Build> visitNotCriteria(NotCriteriaContext ctx) {
- return new NotCriteria<Build>(visit(ctx.criteria()));
- }
-
- }.visit(jobMatchContext.criteria());
- }
- return new JobMatch(criteria);
- }
-
- public static void checkField(String fieldName, int operator) {
- if (fieldName.equals(Build.NAME_PROJECT) || fieldName.equals(Build.NAME_JOB)) {
- if (operator != JobMatchLexer.Is)
- throw newOperatorException(fieldName, operator);
- } else {
- throw new ExplicitException("Invalid field: " + fieldName);
- }
- }
-
- private static ExplicitException newOperatorException(String fieldName, int operator) {
- return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '"
- + AntlrUtils.getLexerRuleName(JobMatchLexer.ruleNames, operator) + "'");
- }
-
- @Override
- public boolean matches(Build build) {
- return criteria.matches(build);
- }
-
- @Override
- public void onRenameUser(String oldName, String newName) {
- criteria.onRenameUser(oldName, newName);
- }
-
- @Override
- public void onRenameProject(String oldPath, String newPath) {
- criteria.onRenameProject(oldPath, newPath);
- }
-
- @Override
- public boolean isUsingUser(String userName) {
- return criteria.isUsingUser(userName);
- }
-
- @Override
- public boolean isUsingProject(String projectPath) {
- return criteria.isUsingProject(projectPath);
- }
-
- public static String getRuleName(int rule) {
- return AntlrUtils.getLexerRuleName(JobMatchLexer.ruleNames, rule);
- }
-
- @Override
- public String toStringWithoutParens() {
- return criteria.toString();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/job/match/NameCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/NameCriteria.java
deleted file mode 100644
index 59fc61b930..0000000000
--- a/server-core/src/main/java/io/onedev/server/job/match/NameCriteria.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.onedev.server.job.match;
-
-import static io.onedev.server.job.match.JobMatch.getRuleName;
-import static io.onedev.server.model.Build.NAME_JOB;
-import static io.onedev.server.job.match.JobMatchLexer.Is;
-
-import io.onedev.server.model.Build;
-import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
-
-
-public class NameCriteria extends Criteria<Build> {
-
- private static final long serialVersionUID = 1L;
-
- private String jobName;
-
- public NameCriteria(String jobName) {
- this.jobName = jobName;
- }
-
- @Override
- public boolean matches(Build build) {
- return WildcardUtils.matchString(jobName, build.getJobName());
- }
-
- @Override
- public String toStringWithoutParens() {
- return quote(NAME_JOB) + " " + getRuleName(Is) + " " + quote(jobName);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/job/requirement/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/job/requirement/BranchCriteria.java
new file mode 100644
index 0000000000..60c7e382b8
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/job/requirement/BranchCriteria.java
@@ -0,0 +1,30 @@
+package io.onedev.server.job.requirement;
+
+import static io.onedev.server.job.requirement.JobRequirement.getRuleName;
+import static io.onedev.server.job.requirement.JobRequirementLexer.OnBranch;
+
+import io.onedev.server.util.ProjectAndBranch;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.util.match.WildcardUtils;
+
+public class BranchCriteria extends Criteria<ProjectAndBranch> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String branch;
+
+ public BranchCriteria(String branch) {
+ this.branch = branch;
+ }
+
+ @Override
+ public boolean matches(ProjectAndBranch projectAndBranch) {
+ return WildcardUtils.matchPath(branch, projectAndBranch.getBranch());
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return getRuleName(OnBranch) + " " + quote(branch);
+ }
+
+}
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/requirement/JobRequirement.g4
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/job/match/JobMatch.g4
rename to server-core/src/main/java/io/onedev/server/job/requirement/JobRequirement.g4
index 2067ec4475..0d871c5491 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.g4
+++ b/server-core/src/main/java/io/onedev/server/job/requirement/JobRequirement.g4
@@ -1,7 +1,7 @@
-grammar JobMatch;
+grammar JobRequirement;
-jobMatch
- : WS* (criteria|All) WS* EOF
+jobRequirement
+ : WS* criteria WS* EOF
;
criteria
@@ -13,10 +13,6 @@ criteria
| LParens WS* criteria WS* RParens #ParensCriteria
;
-All
- : 'all'
- ;
-
OnBranch
: 'on' WS+ 'branch'
;
diff --git a/server-core/src/main/java/io/onedev/server/job/requirement/JobRequirement.java b/server-core/src/main/java/io/onedev/server/job/requirement/JobRequirement.java
new file mode 100644
index 0000000000..b085c26212
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/job/requirement/JobRequirement.java
@@ -0,0 +1,168 @@
+package io.onedev.server.job.requirement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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.codeassist.FenceAware;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.job.requirement.JobRequirementParser.AndCriteriaContext;
+import io.onedev.server.job.requirement.JobRequirementParser.CriteriaContext;
+import io.onedev.server.job.requirement.JobRequirementParser.FieldOperatorValueCriteriaContext;
+import io.onedev.server.job.requirement.JobRequirementParser.JobRequirementContext;
+import io.onedev.server.job.requirement.JobRequirementParser.NotCriteriaContext;
+import io.onedev.server.job.requirement.JobRequirementParser.OperatorValueCriteriaContext;
+import io.onedev.server.job.requirement.JobRequirementParser.OrCriteriaContext;
+import io.onedev.server.job.requirement.JobRequirementParser.ParensCriteriaContext;
+import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectAndBranch;
+import io.onedev.server.util.criteria.AndCriteria;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.util.criteria.NotCriteria;
+import io.onedev.server.util.criteria.OrCriteria;
+
+public class JobRequirement extends Criteria<ProjectAndBranch> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Criteria<ProjectAndBranch> criteria;
+
+ public JobRequirement(Criteria<ProjectAndBranch> criteria) {
+ this.criteria = criteria;
+ }
+
+ public static String getValue(String token) {
+ return StringUtils.unescape(FenceAware.unfence(token));
+ }
+
+ public static JobRequirement parse(String jobRequirementString) {
+ CharStream is = CharStreams.fromString(jobRequirementString);
+ JobRequirementLexer lexer = new JobRequirementLexer(is);
+ lexer.removeErrorListeners();
+ lexer.addErrorListener(new BaseErrorListener() {
+
+ @Override
+ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
+ int charPositionInLine, String msg, RecognitionException e) {
+ throw new RuntimeException("Malformed job requirement", e);
+ }
+
+ });
+ CommonTokenStream tokens = new CommonTokenStream(lexer);
+ JobRequirementParser parser = new JobRequirementParser(tokens);
+ parser.removeErrorListeners();
+ parser.setErrorHandler(new BailErrorStrategy());
+ JobRequirementContext jobRequirementContext = parser.jobRequirement();
+
+ Criteria<ProjectAndBranch> criteria = new JobRequirementBaseVisitor<Criteria<ProjectAndBranch>>() {
+
+ @Override
+ public Criteria<ProjectAndBranch> visitParensCriteria(ParensCriteriaContext ctx) {
+ return visit(ctx.criteria()).withParens(true);
+ }
+
+ @Override
+ public Criteria<ProjectAndBranch> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {
+ String fieldName = getValue(ctx.Quoted(0).getText());
+ String fieldValue = getValue(ctx.Quoted(1).getText());
+ int operator = ctx.operator.getType();
+ checkField(fieldName, operator);
+
+ switch (fieldName) {
+ case Build.NAME_PROJECT:
+ return new ProjectCriteria(fieldValue);
+ default:
+ throw new RuntimeException("Unknown job requirement field: " + fieldName);
+ }
+ }
+
+ @Override
+ public Criteria<ProjectAndBranch> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {
+ String fieldValue = getValue(ctx.Quoted().getText());
+ return new BranchCriteria(fieldValue);
+ }
+
+ @Override
+ public Criteria<ProjectAndBranch> visitOrCriteria(OrCriteriaContext ctx) {
+ List<Criteria<ProjectAndBranch>> childCriterias = new ArrayList<>();
+ for (CriteriaContext childCtx: ctx.criteria())
+ childCriterias.add(visit(childCtx));
+ return new OrCriteria<ProjectAndBranch>(childCriterias);
+ }
+
+ @Override
+ public Criteria<ProjectAndBranch> visitAndCriteria(AndCriteriaContext ctx) {
+ List<Criteria<ProjectAndBranch>> childCriterias = new ArrayList<>();
+ for (CriteriaContext childCtx: ctx.criteria())
+ childCriterias.add(visit(childCtx));
+ return new AndCriteria<ProjectAndBranch>(childCriterias);
+ }
+
+ @Override
+ public Criteria<ProjectAndBranch> visitNotCriteria(NotCriteriaContext ctx) {
+ return new NotCriteria<ProjectAndBranch>(visit(ctx.criteria()));
+ }
+
+ }.visit(jobRequirementContext.criteria());
+
+ return new JobRequirement(criteria);
+ }
+
+ public static void checkField(String fieldName, int operator) {
+ if (fieldName.equals(Build.NAME_PROJECT) || fieldName.equals(Build.NAME_JOB)) {
+ if (operator != JobRequirementLexer.Is)
+ throw newOperatorException(fieldName, operator);
+ } else {
+ throw new ExplicitException("Invalid field: " + fieldName);
+ }
+ }
+
+ private static ExplicitException newOperatorException(String fieldName, int operator) {
+ return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '"
+ + AntlrUtils.getLexerRuleName(JobRequirementLexer.ruleNames, operator) + "'");
+ }
+
+ @Override
+ public boolean matches(ProjectAndBranch projectAndBranch) {
+ return criteria.matches(projectAndBranch);
+ }
+
+ @Override
+ public void onRenameUser(String oldName, String newName) {
+ criteria.onRenameUser(oldName, newName);
+ }
+
+ @Override
+ public void onRenameProject(String oldPath, String newPath) {
+ criteria.onRenameProject(oldPath, newPath);
+ }
+
+ @Override
+ public boolean isUsingUser(String userName) {
+ return criteria.isUsingUser(userName);
+ }
+
+ @Override
+ public boolean isUsingProject(String projectPath) {
+ return criteria.isUsingProject(projectPath);
+ }
+
+ public static String getRuleName(int rule) {
+ return AntlrUtils.getLexerRuleName(JobRequirementLexer.ruleNames, rule);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return criteria.toString();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/job/requirement/ProjectCriteria.java
similarity index 64%
rename from server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
rename to server-core/src/main/java/io/onedev/server/job/requirement/ProjectCriteria.java
index 380b459ffb..10b41d1ec2 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/requirement/ProjectCriteria.java
@@ -1,17 +1,15 @@
-package io.onedev.server.job.match;
+package io.onedev.server.job.requirement;
-import static io.onedev.server.job.match.JobMatch.getRuleName;
+import static io.onedev.server.job.requirement.JobRequirement.getRuleName;
+import static io.onedev.server.job.requirement.JobRequirementLexer.Is;
import static io.onedev.server.model.Build.NAME_PROJECT;
import io.onedev.commons.utils.PathUtils;
-
-import static io.onedev.server.job.match.JobMatchLexer.Is;
-
-import io.onedev.server.model.Build;
+import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.match.WildcardUtils;
-public class ProjectCriteria extends Criteria<Build> {
+public class ProjectCriteria extends Criteria<ProjectAndBranch> {
private static final long serialVersionUID = 1L;
@@ -22,8 +20,8 @@ public class ProjectCriteria extends Criteria<Build> {
}
@Override
- public boolean matches(Build build) {
- return WildcardUtils.matchPath(projectPath, build.getProject().getPath());
+ public boolean matches(ProjectAndBranch projectAndBranch) {
+ return WildcardUtils.matchPath(projectPath, projectAndBranch.getProject().getPath());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
index fd26333474..0b58835a20 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
@@ -14,22 +14,18 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.google.common.base.Splitter;
import com.google.common.base.Throwables;
-import edu.emory.mathcs.backport.java.util.Collections;
-import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.loader.ExtensionPoint;
import io.onedev.commons.utils.FileUtils;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.job.JobContext;
-import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.model.Build;
import io.onedev.server.util.ExceptionUtils;
import io.onedev.server.util.PKCS12CertExtractor;
import io.onedev.server.util.ServerConfig;
import io.onedev.server.util.usage.Usage;
import io.onedev.server.util.validation.annotation.DnsName;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.JobMatch;
-import io.onedev.server.web.util.SuggestionUtils;
+import io.onedev.server.web.editable.annotation.JobRequirement;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@ExtensionPoint
@Editable
@@ -41,7 +37,7 @@ public abstract class JobExecutor implements Serializable {
private String name;
- private String jobMatch = "all";
+ private String jobRequirement;
private int cacheTTL = 7;
@@ -64,23 +60,16 @@ public abstract class JobExecutor implements Serializable {
this.name = name;
}
- @Editable(order=10000, name="Job Match Condition", description="Jobs applicable for this executor must match "
- + "condition specified here")
- @JobMatch
- @NotEmpty
- public String getJobMatch() {
- return jobMatch;
- }
-
- public void setJobMatch(String jobMatch) {
- this.jobMatch = jobMatch;
+ @Editable(order=10000, name="Job Requirement", description="Optionally specify job requirement of this executor. "
+ + "Only satisfied jobs can use this executor")
+ @JobRequirement
+ @NameOfEmptyValue("Can be used by any jobs")
+ public String getJobRequirement() {
+ return jobRequirement;
}
- @SuppressWarnings("unused")
- private static List<InputSuggestion> suggestJobNames(String matchWith) {
- List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildManager.class).getJobNames(null));
- Collections.sort(jobNames);
- return SuggestionUtils.suggest(jobNames, matchWith);
+ public void setJobRequirement(String jobRequirement) {
+ this.jobRequirement = jobRequirement;
}
@Editable(order=50000, group="More Settings", description="Specify job cache TTL (time to live) by days. "
@@ -96,37 +85,33 @@ public abstract class JobExecutor implements Serializable {
}
public abstract void execute(String jobToken, JobContext context);
-
- public final boolean isApplicable(Build build) {
- return isEnabled() && io.onedev.server.job.match.JobMatch.parse(jobMatch).matches(build);
- }
public Usage onDeleteProject(String projectPath) {
Usage usage = new Usage();
- if (io.onedev.server.job.match.JobMatch.parse(jobMatch).isUsingProject(projectPath))
+ if (io.onedev.server.job.requirement.JobRequirement.parse(jobRequirement).isUsingProject(projectPath))
usage.add("job match" );
return usage;
}
public void onRenameProject(String oldPath, String newPath) {
- io.onedev.server.job.match.JobMatch parsedJobMatch =
- io.onedev.server.job.match.JobMatch.parse(this.jobMatch);
- parsedJobMatch.onRenameProject(oldPath, newPath);
- jobMatch = parsedJobMatch.toString();
+ io.onedev.server.job.requirement.JobRequirement parsedJobRequirement =
+ io.onedev.server.job.requirement.JobRequirement.parse(this.jobRequirement);
+ parsedJobRequirement.onRenameProject(oldPath, newPath);
+ jobRequirement = parsedJobRequirement.toString();
}
public Usage onDeleteUser(String userName) {
Usage usage = new Usage();
- if (io.onedev.server.job.match.JobMatch.parse(jobMatch).isUsingUser(userName))
- usage.add("job match" );
+ if (io.onedev.server.job.requirement.JobRequirement.parse(jobRequirement).isUsingUser(userName))
+ usage.add("job requirement" );
return usage;
}
public void onRenameUser(String oldName, String newName) {
- io.onedev.server.job.match.JobMatch parsedJobMatch =
- io.onedev.server.job.match.JobMatch.parse(this.jobMatch);
- parsedJobMatch.onRenameUser(oldName, newName);
- jobMatch = parsedJobMatch.toString();
+ io.onedev.server.job.requirement.JobRequirement parsedJobRequirement =
+ io.onedev.server.job.requirement.JobRequirement.parse(this.jobRequirement);
+ parsedJobRequirement.onRenameUser(oldName, newName);
+ jobRequirement = parsedJobRequirement.toString();
}
protected List<String> getTrustCertContent() {
diff --git a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
index 5da4a439fa..99b9ce0dab 100644
--- a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
@@ -220,7 +220,7 @@ public class ProjectResource {
throw new UnauthorizedException("Not authorized to create root project");
if (parent != null && project.isSelfOrAncestorOf(parent))
- throw new ExplicitException("Can not use current or descendent project as parent");
+ throw new ExplicitException("Can not use current or descendant project as parent");
Project projectWithSameName = projectManager.find(parent, project.getName());
if (projectWithSameName != null) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
index 5f9d62f5f5..2820ee0378 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
@@ -48,11 +48,11 @@ public class FixedIssueCriteria extends EntityCriteria<Build> {
Path<Long> attribute = root.get(Build.PROP_ID);
Project project = issue.getProject();
Collection<ObjectId> fixCommits = getCommitInfoManager().getFixCommits(project, issue.getNumber());
- Collection<String> descendents = new HashSet<>();
+ Collection<String> descendants = new HashSet<>();
for (ObjectId each: getCommitInfoManager().getDescendants(project, fixCommits))
- descendents.add(each.name());
+ descendants.add(each.name());
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- Collection<Long> inBuildIds = buildManager.filterIds(project.getId(), descendents);
+ Collection<Long> inBuildIds = buildManager.filterIds(project.getId(), descendants);
return builder.and(
builder.equal(root.get(Build.PROP_PROJECT), issue.getProject()),
inManyValues(builder, attribute, inBuildIds, buildManager.getIdsByProject(project.getId())));
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/DescendentsOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/DescendantsOfCriteria.java
similarity index 85%
rename from server-core/src/main/java/io/onedev/server/search/entity/project/DescendentsOfCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/project/DescendantsOfCriteria.java
index f2aedd4d68..3abc1a7873 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/DescendentsOfCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/DescendantsOfCriteria.java
@@ -10,13 +10,13 @@ import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.util.criteria.Criteria;
-public class DescendentsOfCriteria extends EntityCriteria<Project> {
+public class DescendantsOfCriteria extends EntityCriteria<Project> {
private static final long serialVersionUID = 1L;
private final Project project;
- public DescendentsOfCriteria(Project project) {
+ public DescendantsOfCriteria(Project project) {
this.project = project;
}
@@ -34,7 +34,7 @@ public class DescendentsOfCriteria extends EntityCriteria<Project> {
@Override
public String toStringWithoutParens() {
- return ProjectQuery.getRuleName(ProjectQueryLexer.DescendentsOf) + " " + Criteria.quote(project.getPath());
+ return ProjectQuery.getRuleName(ProjectQueryLexer.DescendantsOf) + " " + Criteria.quote(project.getPath());
}
}
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.g4
index edd33e2cef..a17a329ba1 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,7 +8,7 @@ query
criteria
: operator=(Roots|OwnedByMe|OwnedByNone) #OperatorCriteria
- | operator=(OwnedBy|ForksOf|ChildrenOf|DescendentsOf) WS+ criteriaValue=Quoted #OperatorValueCriteria
+ | operator=(OwnedBy|ForksOf|ChildrenOf|DescendantsOf) WS+ criteriaValue=Quoted #OperatorValueCriteria
| criteriaField=Quoted WS+ operator=(Is|Contains|IsUntil|IsSince) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
| criteria WS+ Or WS+ criteria #OrCriteria
@@ -64,8 +64,8 @@ ChildrenOf
: 'children' WS+ 'of'
;
-DescendentsOf
- : 'descendents' WS+ 'of'
+DescendantsOf
+ : 'descendants' WS+ 'of'
;
And
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
index 8d63991221..9030cf9682 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
@@ -102,8 +102,8 @@ public class ProjectQuery extends EntityQuery<Project> {
String value = getValue(ctx.Quoted().getText());
if (ctx.operator.getType() == ProjectQueryLexer.ChildrenOf)
return new ChildrenOfCriteria(getProject(value));
- else if (ctx.operator.getType() == ProjectQueryLexer.DescendentsOf)
- return new DescendentsOfCriteria(getProject(value));
+ else if (ctx.operator.getType() == ProjectQueryLexer.DescendantsOf)
+ return new DescendantsOfCriteria(getProject(value));
else if (ctx.operator.getType() == ProjectQueryLexer.ForksOf)
return new ForksOfCriteria(getProject(value));
else
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/JobMatchValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/JobRequirementValidator.java
similarity index 68%
rename from server-core/src/main/java/io/onedev/server/util/validation/JobMatchValidator.java
rename to server-core/src/main/java/io/onedev/server/util/validation/JobRequirementValidator.java
index 7ccfa37fcf..a5476a397d 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/JobMatchValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/JobRequirementValidator.java
@@ -4,14 +4,14 @@ import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.web.editable.annotation.JobMatch;
+import io.onedev.server.web.editable.annotation.JobRequirement;
-public class JobMatchValidator implements ConstraintValidator<JobMatch, String> {
+public class JobRequirementValidator implements ConstraintValidator<JobRequirement, String> {
private String message;
@Override
- public void initialize(JobMatch constaintAnnotation) {
+ public void initialize(JobRequirement constaintAnnotation) {
message = constaintAnnotation.message();
}
@@ -21,7 +21,7 @@ public class JobMatchValidator implements ConstraintValidator<JobMatch, String>
return true;
} else {
try {
- io.onedev.server.job.match.JobMatch.parse(value);
+ io.onedev.server.job.requirement.JobRequirement.parse(value);
return true;
} catch (Exception e) {
constraintContext.disableDefaultConstraintViolation();
@@ -30,7 +30,7 @@ public class JobMatchValidator implements ConstraintValidator<JobMatch, String>
if (StringUtils.isNotBlank(e.getMessage()))
message = e.getMessage();
else
- message = "Malformed job match";
+ message = "Malformed job requirement";
}
constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
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/JobRequirementBehavior.java
similarity index 82%
rename from server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java
rename to server-core/src/main/java/io/onedev/server/web/behavior/JobRequirementBehavior.java
index cfc89626df..a6d4e424ba 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/JobRequirementBehavior.java
@@ -18,19 +18,19 @@ import io.onedev.commons.codeassist.parser.ParseExpect;
import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
-import io.onedev.server.job.match.JobMatch;
+import io.onedev.server.job.requirement.JobRequirementLexer;
+import io.onedev.server.job.requirement.JobRequirementParser;
+import io.onedev.server.job.requirement.JobRequirement;
import io.onedev.server.model.Build;
import io.onedev.server.search.entity.project.ProjectQuery;
-import io.onedev.server.job.match.JobMatchLexer;
-import io.onedev.server.job.match.JobMatchParser;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
@SuppressWarnings("serial")
-public class JobMatchBehavior extends ANTLRAssistBehavior {
+public class JobRequirementBehavior extends ANTLRAssistBehavior {
- public JobMatchBehavior() {
- super(JobMatchParser.class, "jobMatch", false);
+ public JobRequirementBehavior() {
+ super(JobRequirementParser.class, "jobRequirement", false);
}
@Override
@@ -43,17 +43,17 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {
@Override
protected List<InputSuggestion> match(String matchWith) {
if ("criteriaField".equals(spec.getLabel())) {
- List<String> fields = Lists.newArrayList(Build.NAME_PROJECT, Build.NAME_JOB);
+ List<String> fields = Lists.newArrayList(Build.NAME_PROJECT);
return SuggestionUtils.suggest(fields, matchWith);
} else if ("criteriaValue".equals(spec.getLabel())) {
List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);
Preconditions.checkState(operatorElements.size() == 1);
String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());
- int operator = AntlrUtils.getLexerRule(JobMatchLexer.ruleNames, operatorName);
- if (operator == JobMatchLexer.Is) {
+ int operator = AntlrUtils.getLexerRule(JobRequirementLexer.ruleNames, operatorName);
+ if (operator == JobRequirementLexer.Is) {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
Preconditions.checkState(fieldElements.size() == 1);
- String fieldName = JobMatch.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = JobRequirement.getValue(fieldElements.get(0).getMatchedText());
if (fieldName.equals(Build.NAME_PROJECT)) {
if (!matchWith.contains("*") && !matchWith.contains("?"))
return SuggestionUtils.suggestProjects(matchWith);
@@ -82,9 +82,9 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {
if (parseExpect != null) {
List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);
if (!fieldElements.isEmpty()) {
- String fieldName = JobMatch.getValue(fieldElements.iterator().next().getMatchedText());
+ String fieldName = JobRequirement.getValue(fieldElements.iterator().next().getMatchedText());
try {
- JobMatch.checkField(fieldName, AntlrUtils.getLexerRule(JobMatchLexer.ruleNames, suggestedLiteral));
+ JobRequirement.checkField(fieldName, AntlrUtils.getLexerRule(JobRequirementLexer.ruleNames, suggestedLiteral));
} catch (ExplicitException e) {
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
index d1299cea02..5d78aa345f 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
@@ -60,7 +60,7 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {
if (fieldElements.isEmpty()) {
if (operator == ProjectQueryLexer.ForksOf
|| operator == ProjectQueryLexer.ChildrenOf
- || operator == ProjectQueryLexer.DescendentsOf) {
+ || operator == ProjectQueryLexer.DescendantsOf) {
return SuggestionUtils.suggestProjects(matchWith);
} else {
return SuggestionUtils.suggestUsers(matchWith);
@@ -102,7 +102,7 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {
protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {
if (childQuery) {
if (suggestedLiteral.equals(getRuleName(ProjectQueryParser.ChildrenOf))
- || suggestedLiteral.equals(getRuleName(ProjectQueryParser.DescendentsOf))
+ || suggestedLiteral.equals(getRuleName(ProjectQueryParser.DescendantsOf))
|| suggestedLiteral.equals(getRuleName(ProjectQueryParser.Roots))) {
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index fab7cbbbec..ac69b7c5fa 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -296,7 +296,7 @@ public class ProjectListPanel extends Panel {
errorMessage = "Project manage privilege required to move '" + eachProject + "'";
break;
} else if (eachProject.isSelfOrAncestorOf(project)) {
- errorMessage = "Can not move project '" + eachProject + "' to be under itself or its descendents";
+ errorMessage = "Can not move project '" + eachProject + "' to be under itself or its descendants";
break;
} else {
Project projectWithSameName = getProjectManager().find(project, eachProject.getName());
@@ -556,7 +556,7 @@ public class ProjectListPanel extends Panel {
errorMessage = "Project manage privilege required to move '" + eachProject + "'";
break;
} else if (eachProject.isSelfOrAncestorOf(project)) {
- errorMessage = "Can not move project '" + eachProject + "' to be under itself or its descendents";
+ errorMessage = "Can not move project '" + eachProject + "' to be under itself or its descendants";
break;
} else {
Project projectWithSameName = getProjectManager().find(project, eachProject.getName());
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/JobMatchEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/JobRequirementEditSupport.java
similarity index 70%
rename from server-core/src/main/java/io/onedev/server/web/editable/JobMatchEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/JobRequirementEditSupport.java
index e8562cc71f..4da191e134 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/JobMatchEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/JobRequirementEditSupport.java
@@ -6,19 +6,19 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import io.onedev.server.web.behavior.JobMatchBehavior;
-import io.onedev.server.web.editable.annotation.JobMatch;
+import io.onedev.server.web.behavior.JobRequirementBehavior;
+import io.onedev.server.web.editable.annotation.JobRequirement;
import io.onedev.server.web.editable.string.StringPropertyEditor;
@SuppressWarnings("serial")
-public class JobMatchEditSupport implements EditSupport {
+public class JobRequirementEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
Method propertyGetter = descriptor.getPropertyGetter();
- if (propertyGetter.getAnnotation(JobMatch.class) != null) {
+ if (propertyGetter.getAnnotation(JobRequirement.class) != null) {
if (propertyGetter.getReturnType() != String.class) {
- throw new RuntimeException("Annotation 'JobMatch' should be applied to property "
+ throw new RuntimeException("Annotation 'JobRequirement' should be applied to property "
+ "with type 'String'");
}
return new PropertyContext<String>(descriptor) {
@@ -29,9 +29,9 @@ public class JobMatchEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
- String jobMatch = model.getObject();
- if (jobMatch != null)
- return new Label(id, jobMatch);
+ String jobRequirement = model.getObject();
+ if (jobRequirement != null)
+ return new Label(id, jobRequirement);
else
return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
}
@@ -42,7 +42,7 @@ public class JobMatchEditSupport implements EditSupport {
@Override
public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
return new StringPropertyEditor(componentId, descriptor, model)
- .setInputAssist(new JobMatchBehavior());
+ .setInputAssist(new JobRequirementBehavior());
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/JobMatch.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/JobRequirement.java
similarity index 75%
rename from server-core/src/main/java/io/onedev/server/web/editable/annotation/JobMatch.java
rename to server-core/src/main/java/io/onedev/server/web/editable/annotation/JobRequirement.java
index df1adc2184..d198244d61 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/JobMatch.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/JobRequirement.java
@@ -8,12 +8,12 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-import io.onedev.server.util.validation.JobMatchValidator;
+import io.onedev.server.util.validation.JobRequirementValidator;
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
-@Constraint(validatedBy=JobMatchValidator.class)
-public @interface JobMatch {
+@Constraint(validatedBy=JobRequirementValidator.class)
+public @interface JobRequirement {
String message() default "";
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html
index e479887eb9..6bae843a73 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html
@@ -1,10 +1,5 @@
<wicket:extend>
<div class="job-executors">
- <div class="alert alert-notice bg-white shadow mb-5 text-gray">
- <wicket:svg href="bulb" class="icon mr-2"></wicket:svg>
- For a given build job, the first matching executor will be used
- </div>
-
<div class="body">
<div wicket:id="jobExecutorSetting">
<ul class="list-unstyled">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
index 3866cc58e2..94f2a6f827 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java
@@ -101,7 +101,7 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {
Project project = getProject();
if (parent != null && project.isSelfOrAncestorOf(parent)) {
parentEditor.error(new Path(new PathNode.Named("parentPath")),
- "Can not use current or descendent project as parent");
+ "Can not use current or descendant project as parent");
} else {
project.setParent(parent);
ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);