The Unified and Autonomous Development Platform
Add post build action to create issue.
Robin Shen4a640adc363e
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 486c71b0ea..d212f49624 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -165,6 +165,7 @@ import io.onedev.server.maintenance.RestoreDatabase;import io.onedev.server.maintenance.Upgrade;import io.onedev.server.migration.JpaConverter;import io.onedev.server.migration.PersistentBagConverter;+import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.model.support.administration.authenticator.Authenticator;import io.onedev.server.model.support.administration.jobexecutor.AutoDiscoveredJobExecutor;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;@@ -225,6 +226,7 @@ import io.onedev.server.util.markdown.DefaultMarkdownManager;import io.onedev.server.util.markdown.EntityReferenceManager;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.markdown.MarkdownProcessor;+import io.onedev.server.util.script.ScriptContribution;import io.onedev.server.util.validation.DefaultEntityValidator;import io.onedev.server.util.validation.EntityValidator;import io.onedev.server.util.validation.ValidatorProvider;@@ -302,6 +304,7 @@ public class CoreModule extends AbstractPluginModule {configurePersistence();configureRestServices();configureWeb();+ configureCI();bind(GitConfig.class).toProvider(GitConfigProvider.class);@@ -521,6 +524,31 @@ public class CoreModule extends AbstractPluginModule {});}+ private void configureCI() {+ contribute(ScriptContribution.class, new ScriptContribution() {++ @Override+ public GroovyScript getScript() {+ GroovyScript script = new GroovyScript();+ script.setName("determine-build-failure-investigator");+ script.setContent(Lists.newArrayList("io.onedev.server.util.script.ScriptContribution.determineBuildFailureInvestigator()"));+ return script;+ }++ });+ contribute(ScriptContribution.class, new ScriptContribution() {++ @Override+ public GroovyScript getScript() {+ GroovyScript script = new GroovyScript();+ script.setName("get-build-number");+ script.setContent(Lists.newArrayList("io.onedev.server.util.script.ScriptContribution.getBuildNumber()"));+ return script;+ }++ });+ }+private void configurePersistence() {// Use an optional binding here in case our client does not like to// start persist service provided by this plugindiff --git a/server-core/src/main/java/io/onedev/server/ci/CISpec.java b/server-core/src/main/java/io/onedev/server/ci/CISpec.javaindex f2b8234bac..6240752fa7 100644--- a/server-core/src/main/java/io/onedev/server/ci/CISpec.java+++ b/server-core/src/main/java/io/onedev/server/ci/CISpec.java@@ -13,6 +13,9 @@ import javax.validation.ConstraintValidatorContext;import javax.validation.Valid;import javax.validation.ValidationException;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import com.google.common.base.Charsets;import com.google.common.collect.Lists;@@ -20,7 +23,7 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobDependency;import io.onedev.server.ci.job.action.PostBuildAction;-import io.onedev.server.ci.job.param.JobParam;+import io.onedev.server.ci.job.paramsupply.ParamSupply;import io.onedev.server.ci.job.retrycondition.RetryCondition;import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.migration.VersionedDocument;@@ -34,6 +37,8 @@ public class CISpec implements Serializable, Validatable {private static final long serialVersionUID = 1L;+ private static final Logger logger = LoggerFactory.getLogger(CISpec.class);+public static final String BLOB_PATH = "onedev-ci.xml";private List<Job> jobs = new ArrayList<>();@@ -80,7 +85,7 @@ public class CISpec implements Serializable, Validatable {Job dependencyJob = getJobMap().get(dependency.getJobName());if (dependencyJob != null) {try {- JobParam.validateParams(dependencyJob.getParamSpecs(), dependency.getJobParams());+ ParamSupply.validateParams(dependencyJob.getParamSpecs(), dependency.getJobParams());} catch (ValidationException e) {String message = "Item #" + j + ": Error validating parameters of dependency job '"+ dependencyJob.getName() + "': " + e.getMessage();@@ -111,7 +116,7 @@ public class CISpec implements Serializable, Validatable {j=1;for (JobTrigger trigger: job.getTriggers()) {try {- JobParam.validateParams(job.getParamSpecs(), trigger.getParams());+ ParamSupply.validateParams(job.getParamSpecs(), trigger.getParams());} catch (Exception e) {String message = "Item #" + j + ": Error validating job parameters: " + e.getMessage();context.buildConstraintViolationWithTemplate(message)@@ -140,6 +145,8 @@ public class CISpec implements Serializable, Validatable {try {action.validateWithContext(this, job);} catch (Exception e) {+ if (e.getMessage() == null)+ logger.error("Error validating post build action", e);context.buildConstraintViolationWithTemplate("Item #" + j + ": " + e.getMessage()).addPropertyNode("jobs").addPropertyNode("postBuildActions").inIterable().atIndex(i)diff --git a/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java b/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.javaindex b1fb991037..ed185de520 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java@@ -24,7 +24,7 @@ public class CacheSpec implements Serializable {+ "Note: Type @ to insert variable, use \\ to escape normal occurrences of @ or \\")@Interpolative(variableSuggester="suggestVariables")@NotEmpty- @RegEx(interpolative=true, value="[a-zA-Z0-9\\-_\\.]+", message="Can only contain alphanumeric, dash, dot and underscore")+ @RegEx(interpolative=true, pattern="[a-zA-Z0-9\\-_\\.]+", message="Can only contain alphanumeric, dash, dot and underscore")public String getKey() {return key;}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.javaindex b3af8abd76..f687697210 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java@@ -56,9 +56,9 @@ import io.onedev.server.ci.CISpec;import io.onedev.server.ci.job.action.PostBuildAction;import io.onedev.server.ci.job.action.condition.ActionCondition;import io.onedev.server.ci.job.log.LogManager;-import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.ci.job.paramspec.SecretParam;+import io.onedev.server.ci.job.paramsupply.ParamSupply;import io.onedev.server.ci.job.retrycondition.RetryCondition;import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.entitymanager.BuildManager;@@ -83,7 +83,6 @@ import io.onedev.server.model.Setting;import io.onedev.server.model.Setting.Key;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;-import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;@@ -94,9 +93,10 @@ import io.onedev.server.security.permission.JobPermission;import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.util.BuildCommitAware;import io.onedev.server.util.JobLogger;+import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.util.scriptidentity.JobIdentity;-import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.util.script.identity.JobIdentity;+import io.onedev.server.util.script.identity.ScriptIdentity;import io.onedev.server.util.validation.Interpolated;import io.onedev.server.web.editable.Path;@@ -175,7 +175,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriztry {lock.lockInterruptibly();return submit(project, commitId, jobName, paramMap, submitter, new LinkedHashSet<>());- } catch (Exception e) {+ } catch (Throwable e) {throw ExceptionUtils.unchecked(e);}}@@ -194,7 +194,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizbuild.setStatus(Build.Status.WAITING);build.setSubmitter(submitter);- JobParam.validateParamMap(build.getJob().getParamSpecMap(), paramMap);+ ParamSupply.validateParamMap(build.getJob().getParamSpecMap(), paramMap);if (!checkedJobNames.add(jobName)) {String message = String.format("Circular job dependencies found (%s)", checkedJobNames);@@ -233,7 +233,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizBuild.push(build);try {for (JobDependency dependency: build.getJob().getJobDependencies()) {- new MatrixRunner<List<String>>(JobParam.getParamMatrix(dependency.getJobParams())) {+ new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(dependency.getJobParams())) {@Overridepublic void run(Map<String, List<String>> params) {@@ -431,7 +431,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriztry {executor.execute(jobToken, jobContext);break;- } catch (Exception e) {+ } catch (Throwable e) {if (ExceptionUtils.find(e, InterruptedException.class) != null) {throw e;} else {@@ -474,7 +474,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}}}- } catch (Exception e) {+ } catch (Throwable e) {if (ExceptionUtils.find(e, InterruptedException.class) == null)log(e, jobLogger);throw maskSecrets(e, jobSecretsToMask);@@ -498,7 +498,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz});FileUtils.deleteDir(serverWorkspace);- } catch (Exception e) {+ } catch (Throwable e) {if (ExceptionUtils.find(e, InterruptedException.class) == null)log(e, jobLogger);throw maskSecrets(e, jobSecretsToMask);@@ -516,7 +516,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz} else {markBuildError(build, "No applicable job executor");}- } catch (Exception e) {+ } catch (Throwable e) {if (e.getMessage() != null)markBuildError(build, e.getMessage());else@@ -526,14 +526,14 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}}- private void log(Exception e, JobLogger logger) {+ private void log(Throwable e, JobLogger logger) {if (e.getMessage() != null)logger.log(e.getMessage());elselogger.log(e);}- private RuntimeException maskSecrets(Exception e, Collection<String> jobSecretsToMask) {+ private RuntimeException maskSecrets(Throwable e, Collection<String> jobSecretsToMask) {String errorMessage = e.getMessage();if (errorMessage != null) {for (String secret: jobSecretsToMask)@@ -573,7 +573,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizfor (Job job: ciSpec.getJobs()) {JobTrigger trigger = job.getMatchedTrigger(event);if (trigger != null) {- Map<String, List<List<String>>> paramMatrix = JobParam.getParamMatrix(trigger.getParams());+ Map<String, List<List<String>>> paramMatrix = ParamSupply.getParamMatrix(trigger.getParams());Long projectId = event.getProject().getId();// run asynchrously as session may get closed due to exception@@ -595,7 +595,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}}.run();- } catch (Exception e) {+ } catch (Throwable e) {String message = String.format("Error submitting build (project: %s, commit: %s, job: %s)",project.getName(), commitId.name(), job.getName());logger.error(message, e);@@ -609,7 +609,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}}}- } catch (Exception e) {+ } catch (Throwable e) {String message = String.format("Error checking job triggers (project: %s, commit: %s)",event.getProject().getName(), commitId.name());logger.error(message, e);@@ -781,7 +781,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz});if (!hasRunnings && status == Status.STOPPING)break;- } catch (Exception e) {+ } catch (Throwable e) {logger.error("Error checking unfinished builds", e);}}@@ -803,7 +803,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizif (ActionCondition.parse(build.getJob(), action.getCondition()).test(build))action.execute(build);}- } catch (Exception e) {+ } catch (Throwable e) {logger.error("Error processing post build actions", e);}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/Job.java b/server-core/src/main/java/io/onedev/server/ci/job/Job.javaindex 6f22e1e60e..c05338c1fb 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/Job.java@@ -16,7 +16,6 @@ import java.util.Set;import javax.validation.ConstraintValidatorContext;import javax.validation.Valid;-import javax.validation.constraints.Pattern;import javax.validation.constraints.Size;import org.apache.wicket.Component;@@ -28,8 +27,8 @@ import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.CISpecAware;import io.onedev.server.ci.job.action.PostBuildAction;-import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.paramspec.ParamSpec;+import io.onedev.server.ci.job.paramsupply.ParamSupply;import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.event.ProjectEvent;import io.onedev.server.model.Project;@@ -37,6 +36,7 @@ import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;+import io.onedev.server.util.validation.annotation.RegEx;import io.onedev.server.web.editable.annotation.Code;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;@@ -103,7 +103,7 @@ public class Job implements Serializable, Validatable {private transient Map<String, ParamSpec> paramSpecMap;@Editable(order=100, description="Specify name of the job")- @Pattern(regexp="[^:]*", message="Character ':' is not allowed") // ':' will be used as project/job separator in build query+ @RegEx(pattern="[^:]*", message="Character ':' is not allowed") // ':' will be used as project/job separator in build query@NotEmptypublic String getName() {return name;@@ -451,7 +451,7 @@ public class Job implements Serializable, Validatable {public Map<String, ParamSpec> getParamSpecMap() {if (paramSpecMap == null)- paramSpecMap = JobParam.getParamSpecMap(paramSpecs);+ paramSpecMap = ParamSupply.getParamSpecMap(paramSpecs);return paramSpecMap;}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java b/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.javaindex 1d47000842..8485e3e0e5 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java@@ -10,8 +10,8 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.CISpecAware;-import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.paramspec.ParamSpec;+import io.onedev.server.ci.job.paramsupply.ParamSupply;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;@@ -32,7 +32,7 @@ public class JobDependency implements Serializable {private boolean requireSuccessful = true;- private List<JobParam> jobParams = new ArrayList<>();+ private List<ParamSupply> jobParams = new ArrayList<>();private String artifacts = "**";@@ -60,11 +60,11 @@ public class JobDependency implements Serializable {@Editable(order=200, name="Job Parameters")@ParamSpecProvider("getParamSpecs")@OmitName- public List<JobParam> getJobParams() {+ public List<ParamSupply> getJobParams() {return jobParams;}- public void setJobParams(List<JobParam> jobParams) {+ public void setJobParams(List<ParamSupply> jobParams) {this.jobParams = jobParams;}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/NamedFunction.java b/server-core/src/main/java/io/onedev/server/ci/job/NamedFunction.javadeleted file mode 100644index 0e9ada8f16..0000000000--- a/server-core/src/main/java/io/onedev/server/ci/job/NamedFunction.java+++ /dev/null@@ -1,14 +0,0 @@-package io.onedev.server.ci.job;--import javax.annotation.Nullable;--import io.onedev.server.model.Build;--public interface NamedFunction {-- String getName();-- @Nullable- String call(Build build);--}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/ci/job/VariableInterpolator.javaindex 725e8a9305..4b39961172 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/VariableInterpolator.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/VariableInterpolator.java@@ -8,7 +8,6 @@ import java.util.Map.Entry;import java.util.function.Function;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.model.Build;@@ -17,13 +16,11 @@ import io.onedev.server.util.Input;public class VariableInterpolator implements Function<String, String> {- public static final String PARAMS_PREFIX = "params.";+ public static final String PARAMS_PREFIX = "params:";- public static final String SECRETS_PREFIX = "secrets.";+ public static final String SECRETS_PREFIX = "secrets:";- public static final String SCRIPTS_PREFIX = "scripts.";-- public static final String FUNCTIONS_PREFIX = "functions.";+ public static final String SCRIPTS_PREFIX = "scripts:";private final Build build;@@ -63,14 +60,11 @@ public class VariableInterpolator implements Function<String, String> {String scriptName = t.substring(SCRIPTS_PREFIX.length());Map<String, Object> context = new HashMap<>();context.put("build", build);- return (String) GroovyUtils.evalScriptByName(scriptName, context);- } else if (t.startsWith(FUNCTIONS_PREFIX)) {- String functionName = t.substring(FUNCTIONS_PREFIX.length());- for (NamedFunction function: OneDev.getExtensions(NamedFunction.class)) {- if (function.getName().equals(functionName))- return function.call(build);- }- throw new OneException("Unable to find function with name: " + functionName);+ Object result = GroovyUtils.evalScriptByName(scriptName, context);+ if (result != null)+ return result.toString();+ else+ return "";} else {throw new OneException("Unrecognized interpolation variable: " + t);}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/CreateIssueAction.java b/server-core/src/main/java/io/onedev/server/ci/job/action/CreateIssueAction.javanew file mode 100644index 0000000000..a8994261e1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/action/CreateIssueAction.java@@ -0,0 +1,154 @@+package io.onedev.server.ci.job.action;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Date;+import java.util.List;+import java.util.UUID;++import javax.validation.Valid;+import javax.validation.ValidationException;++import org.apache.shiro.SecurityUtils;+import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.OneDev;+import io.onedev.server.ci.CISpec;+import io.onedev.server.ci.job.Job;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldsupply.FieldSupply;+import io.onedev.server.model.Build;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.administration.IssueSetting;+import io.onedev.server.persistence.SessionManager;+import io.onedev.server.persistence.TransactionManager;+import io.onedev.server.util.script.identity.JobIdentity;+import io.onedev.server.util.script.identity.ScriptIdentity;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.FieldNamesProvider;+import io.onedev.server.web.editable.annotation.Interpolative;+import io.onedev.server.web.editable.annotation.Multiline;+import io.onedev.server.web.editable.annotation.OmitName;++@Editable(name="Create issue", order=300)+public class CreateIssueAction extends PostBuildAction {++ private static final long serialVersionUID = 1L;++ private String issueTitle;++ private String issueDescription;++ private List<FieldSupply> issueFields = new ArrayList<>();++ @Editable(order=1000, name="Title", group="Issue Detail", description="Specify title of the issue. "+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ @Interpolative(variableSuggester="suggestVariables")+ @NotEmpty+ public String getIssueTitle() {+ return issueTitle;+ }++ public void setIssueTitle(String issueTitle) {+ this.issueTitle = issueTitle;+ }++ @Editable(order=1050, name="Description", group="Issue Detail", description="Optionally specify description of the issue. "+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ @Multiline+ @Interpolative(variableSuggester="suggestVariables")+ public String getIssueDescription() {+ return issueDescription;+ }++ public void setIssueDescription(String issueDescription) {+ this.issueDescription = issueDescription;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestVariables(String matchWith) {+ return Job.suggestVariables(matchWith);+ }++ @Editable(order=1100, group="Issue Detail")+ @FieldNamesProvider("getFieldNames")+ @OmitName+ @Valid+ public List<FieldSupply> getIssueFields() {+ return issueFields;+ }++ public void setIssueFields(List<FieldSupply> issueFields) {+ this.issueFields = issueFields;+ }++ private static Collection<String> getFieldNames() {+ return Project.get().getIssueSetting().getPromptFieldsUponIssueOpen(true);+ }++ @Override+ public void execute(Build build) {+ Long buildId = build.getId();++ OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {++ @Override+ public void run() {+ OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {++ @Override+ public void run() {+ Build build = OneDev.getInstance(BuildManager.class).load(buildId);+ Build.push(build);+ ScriptIdentity.push(new JobIdentity(build.getProject(), build.getCommitId()));+ try {+ Issue issue = new Issue();+ issue.setUUID(UUID.randomUUID().toString());+ issue.setProject(build.getProject());+ issue.setTitle(build.interpolate(getIssueTitle()));+ issue.setSubmitDate(new Date());+ SettingManager settingManager = OneDev.getInstance(SettingManager.class);+ IssueSetting issueSetting = settingManager.getIssueSetting();+ issue.setState(issueSetting.getInitialStateSpec().getName());++ issue.setDescription(getIssueDescription());+ for (FieldSupply supply: getIssueFields()) {+ Object fieldValue = issueSetting.getFieldSpec(supply.getName())+ .convertToObject(supply.getValueProvider().getValue());+ issue.setFieldValue(supply.getName(), fieldValue);+ }+ OneDev.getInstance(IssueManager.class).open(issue);+ } finally {+ Build.pop();+ ScriptIdentity.pop();+ }+ }+ }, SecurityUtils.getSubject());+ }+ });++ }++ @Override+ public String getDescription() {+ return "Create issue";+ }++ @Override+ public void validateWithContext(CISpec ciSpec, Job job) {+ super.validateWithContext(ciSpec, job);++ IssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ try {+ FieldSupply.validateFields(issueSetting.getFieldSpecMap(getFieldNames()), issueFields);+ } catch (ValidationException e) {+ throw new ValidationException("Error validating issue fields: " + e.getMessage());+ }++ }++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/RunJobAction.java b/server-core/src/main/java/io/onedev/server/ci/job/action/RunJobAction.javaindex 384e787049..b782e0c916 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/action/RunJobAction.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/action/RunJobAction.java@@ -19,8 +19,8 @@ import io.onedev.server.ci.CISpec;import io.onedev.server.ci.CISpecAware;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobManager;-import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.paramspec.ParamSpec;+import io.onedev.server.ci.job.paramsupply.ParamSupply;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.persistence.SessionManager;@@ -42,7 +42,7 @@ public class RunJobAction extends PostBuildAction {private String jobName;- private List<JobParam> jobParams = new ArrayList<>();+ private List<ParamSupply> jobParams = new ArrayList<>();@Editable(order=900, name="Job")@ChoiceProvider("getJobChoices")@@ -64,11 +64,11 @@ public class RunJobAction extends PostBuildAction {@ParamSpecProvider("getParamSpecs")@OmitName@Valid- public List<JobParam> getJobParams() {+ public List<ParamSupply> getJobParams() {return jobParams;}- public void setJobParams(List<JobParam> jobParams) {+ public void setJobParams(List<ParamSupply> jobParams) {this.jobParams = jobParams;}@@ -105,7 +105,7 @@ public class RunJobAction extends PostBuildAction {Build build = OneDev.getInstance(BuildManager.class).load(buildId);Build.push(build);try {- new MatrixRunner<List<String>>(JobParam.getParamMatrix(getJobParams())) {+ new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(getJobParams())) {@Overridepublic void run(Map<String, List<String>> paramMap) {@@ -141,7 +141,7 @@ public class RunJobAction extends PostBuildAction {Job jobToRun = ciSpec.getJobMap().get(jobName);if (jobToRun != null) {try {- JobParam.validateParams(jobToRun.getParamSpecs(), jobParams);+ ParamSupply.validateParams(jobToRun.getParamSpecs(), jobParams);} catch (ValidationException e) {throw new ValidationException("Error validating parameters of run job '"+ jobToRun.getName() + "': " + e.getMessage());diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java b/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.javaindex 4921bfbf40..c30f7fbf60 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java@@ -45,10 +45,10 @@ import io.onedev.server.ci.job.log.instruction.LogInstructionParser.ParamContextimport io.onedev.server.entitymanager.BuildManager;import io.onedev.server.event.build.BuildFinished;import io.onedev.server.model.Build;-import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.JobLogger;+import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.web.websocket.WebSocketManager;@Singletondiff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BooleanParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BooleanParam.javaindex 5f9f435a6c..8e0b080b48 100755--- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BooleanParam.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BooleanParam.java@@ -6,9 +6,9 @@ import java.util.Map;import javax.validation.Valid;import javax.validation.constraints.NotNull;-import io.onedev.server.model.support.inputspec.booleaninput.BooleanInput;-import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.FalseDefaultValue;+import io.onedev.server.util.inputspec.booleaninput.BooleanInput;+import io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider.FalseDefaultValue;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=300, name=ParamSpec.BOOLEAN)diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BuildChoiceParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BuildChoiceParam.javaindex 2fb0853521..7d2b5fac0f 100755--- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BuildChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BuildChoiceParam.java@@ -3,7 +3,7 @@ package io.onedev.server.ci.job.paramspec;import java.util.List;import java.util.Map;-import io.onedev.server.model.support.inputspec.BuildChoiceInput;+import io.onedev.server.util.inputspec.BuildChoiceInput;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=1200, name=ParamSpec.BUILD)diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ChoiceParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ChoiceParam.javaindex 1b49301f1a..fb1a912c91 100755--- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ChoiceParam.java@@ -7,12 +7,12 @@ import java.util.Map;import javax.validation.Valid;import javax.validation.constraints.NotNull;-import io.onedev.server.model.support.inputspec.choiceinput.ChoiceInput;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;-import io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;-import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.util.EditContext;+import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.util.inputspec.choiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;+import io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.ShowCondition;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/CommitParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/CommitParam.javaindex 18d60a8f07..8534f62a1f 100755--- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/CommitParam.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/CommitParam.java@@ -3,7 +3,7 @@ package io.onedev.server.ci.job.paramspec;import java.util.List;import java.util.Map;-import io.onedev.server.model.support.inputspec.CommitInput;+import io.onedev.server.util.inputspec.CommitInput;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=1400, name=ParamSpec.COMMIT)diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/DateParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/DateParam.javaindex 721b119eb5..95692ebb3d 100755--- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/DateParam.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/DateParam.java@@ -6,8 +6,8 @@ import java.util.Map;import javax.validation.Valid;-import io.onedev.server.model.support.inputspec.dateinput.DateInput;-import io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.dateinput.DateInput;+import io.onedev.server.util.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/GroupChoiceParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/GroupChoiceParam.javaindex a624e6f8f5..40e170414d 100755--- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/GroupChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/GroupChoiceParam.java@@ -6,10 +6,10 @@ import java.util.Map;import javax.validation.Valid;import javax.validation.constraints.NotNull;-import io.onedev.server.model.support.inputspec.groupchoiceinput.GroupChoiceInput;-import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.AllGroups;-import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;+import io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider.AllGroups;+import io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/IssueChoiceParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/IssueChoiceParam.javaindex 8cf467f5b3..eac7d30ac4 100755--- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/IssueChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/IssueChoiceParam.java@@ -3,7 +3,7 @@ package io.onedev.server.ci.job.paramspec;import java.util.List;import java.util.Map;-import io.onedev.server.model.support.inputspec.IssueChoiceInput;+import io.onedev.server.util.inputspec.IssueChoiceInput;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=1100, name=ParamSpec.ISSUE)diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/NumberParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/NumberParam.javaindex 8eb6626b0f..324c518fef 100755--- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/NumberParam.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/NumberParam.java@@ -5,8 +5,8 @@ import java.util.Map;import javax.validation.Valid;-import io.onedev.server.model.support.inputspec.numberinput.NumberInput;-import io.onedev.server.model.support.inputspec.numberinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.numberinput.NumberInput;+import io.onedev.server.util.inputspec.numberinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ParamSpec.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ParamSpec.javaindex d64f047d82..019c6f3749 100755--- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ParamSpec.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ParamSpec.java@@ -4,8 +4,8 @@ import javax.validation.Valid;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.showcondition.ShowCondition;import io.onedev.server.util.validation.annotation.ParamName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/PullRequestChoiceParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/PullRequestChoiceParam.javaindex cc06845c43..4308e72606 100755--- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/PullRequestChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/PullRequestChoiceParam.java@@ -3,7 +3,7 @@ package io.onedev.server.ci.job.paramspec;import java.util.List;import java.util.Map;-import io.onedev.server.model.support.inputspec.PullRequestChoiceInput;+import io.onedev.server.util.inputspec.PullRequestChoiceInput;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=1000, name=ParamSpec.PULLREQUEST)diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/SecretParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/SecretParam.javaindex 2b58c49555..c604c1cd34 100755--- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/SecretParam.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/SecretParam.java@@ -3,7 +3,7 @@ package io.onedev.server.ci.job.paramspec;import java.util.List;import java.util.Map;-import io.onedev.server.model.support.inputspec.SecretInput;+import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=500, name=ParamSpec.SECRET)@@ -11,8 +11,6 @@ public class SecretParam extends ParamSpec {private static final long serialVersionUID = 1L;- public static final String LITERAL_VALUE_PREFIX = "$OneDev-Secret-Literal$";-@Editable@Overridepublic boolean isAllowEmpty() {diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/TextParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/TextParam.javaindex df9fb3a2b2..c913d5777e 100755--- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/TextParam.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/TextParam.java@@ -5,8 +5,8 @@ import java.util.Map;import javax.validation.Valid;-import io.onedev.server.model.support.inputspec.textinput.TextInput;-import io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.textinput.TextInput;+import io.onedev.server.util.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/UserChoiceParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/UserChoiceParam.javaindex 25e377586c..543a31bf76 100755--- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/UserChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramspec/UserChoiceParam.java@@ -9,10 +9,10 @@ import javax.validation.constraints.NotNull;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.inputspec.userchoiceinput.UserChoiceInput;-import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.AllUsers;-import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;+import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.AllUsers;+import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/param/JobParam.java b/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ParamSupply.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/ci/job/param/JobParam.javarename to server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ParamSupply.javaindex 72ab009f3e..dcc046f2d5 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/param/JobParam.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ParamSupply.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.job.param;+package io.onedev.server.ci.job.paramsupply;import java.io.Serializable;import java.util.ArrayList;@@ -21,23 +21,27 @@ import org.apache.commons.lang.SerializationUtils;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;import org.hibernate.validator.constraints.NotEmpty;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.ci.job.paramspec.SecretParam;-import io.onedev.server.model.support.inputspec.SecretInput;+import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.annotation.Editable;@Editable-public class JobParam implements Serializable {+public class ParamSupply implements Serializable {private static final long serialVersionUID = 1L;- private static final String PARAM_BEAN_PREFIX = "JobParamBean";+ private static final Logger logger = LoggerFactory.getLogger(ParamSupply.class);++ private static final String PARAM_BEAN_PREFIX = "ParamSupplyBean";private String name;@@ -74,14 +78,14 @@ public class JobParam implements Serializable {@Overridepublic boolean equals(Object other) {- if (!(other instanceof JobParam))+ if (!(other instanceof ParamSupply))return false;if (this == other)return true;- JobParam otherJobParam = (JobParam) other;+ ParamSupply otherParamValue = (ParamSupply) other;return new EqualsBuilder()- .append(name, otherJobParam.name)- .append(valuesProvider, otherJobParam.valuesProvider)+ .append(name, otherParamValue.name)+ .append(valuesProvider, otherParamValue.valuesProvider).isEquals();}@@ -108,7 +112,6 @@ public class JobParam implements Serializable {public static void validateParamMatrix(Map<String, ParamSpec> paramSpecMap, Map<String, List<List<String>>> paramMatrix) {validateParamNames(paramSpecMap.keySet(), paramMatrix.keySet());for (Map.Entry<String, List<List<String>>> entry: paramMatrix.entrySet()) {- ParamSpec paramSpec = Preconditions.checkNotNull(paramSpecMap.get(entry.getKey()));if (entry.getValue() != null) {try {validateParamValues(entry.getValue());@@ -117,6 +120,7 @@ public class JobParam implements Serializable {+ entry.getKey() + "': " + e.getMessage());}+ ParamSpec paramSpec = Preconditions.checkNotNull(paramSpecMap.get(entry.getKey()));for (List<String> value: entry.getValue())validateParamValue(paramSpec, entry.getKey(), value);}@@ -132,6 +136,8 @@ public class JobParam implements Serializable {displayValue = SecretInput.MASK;elsedisplayValue = paramValue.toString();+ if (e.getMessage() == null)+ logger.error("Error validating field value", e);throw new ValidationException("Error validating value '" + displayValue + "' of parameter '"+ paramName + "': " + e.getMessage());}@@ -144,7 +150,7 @@ public class JobParam implements Serializable {}for (String paramName: paramNames) {if (!paramSpecNames.contains(paramName))- throw new ValidationException("Unknow job parameter: " + paramName);+ throw new ValidationException("Unknown job parameter: " + paramName);}}@@ -163,9 +169,9 @@ public class JobParam implements Serializable {return paramSpecMap;}- public static void validateParams(List<ParamSpec> paramSpecs, List<JobParam> params) {+ public static void validateParams(List<ParamSpec> paramSpecs, List<ParamSupply> params) {Map<String, List<List<String>>> paramMap = new HashMap<>();- for (JobParam param: params) {+ for (ParamSupply param: params) {List<List<String>> values;if (param.getValuesProvider() instanceof SpecifiedValues)values = param.getValuesProvider().getValues();@@ -227,7 +233,7 @@ public class JobParam implements Serializable {List<String> values = new ArrayList<>();for (String value: paramSpec.convertToStrings(typedValue)) {if (paramSpec instanceof SecretParam)- value = SecretParam.LITERAL_VALUE_PREFIX + value;+ value = SecretInput.LITERAL_VALUE_PREFIX + value;values.add(value);}paramMap.put(paramSpec.getName(), values);@@ -237,9 +243,9 @@ public class JobParam implements Serializable {return paramMap;}- public static Map<String, List<List<String>>> getParamMatrix(List<JobParam> params) {+ public static Map<String, List<List<String>>> getParamMatrix(List<ParamSupply> params) {Map<String, List<List<String>>> paramMatrix = new LinkedHashMap<>();- for (JobParam param: params)+ for (ParamSupply param: params)paramMatrix.put(param.getName(), param.getValuesProvider().getValues());return paramMatrix;}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java b/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ScriptingValues.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.javarename to server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ScriptingValues.javaindex b7a11f0038..dd8823de3a 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ScriptingValues.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.job.param;+package io.onedev.server.ci.job.paramsupply;import java.util.ArrayList;import java.util.Collection;@@ -10,7 +10,6 @@ import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;import org.hibernate.validator.constraints.NotEmpty;-import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.event.Event;import io.onedev.server.model.Build;import io.onedev.server.util.GroovyUtils;@@ -68,10 +67,10 @@ public class ScriptingValues implements ValuesProvider {for (Object each: (List<Object>) GroovyUtils.evalScriptByName(scriptName, variables)) {List<String> strings = new ArrayList<>();if (each instanceof Collection) {- strings.addAll((Collection<? extends String>) each);- Collections.sort(strings);- } else {- strings.add((String) each);+ for (Object each2: (Collection<?>) each)+ strings.add(each2.toString());+ } else if (each != null) {+ strings.add(each.toString());}values.add(strings);}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/param/SpecifiedValues.java b/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/SpecifiedValues.javasimilarity index 94%rename from server-core/src/main/java/io/onedev/server/ci/job/param/SpecifiedValues.javarename to server-core/src/main/java/io/onedev/server/ci/job/paramsupply/SpecifiedValues.javaindex bafdb4948b..b98a617841 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/param/SpecifiedValues.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/SpecifiedValues.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.job.param;+package io.onedev.server.ci.job.paramsupply;import java.util.ArrayList;import java.util.List;@@ -12,7 +12,7 @@ public class SpecifiedValues implements ValuesProvider {public static final String DISPLAY_NAME = "Use specified values";- public static final String SECRET_DISPLAY_NAME = "Use specified secrets";+ public static final String SECRET_DISPLAY_NAME = "Use specified project secrets";private List<List<String>> values = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/ci/job/param/ValuesProvider.java b/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ValuesProvider.javasimilarity index 76%rename from server-core/src/main/java/io/onedev/server/ci/job/param/ValuesProvider.javarename to server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ValuesProvider.javaindex 2eba7c5673..6eaa338558 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/param/ValuesProvider.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ValuesProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.job.param;+package io.onedev.server.ci.job.paramsupply;import java.io.Serializable;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/DependencyFinishedTrigger.java b/server-core/src/main/java/io/onedev/server/ci/job/trigger/DependencyFinishedTrigger.javaindex 90338d1eee..ad0fd2641d 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/trigger/DependencyFinishedTrigger.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/trigger/DependencyFinishedTrigger.java@@ -4,7 +4,7 @@ import java.util.List;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobDependency;-import io.onedev.server.ci.job.param.JobParam;+import io.onedev.server.ci.job.paramsupply.ParamSupply;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.build.BuildFinished;import io.onedev.server.model.Build;@@ -24,7 +24,7 @@ public class DependencyFinishedTrigger extends JobTrigger {for (JobDependency dependency: job.getJobDependencies()) {if (dependency.getJobName().equals(build.getJobName())&& (!dependency.isRequireSuccessful() || build.getStatus() == Status.SUCCESSFUL)) {- for (JobParam param: dependency.getJobParams()) {+ for (ParamSupply param: dependency.getJobParams()) {if (!param.isSecret()) {List<String> paramValue = build.getParamMap().get(param.getName());if (!param.getValuesProvider().getValues().contains(paramValue))diff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java b/server-core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.javaindex 2949ded8ea..fb300248ff 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java@@ -10,8 +10,8 @@ import org.apache.wicket.Component;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobAware;-import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.paramspec.ParamSpec;+import io.onedev.server.ci.job.paramsupply.ParamSupply;import io.onedev.server.event.ProjectEvent;import io.onedev.server.util.ComponentContext;import io.onedev.server.web.editable.annotation.Editable;@@ -24,17 +24,17 @@ public abstract class JobTrigger implements Serializable {private static final long serialVersionUID = 1L;- private List<JobParam> params = new ArrayList<>();+ private List<ParamSupply> params = new ArrayList<>();@Editable(name="Job Parameters", order=1000)@ParamSpecProvider("getParamSpecs")@OmitName@Valid- public List<JobParam> getParams() {+ public List<ParamSupply> getParams() {return params;}- public void setParams(List<JobParam> params) {+ public void setParams(List<ParamSupply> params) {this.params = params;}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex 5c419e9b06..45f2111976 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -26,6 +26,8 @@ public interface BuildManager extends EntityManager<Build> {Build findStreamPrevious(Build build, @Nullable Build.Status status);+ Collection<Long> queryNumbersOfStreamPrevious(Build build, @Nullable Build.Status status, int limit);+Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName, Map<String, List<String>> params);Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.javaindex f7499a58ca..b9742f5f30 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java@@ -6,11 +6,11 @@ import java.util.Map;import javax.annotation.Nullable;+import io.onedev.server.issue.StateSpec;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.issue.IssueCriteria;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 0bfde86ac0..200484c7e7 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -23,6 +23,7 @@ import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import javax.persistence.criteria.Selection;import org.apache.commons.lang3.StringUtils;import org.apache.shiro.subject.Subject;@@ -555,9 +556,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementstaskScheduler.unschedule(taskId);}- @Sessional- @Override- public Build findStreamPrevious(Build build, Status status) {+ private CriteriaQuery<Object[]> buildQueryOfStreamPrevios(Build build, Status status, String...fields) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Object[]> query = builder.createQuery(Object[].class);Root<Build> root = query.from(Build.class);@@ -568,11 +567,50 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsif (status != null)predicates.add(builder.equal(root.get("status"), status));predicates.add(builder.lessThan(root.get("number"), build.getNumber()));-query.where(predicates.toArray(new Predicate[0]));+ List<Selection<?>> selections = new ArrayList<>();+ for (String field: fields)+ selections.add(root.get(field));+ query.multiselect(selections);+ return query;+ }++ @Sessional+ @Override+ public Collection<Long> queryNumbersOfStreamPrevious(Build build, Status status, int limit) {+ Map<ObjectId, Long> buildNumbers = new HashMap<>();+ for (Object[] fields: getSession().createQuery(buildQueryOfStreamPrevios(build, status, "commitHash", "number")).list()) {+ buildNumbers.put(ObjectId.fromString((String) fields[0]), (Long)fields[1]);+ }++ Collection<Long> prevBuildNumbers = new HashSet<>();+ try (RevWalk revWalk = new RevWalk(build.getProject().getRepository())) {+ RevCommit current = revWalk.lookupCommit(build.getCommitId());+ revWalk.parseHeaders(current);+ while (current.getParentCount() != 0) {+ RevCommit firstParent = current.getParent(0);+ Long buildNumber = buildNumbers.get(firstParent);+ if (buildNumber != null) {+ prevBuildNumbers.add(buildNumber);+ if (prevBuildNumbers.size() >= limit)+ break;+ }+ current = firstParent;+ revWalk.parseHeaders(current);+ }+ } catch (MissingObjectException e) {+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ return prevBuildNumbers;+ }++ @Sessional+ @Override+ public Build findStreamPrevious(Build build, Status status) {Map<ObjectId, Long> buildIds = new HashMap<>();- for (Object[] fields: getSession().createQuery(query.multiselect(root.get("commitHash"), root.get("id"))).list()) {+ for (Object[] fields: getSession().createQuery(buildQueryOfStreamPrevios(build, status, "commitHash", "id")).list()) {buildIds.put(ObjectId.fromString((String) fields[0]), (Long)fields[1]);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex c4637ad540..50db8e0485 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -1,14 +1,17 @@package io.onedev.server.entitymanager.impl;+import java.util.ArrayList;import java.util.Date;import java.util.HashMap;import java.util.Iterator;+import java.util.List;import java.util.Map;import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;+import org.apache.shiro.SecurityUtils;import org.apache.wicket.util.lang.Objects;import org.eclipse.jgit.lib.ObjectId;@@ -16,14 +19,22 @@ import com.google.common.base.Optional;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueFieldManager;import io.onedev.server.entitymanager.IssueManager;-import io.onedev.server.event.build.BuildEvent;+import io.onedev.server.event.build.BuildFinished;import io.onedev.server.event.issue.IssueChangeEvent;import io.onedev.server.event.issue.IssueCommitted;import io.onedev.server.event.pullrequest.PullRequestChangeEvent;import io.onedev.server.event.pullrequest.PullRequestOpened;+import io.onedev.server.issue.TransitionSpec;+import io.onedev.server.issue.transitiontrigger.BuildSuccessfulTrigger;+import io.onedev.server.issue.transitiontrigger.CommitTrigger;+import io.onedev.server.issue.transitiontrigger.DiscardPullRequest;+import io.onedev.server.issue.transitiontrigger.MergePullRequest;+import io.onedev.server.issue.transitiontrigger.OpenPullRequest;+import io.onedev.server.issue.transitiontrigger.PullRequestTrigger;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;@@ -31,24 +42,21 @@ import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;import io.onedev.server.model.support.issue.changedata.IssueFieldChangeData;import io.onedev.server.model.support.issue.changedata.IssueMilestoneChangeData;import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;import io.onedev.server.model.support.issue.changedata.IssueTitleChangeData;-import io.onedev.server.model.support.issue.transitiontrigger.BuildSuccessfulTrigger;-import io.onedev.server.model.support.issue.transitiontrigger.CommitTrigger;-import io.onedev.server.model.support.issue.transitiontrigger.DiscardPullRequest;-import io.onedev.server.model.support.issue.transitiontrigger.MergePullRequest;-import io.onedev.server.model.support.issue.transitiontrigger.OpenPullRequest;-import io.onedev.server.model.support.issue.transitiontrigger.PullRequestTrigger;import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;+import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.search.entity.issue.IssueCriteria;+import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.util.Input;@Singleton@@ -59,14 +67,21 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangeprivate final IssueFieldManager issueFieldManager;+ private final TransactionManager transactionManager;++ private final BuildManager buildManager;+private final ListenerRegistry listenerRegistry;@Inject- public DefaultIssueChangeManager(Dao dao, IssueManager issueManager,- IssueFieldManager issueFieldManager, ListenerRegistry listenerRegistry) {+ public DefaultIssueChangeManager(Dao dao, TransactionManager transactionManager,+ IssueManager issueManager, IssueFieldManager issueFieldManager,+ BuildManager buildManager, ListenerRegistry listenerRegistry) {super(dao);this.issueManager = issueManager;this.issueFieldManager = issueFieldManager;+ this.transactionManager = transactionManager;+ this.buildManager = buildManager;this.listenerRegistry = listenerRegistry;}@@ -191,27 +206,50 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange@Transactional@Listen- public void on(BuildEvent event) {- Project project = event.getBuild().getProject();- for (TransitionSpec transition: project.getIssueSetting().getTransitionSpecs(true)) {- if (transition.getTrigger() instanceof BuildSuccessfulTrigger) {- BuildSuccessfulTrigger trigger = (BuildSuccessfulTrigger) transition.getTrigger();- String branches = trigger.getBranches();- ObjectId commitId = ObjectId.fromString(event.getBuild().getCommitHash());- if (trigger.getJobName().equals(event.getBuild().getJobName())- && event.getBuild().getStatus() == Build.Status.SUCCESSFUL- && (branches == null || project.isCommitOnBranches(commitId, branches))) {- Build build = event.getBuild();- for (Long issueNumber: build.getFixedIssueNumbers()) {- Issue issue = issueManager.find(build.getProject(), issueNumber);- if (issue != null && transition.getFromStates().contains(issue.getState())) {- issue.removeFields(transition.getRemoveFields());- changeState(issue, transition.getToState(), new HashMap<>(), null, null);+ public void on(BuildFinished event) {+ Long buildId = event.getBuild().getId();+ transactionManager.runAsyncAfterCommit(new Runnable() {++ @Override+ public void run() {+ transactionManager.run(new Runnable() {++ @Override+ public void run() {+ Build build = buildManager.load(buildId);+ Project project = build.getProject();+ for (TransitionSpec transition: project.getIssueSetting().getTransitionSpecs(true)) {+ if (transition.getTrigger() instanceof BuildSuccessfulTrigger) {+ BuildSuccessfulTrigger trigger = (BuildSuccessfulTrigger) transition.getTrigger();+ String branches = trigger.getBranches();+ ObjectId commitId = ObjectId.fromString(build.getCommitHash());+ if ((trigger.getJobName() == null || trigger.getJobName().equals(build.getJobName()))+ && build.getStatus() == Build.Status.SUCCESSFUL+ && (branches == null || project.isCommitOnBranches(commitId, branches))) {+ Build.push(build);+ try {+ IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), true);+ List<IssueCriteria> criterias = new ArrayList<>();+ for (String fromState: transition.getFromStates())+ criterias.add(new StateCriteria(fromState));+ criterias.add(query.getCriteria());+ query = new IssueQuery(IssueCriteria.of(criterias), new ArrayList<>());+ for (Issue issue: issueManager.query(project, null, query, 0, Integer.MAX_VALUE)) {+ issue.removeFields(transition.getRemoveFields());+ changeState(issue, transition.getToState(), new HashMap<>(), null, null);+ }+ } finally {+ Build.pop();+ }+ }+ }}}- }++ });}- }++ }, SecurityUtils.getSubject());}private void on(PullRequest request, Class<? extends PullRequestTrigger> triggerClass) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.javaindex fe6f537ee8..3070c9727d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldManager.java@@ -14,9 +14,9 @@ import javax.persistence.criteria.Expression;import javax.persistence.criteria.Root;import io.onedev.server.entitymanager.IssueFieldManager;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex e3826af138..4c4b385346 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -46,6 +46,8 @@ import io.onedev.server.event.issue.IssueCommitted;import io.onedev.server.event.issue.IssueEvent;import io.onedev.server.event.issue.IssueOpened;import io.onedev.server.event.system.SystemStarted;+import io.onedev.server.issue.StateSpec;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.IssueQuerySetting;@@ -53,10 +55,7 @@ import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.model.support.issue.NamedIssueQuery;-import io.onedev.server.model.support.issue.StateSpec;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -75,6 +74,7 @@ import io.onedev.server.security.permission.SystemAdministration;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.util.facade.IssueFacade;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;@@ -343,17 +343,17 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}for (Project project: projectManager.query())- project.getIssueSetting().fixUndefinedStates(resolutions);+ project.getIssueSetting().fixUndefinedStates(project, resolutions);for (IssueQuerySetting setting: issueQuerySettingManager.query())- fixUndefinedStates(resolutions, setting.getProject(), setting.getUserQueries());+ fixUndefinedStates(setting.getProject(), resolutions, setting.getUserQueries());for (User user: userManager.query())- fixUndefinedStates(resolutions, null, user.getIssueQuerySetting().getUserQueries());+ fixUndefinedStates(null, resolutions, user.getIssueQuerySetting().getUserQueries());}- private void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions,- @Nullable Project project, List<NamedIssueQuery> namedQueries) {+ private void fixUndefinedStates(@Nullable Project project, Map<String, UndefinedStateResolution> resolutions,+ List<NamedIssueQuery> namedQueries) {for (NamedIssueQuery namedQuery: namedQueries) {try {IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.javaindex d136d275e8..267dd1047d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java@@ -20,11 +20,11 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.issue.IssueChangeEvent;import io.onedev.server.event.issue.IssueOpened;+import io.onedev.server.issue.StateSpec;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;import io.onedev.server.model.support.issue.changedata.IssueMilestoneChangeData;import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex aa1f8137d4..1b680f6cd4 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -64,7 +64,7 @@ import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobManager;-import io.onedev.server.ci.job.param.JobParam;+import io.onedev.server.ci.job.paramsupply.ParamSupply;import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.ci.job.trigger.PullRequestTrigger;import io.onedev.server.entitymanager.ProjectManager;@@ -130,8 +130,8 @@ import io.onedev.server.util.PullRequestConstants;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.reviewrequirement.ReviewRequirement;-import io.onedev.server.util.scriptidentity.JobIdentity;-import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.util.script.identity.JobIdentity;+import io.onedev.server.util.script.identity.ScriptIdentity;import io.onedev.server.util.work.BatchWorkManager;import io.onedev.server.util.work.BatchWorker;@@ -745,7 +745,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequesttry {if (pullRequestTrigger.matches(pullRequestMergePreviewCalculated, job)) {boolean required = requiredJobNames.contains(job.getName());- new MatrixRunner<List<String>>(JobParam.getParamMatrix(trigger.getParams())) {+ new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(trigger.getParams())) {@Overridepublic void run(Map<String, List<String>> paramMap) {diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.javaindex c46faeb40b..86b0ed7ad8 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java@@ -7,10 +7,10 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.MarkdownAware;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.Input;public class IssueOpened extends IssueEvent implements MarkdownAware {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/issue/BoardSpec.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.javarename to server-core/src/main/java/io/onedev/server/issue/BoardSpec.javaindex 97df843093..957eb4e7e9 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue;+package io.onedev.server.issue;import java.io.Serializable;import java.util.ArrayList;@@ -19,16 +19,17 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldspec.ChoiceField;+import io.onedev.server.issue.fieldspec.FieldSpec;+import io.onedev.server.issue.fieldspec.GroupChoiceField;+import io.onedev.server.issue.fieldspec.UserChoiceField;+import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.issue.fieldspec.ChoiceField;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;-import io.onedev.server.model.support.issue.fieldspec.GroupChoiceField;-import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.util.EditContext;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;@@ -186,11 +187,12 @@ public class BoardSpec implements Serializable {return -1;}- public Set<String> getUndefinedStates() {+ public Set<String> getUndefinedStates(Project project) {Set<String> undefinedStates = new HashSet<>();if (getBaseQuery() != null) {try {- undefinedStates.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false).getUndefinedStates());+ undefinedStates.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(+ project, getBaseQuery(), false).getUndefinedStates());} catch (Exception e) {}}@@ -203,11 +205,11 @@ public class BoardSpec implements Serializable {return undefinedStates;}- public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {+ public void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions) {if (getBaseQuery() != null) {try {io.onedev.server.search.entity.issue.IssueQuery query =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);+ io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), false);for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());setBaseQuery(query.toString());@@ -227,11 +229,12 @@ public class BoardSpec implements Serializable {}}- public Set<String> getUndefinedFields() {+ public Set<String> getUndefinedFields(Project project) {Set<String> undefinedFields = new HashSet<>();if (getBaseQuery() != null) {try {- undefinedFields.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false).getUndefinedFields());+ undefinedFields.addAll(io.onedev.server.search.entity.issue.IssueQuery+ .parse(project, getBaseQuery(), false).getUndefinedFields());} catch (Exception e) {}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java b/server-core/src/main/java/io/onedev/server/issue/StateSpec.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.javarename to server-core/src/main/java/io/onedev/server/issue/StateSpec.javaindex 60024ae297..203d36fe5f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java+++ b/server-core/src/main/java/io/onedev/server/issue/StateSpec.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue;+package io.onedev.server.issue;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/server-core/src/main/java/io/onedev/server/issue/TransitionSpec.javasimilarity index 71%rename from server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.javarename to server-core/src/main/java/io/onedev/server/issue/TransitionSpec.javaindex d85ebb698a..da9f209115 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java+++ b/server-core/src/main/java/io/onedev/server/issue/TransitionSpec.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue;+package io.onedev.server.issue;import java.io.Serializable;import java.util.ArrayList;@@ -16,25 +16,23 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldspec.FieldSpec;+import io.onedev.server.issue.transitionprerequisite.TransitionPrerequisite;+import io.onedev.server.issue.transitionprerequisite.ValueIsNotAnyOf;+import io.onedev.server.issue.transitionprerequisite.ValueIsOneOf;+import io.onedev.server.issue.transitionprerequisite.ValueMatcher;+import io.onedev.server.issue.transitiontrigger.TransitionTrigger;import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;-import io.onedev.server.model.support.issue.transitionprerequisite.TransitionPrerequisite;-import io.onedev.server.model.support.issue.transitionprerequisite.ValueIsNotAnyOf;-import io.onedev.server.model.support.issue.transitionprerequisite.ValueIsOneOf;-import io.onedev.server.model.support.issue.transitionprerequisite.ValueMatcher;-import io.onedev.server.model.support.issue.transitiontrigger.BuildSuccessfulTrigger;-import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;-import io.onedev.server.model.support.issue.transitiontrigger.PullRequestTrigger;-import io.onedev.server.model.support.issue.transitiontrigger.TransitionTrigger;import io.onedev.server.util.Input;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution.FixType;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution.FixType;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Multiline;@@ -131,38 +129,15 @@ public class TransitionSpec implements Serializable {}public Usage onDeleteBranch(String branchName) {- Usage usage = new Usage();- TransitionTrigger trigger = getTrigger();- if (trigger instanceof BuildSuccessfulTrigger) {- BuildSuccessfulTrigger buildSuccessful = (BuildSuccessfulTrigger) trigger;- usage.add(buildSuccessful.onDeleteBranch(branchName).prefix("build successful trigger"));- } else if (trigger instanceof PullRequestTrigger) {- PullRequestTrigger pullRequestTrigger = (PullRequestTrigger) trigger;- if (pullRequestTrigger.getBranch().equals(branchName))- usage.add("pull request trigger: target branch");- }- return usage.prefix("transitions: " + fromStates + "->" + toState);+ return getTrigger().onDeleteBranch(branchName).prefix("transitions: " + fromStates + "->" + toState);}public void onRenameRole(String oldName, String newName) {- TransitionTrigger trigger = getTrigger();- if (trigger instanceof PressButtonTrigger) {- PressButtonTrigger pressButton = (PressButtonTrigger) trigger;- int index = pressButton.getAuthorizedRoles().indexOf(oldName);- if (index != -1)- pressButton.getAuthorizedRoles().set(index, newName);- }+ getTrigger().onRenameRole(oldName, newName);}public Usage onDeleteRole(String roleName) {- Usage usage = new Usage();- TransitionTrigger trigger = getTrigger();- if (trigger instanceof PressButtonTrigger) {- PressButtonTrigger pressButton = (PressButtonTrigger) trigger;- if (pressButton.getAuthorizedRoles().contains(roleName))- usage.add("press button trigger: authorized roles");- }- return usage.prefix("transitions: " + fromStates + "->" + toState);+ return trigger.onDeleteRole(roleName).prefix("transitions: " + fromStates + "->" + toState);}public void onRenameState(String oldName, String newName) {@@ -175,21 +150,12 @@ public class TransitionSpec implements Serializable {}if (toState.equals(oldName))toState = newName;+ trigger.onRenameState(oldName, newName);}public void onRenameField(String oldName, String newName) {if (getPrerequisite() != null && getPrerequisite().getInputName().equals(oldName))getPrerequisite().setInputName(newName);- if (getTrigger() instanceof PressButtonTrigger) {- PressButtonTrigger trigger = (PressButtonTrigger) getTrigger();- int index = trigger.getPromptFields().indexOf(oldName);- if (index != -1) {- if (trigger.getPromptFields().contains(newName))- trigger.getPromptFields().remove(index);- else- trigger.getPromptFields().set(index, newName);- }- }int index = getRemoveFields().indexOf(oldName);if (index != -1) {if (getRemoveFields().contains(newName))@@ -197,18 +163,16 @@ public class TransitionSpec implements Serializable {elsegetRemoveFields().set(index, newName);}+ trigger.onRenameField(oldName, newName);}public boolean onDeleteField(String fieldName) {if (getPrerequisite() != null && getPrerequisite().getInputName().equals(fieldName))setPrerequisite(null);- if (getTrigger() instanceof PressButtonTrigger) {- PressButtonTrigger trigger = (PressButtonTrigger) getTrigger();- for (Iterator<String> it = trigger.getPromptFields().iterator(); it.hasNext();) {- if (it.next().equals(fieldName))- it.remove();- }- }++ if (getTrigger().onDeleteField(fieldName))+ return true;+for (Iterator<String> it = getRemoveFields().iterator(); it.hasNext();) {if (it.next().equals(fieldName))it.remove();@@ -219,20 +183,18 @@ public class TransitionSpec implements Serializable {public boolean onDeleteState(String stateName) {fromStates.remove(stateName);- return fromStates.isEmpty() || toState.equals(stateName);+ if (fromStates.isEmpty() || toState.equals(stateName))+ return true;+ else+ return trigger.onDeleteState(stateName);}- public Collection<String> getUndefinedFields(IssueSetting setting) {+ public Collection<String> getUndefinedFields(Project project) {Collection<String> undefinedFields = new HashSet<>();+ IssueSetting setting = OneDev.getInstance(SettingManager.class).getIssueSetting();if (getPrerequisite() != null && setting.getFieldSpec(getPrerequisite().getInputName()) == null)undefinedFields.add(getPrerequisite().getInputName());- if (getTrigger() instanceof PressButtonTrigger) {- PressButtonTrigger trigger = (PressButtonTrigger) getTrigger();- for (String field: trigger.getPromptFields()) {- if (setting.getFieldSpec(field) == null)- undefinedFields.add(field);- }- }+ undefinedFields.addAll(getTrigger().getUndefinedFields());for (String field: getRemoveFields()) {if (setting.getFieldSpec(field) == null)undefinedFields.add(field);@@ -282,7 +244,7 @@ public class TransitionSpec implements Serializable {setPrerequisite(null);}}- return false;+ return trigger.onEditFieldValues(fieldName, valueSetEdit);}public boolean fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {@@ -349,6 +311,7 @@ public class TransitionSpec implements Serializable {}}}+ undefinedFieldValues.addAll(trigger.getUndefinedFieldValues());return undefinedFieldValues;}@@ -360,21 +323,13 @@ public class TransitionSpec implements Serializable {if (getIssueSetting().getStateSpec(fromState) == null)undefinedStates.add(fromState);}+ undefinedStates.addAll(trigger.getUndefinedStates());return undefinedStates;}public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {- for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {- if (toState.equals(entry.getKey()))- toState = entry.getValue().getNewState();- int index = fromStates.indexOf(entry.getKey());- if (index != -1) {- if (fromStates.contains(entry.getValue().getNewState()))- fromStates.remove(index);- else- fromStates.set(index, entry.getValue().getNewState());- }- }+ for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet())+ onRenameState(entry.getKey(), entry.getValue().getNewState());}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/BooleanField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/BooleanField.javasimilarity index 80%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/BooleanField.javarename to server-core/src/main/java/io/onedev/server/issue/fieldspec/BooleanField.javaindex c974ce53c9..971feb4ac5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/BooleanField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/BooleanField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.issue.fieldspec;import java.util.List;import java.util.Map;@@ -6,9 +6,9 @@ import java.util.Map;import javax.validation.Valid;import javax.validation.constraints.NotNull;-import io.onedev.server.model.support.inputspec.booleaninput.BooleanInput;-import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.FalseDefaultValue;+import io.onedev.server.util.inputspec.booleaninput.BooleanInput;+import io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider.FalseDefaultValue;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=300, name=FieldSpec.BOOLEAN)diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/BuildChoiceField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/BuildChoiceField.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/BuildChoiceField.javarename to server-core/src/main/java/io/onedev/server/issue/fieldspec/BuildChoiceField.javaindex b159aff9dc..695bb675d9 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/BuildChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/BuildChoiceField.java@@ -1,9 +1,9 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.issue.fieldspec;import java.util.List;import java.util.Map;-import io.onedev.server.model.support.inputspec.BuildChoiceInput;+import io.onedev.server.util.inputspec.BuildChoiceInput;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=1200, name=FieldSpec.BUILD)diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/ChoiceField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/ChoiceField.javasimilarity index 84%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/ChoiceField.javarename to server-core/src/main/java/io/onedev/server/issue/fieldspec/ChoiceField.javaindex b0ef05e058..4914f998f4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/ChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/ChoiceField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.issue.fieldspec;import java.util.ArrayList;import java.util.List;@@ -7,12 +7,12 @@ import java.util.Map;import javax.validation.Valid;import javax.validation.constraints.NotNull;-import io.onedev.server.model.support.inputspec.choiceinput.ChoiceInput;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;-import io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;-import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.util.EditContext;+import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.util.inputspec.choiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;+import io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.ShowCondition;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/CommitField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/CommitField.javasimilarity index 85%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/CommitField.javarename to server-core/src/main/java/io/onedev/server/issue/fieldspec/CommitField.javaindex 059f59184e..0ab23d8cf2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/CommitField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/CommitField.java@@ -1,9 +1,9 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.issue.fieldspec;import java.util.List;import java.util.Map;-import io.onedev.server.model.support.inputspec.CommitInput;+import io.onedev.server.util.inputspec.CommitInput;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=1400, name=FieldSpec.COMMIT)diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/DateField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/DateField.javasimilarity index 85%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/DateField.javarename to server-core/src/main/java/io/onedev/server/issue/fieldspec/DateField.javaindex c661cb615b..ac946bb72b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/DateField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/DateField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.issue.fieldspec;import java.util.Date;import java.util.List;@@ -6,8 +6,8 @@ import java.util.Map;import javax.validation.Valid;-import io.onedev.server.model.support.inputspec.dateinput.DateInput;-import io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.dateinput.DateInput;+import io.onedev.server.util.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/FieldSpec.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/FieldSpec.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/FieldSpec.javarename to server-core/src/main/java/io/onedev/server/issue/fieldspec/FieldSpec.javaindex 593602703e..204058214c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/FieldSpec.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/FieldSpec.java@@ -1,12 +1,12 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.issue.fieldspec;import javax.validation.Valid;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;import io.onedev.server.util.EditContext;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.showcondition.ShowCondition;import io.onedev.server.util.validation.annotation.FieldName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/GroupChoiceField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/GroupChoiceField.javasimilarity index 82%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/GroupChoiceField.javarename to server-core/src/main/java/io/onedev/server/issue/fieldspec/GroupChoiceField.javaindex 2ad81ad42f..30e0698a8a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/GroupChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/GroupChoiceField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.issue.fieldspec;import java.util.List;import java.util.Map;@@ -6,12 +6,12 @@ import java.util.Map;import javax.validation.Valid;import javax.validation.constraints.NotNull;-import io.onedev.server.model.support.inputspec.groupchoiceinput.GroupChoiceInput;-import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.AllGroups;-import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.util.Usage;+import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;+import io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider.AllGroups;+import io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/IssueChoiceField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/IssueChoiceField.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/IssueChoiceField.javarename to server-core/src/main/java/io/onedev/server/issue/fieldspec/IssueChoiceField.javaindex 58c60b1cb4..645817f152 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/IssueChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/IssueChoiceField.java@@ -1,9 +1,9 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.issue.fieldspec;import java.util.List;import java.util.Map;-import io.onedev.server.model.support.inputspec.IssueChoiceInput;+import io.onedev.server.util.inputspec.IssueChoiceInput;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=1100, name=FieldSpec.ISSUE)diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/NumberField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/NumberField.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/NumberField.javarename to server-core/src/main/java/io/onedev/server/issue/fieldspec/NumberField.javaindex d3425a53d2..4e6efbf659 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/NumberField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/NumberField.java@@ -1,12 +1,12 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.issue.fieldspec;import java.util.List;import java.util.Map;import javax.validation.Valid;-import io.onedev.server.model.support.inputspec.numberinput.NumberInput;-import io.onedev.server.model.support.inputspec.numberinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.numberinput.NumberInput;+import io.onedev.server.util.inputspec.numberinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/PullRequestChoiceField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/PullRequestChoiceField.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/PullRequestChoiceField.javarename to server-core/src/main/java/io/onedev/server/issue/fieldspec/PullRequestChoiceField.javaindex 655821a4b0..774d56b495 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/PullRequestChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/PullRequestChoiceField.java@@ -1,9 +1,9 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.issue.fieldspec;import java.util.List;import java.util.Map;-import io.onedev.server.model.support.inputspec.PullRequestChoiceInput;+import io.onedev.server.util.inputspec.PullRequestChoiceInput;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=1000, name=FieldSpec.PULLREQUEST)diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/SecretField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/SecretField.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/SecretField.javarename to server-core/src/main/java/io/onedev/server/issue/fieldspec/SecretField.javaindex 03398af75e..0692c0489c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/SecretField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/SecretField.java@@ -1,9 +1,9 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.issue.fieldspec;import java.util.List;import java.util.Map;-import io.onedev.server.model.support.inputspec.SecretInput;+import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=500, name=FieldSpec.SECRET)diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/TextField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/TextField.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/TextField.javarename to server-core/src/main/java/io/onedev/server/issue/fieldspec/TextField.javaindex f74d11f4c9..a835a4cc80 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/TextField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/TextField.java@@ -1,12 +1,12 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.issue.fieldspec;import java.util.List;import java.util.Map;import javax.validation.Valid;-import io.onedev.server.model.support.inputspec.textinput.TextInput;-import io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.textinput.TextInput;+import io.onedev.server.util.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/UserChoiceField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/UserChoiceField.javasimilarity index 83%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/UserChoiceField.javarename to server-core/src/main/java/io/onedev/server/issue/fieldspec/UserChoiceField.javaindex 88037077d4..e0df821c27 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldspec/UserChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/UserChoiceField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.issue.fieldspec;import java.util.List;import java.util.Map;@@ -9,12 +9,12 @@ import javax.validation.constraints.NotNull;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.inputspec.userchoiceinput.UserChoiceInput;-import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.AllUsers;-import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.util.Usage;+import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;+import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.AllUsers;+import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;diff --git a/server-core/src/main/java/io/onedev/server/issue/fieldsupply/FieldSupply.java b/server-core/src/main/java/io/onedev/server/issue/fieldsupply/FieldSupply.javanew file mode 100644index 0000000000..71f8caaf46--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/issue/fieldsupply/FieldSupply.java@@ -0,0 +1,138 @@+package io.onedev.server.issue.fieldsupply;++import java.io.Serializable;+import java.util.Collection;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.validation.Valid;+import javax.validation.ValidationException;+import javax.validation.constraints.NotNull;++import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;+import org.hibernate.validator.constraints.NotEmpty;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.base.Preconditions;++import io.onedev.server.issue.fieldspec.FieldSpec;+import io.onedev.server.issue.fieldspec.SecretField;+import io.onedev.server.util.inputspec.SecretInput;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class FieldSupply implements Serializable {++ private static final long serialVersionUID = 1L;++ private static final Logger logger = LoggerFactory.getLogger(FieldSupply.class);++ private String name;++ private boolean secret;++ private ValueProvider valueProvider = new SpecifiedValue();++ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @NotNull+ @Valid+ public ValueProvider getValueProvider() {+ return valueProvider;+ }++ public void setValueProvider(ValueProvider valueProvider) {+ this.valueProvider = valueProvider;+ }++ public boolean isSecret() {+ return secret;+ }++ public void setSecret(boolean secret) {+ this.secret = secret;+ }++ @Override+ public boolean equals(Object other) {+ if (!(other instanceof FieldSupply))+ return false;+ if (this == other)+ return true;+ FieldSupply otherIssueField = (FieldSupply) other;+ return new EqualsBuilder()+ .append(name, otherIssueField.name)+ .append(valueProvider, otherIssueField.valueProvider)+ .isEquals();+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37)+ .append(name)+ .append(valueProvider)+ .toHashCode();+ }++ private static void validateFieldValue(FieldSpec fieldSpec, String fieldName, List<String> fieldValue) {+ try {+ fieldSpec.convertToObject(fieldValue);+ } catch (Exception e) {+ String displayValue;+ if (fieldSpec instanceof SecretField)+ displayValue = SecretInput.MASK;+ else+ displayValue = fieldValue.toString();+ if (e.getMessage() == null)+ logger.error("Error validating field value", e);+ throw new ValidationException("Error validating value '" + displayValue + "' of field '"+ + fieldName + "': " + e.getMessage());+ }+ }++ private static void validateFieldNames(Collection<String> fieldSpecNames, Collection<String> fieldNames) {+ for (String fieldSpecName: fieldSpecNames) {+ if (!fieldNames.contains(fieldSpecName))+ throw new ValidationException("Missing issue field: " + fieldSpecName);+ }+ for (String fieldName: fieldNames) {+ if (!fieldSpecNames.contains(fieldName))+ throw new ValidationException("Unknown issue field: " + fieldName);+ }+ }++ public static void validateFieldMap(Map<String, FieldSpec> fieldSpecMap, Map<String, List<String>> fieldMap) {+ validateFieldNames(fieldSpecMap.keySet(), fieldMap.keySet());+ for (Map.Entry<String, List<String>> entry: fieldMap.entrySet()) {+ if (entry.getValue() != null) {+ FieldSpec fieldSpec = Preconditions.checkNotNull(fieldSpecMap.get(entry.getKey()));+ validateFieldValue(fieldSpec, entry.getKey(), entry.getValue());+ }+ }+ }++ public static void validateFields(Map<String, FieldSpec> fieldSpecs, List<FieldSupply> fields) {+ Map<String, List<String>> fieldMap = new HashMap<>();+ for (FieldSupply field: fields) {+ List<String> values;+ if (field.getValueProvider() instanceof SpecifiedValue)+ values = field.getValueProvider().getValue();+ else+ values = null;+ if (fieldMap.put(field.getName(), values) != null)+ throw new ValidationException("Duplicate field: " + field.getName());+ }+ validateFieldMap(fieldSpecs, fieldMap);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/issue/fieldsupply/ScriptingValue.java b/server-core/src/main/java/io/onedev/server/issue/fieldsupply/ScriptingValue.javanew file mode 100644index 0000000000..abd1a34349--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/issue/fieldsupply/ScriptingValue.java@@ -0,0 +1,78 @@+package io.onedev.server.issue.fieldsupply;++import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;+import org.hibernate.validator.constraints.NotEmpty;++import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.server.event.Event;+import io.onedev.server.model.Build;+import io.onedev.server.util.GroovyUtils;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.ScriptChoice;++@Editable+public class ScriptingValue implements ValueProvider {++ private static final long serialVersionUID = 1L;++ public static final String DISPLAY_NAME = "Evaluate script to get value";++ public static final String SECRET_DISPLAY_NAME = "Evaluate script to get secret";++ private String scriptName;++ @Editable+ @ScriptChoice+ @NotEmpty+ public String getScriptName() {+ return scriptName;+ }++ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;+ }++ @Override+ public boolean equals(Object other) {+ if (!(other instanceof ScriptingValue))+ return false;+ if (this == other)+ return true;+ ScriptingValue otherScriptingValue = (ScriptingValue) other;+ return new EqualsBuilder()+ .append(scriptName, otherScriptingValue.scriptName)+ .isEquals();+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37)+ .append(scriptName)+ .toHashCode();+ }++ @SuppressWarnings("unchecked")+ @Override+ public List<String> getValue() {+ Map<String, Object> variables = new HashMap<>();+ variables.put("build", Build.get());+ variables.put("event", Event.get());+ List<String> values = new ArrayList<>();+ Object result = GroovyUtils.evalScriptByName(scriptName, variables);+ if (result instanceof Collection) {+ values.addAll((Collection<? extends String>) result);+ Collections.sort(values);+ } else if (result != null) {+ values.add(result.toString());+ }+ return values;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/issue/fieldsupply/SpecifiedValue.java b/server-core/src/main/java/io/onedev/server/issue/fieldsupply/SpecifiedValue.javanew file mode 100644index 0000000000..9b390e0daf--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/issue/fieldsupply/SpecifiedValue.java@@ -0,0 +1,47 @@+package io.onedev.server.issue.fieldsupply;++import java.util.ArrayList;+import java.util.List;++import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;++public class SpecifiedValue implements ValueProvider {++ private static final long serialVersionUID = 1L;++ public static final String DISPLAY_NAME = "Use specified value";++ public static final String SECRET_DISPLAY_NAME = "Use specified project secret";++ private List<String> value = new ArrayList<>();++ @Override+ public List<String> getValue() {+ return value;+ }++ public void setValue(List<String> value) {+ this.value = value;+ }++ @Override+ public boolean equals(Object other) {+ if (!(other instanceof SpecifiedValue))+ return false;+ if (this == other)+ return true;+ SpecifiedValue otherSpecifiedValue = (SpecifiedValue) other;+ return new EqualsBuilder()+ .append(value, otherSpecifiedValue.value)+ .isEquals();+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37)+ .append(value)+ .toHashCode();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/issue/fieldsupply/ValueProvider.java b/server-core/src/main/java/io/onedev/server/issue/fieldsupply/ValueProvider.javanew file mode 100644index 0000000000..836c7fccdf--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/issue/fieldsupply/ValueProvider.java@@ -0,0 +1,10 @@+package io.onedev.server.issue.fieldsupply;++import java.io.Serializable;+import java.util.List;++public interface ValueProvider extends Serializable {++ List<String> getValue();++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/TransitionPrerequisite.java b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/TransitionPrerequisite.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/TransitionPrerequisite.javarename to server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/TransitionPrerequisite.javaindex ee26c2b103..2b90c053d6 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/TransitionPrerequisite.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/TransitionPrerequisite.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.transitionprerequisite;+package io.onedev.server.issue.transitionprerequisite;import java.io.Serializable;import java.util.ArrayList;@@ -10,7 +10,7 @@ import org.hibernate.validator.constraints.NotEmpty;import com.google.common.base.Preconditions;-import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsEmpty.java b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsEmpty.javasimilarity index 81%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsEmpty.javarename to server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsEmpty.javaindex 21d45277a2..ffd667fcb2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsEmpty.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsEmpty.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.showcondition;+package io.onedev.server.issue.transitionprerequisite;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotAnyOf.java b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsNotAnyOf.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotAnyOf.javarename to server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsNotAnyOf.javaindex ab3e02e9e3..6e57aa2077 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotAnyOf.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsNotAnyOf.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.transitionprerequisite;+package io.onedev.server.issue.transitionprerequisite;import java.util.List;@@ -10,9 +10,9 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;-import io.onedev.server.model.support.inputspec.InputContext;-import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.util.EditContext;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotEmpty.java b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsNotEmpty.javasimilarity index 82%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotEmpty.javarename to server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsNotEmpty.javaindex b1cbbb3799..337429902c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotEmpty.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsNotEmpty.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.showcondition;+package io.onedev.server.issue.transitionprerequisite;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsOneOf.java b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsOneOf.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsOneOf.javarename to server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsOneOf.javaindex e8b1bcdd2d..15607f772e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsOneOf.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueIsOneOf.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.transitionprerequisite;+package io.onedev.server.issue.transitionprerequisite;import java.util.List;@@ -10,9 +10,9 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;-import io.onedev.server.model.support.inputspec.InputContext;-import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.util.EditContext;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueMatcher.java b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueMatcher.javasimilarity index 73%rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueMatcher.javarename to server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueMatcher.javaindex 10ae9489eb..ad9b81b56f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueMatcher.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitionprerequisite/ValueMatcher.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.transitionprerequisite;+package io.onedev.server.issue.transitionprerequisite;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/BuildSuccessfulTrigger.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/BuildSuccessfulTrigger.javanew file mode 100644index 0000000000..db7ee05d01--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/BuildSuccessfulTrigger.java@@ -0,0 +1,182 @@+package io.onedev.server.issue.transitiontrigger;++import java.util.Collection;+import java.util.HashSet;+import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.model.Project;+import io.onedev.server.util.Usage;+import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.util.patternset.PatternSet;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.IssueQuery;+import io.onedev.server.web.editable.annotation.JobChoice;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.util.SuggestionUtils;++@Editable(order=400, name="Build is successful")+public class BuildSuccessfulTrigger extends TransitionTrigger {++ private static final long serialVersionUID = 1L;++ private String jobName;++ private String branches;++ private String issueQuery;++ @Editable(order=100, description="Specify job of the build")+ @JobChoice+ @NameOfEmptyValue("Any job")+ public String getJobName() {+ return jobName;+ }++ public void setJobName(String jobName) {+ this.jobName = jobName;+ }++ @Editable(order=200, name="Applicable Branches", description="Optionally specify space-separated branches "+ + "applicable for this trigger. Use * or ? for wildcard match")+ @Patterns(suggester = "suggestBranches")+ @NameOfEmptyValue("Any branch")+ public String getBranches() {+ return branches;+ }++ public void setBranches(String branches) {+ this.branches = branches;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestBranches(String matchWith) {+ return SuggestionUtils.suggestBranches(Project.get(), matchWith);+ }++ @Editable(order=300, description="Specify an issue query to filter issues eligible for this transition."+ + "This query will be combined with 'from states' criteria of this transition")+ @IssueQuery+ @NotEmpty+ public String getIssueQuery() {+ return issueQuery;+ }++ public void setIssueQuery(String issueQuery) {+ this.issueQuery = issueQuery;+ }++ @Override+ public Usage onDeleteBranch(String branchName) {+ Usage usage = new Usage();+ PatternSet patternSet = PatternSet.fromString(getBranches());+ if (patternSet.getIncludes().contains(branchName) || patternSet.getExcludes().contains(branchName))+ usage.add("applicable branches");+ return usage.prefix("build successful trigger");+ }++ @Override+ public void onRenameState(String oldName, String newName) {+ try {+ io.onedev.server.search.entity.issue.IssueQuery query =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false);+ query.onRenameState(oldName, newName);+ issueQuery = query.toString();+ } catch (Exception e) {+ }+ }++ @Override+ public boolean onDeleteState(String stateName) {+ try {+ io.onedev.server.search.entity.issue.IssueQuery query =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false);+ if (query.onDeleteState(stateName)) {+ return true;+ } else {+ issueQuery = query.toString();+ return false;+ }+ } catch (Exception e) {+ return false;+ }+ }++ @Override+ public void onRenameField(String oldName, String newName) {+ try {+ io.onedev.server.search.entity.issue.IssueQuery query =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false);+ query.onRenameField(oldName, newName);+ issueQuery = query.toString();+ } catch (Exception e) {+ }+ }++ @Override+ public boolean onDeleteField(String fieldName) {+ try {+ io.onedev.server.search.entity.issue.IssueQuery query =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false);+ if (query.onDeleteField(fieldName)) {+ return true;+ } else {+ issueQuery = query.toString();+ return false;+ }+ } catch (Exception e) {+ return false;+ }+ }++ @Override+ public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {+ try {+ io.onedev.server.search.entity.issue.IssueQuery query =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false);+ if (query.onEditFieldValues(fieldName, valueSetEdit)) {+ return true;+ } else {+ issueQuery = query.toString();+ return false;+ }+ } catch (Exception e) {+ return false;+ }+ }++ @Override+ public Collection<String> getUndefinedStates() {+ try {+ return io.onedev.server.search.entity.issue.IssueQuery+ .parse(null, issueQuery, false).getUndefinedStates();+ } catch (Exception e) {+ return new HashSet<>();+ }+ }++ @Override+ public Collection<String> getUndefinedFields() {+ try {+ return io.onedev.server.search.entity.issue.IssueQuery+ .parse(null, issueQuery, false).getUndefinedFields();+ } catch (Exception e) {+ return new HashSet<>();+ }+ }++ @Override+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {+ try {+ return io.onedev.server.search.entity.issue.IssueQuery+ .parse(null, issueQuery, false).getUndefinedFieldValues();+ } catch (Exception e) {+ return new HashSet<>();+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/CommitTrigger.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/CommitTrigger.javasimilarity index 57%rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/CommitTrigger.javarename to server-core/src/main/java/io/onedev/server/issue/transitiontrigger/CommitTrigger.javaindex 15c379260d..dbfeff47d1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/CommitTrigger.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/CommitTrigger.java@@ -1,9 +1,9 @@-package io.onedev.server.model.support.issue.transitiontrigger;+package io.onedev.server.issue.transitiontrigger;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=500, name="Issue is committed")-public class CommitTrigger implements TransitionTrigger {+public class CommitTrigger extends TransitionTrigger {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequest.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/DiscardPullRequest.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequest.javarename to server-core/src/main/java/io/onedev/server/issue/transitiontrigger/DiscardPullRequest.javaindex 4825748a08..06c98e3cf2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequest.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/DiscardPullRequest.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.transitiontrigger;+package io.onedev.server.issue.transitiontrigger;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequest.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/MergePullRequest.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequest.javarename to server-core/src/main/java/io/onedev/server/issue/transitiontrigger/MergePullRequest.javaindex d0039270df..51e6b40a19 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequest.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/MergePullRequest.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.transitiontrigger;+package io.onedev.server.issue.transitiontrigger;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequest.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/OpenPullRequest.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequest.javarename to server-core/src/main/java/io/onedev/server/issue/transitiontrigger/OpenPullRequest.javaindex 5bdef77520..7cb0a99956 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequest.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/OpenPullRequest.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.transitiontrigger;+package io.onedev.server.issue.transitiontrigger;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PressButtonTrigger.javasimilarity index 60%rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.javarename to server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PressButtonTrigger.javaindex 11c6979e15..c252df6168 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PressButtonTrigger.java@@ -1,23 +1,27 @@-package io.onedev.server.model.support.issue.transitiontrigger;+package io.onedev.server.issue.transitiontrigger;import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;+import java.util.Iterator;import java.util.List;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.Usage;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.RoleChoice;@Editable(order=100, name="Button is pressed")-public class PressButtonTrigger implements TransitionTrigger {+public class PressButtonTrigger extends TransitionTrigger {private static final long serialVersionUID = 1L;@@ -68,6 +72,52 @@ public class PressButtonTrigger implements TransitionTrigger {return fields;}+ @Override+ public void onRenameField(String oldName, String newName) {+ int index = getPromptFields().indexOf(oldName);+ if (index != -1) {+ if (getPromptFields().contains(newName))+ getPromptFields().remove(index);+ else+ getPromptFields().set(index, newName);+ }+ }++ @Override+ public boolean onDeleteField(String fieldName) {+ for (Iterator<String> it = getPromptFields().iterator(); it.hasNext();) {+ if (it.next().equals(fieldName))+ it.remove();+ }+ return false;+ }++ @Override+ public void onRenameRole(String oldName, String newName) {+ int index = getAuthorizedRoles().indexOf(oldName);+ if (index != -1)+ getAuthorizedRoles().set(index, newName);+ }++ @Override+ public Usage onDeleteRole(String roleName) {+ Usage usage = new Usage();+ if (getAuthorizedRoles().contains(roleName))+ usage.add("press button trigger: authorized roles");+ return usage;+ }++ @Override+ public Collection<String> getUndefinedFields() {+ Collection<String> undefinedFields = new HashSet<>();+ IssueSetting setting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ for (String field: getPromptFields()) {+ if (setting.getFieldSpec(field) == null)+ undefinedFields.add(field);+ }+ return undefinedFields;+ }+public boolean isAuthorized(Project project) {if (!getAuthorizedRoles().isEmpty()) {if (SecurityUtils.canManageIssues(Project.get())) {@@ -84,4 +134,5 @@ public class PressButtonTrigger implements TransitionTrigger {}}+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PullRequestTrigger.javasimilarity index 54%rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.javarename to server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PullRequestTrigger.javaindex 71dd6e25dd..51753db684 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PullRequestTrigger.java@@ -1,11 +1,12 @@-package io.onedev.server.model.support.issue.transitiontrigger;+package io.onedev.server.issue.transitiontrigger;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.util.Usage;import io.onedev.server.web.editable.annotation.BranchChoice;import io.onedev.server.web.editable.annotation.Editable;-public abstract class PullRequestTrigger implements TransitionTrigger {+public abstract class PullRequestTrigger extends TransitionTrigger {private static final long serialVersionUID = 1L;@@ -22,4 +23,12 @@ public abstract class PullRequestTrigger implements TransitionTrigger {this.branch = branch;}+ @Override+ public Usage onDeleteBranch(String branchName) {+ Usage usage = new Usage();+ if (getBranch().equals(branchName))+ usage.add("pull request trigger: target branch");+ return usage;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/TransitionTrigger.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/TransitionTrigger.javanew file mode 100644index 0000000000..6f73ba772b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/TransitionTrigger.java@@ -0,0 +1,63 @@+package io.onedev.server.issue.transitiontrigger;++import java.io.Serializable;+import java.util.Collection;+import java.util.HashSet;+import java.util.Map;++import io.onedev.server.util.Usage;+import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public abstract class TransitionTrigger implements Serializable {++ private static final long serialVersionUID = 1L;++ public void onRenameState(String oldName, String newName) {+ }++ public boolean onDeleteState(String stateName) {+ return false;+ }++ public void onRenameField(String oldName, String newName) {+ }++ public boolean onDeleteField(String fieldName) {+ return false;+ }++ public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {+ return false;+ }++ public void onRenameRole(String oldName, String newName) {+ }++ public Usage onDeleteRole(String roleName) {+ return new Usage();+ }++ public Usage onDeleteBranch(String branchName) {+ return new Usage();+ }++ public Collection<String> getUndefinedStates() {+ return new HashSet<>();+ }++ public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {+ }++ public Collection<String> getUndefinedFields() {+ return new HashSet<>();+ }++ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {+ return new HashSet<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex a245c83611..b46d1ffdb1 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -53,23 +53,26 @@ import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.VariableInterpolator;-import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.paramspec.ParamSpec;-import io.onedev.server.ci.job.paramspec.SecretParam;+import io.onedev.server.ci.job.paramsupply.ParamSupply;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;-import io.onedev.server.model.support.inputspec.SecretInput;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.storage.StorageManager;+import io.onedev.server.util.ComponentContext;import io.onedev.server.util.Input;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.Referenceable;import io.onedev.server.util.facade.BuildFacade;+import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.util.BuildAware;+import io.onedev.server.web.util.WicketUtils;@Entity@Table(@@ -190,6 +193,8 @@ public class Build extends AbstractEntity implements Referenceable {private transient Map<Build.Status, Build> streamPreviousCache = new HashMap<>();+ private transient Map<Integer, Collection<Long>> numbersOfStreamPreviousCache = new HashMap<>();+public Project getProject() {return project;}@@ -526,8 +531,8 @@ public class Build extends AbstractEntity implements Referenceable {}public String getSecretValue(String secretName) {- if (secretName.startsWith(SecretParam.LITERAL_VALUE_PREFIX))- return secretName.substring(SecretParam.LITERAL_VALUE_PREFIX.length());+ if (secretName.startsWith(SecretInput.LITERAL_VALUE_PREFIX))+ return secretName.substring(SecretInput.LITERAL_VALUE_PREFIX.length());elsereturn project.getSecretValue(secretName, ObjectId.fromString(getCommitHash()));}@@ -547,7 +552,7 @@ public class Build extends AbstractEntity implements Referenceable {public Serializable getParamBean() {Serializable paramBean;try {- paramBean = (Serializable) JobParam.defineBeanClass(getJob().getParamSpecs()).newInstance();+ paramBean = (Serializable) ParamSupply.defineBeanClass(getJob().getParamSpecs()).newInstance();} catch (InstantiationException | IllegalAccessException e) {throw new RuntimeException(e);}@@ -610,6 +615,17 @@ public class Build extends AbstractEntity implements Referenceable {return streamPreviousCache.get(status);}+ public Collection<Long> getNumbersOfStreamPrevious(int limit) {+ if (numbersOfStreamPreviousCache == null)+ numbersOfStreamPreviousCache = new HashMap<>();+ if (!numbersOfStreamPreviousCache.containsKey(limit)) {+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);+ numbersOfStreamPreviousCache.put(limit, buildManager.queryNumbersOfStreamPrevious(+ this, null, EntityCriteria.IN_CLAUSE_LIMIT));+ }+ return numbersOfStreamPreviousCache.get(limit);+ }+public void retrieveArtifacts(Build dependency, String artifacts, File workspaceDir) {LockUtils.read(dependency.getArtifactsLockKey(), new Callable<Void>() {@@ -646,6 +662,7 @@ public class Build extends AbstractEntity implements Referenceable {@SuppressWarnings("unchecked")public void interpolate(Serializable bean) {+ Build.push(this);try {for (Method getter: BeanUtils.findGetters(bean.getClass())) {Method setter = BeanUtils.findSetter(getter);@@ -673,6 +690,8 @@ public class Build extends AbstractEntity implements Referenceable {}} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {throw new RuntimeException(e);+ } finally {+ Build.pop();}}@@ -710,10 +729,17 @@ public class Build extends AbstractEntity implements Referenceable {@Nullablepublic static Build get() {- if (!stack.get().isEmpty())+ if (!stack.get().isEmpty()) {return stack.get().peek();- else+ } else {+ ComponentContext componentContext = ComponentContext.get();+ if (componentContext != null) {+ BuildAware buildAware = WicketUtils.findInnermost(componentContext.getComponent(), BuildAware.class);+ if (buildAware != null)+ return buildAware.getBuild();+ }return null;+ }}}diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex 464b9bddd4..58cda245fd 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -41,9 +41,9 @@ import io.onedev.server.OneDev;import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.cache.UserInfoManager;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.storage.AttachmentStorageSupport;import io.onedev.server.util.Input;import io.onedev.server.util.Referenceable;diff --git a/server-core/src/main/java/io/onedev/server/model/Milestone.java b/server-core/src/main/java/io/onedev/server/model/Milestone.javaindex 5222867309..9365f2af89 100644--- a/server-core/src/main/java/io/onedev/server/model/Milestone.java+++ b/server-core/src/main/java/io/onedev/server/model/Milestone.java@@ -13,12 +13,12 @@ import javax.persistence.OneToMany;import javax.persistence.Table;import javax.persistence.UniqueConstraint;import javax.validation.constraints.NotNull;-import javax.validation.constraints.Pattern;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.util.validation.annotation.RegEx;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Multiline;@@ -65,7 +65,7 @@ public class Milestone extends AbstractEntity {}@Editable(order=100)- @Pattern(regexp="[^:]*", message="Character ':' is not allowed") // ':' will be used as project/milestone separator in issue query+ @RegEx(pattern="[^:]*", message="Character ':' is not allowed") // ':' will be used as project/milestone separator in issue query@NotEmptypublic String getName() {return name;diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 973cab732b..846e6d9018 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -122,7 +122,6 @@ import io.onedev.server.util.validation.annotation.ProjectName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Markdown;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.editable.annotation.RoleChoice;import io.onedev.server.web.editable.annotation.UserChoice;import io.onedev.server.web.util.ProjectAware;import io.onedev.server.web.util.WicketUtils;@@ -346,17 +345,6 @@ public class Project extends AbstractEntity {this.description = description;}- @Editable(order=300, name="Default Role", description="Optionally specify default role to access the project. ")- @RoleChoice- @NameOfEmptyValue("No default role")- public String getDefaultRoleName() {- return ownerName;- }-- public void setDefaultRoleName(String ownerName) {- this.ownerName = ownerName;- }-@Editable(order=500, name="Owner", description="Projects without owners are considered orphan projects")@UserChoice@NameOfEmptyValue("No owner")@@ -1355,19 +1343,23 @@ public class Project extends AbstractEntity {return null;}- public boolean isCommitOnBranches(ObjectId commitId, String branches) {- CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);- Collection<ObjectId> descendants = commitInfoManager.getDescendants(this, Sets.newHashSet(commitId));- descendants.add(commitId);-+ public boolean isCommitOnBranches(@Nullable ObjectId commitId, String branches) {Matcher matcher = new PathMatcher();- PatternSet branchPatterns = PatternSet.fromString(branches);- for (RefInfo ref: getBranches()) {- String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getRef().getName()));- if (descendants.contains(ref.getPeeledObj()) && branchPatterns.matches(matcher, branchName))- return true;+ if (commitId != null) {+ CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);+ Collection<ObjectId> descendants = commitInfoManager.getDescendants(this, Sets.newHashSet(commitId));+ descendants.add(commitId);++ PatternSet branchPatterns = PatternSet.fromString(branches);+ for (RefInfo ref: getBranches()) {+ String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getRef().getName()));+ if (descendants.contains(ref.getPeeledObj()) && branchPatterns.matches(matcher, branchName))+ return true;+ }+ return false;+ } else {+ return PatternSet.fromString(branches).matches(matcher, "master");}- return false;}public Collection<String> getChangedFiles(ObjectId oldObjectId, ObjectId newObjectId,diff --git a/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.javaindex 9b809c7fb9..70587ae9c5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java@@ -27,7 +27,7 @@ public class ProjectBuildSetting implements Serializable {@Editable(description="Specify builds to preserve. OneDev will run every night to remove builds not matching "+ "query specified here")- @BuildQuery(noLoginSupport=true)+ @BuildQuery@NotEmptypublic String getBuildsToPreserve() {return buildsToPreserve;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.javaindex 383a4bb62a..fd570af088 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java@@ -13,10 +13,10 @@ import io.onedev.commons.utils.match.PathMatcher;import io.onedev.server.util.EditContext;import io.onedev.server.util.Usage;import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.util.scriptidentity.JobIdentity;-import io.onedev.server.util.scriptidentity.ScriptIdentity;-import io.onedev.server.util.scriptidentity.SiteAdministrator;-import io.onedev.server.util.validation.annotation.DnsName;+import io.onedev.server.util.script.identity.JobIdentity;+import io.onedev.server.util.script.identity.ScriptIdentity;+import io.onedev.server.util.script.identity.SiteAdministrator;+import io.onedev.server.util.validation.annotation.RegEx;import io.onedev.server.web.editable.annotation.Code;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@@ -29,8 +29,12 @@ public class GroovyScript implements Serializable {private static final long serialVersionUID = 1L;+ public static final String BUILTIN_PREFIX = "builtin:";+private String name;+ private String description;+private List<String> content;private boolean canBeUsedByJobs = true;@@ -40,7 +44,7 @@ public class GroovyScript implements Serializable {private String allowedBranches;@Editable(order=100)- @DnsName+ @RegEx(pattern="^(?!" + BUILTIN_PREFIX + ").*$", message="Name is not allowed to start with '" + BUILTIN_PREFIX + "'")@NotEmptypublic String getName() {return name;@@ -50,6 +54,15 @@ public class GroovyScript implements Serializable {this.name = name;}+ @Editable(order=200)+ public String getDescription() {+ return description;+ }++ public void setDescription(String description) {+ this.description = description;+ }+@Editable(order=300)@Code(language = Code.GROOVY)@Size(min=1, message="May not be empty")@@ -139,5 +152,5 @@ public class GroovyScript implements Serializable {if (getAllowedProjects().length() == 0)setAllowedProjects(null);}-+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/IssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/IssueSetting.javaindex 7b0231d5bc..810b2d034c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/IssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/IssueSetting.java@@ -17,20 +17,17 @@ import com.google.common.collect.Lists;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneException;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.Choice;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;-import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.SpecifiedDefaultValue;-import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;-import io.onedev.server.model.support.inputspec.showcondition.ValueIsOneOf;-import io.onedev.server.model.support.issue.BoardSpec;+import io.onedev.server.issue.BoardSpec;+import io.onedev.server.issue.StateSpec;+import io.onedev.server.issue.TransitionSpec;+import io.onedev.server.issue.fieldspec.BuildChoiceField;+import io.onedev.server.issue.fieldspec.ChoiceField;+import io.onedev.server.issue.fieldspec.FieldSpec;+import io.onedev.server.issue.fieldspec.IssueChoiceField;+import io.onedev.server.issue.fieldspec.UserChoiceField;+import io.onedev.server.issue.transitiontrigger.BuildSuccessfulTrigger;+import io.onedev.server.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.model.support.issue.NamedIssueQuery;-import io.onedev.server.model.support.issue.StateSpec;-import io.onedev.server.model.support.issue.TransitionSpec;-import io.onedev.server.model.support.issue.fieldspec.ChoiceField;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;-import io.onedev.server.model.support.issue.fieldspec.IssueChoiceField;-import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;-import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.OrCriteria;@@ -38,6 +35,11 @@ import io.onedev.server.search.entity.issue.StateCriteria;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.Choice;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider.SpecifiedDefaultValue;+import io.onedev.server.util.inputspec.showcondition.ShowCondition;+import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;import io.onedev.server.web.editable.annotation.Editable;@Editable@@ -83,6 +85,10 @@ public class IssueSetting implements Serializable {task.setValue("Task");choices.add(task);+ Choice buildFailure = new Choice();+ buildFailure.setValue("Build Failure");+ choices.add(buildFailure);+specifiedChoices.setChoices(choices);type.setChoiceProvider(specifiedChoices);@@ -134,6 +140,19 @@ public class IssueSetting implements Serializable {fieldSpecs.add(assignee);+ BuildChoiceField build = new BuildChoiceField();+ build.setName("Build");+ build.setAllowEmpty(true);+ build.setNameOfEmptyValue("No build specified");+ ShowCondition showCondition = new ShowCondition();+ showCondition.setInputName("Type");+ ValueIsOneOf valueIsOneOf = new ValueIsOneOf();+ valueIsOneOf.setValues(Lists.newArrayList("Build Failure"));+ showCondition.setValueMatcher(valueIsOneOf);+ build.setShowCondition(showCondition);++ fieldSpecs.add(build);+ChoiceField resolution = new ChoiceField();resolution.setName("Resolution");specifiedChoices = new SpecifiedChoices();@@ -164,9 +183,9 @@ public class IssueSetting implements Serializable {IssueChoiceField duplicateWith = new IssueChoiceField();duplicateWith.setName("Duplicate With");- ShowCondition showCondition = new ShowCondition();+ showCondition = new ShowCondition();showCondition.setInputName("Resolution");- ValueIsOneOf valueIsOneOf = new ValueIsOneOf();+ valueIsOneOf = new ValueIsOneOf();valueIsOneOf.setValues(Lists.newArrayList("Duplicated"));showCondition.setValueMatcher(valueIsOneOf);duplicateWith.setShowCondition(showCondition);@@ -198,6 +217,26 @@ public class IssueSetting implements Serializable {defaultTransitionSpecs.add(transition);+ transition = new TransitionSpec();+ transition.setFromStates(Lists.newArrayList("Open"));+ transition.setToState("Closed");+ BuildSuccessfulTrigger buildSuccessful = new BuildSuccessfulTrigger();+ buildSuccessful.setBranches("master");+ buildSuccessful.setIssueQuery("\"Type\" is \"Build Failure\" and (\"Build\" is current or \"Build\" is previous)");+ transition.setTrigger(buildSuccessful);++ defaultTransitionSpecs.add(transition);++ transition = new TransitionSpec();+ transition.setFromStates(Lists.newArrayList("Open"));+ transition.setToState("Closed");+ buildSuccessful = new BuildSuccessfulTrigger();+ buildSuccessful.setBranches("master");+ buildSuccessful.setIssueQuery("fixed in current build");+ transition.setTrigger(buildSuccessful);++ defaultTransitionSpecs.add(transition);+transition = new TransitionSpec();transition.setFromStates(Lists.newArrayList("Closed"));transition.setToState("Open");@@ -212,6 +251,7 @@ public class IssueSetting implements Serializable {defaultPromptFieldsUponIssueOpen.add("Type");defaultPromptFieldsUponIssueOpen.add("Priority");defaultPromptFieldsUponIssueOpen.add("Assignee");+ defaultPromptFieldsUponIssueOpen.add("Build");BoardSpec board = new BoardSpec();board.setName(IssueConstants.FIELD_STATE);@@ -292,16 +332,16 @@ public class IssueSetting implements Serializable {this.reconciled = reconciled;}- private Map<String, FieldSpec> getFieldSpecMap() {- // Do not use cache here as we may change fieldSpecs while editing IssueSetting+ public Map<String, FieldSpec> getFieldSpecMap(@Nullable Collection<String> fieldNames) {Map<String, FieldSpec> fieldSpecMap = new LinkedHashMap<>();- for (FieldSpec field: getFieldSpecs())- fieldSpecMap.put(field.getName(), field);+ for (FieldSpec fieldSpec: getFieldSpecs()) {+ if (fieldNames == null || fieldNames.contains(fieldSpec.getName()))+ fieldSpecMap.put(fieldSpec.getName(), fieldSpec);+ }return fieldSpecMap;}- private Map<String, StateSpec> getStateSpecMap() {- // Do not use cache here as we may change fieldSpecs while editing IssueSetting+ public Map<String, StateSpec> getStateSpecMap() {Map<String, StateSpec> stateSpecMap = new LinkedHashMap<>();for (StateSpec state: getStateSpecs())stateSpecMap.put(state.getName(), state);@@ -309,7 +349,7 @@ public class IssueSetting implements Serializable {}public List<String> getFieldNames() {- return new ArrayList<>(getFieldSpecMap().keySet());+ return new ArrayList<>(getFieldSpecMap(null).keySet());}public void onDeleteState(String stateName) {@@ -357,7 +397,7 @@ public class IssueSetting implements Serializable {@Nullablepublic FieldSpec getFieldSpec(String fieldName) {- return getFieldSpecMap().get(fieldName);+ return getFieldSpecMap(null).get(fieldName);}public void onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.javaindex 4e2e46ff0a..3cc14931a7 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java@@ -13,15 +13,17 @@ import javax.annotation.Nullable;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.BoardSpec;+import io.onedev.server.issue.TransitionSpec;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution.FixType;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution.FixType;public class ProjectIssueSetting implements Serializable {@@ -176,7 +178,7 @@ public class ProjectIssueSetting implements Serializable {}if (transitionSpecs != null) {for (TransitionSpec transition: transitionSpecs)- undefinedFields.addAll(transition.getUndefinedFields(getSetting()));+ undefinedFields.addAll(transition.getUndefinedFields(project));}if (namedQueries != null) {for (NamedIssueQuery namedQuery: namedQueries) {@@ -188,7 +190,7 @@ public class ProjectIssueSetting implements Serializable {}if (boardSpecs != null) {for (BoardSpec board: boardSpecs)- undefinedFields.addAll(board.getUndefinedFields());+ undefinedFields.addAll(board.getUndefinedFields(project));}return undefinedFields;}@@ -259,7 +261,7 @@ public class ProjectIssueSetting implements Serializable {if (boardSpecs != null) {for (BoardSpec board: boardSpecs)- undefinedStates.addAll(board.getUndefinedStates());+ undefinedStates.addAll(board.getUndefinedStates(project));}if (transitionSpecs != null) {@@ -270,11 +272,11 @@ public class ProjectIssueSetting implements Serializable {return undefinedStates;}- public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {+ public void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions) {if (namedQueries != null) {for (NamedIssueQuery namedQuery: namedQueries) {try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);+ IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false);for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());namedQuery.setQuery(query.toString());@@ -285,7 +287,7 @@ public class ProjectIssueSetting implements Serializable {if (boardSpecs != null) {for (BoardSpec board: boardSpecs)- board.fixUndefinedStates(resolutions);+ board.fixUndefinedStates(project, resolutions);}if (transitionSpecs != null) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.javaindex d13dcc23c6..7409863aeb 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java@@ -12,10 +12,10 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Group;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.CommentSupport;import io.onedev.server.util.Input;import io.onedev.server.web.component.diff.plain.PlainDiffPanel;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.javadeleted file mode 100644index dde6b71e48..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java+++ /dev/null@@ -1,62 +0,0 @@-package io.onedev.server.model.support.issue.transitiontrigger;--import java.util.List;--import org.hibernate.validator.constraints.NotEmpty;--import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.server.model.Project;-import io.onedev.server.util.Usage;-import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.JobChoice;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.editable.annotation.Patterns;-import io.onedev.server.web.util.SuggestionUtils;--@Editable(order=400, name="Build fixing the issue is successful")-public class BuildSuccessfulTrigger implements TransitionTrigger {-- private static final long serialVersionUID = 1L;-- private String jobName;-- private String branches;-- @Editable(order=100, description="Specify job of the build")- @JobChoice- @NotEmpty- public String getJobName() {- return jobName;- }-- public void setJobName(String jobName) {- this.jobName = jobName;- }-- @Editable(order=200, name="Applicable Branches", description="Optionally specify space-separated branches "- + "applicable for this trigger. Use * or ? for wildcard match")- @Patterns(suggester = "suggestBranches")- @NameOfEmptyValue("All")- public String getBranches() {- return branches;- }-- public void setBranches(String branches) {- this.branches = branches;- }-- @SuppressWarnings("unused")- private static List<InputSuggestion> suggestBranches(String matchWith) {- return SuggestionUtils.suggestBranches(Project.get(), matchWith);- }-- public Usage onDeleteBranch(String branchName) {- Usage usage = new Usage();- PatternSet patternSet = PatternSet.fromString(getBranches());- if (patternSet.getIncludes().contains(branchName) || patternSet.getExcludes().contains(branchName))- usage.add("applicable branches");- return usage;- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.javadeleted file mode 100644index 54370b37a0..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java+++ /dev/null@@ -1,10 +0,0 @@-package io.onedev.server.model.support.issue.transitiontrigger;--import java.io.Serializable;--import io.onedev.server.web.editable.annotation.Editable;--@Editable-public interface TransitionTrigger extends Serializable {--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityCriteria.javaindex 0fd76ca33f..08e64fc7a7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityCriteria.java@@ -5,6 +5,7 @@ import java.util.ArrayList;import java.util.Collection;import java.util.List;+import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -21,9 +22,9 @@ public abstract class EntityCriteria<T extends AbstractEntity> implements Serialpublic static final int IN_CLAUSE_LIMIT = 1000;- public abstract Predicate getPredicate(Root<T> root, CriteriaBuilder builder, User user);+ public abstract Predicate getPredicate(Root<T> root, CriteriaBuilder builder, @Nullable User user);- public abstract boolean matches(T entity, User user);+ public abstract boolean matches(T entity, @Nullable User user);public abstract boolean needsLogin();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 859ef1207a..972d163fdb 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@@ -133,9 +133,9 @@ public class BuildQuery extends EntityQuery<Build> {public EntityCriteria<Build> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {String value = getValue(ctx.Quoted().getText());if (ctx.SubmittedBy() != null)- return new SubmittedByCriteria(getUser(value), value);+ return new SubmittedByCriteria(value);else if (ctx.CancelledBy() != null)- return new CancelledByCriteria(getUser(value), value);+ return new CancelledByCriteria(value);else if (ctx.FixedIssue() != null)return new FixedIssueCriteria(project, value);else if (ctx.DependsOn() != null)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.javaindex 79d78ff183..6b6dd2bd86 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java@@ -10,30 +10,31 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.BuildConstants;public class CancelledByCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;- private final User value;+ private final User user;- private String rawValue;+ private final String value;- public CancelledByCriteria(User value, String rawValue) {+ public CancelledByCriteria(String value) {+ user = EntityQuery.getUser(value);this.value = value;- this.rawValue = rawValue;}@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(BuildConstants.ATTR_CANCELLER);- return builder.equal(attribute, value);+ return builder.equal(attribute, this.user);}@Overridepublic boolean matches(Build build, User user) {- return Objects.equals(build.getCanceller(), value);+ return Objects.equals(build.getCanceller(), this.user);}@Override@@ -43,7 +44,7 @@ public class CancelledByCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.getRuleName(BuildQueryLexer.CancelledBy) + " " + BuildQuery.quote(rawValue);+ return BuildQuery.getRuleName(BuildQueryLexer.CancelledBy) + " " + BuildQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.javaindex 39c6bf96ec..169202f613 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByMeCriteria.java@@ -1,7 +1,5 @@package io.onedev.server.search.entity.build;-import java.util.Objects;-import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -18,13 +16,20 @@ public class CancelledByMeCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<User> attribute = root.get(BuildConstants.ATTR_CANCELLER);- return builder.equal(attribute, user);+ if (user != null) {+ Path<User> attribute = root.get(BuildConstants.ATTR_CANCELLER);+ return builder.equal(attribute, user);+ } else {+ return builder.disjunction();+ }}@Overridepublic boolean matches(Build build, User user) {- return Objects.equals(build.getCanceller(), user);+ if (user != null)+ return user.equals(build.getCanceller());+ else+ return false;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.javaindex 0db80b0257..79f13027a6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java@@ -10,30 +10,31 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Build;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.BuildConstants;public class SubmittedByCriteria extends EntityCriteria<Build> {private static final long serialVersionUID = 1L;- private final User value;+ private final User user;- private String rawValue;+ private final String value;- public SubmittedByCriteria(User value, String rawValue) {+ public SubmittedByCriteria(String value) {+ user = EntityQuery.getUser(value);this.value = value;- this.rawValue = rawValue;}@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(BuildConstants.ATTR_SUBMITTER);- return builder.equal(attribute, value);+ return builder.equal(attribute, this.user);}@Overridepublic boolean matches(Build build, User user) {- return Objects.equals(build.getSubmitter(), value);+ return Objects.equals(build.getSubmitter(), this.user);}@Override@@ -43,7 +44,7 @@ public class SubmittedByCriteria extends EntityCriteria<Build> {@Overridepublic String toString() {- return BuildQuery.getRuleName(BuildQueryLexer.SubmittedBy) + " " + BuildQuery.quote(rawValue);+ return BuildQuery.getRuleName(BuildQueryLexer.SubmittedBy) + " " + BuildQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.javaindex 79d2189f37..96368aeb7e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java@@ -1,7 +1,5 @@package io.onedev.server.search.entity.build;-import java.util.Objects;-import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -18,13 +16,20 @@ public class SubmittedByMeCriteria extends EntityCriteria<Build> {@Overridepublic Predicate getPredicate(Root<Build> root, CriteriaBuilder builder, User user) {- Path<User> attribute = root.get(BuildConstants.ATTR_SUBMITTER);- return builder.equal(attribute, user);+ if (user != null) {+ Path<User> attribute = root.get(BuildConstants.ATTR_SUBMITTER);+ return builder.equal(attribute, user);+ } else {+ return builder.disjunction();+ }}@Overridepublic boolean matches(Build build, User user) {- return Objects.equals(build.getSubmitter(), user);+ if (user != null)+ return user.equals(build.getSubmitter());+ else+ return false;}@Overridediff --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 5afd5d0eb5..486aa41c4f 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@@ -6,8 +6,8 @@ import static io.onedev.server.util.CodeCommentConstants.FIELD_PATH;import static io.onedev.server.util.CodeCommentConstants.FIELD_REPLY;import static io.onedev.server.util.CodeCommentConstants.FIELD_REPLY_COUNT;import static io.onedev.server.util.CodeCommentConstants.FIELD_UPDATE_DATE;-import static io.onedev.server.util.CodeCommentConstants.QUERY_FIELDS;import static io.onedev.server.util.CodeCommentConstants.ORDER_FIELDS;+import static io.onedev.server.util.CodeCommentConstants.QUERY_FIELDS;import java.util.ArrayList;import java.util.Date;@@ -105,7 +105,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {int operator = ctx.operator.getType();String value = getValue(ctx.Quoted().getText());if (operator == CodeCommentQueryLexer.CreatedBy) {- return new CreatedByCriteria(getUser(value));+ return new CreatedByCriteria(value);} else {ProjectAwareCommitId commitId = getCommitId(project, value);return new OnCommitCriteria(commitId.getProject(), commitId.getCommitId());diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.javaindex aecd4ebd28..a434463aa2 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java@@ -10,27 +10,31 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.CodeComment;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.CodeCommentConstants;public class CreatedByCriteria extends EntityCriteria<CodeComment> {private static final long serialVersionUID = 1L;- private final User value;+ private final User user;- public CreatedByCriteria(User value) {+ private final String value;++ public CreatedByCriteria(String value) {+ user = EntityQuery.getUser(value);this.value = value;}@Overridepublic Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(CodeCommentConstants.ATTR_USER);- return builder.equal(attribute, value);+ return builder.equal(attribute, this.user);}@Overridepublic boolean matches(CodeComment comment, User user) {- return Objects.equals(comment.getUser(), value);+ return Objects.equals(comment.getUser(), this.user);}@Override@@ -40,7 +44,8 @@ public class CreatedByCriteria extends EntityCriteria<CodeComment> {@Overridepublic String toString() {- return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.CreatedBy) + " " + CodeCommentQuery.quote(value.getName());+ return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.CreatedBy)+ + " " + CodeCommentQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.javaindex bd414ad2ad..8eed35e8d3 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java@@ -1,7 +1,5 @@package io.onedev.server.search.entity.codecomment;-import java.util.Objects;-import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -18,13 +16,20 @@ public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {@Overridepublic Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder, User user) {- Path<?> attribute = root.get(CodeCommentConstants.ATTR_USER);- return builder.equal(attribute, user);+ if (user != null) {+ Path<?> attribute = root.get(CodeCommentConstants.ATTR_USER);+ return builder.equal(attribute, user);+ } else {+ return builder.disjunction();+ }}@Overridepublic boolean matches(CodeComment comment, User user) {- return Objects.equals(comment.getUser(), user);+ if (user != null)+ return user.equals(comment.getUser());+ else+ return false;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.javaindex 7490e23fd5..f93e373cde 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java@@ -17,8 +17,8 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;public class ChoiceFieldCriteria extends FieldCriteria {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.javaindex 892dfce11d..0ca7083556 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java@@ -1,16 +1,20 @@package io.onedev.server.search.entity.issue;+import java.util.Collection;import java.util.Objects;import java.util.Set;+import java.util.stream.Collectors;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Join;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;+import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.SecurityUtils;public class FieldOperatorCriteria extends FieldCriteria {@@ -27,19 +31,55 @@ public class FieldOperatorCriteria extends FieldCriteria {@Overrideprotected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder, User user) {Path<?> attribute = field.get(IssueField.ATTR_VALUE);- if (operator == IssueQueryLexer.IsEmpty)+ if (operator == IssueQueryLexer.IsEmpty) {return builder.isNull(attribute);- else- return builder.equal(attribute, user.getName());+ } else if (operator == IssueQueryLexer.IsMe) {+ if (user != null)+ return builder.equal(attribute, user.getName());+ else+ return builder.disjunction();+ } else {+ Build build = Build.get();+ if (build != null) {+ if (operator == IssueQueryLexer.IsCurrent) {+ return builder.equal(attribute, build.getNumber());+ } else {+ Collection<Long> numbersOfStreamPrevious = build.getNumbersOfStreamPrevious(EntityCriteria.IN_CLAUSE_LIMIT);+ if (!numbersOfStreamPrevious.isEmpty())+ return attribute.in(numbersOfStreamPrevious.stream().map(it->it.toString()).collect(Collectors.toSet()));+ else+ return builder.disjunction();+ }+ } else {+ return builder.disjunction();+ }+ }}@Overridepublic boolean matches(Issue issue, User user) {Object fieldValue = issue.getFieldValue(getFieldName());- if (operator == IssueQueryLexer.IsEmpty)+ if (operator == IssueQueryLexer.IsEmpty) {return fieldValue == null;- else- return Objects.equals(fieldValue, user.getName());+ } else if (operator == IssueQueryLexer.IsMe) {+ if (user != null)+ return Objects.equals(fieldValue, user.getName());+ else+ return false;+ } else {+ Build build = Build.get();+ if (build != null) {+ if (operator == IssueQueryLexer.IsCurrent) {+ return build.getId().toString().equals(fieldValue);+ } else {+ return build.getNumbersOfStreamPrevious(EntityCriteria.IN_CLAUSE_LIMIT)+ .stream()+ .anyMatch(it->it.equals(fieldValue));+ }+ } else {+ return false;+ }+ }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.javanew file mode 100644index 0000000000..6934a6ab32--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedInCurrentBuildCriteria.java@@ -0,0 +1,43 @@+package io.onedev.server.search.entity.issue;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import io.onedev.server.model.Build;+import io.onedev.server.model.Issue;+import io.onedev.server.model.User;++public class FixedInCurrentBuildCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {+ Build build = Build.get();+ if (build != null)+ return new FixedInCriteria(build).getPredicate(root, builder, user);+ else+ return builder.disjunction();+ }++ @Override+ public boolean matches(Issue issue, User user) {+ Build build = Build.get();+ if (build != null)+ return new FixedInCriteria(build).matches(issue, user);+ else+ return false;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return IssueQuery.getRuleName(IssueQueryLexer.FixedInCurrentBuild);+ }++}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 624c28a559..0201cfd381 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@@ -7,10 +7,10 @@ query;criteria- : operator=SubmittedByMe #OperatorCriteria+ : operator=(SubmittedByMe|FixedInCurrentBuild) #OperatorCriteria| operator=(SubmittedBy|FixedInBuild) WS+ criteriaValue=Quoted #OperatorValueCriteria| FixedBetween WS+ revisionCriteria WS+ And WS+ revisionCriteria #FixedBetweenCriteria- | criteriaField=Quoted WS+ operator=(IsMe|IsEmpty) #FieldOperatorCriteria+ | criteriaField=Quoted WS+ operator=(IsMe|IsEmpty|IsCurrent|IsPrevious) #FieldOperatorCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria@@ -41,7 +41,19 @@ SubmittedByFixedInBuild: 'fixed' WS+ 'in' WS+ 'build';++FixedInCurrentBuild+ : 'fixed' WS+ 'in' WS+ 'current' WS+ 'build'+ ;++IsCurrent+ : 'is' WS+ 'current'+ ;+IsPrevious+ : 'is' WS+ 'previous'+ ;+FixedBetween: 'fixed' WS+ 'between';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 4950c18df3..b9b41ab430 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@@ -22,21 +22,21 @@ import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldspec.BooleanField;+import io.onedev.server.issue.fieldspec.BuildChoiceField;+import io.onedev.server.issue.fieldspec.ChoiceField;+import io.onedev.server.issue.fieldspec.DateField;+import io.onedev.server.issue.fieldspec.FieldSpec;+import io.onedev.server.issue.fieldspec.GroupChoiceField;+import io.onedev.server.issue.fieldspec.IssueChoiceField;+import io.onedev.server.issue.fieldspec.NumberField;+import io.onedev.server.issue.fieldspec.PullRequestChoiceField;+import io.onedev.server.issue.fieldspec.TextField;+import io.onedev.server.issue.fieldspec.UserChoiceField;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.issue.fieldspec.BooleanField;-import io.onedev.server.model.support.issue.fieldspec.BuildChoiceField;-import io.onedev.server.model.support.issue.fieldspec.ChoiceField;-import io.onedev.server.model.support.issue.fieldspec.DateField;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;-import io.onedev.server.model.support.issue.fieldspec.GroupChoiceField;-import io.onedev.server.model.support.issue.fieldspec.IssueChoiceField;-import io.onedev.server.model.support.issue.fieldspec.NumberField;-import io.onedev.server.model.support.issue.fieldspec.PullRequestChoiceField;-import io.onedev.server.model.support.issue.fieldspec.TextField;-import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;@@ -127,6 +127,8 @@ public class IssueQuery extends EntityQuery<Issue> {switch (ctx.operator.getType()) {case IssueQueryLexer.SubmittedByMe:return new SubmittedByMeCriteria();+ case IssueQueryLexer.FixedInCurrentBuild:+ return new FixedInCurrentBuildCriteria();default:throw new OneException("Unexpected operator: " + ctx.operator.getText());}@@ -149,7 +151,7 @@ public class IssueQuery extends EntityQuery<Issue> {public IssueCriteria visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {String value = getValue(ctx.Quoted().getText());if (ctx.SubmittedBy() != null)- return new SubmittedByCriteria(getUser(value), value);+ return new SubmittedByCriteria(value);else if (ctx.FixedInBuild() != null)return new FixedInCriteria(project, value);else@@ -349,6 +351,11 @@ public class IssueQuery extends EntityQuery<Issue> {if (!(fieldSpec instanceof UserChoiceField))throw newOperatorException(fieldName, operator);break;+ case IssueQueryLexer.IsCurrent:+ case IssueQueryLexer.IsPrevious:+ if (!(fieldSpec instanceof BuildChoiceField))+ throw newOperatorException(fieldName, operator);+ break;case IssueQueryLexer.IsBefore:case IssueQueryLexer.IsAfter:if (!fieldName.equals(IssueConstants.FIELD_SUBMIT_DATE)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.javaindex 2661c95c9b..d56e728c74 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java@@ -9,30 +9,31 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.IssueConstants;public class SubmittedByCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;- private final User value;+ private final User user;- private String rawValue;+ private final String value;- public SubmittedByCriteria(User value, String rawValue) {+ public SubmittedByCriteria(String value) {+ user = EntityQuery.getUser(value);this.value = value;- this.rawValue = rawValue;}@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(IssueConstants.ATTR_SUBMITTER);- return builder.equal(attribute, value);+ return builder.equal(attribute, this.user);}@Overridepublic boolean matches(Issue issue, User user) {- return Objects.equals(issue.getSubmitter(), value);+ return Objects.equals(issue.getSubmitter(), this.user);}@Override@@ -42,7 +43,7 @@ public class SubmittedByCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.getRuleName(IssueQueryLexer.SubmittedBy) + " " + IssueQuery.quote(rawValue);+ return IssueQuery.getRuleName(IssueQueryLexer.SubmittedBy) + " " + IssueQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.javaindex 95884ec625..066aab12dd 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java@@ -1,7 +1,5 @@package io.onedev.server.search.entity.issue;-import java.util.Objects;-import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -17,13 +15,20 @@ public class SubmittedByMeCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder, User user) {- Path<User> attribute = root.get(IssueConstants.ATTR_SUBMITTER);- return builder.equal(attribute, user);+ if (user != null) {+ Path<User> attribute = root.get(IssueConstants.ATTR_SUBMITTER);+ return builder.equal(attribute, user);+ } else {+ return builder.disjunction();+ }}@Overridepublic boolean matches(Issue issue, User user) {- return Objects.equals(issue.getSubmitter(), user);+ if (user != null)+ return user.equals(issue.getSubmitter());+ else+ return false;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.javaindex c26ec9a0c0..2bc705b181 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java@@ -17,9 +17,12 @@ public class ApprovedByCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;- private final User value;+ private final User user;- public ApprovedByCriteria(User value) {+ private final String value;++ public ApprovedByCriteria(String value) {+ user = EntityQuery.getUser(value);this.value = value;}@@ -30,14 +33,14 @@ public class ApprovedByCriteria extends PullRequestCriteria {Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);return builder.and(- builder.equal(userPath, value),+ builder.equal(userPath, this.user),builder.isNull(excludeDatePath),builder.equal(approvedPath, true));}@Overridepublic boolean matches(PullRequest request, User user) {- PullRequestReview review = request.getReview(value);+ PullRequestReview review = request.getReview(this.user);return review != null && review.getExcludeDate() == null && review.getResult() != null&& review.getResult().isApproved();}@@ -50,7 +53,7 @@ public class ApprovedByCriteria extends PullRequestCriteria {@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.ApprovedBy) + " "- + PullRequestQuery.quote(value.getName());+ + PullRequestQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.javaindex ebf4839cba..fe5e3e4fde 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java@@ -19,20 +19,31 @@ public class ApprovedByMeCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);- Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);- Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);- return builder.and(- builder.equal(userPath, user),- builder.isNull(excludeDatePath),- builder.equal(approvedPath, true));+ if (user != null) {+ From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);+ Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);+ Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);+ return builder.and(+ builder.equal(userPath, user),+ builder.isNull(excludeDatePath),+ builder.equal(approvedPath, true));+ } else {+ return builder.disjunction();+ }}@Overridepublic boolean matches(PullRequest request, User user) {- PullRequestReview review = request.getReview(user);- return review != null && review.getExcludeDate() == null && review.getResult() != null && review.getResult().isApproved();+ if (user != null) {+ PullRequestReview review = request.getReview(user);+ return review != null+ && review.getExcludeDate() == null+ && review.getResult() != null+ && review.getResult().isApproved();+ } else {+ return false;+ }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.javaindex 3b28492653..421c861e03 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java@@ -9,27 +9,31 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.PullRequestConstants;public class DiscardedByCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;- private final User value;+ private final User user;- public DiscardedByCriteria(User value) {+ private final String value;++ public DiscardedByCriteria(String value) {+ user = EntityQuery.getUser(value);this.value = value;}@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<User> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_CLOSE_USER);- return builder.equal(attribute, value);+ return builder.equal(attribute, this.user);}@Override- public boolean matches(PullRequest request, User usert) {- return Objects.equals(request.getSubmitter(), value);+ public boolean matches(PullRequest request, User user) {+ return Objects.equals(request.getSubmitter(), this.user);}@Override@@ -39,7 +43,8 @@ public class DiscardedByCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.getRuleName(PullRequestQueryLexer.DiscardedBy) + " " + PullRequestQuery.quote(value.getName());+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.DiscardedBy)+ + " " + PullRequestQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.javaindex bd4f3e4df1..d280c9629b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java@@ -1,7 +1,5 @@package io.onedev.server.search.entity.pullrequest;-import java.util.Objects;-import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -17,13 +15,20 @@ public class DiscardedByMeCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Path<User> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_CLOSE_USER);- return builder.equal(attribute, user);+ if (user != null) {+ Path<User> attribute = PullRequestQuery.getPath(root, PullRequestConstants.ATTR_CLOSE_USER);+ return builder.equal(attribute, user);+ } else {+ return builder.disjunction();+ }}@Overridepublic boolean matches(PullRequest request, User user) {- return Objects.equals(request.getSubmitter(), user);+ if (user != null)+ return user.equals(request.getSubmitter());+ else+ return false;}@Overridediff --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 61cbef49d6..fe560b0017 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@@ -123,15 +123,15 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {String value = getValue(ctx.Quoted().getText());switch (ctx.operator.getType()) {case PullRequestQueryLexer.ToBeReviewedBy:- return new ToBeReviewedByCriteria(getUser(value));+ return new ToBeReviewedByCriteria(value);case PullRequestQueryLexer.ApprovedBy:- return new ApprovedByCriteria(getUser(value));+ return new ApprovedByCriteria(value);case PullRequestQueryLexer.RequestedForChangesBy:- return new RequestedForChangesByCriteria(getUser(value));+ return new RequestedForChangesByCriteria(value);case PullRequestQueryLexer.SubmittedBy:- return new SubmittedByCriteria(getUser(value));+ return new SubmittedByCriteria(value);case PullRequestQueryLexer.DiscardedBy:- return new DiscardedByCriteria(getUser(value));+ return new DiscardedByCriteria(value);case PullRequestQueryLexer.IncludesCommit:return new IncludesCommitCriteria(project, value);case PullRequestQueryLexer.IncludesIssue:diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.javaindex 0ad7569500..0dc8d9fc0f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java@@ -17,9 +17,12 @@ public class RequestedForChangesByCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;- private final User value;+ private final User user;- public RequestedForChangesByCriteria(User value) {+ private final String value;++ public RequestedForChangesByCriteria(String value) {+ user = EntityQuery.getUser(value);this.value = value;}@@ -30,14 +33,14 @@ public class RequestedForChangesByCriteria extends PullRequestCriteria {Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);return builder.and(- builder.equal(userPath, value),+ builder.equal(userPath, this.user),builder.isNull(excludeDatePath),builder.equal(approvedPath, false));}@Overridepublic boolean matches(PullRequest request, User user) {- PullRequestReview review = request.getReview(value);+ PullRequestReview review = request.getReview(this.user);return review != null && review.getExcludeDate() == null && review.getResult() != null&& !review.getResult().isApproved();}@@ -50,7 +53,7 @@ public class RequestedForChangesByCriteria extends PullRequestCriteria {@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.RequestedForChangesBy)- + " " + PullRequestQuery.quote(value.getName());+ + " " + PullRequestQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.javaindex 79e8668b8f..4f27458b50 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java@@ -19,20 +19,31 @@ public class RequestedForChangesByMeCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);- Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);- Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);- return builder.and(- builder.equal(userPath, user),- builder.isNull(excludeDatePath),- builder.equal(approvedPath, false));+ if (user != null) {+ From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);+ Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);+ Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);+ return builder.and(+ builder.equal(userPath, user),+ builder.isNull(excludeDatePath),+ builder.equal(approvedPath, false));+ } else {+ return builder.disjunction();+ }}@Overridepublic boolean matches(PullRequest request, User user) {PullRequestReview review = request.getReview(user);- return review != null && review.getExcludeDate() == null && review.getResult() != null && !review.getResult().isApproved();+ if (user != null) {+ return review != null+ && review.getExcludeDate() == null+ && review.getResult() != null+ && !review.getResult().isApproved();+ } else {+ return false;+ }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.javaindex b609332845..2305cc3e81 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java@@ -9,27 +9,31 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.PullRequestConstants;public class SubmittedByCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;- private final User value;+ private final User user;- public SubmittedByCriteria(User value) {+ private final String value;++ public SubmittedByCriteria(String value) {+ user = EntityQuery.getUser(value);this.value = value;}@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {Path<User> attribute = root.get(PullRequestConstants.ATTR_SUBMITTER);- return builder.equal(attribute, value);+ return builder.equal(attribute, this.user);}@Overridepublic boolean matches(PullRequest request, User user) {- return Objects.equals(request.getSubmitter(), value);+ return Objects.equals(request.getSubmitter(), this.user);}@Override@@ -39,7 +43,7 @@ public class SubmittedByCriteria extends PullRequestCriteria {@Overridepublic String toString() {- return PullRequestQuery.getRuleName(PullRequestQueryLexer.SubmittedBy) + " " + PullRequestQuery.quote(value.getName());+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.SubmittedBy) + " " + PullRequestQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.javaindex 8800d301b6..c1eefff516 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java@@ -1,7 +1,5 @@package io.onedev.server.search.entity.pullrequest;-import java.util.Objects;-import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;@@ -17,13 +15,20 @@ public class SubmittedByMeCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- Path<?> attribute = root.get(PullRequestConstants.ATTR_SUBMITTER);- return builder.equal(attribute, user);+ if (user != null) {+ Path<?> attribute = root.get(PullRequestConstants.ATTR_SUBMITTER);+ return builder.equal(attribute, user);+ } else {+ return builder.disjunction();+ }}@Overridepublic boolean matches(PullRequest request, User user) {- return Objects.equals(request.getSubmitter(), user);+ if (user != null)+ return user.equals(request.getSubmitter());+ else+ return false;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.javaindex 16cda3671e..ffa481ac17 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java@@ -17,9 +17,12 @@ public class ToBeReviewedByCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;- private final User value;+ private final User user;- public ToBeReviewedByCriteria(User value) {+ private final String value;++ public ToBeReviewedByCriteria(String value) {+ user = EntityQuery.getUser(value);this.value = value;}@@ -30,14 +33,14 @@ public class ToBeReviewedByCriteria extends PullRequestCriteria {Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);return builder.and(- builder.equal(userPath, value),+ builder.equal(userPath, this.user),builder.isNull(excludeDatePath),builder.isNull(approvedPath));}@Overridepublic boolean matches(PullRequest request, User user) {- PullRequestReview review = request.getReview(value);+ PullRequestReview review = request.getReview(this.user);return review != null && review.getExcludeDate() == null && review.getResult() == null;}@@ -49,7 +52,7 @@ public class ToBeReviewedByCriteria extends PullRequestCriteria {@Overridepublic String toString() {return PullRequestQuery.getRuleName(PullRequestQueryLexer.ToBeReviewedBy)- + " " + PullRequestQuery.quote(value.getName());+ + " " + PullRequestQuery.quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.javaindex 3a13b02c29..77f5a5c687 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java@@ -19,20 +19,30 @@ public class ToBeReviewedByMeCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder, User user) {- From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);- Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);- Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);- return builder.and(- builder.equal(userPath, user),- builder.isNull(excludeDatePath),- builder.isNull(approvedPath));+ if (user != null) {+ From<?, ?> join = root.join(PullRequestConstants.ATTR_REVIEWS, JoinType.LEFT);+ Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.ATTR_USER);+ Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.ATTR_EXCLUDE_DATE);+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.ATTR_RESULT_APPROVED);+ return builder.and(+ builder.equal(userPath, user),+ builder.isNull(excludeDatePath),+ builder.isNull(approvedPath));+ } else {+ return builder.disjunction();+ }}@Overridepublic boolean matches(PullRequest request, User user) {- PullRequestReview review = request.getReview(user);- return review != null && review.getExcludeDate() == null && review.getResult() == null;+ if (user != null) {+ PullRequestReview review = request.getReview(user);+ return review != null+ && review.getExcludeDate() == null+ && review.getResult() == null;+ } else {+ return false;+ }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.javaindex 8e2906076d..c4b80a22ee 100644--- a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java@@ -36,6 +36,7 @@ import io.onedev.server.entitymanager.MembershipManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Group;import io.onedev.server.model.GroupAuthorization;import io.onedev.server.model.Membership;@@ -44,7 +45,6 @@ import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;import io.onedev.server.model.support.administration.authenticator.Authenticated;import io.onedev.server.model.support.administration.authenticator.Authenticator;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.security.permission.AccessBuildLog;diff --git a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.javaindex 52008ae499..c415fec425 100644--- a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java@@ -16,7 +16,8 @@ import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.GroovyScript;-import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.util.script.ScriptContribution;+import io.onedev.server.util.script.identity.ScriptIdentity;public class GroovyUtils {@@ -59,6 +60,19 @@ public class GroovyUtils {}public static Object evalScriptByName(String scriptName, Map<String, Object> variables) {+ if (scriptName.startsWith(GroovyScript.BUILTIN_PREFIX)) {+ scriptName = scriptName.substring(GroovyScript.BUILTIN_PREFIX.length());+ for (ScriptContribution contribution: OneDev.getExtensions(ScriptContribution.class)) {+ GroovyScript script = contribution.getScript();+ if (script.getName().equals(scriptName) && script.isAuthorized(ScriptIdentity.get())) {+ try {+ return evalScript(StringUtils.join(script.getContent(), "\n"), variables);+ } catch (Exception e) {+ throw new OneException("Error evaluating builtin groovy script: " + scriptName, e);+ }+ }+ }+ }for (GroovyScript script: OneDev.getInstance(SettingManager.class).getGroovyScripts()) {if (script.getName().equals(scriptName) && script.isAuthorized(ScriptIdentity.get())) {try {diff --git a/server-core/src/main/java/io/onedev/server/util/Input.java b/server-core/src/main/java/io/onedev/server/util/Input.javaindex e60dc71cda..2cdf18d548 100644--- a/server-core/src/main/java/io/onedev/server/util/Input.java+++ b/server-core/src/main/java/io/onedev/server/util/Input.java@@ -13,9 +13,9 @@ import org.slf4j.LoggerFactory;import com.thoughtworks.xstream.annotations.XStreamOmitField;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.inputspec.SecretInput;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.issue.fieldspec.FieldSpec;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.SecretInput;public class Input implements Serializable {diff --git a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java b/server-core/src/main/java/io/onedev/server/util/IssueUtils.javaindex a1fc58d923..361ee65a9d 100644--- a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/IssueUtils.java@@ -22,9 +22,9 @@ import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/BuildChoiceInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/BuildChoiceInput.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.javaindex 18f0109fdb..13441806c2 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/BuildChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec;+package io.onedev.server.util.inputspec;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/CommitInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/CommitInput.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/CommitInput.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/CommitInput.javaindex a7a4201e17..dd8234b007 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/CommitInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/CommitInput.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec;+package io.onedev.server.util.inputspec;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputContext.java b/server-core/src/main/java/io/onedev/server/util/inputspec/InputContext.javasimilarity index 91%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/InputContext.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/InputContext.javaindex 5fb8aa1841..1398c46b02 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputContext.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/InputContext.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec;+package io.onedev.server.util.inputspec;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java b/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.javaindex 9a74f6b065..e63e5b5a2c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec;+package io.onedev.server.util.inputspec;import java.io.Serializable;import java.util.Collection;@@ -15,12 +15,12 @@ import org.unbescape.java.JavaEscape;import com.google.common.collect.Lists;-import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;-import io.onedev.server.model.support.inputspec.showcondition.ValueIsNotAnyOf;-import io.onedev.server.model.support.inputspec.showcondition.ValueIsOneOf;import io.onedev.server.util.GroovyUtils;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.util.inputspec.showcondition.ShowCondition;+import io.onedev.server.util.inputspec.showcondition.ValueIsNotAnyOf;+import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.annotation.Editable;@@ -200,7 +200,7 @@ public abstract class InputSpec implements Serializable {if (choiceProvider != null) {buffer.append(" private static List getInput" + index + "Choices() {\n");literalBytes = getLiteral(SerializationUtils.serialize(choiceProvider));- if (choiceProvider instanceof io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider) {+ if (choiceProvider instanceof io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider) {buffer.append(" return new ArrayList(SerializationUtils.deserialize(" + literalBytes + ").getChoices(false).keySet());\n");} else {buffer.append(" return SerializationUtils.deserialize(" + literalBytes + ").getChoices(false);\n");diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/IssueChoiceInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/IssueChoiceInput.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/IssueChoiceInput.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/IssueChoiceInput.javaindex 5eda016048..600c378e62 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/IssueChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/IssueChoiceInput.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec;+package io.onedev.server.util.inputspec;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/PullRequestChoiceInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/PullRequestChoiceInput.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/PullRequestChoiceInput.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/PullRequestChoiceInput.javaindex 51888296f8..e3952050c6 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/PullRequestChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/PullRequestChoiceInput.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec;+package io.onedev.server.util.inputspec;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/SecretInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/SecretInput.javasimilarity index 90%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/SecretInput.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/SecretInput.javaindex eea2c8343e..91f5c0618c 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/SecretInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/SecretInput.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec;+package io.onedev.server.util.inputspec;import java.util.ArrayList;import java.util.List;@@ -12,6 +12,8 @@ public class SecretInput {public static final String MASK = "*****";+ public static final String LITERAL_VALUE_PREFIX = "$OneDev-Secret-Literal$";+public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes) {int index = indexes.get(inputSpec.getName());StringBuffer buffer = new StringBuffer();diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.javaindex 4d3111c684..cb3bcac05b 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.booleaninput;+package io.onedev.server.util.inputspec.booleaninput;import java.util.List;import java.util.Map;@@ -7,8 +7,8 @@ import javax.validation.ValidationException;import com.google.common.collect.Lists;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.util.TextUtils;public class BooleanInput {diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.javasimilarity index 69%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.javaindex 242163023f..33c0adae8d 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider;+package io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.javasimilarity index 76%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.javaindex 11275c06d1..1ae6af9952 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider;+package io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.javaindex 049a7b458b..bd78775a6f 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider;+package io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider;import org.hibernate.validator.constraints.NotEmpty;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.javasimilarity index 76%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.javaindex 7dcf76ffaa..817545bf9e 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider;+package io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/ChoiceInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/ChoiceInput.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.javaindex d6300624fd..632d2294fe 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/ChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.choiceinput;+package io.onedev.server.util.inputspec.choiceinput;import java.util.ArrayList;import java.util.List;@@ -9,10 +9,10 @@ import javax.validation.Validator;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;-import io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.inputspec.choiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;+import io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider.DefaultValueProvider;public class ChoiceInput {diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.javaindex a22cf5de59..f0323edfba 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.choiceinput.choiceprovider;+package io.onedev.server.util.inputspec.choiceinput.choiceprovider;import java.io.Serializable;import java.util.UUID;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ChoiceProvider.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ChoiceProvider.javasimilarity index 80%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ChoiceProvider.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ChoiceProvider.javaindex 047e266cb7..f9b6603581 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ChoiceProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.choiceinput.choiceprovider;+package io.onedev.server.util.inputspec.choiceinput.choiceprovider;import java.io.Serializable;import java.util.Map;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.javaindex dfb2a2dc19..069b948f46 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.choiceinput.choiceprovider;+package io.onedev.server.util.inputspec.choiceinput.choiceprovider;import java.util.HashMap;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/SpecifiedChoices.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.javaindex 6cbe7250d8..ac45796695 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.choiceinput.choiceprovider;+package io.onedev.server.util.inputspec.choiceinput.choiceprovider;import java.util.ArrayList;import java.util.HashSet;@@ -13,8 +13,8 @@ import javax.validation.ConstraintValidatorContext;import javax.validation.constraints.Size;import io.onedev.server.ci.job.paramspec.ChoiceParam;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.issue.fieldspec.ChoiceField;+import io.onedev.server.issue.fieldspec.ChoiceField;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.javasimilarity index 72%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.javaindex f48f548cdb..53544031f4 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprovider;+package io.onedev.server.util.inputspec.choiceinput.defaultmultivalueprovider;import java.io.Serializable;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.javaindex f90ae1d53e..436b99846f 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprovider;+package io.onedev.server.util.inputspec.choiceinput.defaultmultivalueprovider;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javaindex 675f0f7b88..df349eb67b 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.choiceinput.defaultmultivalueprovider;+package io.onedev.server.util.inputspec.choiceinput.defaultmultivalueprovider;import java.util.ArrayList;import java.util.List;@@ -10,8 +10,8 @@ import org.hibernate.validator.constraints.NotEmpty;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.util.EditContext;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/DefaultValueProvider.javasimilarity index 70%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/DefaultValueProvider.javaindex 63a92618b2..11ef816754 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.javaindex c093d6c202..2760effc2b 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider;import org.hibernate.validator.constraints.NotEmpty;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 98453755a3..ddf6a2a9bd 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider;import java.util.ArrayList;import java.util.List;@@ -8,8 +8,8 @@ import javax.validation.Validator;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.util.EditContext;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/DateInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.javasimilarity index 85%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/DateInput.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.javaindex b925be954e..f2fc1b4b17 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/DateInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.dateinput;+package io.onedev.server.util.inputspec.dateinput;import java.util.ArrayList;import java.util.List;@@ -10,9 +10,9 @@ import org.joda.time.DateTime;import com.google.common.collect.Lists;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.util.Constants;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;public class DateInput {diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.javasimilarity index 72%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.javaindex 3907956cee..31d392fcc9 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.dateinput.defaultvalueprovider;import java.io.Serializable;import java.util.Date;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 2a581943ca..b4b1e44222 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.dateinput.defaultvalueprovider;import java.util.Date;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 785b1e616e..81935c1c6f 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.dateinput.defaultvalueprovider;import java.util.Date;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/GroupChoiceInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.javasimilarity index 83%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/GroupChoiceInput.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.javaindex 44d113042e..3fdcb6a855 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/GroupChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.groupchoiceinput;+package io.onedev.server.util.inputspec.groupchoiceinput;import java.util.ArrayList;import java.util.List;@@ -10,10 +10,10 @@ import javax.validation.Validator;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.model.Group;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;public class GroupChoiceInput {diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/AllGroups.java b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/AllGroups.javasimilarity index 90%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/AllGroups.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/AllGroups.javaindex df43f7b878..3ec9aa922a 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/AllGroups.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/AllGroups.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider;+package io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider;import java.util.Comparator;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.javasimilarity index 76%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.javaindex 58896ee074..9c8c10f5d4 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider;+package io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider;import java.io.Serializable;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.javaindex 780df4f637..32cdd873d2 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider;+package io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider;import java.util.ArrayList;import java.util.HashMap;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.javasimilarity index 70%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/DefaultValueProvider.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.javaindex 9d3f1d9c27..840810ad4b 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/defaultvalueprovider/DefaultValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.choiceinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javasimilarity index 91%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javaindex c0d5bd76cc..ed28c1c8fd 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider;import org.hibernate.validator.constraints.NotEmpty;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 4cc217488c..078a6cc9c7 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider;import java.util.List;@@ -9,8 +9,8 @@ import org.hibernate.validator.constraints.NotEmpty;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.util.EditContext;+import io.onedev.server.util.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.model.Group;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.GroupChoice;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/NumberInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/NumberInput.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.javaindex 4a86d2f003..dfad527ce6 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/NumberInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.numberinput;+package io.onedev.server.util.inputspec.numberinput;import java.util.ArrayList;import java.util.List;@@ -8,8 +8,8 @@ import javax.validation.ValidationException;import com.google.common.collect.Lists;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.inputspec.numberinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.numberinput.defaultvalueprovider.DefaultValueProvider;public class NumberInput {diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/DefaultValueProvider.javasimilarity index 69%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/DefaultValueProvider.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/DefaultValueProvider.javaindex 2979c2a53a..b33e877572 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/DefaultValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.numberinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.numberinput.defaultvalueprovider;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 38c8a8be87..b757d4c3af 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.numberinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.numberinput.defaultvalueprovider;import org.hibernate.validator.constraints.NotEmpty;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/SpecifiedDefaultValue.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/SpecifiedDefaultValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 67ba621d54..424df258d7 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/numberinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.numberinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.numberinput.defaultvalueprovider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ShowCondition.java b/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ShowCondition.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.javaindex 36aa00dc71..cca1532987 100644--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ShowCondition.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.showcondition;+package io.onedev.server.util.inputspec.showcondition;import java.io.Serializable;import java.util.ArrayList;@@ -13,9 +13,9 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;import io.onedev.server.OneException;-import io.onedev.server.model.support.inputspec.InputContext;-import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.util.EditContext;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsEmpty.java b/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsEmpty.javasimilarity index 80%rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsEmpty.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsEmpty.javaindex ed224f7ba8..405b34184f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsEmpty.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsEmpty.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.transitionprerequisite;+package io.onedev.server.util.inputspec.showcondition;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotAnyOf.java b/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotAnyOf.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.javaindex aaedd2dc72..b142a8db50 100644--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotAnyOf.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotAnyOf.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.showcondition;+package io.onedev.server.util.inputspec.showcondition;import java.util.List;@@ -10,9 +10,9 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;-import io.onedev.server.model.support.inputspec.InputContext;-import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.util.EditContext;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotEmpty.java b/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotEmpty.javasimilarity index 80%rename from server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotEmpty.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotEmpty.javaindex 308cee353a..3631770f64 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotEmpty.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsNotEmpty.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.transitionprerequisite;+package io.onedev.server.util.inputspec.showcondition;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsOneOf.java b/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsOneOf.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.javaindex 4e7788a548..295ae8cdc9 100644--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsOneOf.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueIsOneOf.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.showcondition;+package io.onedev.server.util.inputspec.showcondition;import java.util.List;@@ -10,9 +10,9 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;-import io.onedev.server.model.support.inputspec.InputContext;-import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.util.EditContext;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueMatcher.java b/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueMatcher.javasimilarity index 74%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueMatcher.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueMatcher.javaindex 948fe98694..fb91966d98 100644--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueMatcher.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/showcondition/ValueMatcher.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.showcondition;+package io.onedev.server.util.inputspec.showcondition;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/TextInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/TextInput.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.javaindex a873e4ea87..2f9740f533 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/TextInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.textinput;+package io.onedev.server.util.inputspec.textinput;import java.util.ArrayList;import java.util.List;@@ -8,8 +8,8 @@ import javax.validation.ValidationException;import com.google.common.collect.Lists;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;public class TextInput {diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.javasimilarity index 69%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.javaindex 7ed73b6321..3072cdd429 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.textinput.defaultvalueprovider;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 8fa8a8ae17..33d51a3b5e 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.textinput.defaultvalueprovider;import org.hibernate.validator.constraints.NotEmpty;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 1920f856df..b2e01f8e75 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.textinput.defaultvalueprovider;import org.hibernate.validator.constraints.NotEmpty;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/UserChoiceInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.javasimilarity index 82%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/UserChoiceInput.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.javaindex 03fc0c153c..3482b97399 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/UserChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.userchoiceinput;+package io.onedev.server.util.inputspec.userchoiceinput;import java.util.ArrayList;import java.util.List;@@ -11,9 +11,9 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;public class UserChoiceInput {diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/AllUsers.javasimilarity index 85%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/AllUsers.javaindex 7d29139c04..44923d0f04 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/AllUsers.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;+package io.onedev.server.util.inputspec.userchoiceinput.choiceprovider;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.javasimilarity index 76%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.javaindex d896bba494..8bc570fbdd 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;+package io.onedev.server.util.inputspec.userchoiceinput.choiceprovider;import java.io.Serializable;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.javaindex 0d38b4beab..2166366d42 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;+package io.onedev.server.util.inputspec.userchoiceinput.choiceprovider;import java.util.ArrayList;import java.util.HashMap;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.javasimilarity index 68%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.javaindex 6d975c1604..29fcdf699a 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javasimilarity index 91%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.javaindex 639fb56513..8225838f3e 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider;import org.hibernate.validator.constraints.NotEmpty;diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javasimilarity index 91%rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javarename to server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 4139c7cb10..9949880684 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider;+package io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/util/script/ScriptContribution.java b/server-core/src/main/java/io/onedev/server/util/script/ScriptContribution.javanew file mode 100644index 0000000000..9b0f05030d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/script/ScriptContribution.java@@ -0,0 +1,50 @@+package io.onedev.server.util.script;++import javax.annotation.Nullable;++import org.eclipse.jgit.revwalk.RevCommit;++import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.Build;+import io.onedev.server.model.User;+import io.onedev.server.model.support.administration.GroovyScript;++/**+ * Use abstract class instead of interface here as otherwise groovy can not invoke static methods defined here+ * @author robin+ *+ */+@ExtensionPoint+public abstract class ScriptContribution {++ public abstract GroovyScript getScript();++ @Nullable+ public static String determineBuildFailureInvestigator() {+ Build build = Build.get();+ if (build != null) {+ RevCommit commit = Build.get().getProject().getRevCommit(build.getCommitId(), true);+ User user = OneDev.getInstance(UserManager.class).find(commit.getCommitterIdent());+ if (user != null)+ return user.getName();+ else if (build.getProject().getOwner() != null)+ return build.getProject().getOwner().getName();+ else+ return null;+ } else {+ return null;+ }+ }++ @Nullable+ public static Long getBuildNumber() {+ Build build = Build.get();+ if (build != null)+ return build.getNumber();+ else+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/scriptidentity/JobIdentity.java b/server-core/src/main/java/io/onedev/server/util/script/identity/JobIdentity.javasimilarity index 70%rename from server-core/src/main/java/io/onedev/server/util/scriptidentity/JobIdentity.javarename to server-core/src/main/java/io/onedev/server/util/script/identity/JobIdentity.javaindex fcb8f2e2e2..ef1e2005e6 100644--- a/server-core/src/main/java/io/onedev/server/util/scriptidentity/JobIdentity.java+++ b/server-core/src/main/java/io/onedev/server/util/script/identity/JobIdentity.java@@ -1,4 +1,6 @@-package io.onedev.server.util.scriptidentity;+package io.onedev.server.util.script.identity;++import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;@@ -10,7 +12,7 @@ public class JobIdentity implements ScriptIdentity {private final ObjectId commitId;- public JobIdentity(Project project, ObjectId commitId) {+ public JobIdentity(Project project, @Nullable ObjectId commitId) {this.project = project;this.commitId = commitId;}@@ -19,6 +21,7 @@ public class JobIdentity implements ScriptIdentity {return project;}+ @Nullablepublic ObjectId getCommitId() {return commitId;}diff --git a/server-core/src/main/java/io/onedev/server/util/scriptidentity/ScriptIdentity.java b/server-core/src/main/java/io/onedev/server/util/script/identity/ScriptIdentity.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/util/scriptidentity/ScriptIdentity.javarename to server-core/src/main/java/io/onedev/server/util/script/identity/ScriptIdentity.javaindex 41a1dfd65e..7b7e24a4da 100644--- a/server-core/src/main/java/io/onedev/server/util/scriptidentity/ScriptIdentity.java+++ b/server-core/src/main/java/io/onedev/server/util/script/identity/ScriptIdentity.java@@ -1,4 +1,4 @@-package io.onedev.server.util.scriptidentity;+package io.onedev.server.util.script.identity;import java.util.Stack;diff --git a/server-core/src/main/java/io/onedev/server/util/scriptidentity/ScriptIdentityAware.java b/server-core/src/main/java/io/onedev/server/util/script/identity/ScriptIdentityAware.javasimilarity index 73%rename from server-core/src/main/java/io/onedev/server/util/scriptidentity/ScriptIdentityAware.javarename to server-core/src/main/java/io/onedev/server/util/script/identity/ScriptIdentityAware.javaindex 586024ceae..6c0b901a42 100644--- a/server-core/src/main/java/io/onedev/server/util/scriptidentity/ScriptIdentityAware.java+++ b/server-core/src/main/java/io/onedev/server/util/script/identity/ScriptIdentityAware.java@@ -1,4 +1,4 @@-package io.onedev.server.util.scriptidentity;+package io.onedev.server.util.script.identity;import javax.annotation.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/util/scriptidentity/SiteAdministrator.java b/server-core/src/main/java/io/onedev/server/util/script/identity/SiteAdministrator.javasimilarity index 57%rename from server-core/src/main/java/io/onedev/server/util/scriptidentity/SiteAdministrator.javarename to server-core/src/main/java/io/onedev/server/util/script/identity/SiteAdministrator.javaindex 7b82b60ae1..21f9a4e9a0 100644--- a/server-core/src/main/java/io/onedev/server/util/scriptidentity/SiteAdministrator.java+++ b/server-core/src/main/java/io/onedev/server/util/script/identity/SiteAdministrator.java@@ -1,4 +1,4 @@-package io.onedev.server.util.scriptidentity;+package io.onedev.server.util.script.identity;public class SiteAdministrator implements ScriptIdentity {diff --git a/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.javaindex 3e81df0868..fcd2c7b90b 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/BuildQueryValidator.java@@ -10,13 +10,10 @@ import io.onedev.server.web.editable.annotation.BuildQuery;public class BuildQueryValidator implements ConstraintValidator<BuildQuery, String> {- private boolean noLoginSupport;-private String message;@Overridepublic void initialize(BuildQuery constaintAnnotation) {- noLoginSupport = constaintAnnotation.noLoginSupport();message = constaintAnnotation.message();}@@ -29,7 +26,7 @@ public class BuildQueryValidator implements ConstraintValidator<BuildQuery, Stritry {io.onedev.server.search.entity.build.BuildQuery buildQuery =io.onedev.server.search.entity.build.BuildQuery.parse(project, value);- if (noLoginSupport && buildQuery.needsLogin()) {+ if (buildQuery.needsLogin()) {String message = this.message;if (message.length() == 0)message = "This query needs login which is not supported here";diff --git a/server-core/src/main/java/io/onedev/server/util/validation/RegExValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/RegExValidator.javaindex e07e5b3ae8..444ac6d658 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/RegExValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/RegExValidator.java@@ -21,7 +21,7 @@ public class RegExValidator implements ConstraintValidator<RegEx, String> {@Overridepublic void initialize(RegEx constaintAnnotation) {interpolative = constaintAnnotation.interpolative();- pattern = Pattern.compile(constaintAnnotation.value());+ pattern = Pattern.compile(constaintAnnotation.pattern());message = constaintAnnotation.message();}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/RegEx.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/RegEx.javaindex 6804668788..1300225437 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/RegEx.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/RegEx.java@@ -17,7 +17,7 @@ public @interface RegEx {boolean interpolative() default false;- String value();+ String pattern();String message() default "Not matching specified regular expression";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 817c5136b2..6865a02235 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@@ -37,12 +37,9 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {private final IModel<Project> projectModel;- private final boolean noLoginSupport;-- public BuildQueryBehavior(IModel<Project> projectModel, boolean noLoginSupport) {+ public BuildQueryBehavior(IModel<Project> projectModel) {super(BuildQueryParser.class, "query", false);this.projectModel = projectModel;- this.noLoginSupport = noLoginSupport;}@Override@@ -134,7 +131,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {- if ((noLoginSupport || SecurityUtils.getUser() == null)+ if (SecurityUtils.getUser() == null&& (suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.SubmittedByMe))|| suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.CancelledByMe)))) {return null;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 3781a89b6c..69491e1e48 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@@ -42,19 +42,19 @@ import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldspec.BooleanField;+import io.onedev.server.issue.fieldspec.BuildChoiceField;+import io.onedev.server.issue.fieldspec.ChoiceField;+import io.onedev.server.issue.fieldspec.DateField;+import io.onedev.server.issue.fieldspec.FieldSpec;+import io.onedev.server.issue.fieldspec.GroupChoiceField;+import io.onedev.server.issue.fieldspec.IssueChoiceField;+import io.onedev.server.issue.fieldspec.NumberField;+import io.onedev.server.issue.fieldspec.PullRequestChoiceField;+import io.onedev.server.issue.fieldspec.TextField;+import io.onedev.server.issue.fieldspec.UserChoiceField;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.issue.fieldspec.BooleanField;-import io.onedev.server.model.support.issue.fieldspec.BuildChoiceField;-import io.onedev.server.model.support.issue.fieldspec.ChoiceField;-import io.onedev.server.model.support.issue.fieldspec.DateField;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;-import io.onedev.server.model.support.issue.fieldspec.GroupChoiceField;-import io.onedev.server.model.support.issue.fieldspec.IssueChoiceField;-import io.onedev.server.model.support.issue.fieldspec.NumberField;-import io.onedev.server.model.support.issue.fieldspec.PullRequestChoiceField;-import io.onedev.server.model.support.issue.fieldspec.TextField;-import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;import io.onedev.server.search.entity.issue.IssueQueryParser;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.DateUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex db1e4aa79d..a443da2566 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -220,7 +220,7 @@ public abstract class BuildListPanel extends Panel {return getProject();}- }, false));+ }));input.add(new AjaxFormComponentUpdatingBehavior("input"){diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex 7bca07503a..ef2d3d03b2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -32,12 +32,12 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;import io.onedev.server.model.BuildParam;import io.onedev.server.model.Project;-import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.entity.nav.EntityNavPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.javaindex ae78605cd9..a5a26c2f1e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java@@ -7,8 +7,8 @@ import org.apache.wicket.model.IModel;import io.onedev.commons.utils.ColorUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.StateSpec;import io.onedev.server.model.Issue;-import io.onedev.server.model.support.issue.StateSpec;@SuppressWarnings("serial")public class IssueStateLabel extends Label {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.javaindex 5353cee754..e8da1809c3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java@@ -12,7 +12,7 @@ import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;-import io.onedev.server.model.support.issue.BoardSpec;+import io.onedev.server.issue.BoardSpec;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex 21cefeffbe..6bd880cea3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -27,11 +27,11 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.inputspec.InputContext;-import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.project.comment.CommentInput;import io.onedev.server.web.component.stringchoice.StringSingleChoice;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex c65314fb7f..a1b1d09e6d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -22,17 +22,17 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.issue.fieldspec.ChoiceField;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.inputspec.SecretInput;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.model.support.issue.fieldspec.ChoiceField;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.util.Input;+import io.onedev.server.util.inputspec.SecretInput;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex 1ddb3cd98e..15f95ae3ea 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -33,17 +33,17 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanelimport io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.inputspec.InputContext;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.project.comment.CommentInput;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex fbfbb7c0f1..d89346048c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -222,6 +222,7 @@ public abstract class IssueListPanel extends Panel {}}));+input.add(new AjaxFormComponentUpdatingBehavior("input"){@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.javaindex cd0ec651c0..e38084ded6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java@@ -33,14 +33,14 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.TransitionSpec;+import io.onedev.server.issue.fieldspec.ChoiceField;+import io.onedev.server.issue.fieldspec.DateField;+import io.onedev.server.issue.fieldspec.FieldSpec;+import io.onedev.server.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.issue.TransitionSpec;-import io.onedev.server.model.support.issue.fieldspec.ChoiceField;-import io.onedev.server.model.support.issue.fieldspec.DateField;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;-import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.Input;import io.onedev.server.util.IssueConstants;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.javaindex b7079e161a..f56899d31c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java@@ -34,7 +34,7 @@ import com.google.common.base.Preconditions;import com.google.common.collect.Sets;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.model.support.issue.TransitionSpec;+import io.onedev.server.issue.TransitionSpec;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.javaindex 1f600ed487..11e770e677 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java@@ -13,10 +13,10 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.TransitionSpec;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.inputspec.InputContext;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.issue.TransitionSpec;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldResolution.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldResolution.javaindex 6bc77d5718..f8deceb46c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldResolution.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldResolution.java@@ -10,7 +10,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValueResolution.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValueResolution.javaindex f732dad90c..27b265d4f7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValueResolution.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValueResolution.java@@ -12,9 +12,9 @@ import com.google.common.base.Preconditions;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldspec.ChoiceField;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.issue.fieldspec.ChoiceField;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.web.component.issue.workflowreconcile.WorkflowReconcilePanel.UndefinedFieldValueContainer;diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.javaindex 58bd13ede9..4b0ae03528 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java@@ -16,15 +16,15 @@ import io.onedev.server.OneDev;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobManager;-import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.paramspec.ParamSpec;+import io.onedev.server.ci.job.paramsupply.ParamSupply;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.scriptidentity.JobIdentity;-import io.onedev.server.util.scriptidentity.ScriptIdentity;-import io.onedev.server.util.scriptidentity.ScriptIdentityAware;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.script.identity.JobIdentity;+import io.onedev.server.util.script.identity.ScriptIdentity;+import io.onedev.server.util.script.identity.ScriptIdentityAware;import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;@@ -53,7 +53,7 @@ public abstract class RunJobLink extends AjaxLink<Void> {if (!job.getParamSpecs().isEmpty()) {Serializable paramBean;try {- paramBean = JobParam.defineBeanClass(job.getParamSpecs()).newInstance();+ paramBean = ParamSupply.defineBeanClass(job.getParamSpecs()).newInstance();} catch (InstantiationException | IllegalAccessException e) {throw new RuntimeException(e);}@@ -62,7 +62,7 @@ public abstract class RunJobLink extends AjaxLink<Void> {@Overrideprotected void onSave(AjaxRequestTarget target, Serializable bean) {- Map<String, List<String>> paramMap = JobParam.getParamMap(+ Map<String, List<String>> paramMap = ParamSupply.getParamMap(job, bean, job.getParamSpecMap().keySet());Build build = OneDev.getInstance(JobManager.class).submit(getProject(),commitId, job.getName(), paramMap, SecurityUtils.getUser());diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.javaindex 12f36aef23..fbeadde6b3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java@@ -7,8 +7,8 @@ import org.apache.wicket.markup.head.IHeaderResponse;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.issue.StateSpec;import io.onedev.server.model.Milestone;-import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.javaindex 5e780ad838..5be6a5029e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java@@ -54,7 +54,7 @@ public class StringChoiceProvider extends ChoiceProvider<String> {if (StringUtils.isNotBlank(term)) {matched = new ArrayList<>();for (Map.Entry<String, String> entry: choicesModel.getObject().entrySet()) {- if (entry.getValue().toLowerCase().startsWith(term))+ if (entry.getValue().toLowerCase().contains(term))matched.add(entry.getKey());}} else {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex cb13d0ffb7..ad2f752919 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -240,6 +240,9 @@ public class BeanEditor extends ValueEditor<Serializable> {for (Map.Entry<String, List<PropertyContext<Serializable>>> entry: propertyContexts.entrySet()) {WebMarkupContainer groupContainer = new WebMarkupContainer(groupsView.newChildId());+ groupContainer.add(AttributeAppender.append(+ "class",+ "group-" + entry.getKey().replace(" ", "-").toLowerCase()));WebMarkupContainer toggleLink = new WebMarkupContainer("toggle");toggleLink.add(new Label("groupName", entry.getKey()));diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.htmlindex 4d9621bf2f..b0f4c49261 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.html@@ -1,6 +1,6 @@<wicket:panel><div wicket:id="groups" class="group bean-properties">- <a wicket:id="toggle"><span wicket:id="groupName"></span></a>+ <a wicket:id="toggle" class="toggle"><span wicket:id="groupName"></span></a><table><tr wicket:id="properties"><td wicket:id="name" class="name"><span wicket:id="content"></span></td>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.javaindex b0b99b2f22..133487a6f1 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanViewer.java@@ -49,15 +49,17 @@ public class BeanViewer extends Panel {Map<String, ComponentContext> componentContexts = new HashMap<>();RepeatingView groupsView = new RepeatingView("groups");for (Map.Entry<String, List<PropertyContext<Serializable>>> entry: properties.entrySet()) {- WebMarkupContainer groupItem = new WebMarkupContainer(groupsView.newChildId());- groupsView.add(groupItem);+ WebMarkupContainer groupContainer = new WebMarkupContainer(groupsView.newChildId());+ groupContainer.add(AttributeAppender.append("class",+ "group-" + entry.getKey().replace(" ", "-").toLowerCase()));+ groupsView.add(groupContainer);WebMarkupContainer toggleLink = new WebMarkupContainer("toggle");toggleLink.add(new Label("groupName", entry.getKey()));- groupItem.add(toggleLink);+ groupContainer.add(toggleLink);if (entry.getKey().length() == 0) {toggleLink.setVisible(false);- groupItem.add(AttributeAppender.append("class", "expanded"));+ groupContainer.add(AttributeAppender.append("class", "expanded"));}RepeatingView propertiesView = new RepeatingView("properties");@@ -111,7 +113,7 @@ public class BeanViewer extends Panel {propertyContainer.add(AttributeAppender.append("class", "property-" + property.getPropertyName()));}- groupItem.add(propertiesView);+ groupContainer.add(propertiesView);}add(groupsView);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/param/SecretEditBean.java b/server-core/src/main/java/io/onedev/server/web/editable/SecretEditBean.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/editable/job/param/SecretEditBean.javarename to server-core/src/main/java/io/onedev/server/web/editable/SecretEditBean.javaindex 960ce923d0..331a6b8156 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/param/SecretEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/SecretEditBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.job.param;+package io.onedev.server.web.editable;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.javaindex a4286f5c90..01b09d4fa9 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildQuery.java@@ -20,6 +20,4 @@ public @interface BuildQuery {Class<? extends Payload>[] payload() default {};- boolean noLoginSupport() default false;-}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/FieldNamesProvider.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/FieldNamesProvider.javanew file mode 100644index 0000000000..0bc09a942a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/FieldNamesProvider.java@@ -0,0 +1,12 @@+package io.onedev.server.web.editable.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++@Target({ElementType.METHOD, ElementType.FIELD})+@Retention(RetentionPolicy.RUNTIME)+public @interface FieldNamesProvider {+ String value();+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.javaindex 92d8906de5..b3d36b32a1 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/IssueQuery.java@@ -19,5 +19,4 @@ public @interface IssueQuery {Class<?>[] groups() default {};Class<? extends Payload>[] payload() default {};-}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditSupport.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditSupport.javaindex 4b5d98b4eb..dfde8bf43f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.buildchoice;+package io.onedev.server.web.editable.build.choice;import java.lang.reflect.Method;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditor.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditor.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditor.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.javarename to server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditor.javaindex ab36428efa..c62f35588a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditor.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.buildchoice;+package io.onedev.server.web.editable.build.choice;import javax.annotation.Nullable;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditSupport.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditSupport.javaindex a8bfcf3e7f..e8f6de2913 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.buildquery;+package io.onedev.server.web.editable.build.query;import java.lang.reflect.Method;@@ -47,7 +47,7 @@ public class BuildQueryEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new BuildQueryEditor(componentId, descriptor, model, buildQuery.noLoginSupport());+ return new BuildQueryEditor(componentId, descriptor, model);}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditor.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditor.javarename to server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.javaindex cc855f894a..45b74f929e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildquery/BuildQueryEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/query/BuildQueryEditor.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.buildquery;+package io.onedev.server.web.editable.build.query;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.form.TextField;@@ -17,14 +17,10 @@ import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public class BuildQueryEditor extends PropertyEditor<String> {- private final boolean noLoginSupport;-private TextField<String> input;- public BuildQueryEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel,- boolean noLoginSupport) {+ public BuildQueryEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {super(id, propertyDescriptor, propertyModel);- this.noLoginSupport = noLoginSupport;}@Override@@ -39,7 +35,7 @@ public class BuildQueryEditor extends PropertyEditor<String> {return ((ProjectPage) getPage()).getProject();}- }, noLoginSupport));+ }));input.setLabel(Model.of(getDescriptor().getDisplayName()));diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditSupport.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditSupport.javaindex 26bece2449..3a93fd11ec 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.issuechoice;+package io.onedev.server.web.editable.issue.choice;import java.lang.reflect.Method;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.javarename to server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.javaindex 9913ed0d82..dc239b1115 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.issuechoice;+package io.onedev.server.web.editable.issue.choice;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListCssResourceReference.javanew file mode 100644index 0000000000..153d9ecb8b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.editable.issue.fieldsupply;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class FieldListCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public FieldListCssResourceReference() {+ super(FieldListCssResourceReference.class, "field-list.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.htmlnew file mode 100644index 0000000000..b6d89295f2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.html@@ -0,0 +1,14 @@+<wicket:panel>+ <div class="issue-fields-edit">+ <div wicket:id="fields" class="issue-field form-group">+ <label class="name control-label">+ <span wicket:id="name"></span>+ <span wicket:id="required" class="required">*</span>+ </label>+ <select wicket:id="valueProvider" class="form-control value-provider"></select>+ <div wicket:id="value" class="value"></div>+ <div wicket:id="feedback" class="feedback"></div>+ <p wicket:id="description" class="help-block"></p>+ </div>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.javanew file mode 100644index 0000000000..7cbde23c66--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditPanel.java@@ -0,0 +1,291 @@+package io.onedev.server.web.editable.issue.fieldsupply;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.DropDownChoice;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.base.Preconditions;++import io.onedev.commons.utils.ReflectionUtils;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldspec.FieldSpec;+import io.onedev.server.issue.fieldspec.SecretField;+import io.onedev.server.issue.fieldsupply.FieldSupply;+import io.onedev.server.issue.fieldsupply.ScriptingValue;+import io.onedev.server.issue.fieldsupply.SpecifiedValue;+import io.onedev.server.issue.fieldsupply.ValueProvider;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.administration.IssueSetting;+import io.onedev.server.util.IssueUtils;+import io.onedev.server.web.editable.BeanDescriptor;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.SecretEditBean;+import io.onedev.server.web.editable.annotation.FieldNamesProvider;+import io.onedev.server.web.editable.annotation.Password;++@SuppressWarnings("serial")+class FieldListEditPanel extends PropertyEditor<List<Serializable>> {++ private static final Logger logger = LoggerFactory.getLogger(FieldListEditPanel.class);++ private final String fieldNamesProviderMethodName;++ private final Map<String, FieldSupply> fields = new HashMap<>();++ private transient Serializable defaultFieldBean;++ private transient Map<String, FieldSpec> fieldSpecs;++ public FieldListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ super(id, propertyDescriptor, model);++ FieldNamesProvider fieldNamesProvider = Preconditions.checkNotNull(+ propertyDescriptor.getPropertyGetter().getAnnotation(FieldNamesProvider.class));+ fieldNamesProviderMethodName = fieldNamesProvider.value();++ for (Serializable each: model.getObject()) {+ FieldSupply param = (FieldSupply) each;+ fields.put(param.getName(), param);+ }+ }++ @SuppressWarnings("unchecked")+ private Map<String, FieldSpec> getFieldSpecs() {+ if (fieldSpecs == null) {+ fieldSpecs = new HashMap<>();+ Collection<String> fieldNames = (Collection<String>) ReflectionUtils.invokeStaticMethod(+ getDescriptor().getBeanClass(), fieldNamesProviderMethodName);+ fieldSpecs = getIssueSetting().getFieldSpecMap(fieldNames);+ }+ return fieldSpecs;+ }++ private IssueSetting getIssueSetting() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting();+ }++ private Serializable getDefaultFieldBean() {+ if (defaultFieldBean == null) {+ Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass(Project.get());+ try {+ defaultFieldBean = (Serializable) fieldBeanClass.newInstance();+ } catch (InstantiationException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }+ }+ return defaultFieldBean;+ }++ private Component newFieldsView(Class<?> fieldBeanClass) {+ RepeatingView fieldsView = new RepeatingView("fields");+ fieldsView.setDefaultModel(Model.of(fieldBeanClass.getName()));+ BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBeanClass);+ for (List<PropertyDescriptor> groupProperties: beanDescriptor.getProperties().values()) {+ for (PropertyDescriptor property: groupProperties) {+ if (getFieldSpecs().containsKey(property.getDisplayName())) {+ WebMarkupContainer container = new WebMarkupContainer(fieldsView.newChildId());+ FieldSupply field = fields.get(property.getDisplayName());+ if (field != null) {+ container.add(newValueEditor("value", property, field.getValueProvider()));+ container.setDefaultModel(Model.of(field.getValueProvider().getClass()));+ } else {+ container.add(newValueEditor("value", property, newSpecifiedValueProvider(property)));+ container.setDefaultModel(Model.of(SpecifiedValue.class));+ }++ container.add(new Label("name", property.getDisplayName()));++ String required;+ if (property.isPropertyRequired()+ && property.getPropertyClass() != boolean.class+ && property.getPropertyClass() != Boolean.class) {+ required = "*";+ } else {+ required = " ";+ }++ container.add(new Label("required", required).setEscapeModelStrings(false));++ boolean isSecret = property.getPropertyGetter().getAnnotation(Password.class) != null;++ List<String> choices = new ArrayList<>();+ if (isSecret) {+ choices.add(SpecifiedValue.SECRET_DISPLAY_NAME);+ choices.add(ScriptingValue.SECRET_DISPLAY_NAME);+ } else {+ choices.add(SpecifiedValue.DISPLAY_NAME);+ choices.add(ScriptingValue.DISPLAY_NAME);+ }+ DropDownChoice<String> valueProviderChoice = new DropDownChoice<String>("valueProvider", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ Class<?> valueProviderClass = (Class<?>) container.getDefaultModelObject();+ if (valueProviderClass == SpecifiedValue.class)+ return isSecret?SpecifiedValue.SECRET_DISPLAY_NAME:SpecifiedValue.DISPLAY_NAME;+ else+ return isSecret?ScriptingValue.SECRET_DISPLAY_NAME:ScriptingValue.DISPLAY_NAME;+ }++ @Override+ public void setObject(String object) {+ ValueProvider valueProvider;+ if (object.equals(SpecifiedValue.DISPLAY_NAME) || object.equals(SpecifiedValue.SECRET_DISPLAY_NAME))+ valueProvider = newSpecifiedValueProvider(property);+ else+ valueProvider = new ScriptingValue();+ container.replace(newValueEditor("value", property, valueProvider));+ container.setDefaultModelObject(valueProvider.getClass());+ }++ }, choices);++ valueProviderChoice.setNullValid(false);++ valueProviderChoice.add(new AjaxFormComponentUpdatingBehavior("change"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ target.add(container);+ }++ });+ container.add(valueProviderChoice);++ container.add(new Label("description", property.getDescription()));+ container.add(new FencedFeedbackPanel("feedback", container));+ container.setOutputMarkupId(true);+ fieldsView.add(container);+ }+ }+ }++ return fieldsView;+ }++ @Override+ protected void onBeforeRender() {+ Component fieldsView = get("fields");+ String fieldBeanClassName = (String) fieldsView.getDefaultModelObject();+ if (!fieldBeanClassName.equals(getDefaultFieldBean().getClass().getName()))+ replace(newFieldsView(getDefaultFieldBean().getClass()));+ super.onBeforeRender();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(newFieldsView(getDefaultFieldBean().getClass()));++ setOutputMarkupId(true);+ }++ private SpecifiedValue newSpecifiedValueProvider(PropertyDescriptor property) {+ SpecifiedValue specifiedValue = new SpecifiedValue();+ Object typedValue = property.getPropertyValue(getDefaultFieldBean());+ FieldSpec fieldSpec = getFieldSpecs().get(property.getDisplayName());+ Preconditions.checkNotNull(fieldSpec);+ specifiedValue.setValue(fieldSpec.convertToStrings(typedValue));+ return specifiedValue;+ }++ private Component newValueEditor(String componentId, PropertyDescriptor property, ValueProvider valueProvider) {+ if (valueProvider instanceof SpecifiedValue) {+ SpecifiedValue specifiedValue = (SpecifiedValue) valueProvider;+ List<String> value = specifiedValue.getValue();+ FieldSpec fieldSpec = Preconditions.checkNotNull(getFieldSpecs().get(property.getDisplayName()));++ Serializable fieldBean;+ try {+ fieldBean = getDefaultFieldBean().getClass().newInstance();+ } catch (InstantiationException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }++ try {+ if (value != null)+ property.setPropertyValue(fieldBean, fieldSpec.convertToObject(value));+ } catch (Exception e) {+ logger.error("Error setting property value", e);+ }++ if (property.getPropertyGetter().getAnnotation(Password.class) == null) {+ return PropertyContext.edit("value", fieldBean, property.getPropertyName());+ } else {+ SecretEditBean bean = new SecretEditBean();+ bean.setSecret((String) property.getPropertyValue(fieldBean));+ return PropertyContext.edit("value", bean, "secret");+ }+ } else {+ return PropertyContext.edit("value", valueProvider, "scriptName");+ }+ }++ @SuppressWarnings("unchecked")+ @Override+ protected List<Serializable> convertInputToValue() throws ConversionException {+ List<Serializable> value = new ArrayList<>();+ for (Component container: (WebMarkupContainer)get("fields")) {+ Label label = (Label) container.get("name");+ FieldSupply field = new FieldSupply();+ field.setName((String) label.getDefaultModelObject());+ FieldSpec fieldSpec = Preconditions.checkNotNull(getFieldSpecs().get(field.getName()));+ field.setSecret(fieldSpec instanceof SecretField);+ PropertyEditor<Serializable> propertyEditor = (PropertyEditor<Serializable>) container.get("value");+ Class<?> valueProviderClass = (Class<?>) container.getDefaultModelObject();+ if (valueProviderClass == SpecifiedValue.class) {+ SpecifiedValue specifiedValue = new SpecifiedValue();+ Object propertyValue = propertyEditor.getConvertedInput();+ specifiedValue.setValue(fieldSpec.convertToStrings(propertyValue));+ field.setValueProvider(specifiedValue);+ } else {+ ScriptingValue scriptingValue = new ScriptingValue();+ scriptingValue.setScriptName((String) propertyEditor.getConvertedInput());+ field.setValueProvider(scriptingValue);+ }+ value.add(field);+ }+ return value;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new FieldListCssResourceReference()));+ validate();+ if (!getModelObject().equals(getConvertedInput())) {+ String script = String.format("onedev.server.form.markDirty($('#%s').closest('form'));", getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditSupport.javanew file mode 100644index 0000000000..88de1b835c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListEditSupport.java@@ -0,0 +1,59 @@+package io.onedev.server.web.editable.issue.fieldsupply;++import java.io.Serializable;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.model.IModel;++import io.onedev.commons.utils.ReflectionUtils;+import io.onedev.server.issue.fieldsupply.FieldSupply;+import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;++@SuppressWarnings("serial")+public class FieldListEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {+ Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());+ if (elementClass == FieldSupply.class) {+ return new PropertyContext<List<Serializable>>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, IModel<List<Serializable>> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null && !model.getObject().isEmpty())+ return new FieldListViewPanel(id, model.getObject());+ else+ return new WebMarkupContainer(id);+ }++ };+ }++ @Override+ public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {+ return new FieldListEditPanel(componentId, descriptor, model);+ }++ };+ }+ }+ return null;+ }++ @Override+ public int getPriority() {+ return 0;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListViewPanel.htmlnew file mode 100644index 0000000000..f97aeaaefd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListViewPanel.html@@ -0,0 +1,11 @@+<wicket:panel>+ <table class="issue-fields-view">+ <tr wicket:id="fields" class="issue-field">+ <td wicket:id="name" class="name"></td>+ <td class="value">+ <div wicket:id="valueProvider" class="value-provider"></div>+ <div wicket:id="value" class="value"></div>+ </td>+ </tr>+ </table>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListViewPanel.javanew file mode 100644index 0000000000..4b33d4b2b9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/FieldListViewPanel.java@@ -0,0 +1,70 @@+package io.onedev.server.web.editable.issue.fieldsupply;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.markup.repeater.RepeatingView;++import io.onedev.server.issue.fieldsupply.FieldSupply;+import io.onedev.server.issue.fieldsupply.ScriptingValue;+import io.onedev.server.issue.fieldsupply.SpecifiedValue;+import io.onedev.server.web.editable.PropertyContext;++@SuppressWarnings("serial")+class FieldListViewPanel extends Panel {++ private final List<FieldSupply> fields = new ArrayList<>();++ public FieldListViewPanel(String id, List<Serializable> elements) {+ super(id);++ for (Serializable each: elements)+ fields.add((FieldSupply) each);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ RepeatingView fieldsView = new RepeatingView("fields");+ for (FieldSupply field: fields) {+ WebMarkupContainer container = new WebMarkupContainer(fieldsView.newChildId());+ container.add(new Label("name", field.getName()));++ if (field.getValueProvider() instanceof SpecifiedValue) {+ if (field.isSecret())+ container.add(new Label("valueProvider", SpecifiedValue.SECRET_DISPLAY_NAME));+ else+ container.add(new Label("valueProvider", SpecifiedValue.DISPLAY_NAME));+ List<String> value = field.getValueProvider().getValue();+ if (value.size() == 0)+ container.add(new Label("value", "<i>Empty</i>").setEscapeModelStrings(false));+ else if (value.size() == 1)+ container.add(new Label("value", value.iterator().next()));+ else+ container.add(new Label("value", value.toString()));+ } else {+ if (field.isSecret())+ container.add(new Label("valueProvider", ScriptingValue.SECRET_DISPLAY_NAME));+ else+ container.add(new Label("valueProvider", ScriptingValue.DISPLAY_NAME));+ container.add(PropertyContext.view("value", field.getValueProvider(), "scriptName"));+ }+ fieldsView.add(container);+ }+ add(fieldsView);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new FieldListCssResourceReference()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/field-list.css b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/field-list.cssnew file mode 100644index 0000000000..5735c24179--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/fieldsupply/field-list.css@@ -0,0 +1,4 @@+.issue-fields-edit>.issue-field>* {+ margin-bottom: 12px;+}+diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditSupport.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditSupport.javaindex f14b0a331d..f505e2f310 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.issuequery;+package io.onedev.server.web.editable.issue.query;import java.lang.reflect.Method;@@ -20,7 +20,8 @@ public class IssueQueryEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {Method propertyGetter = descriptor.getPropertyGetter();- if (propertyGetter.getAnnotation(IssueQuery.class) != null) {+ IssueQuery issueQuery = propertyGetter.getAnnotation(IssueQuery.class);+ if (issueQuery != null) {if (propertyGetter.getReturnType() != String.class) {throw new RuntimeException("Annotation 'IssueQuery' should be applied to property "+ "with type 'String'");diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditor.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditor.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditor.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.javarename to server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditor.javaindex 0771a2d217..ffef09a37a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/query/IssueQueryEditor.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.issuequery;+package io.onedev.server.web.editable.issue.query;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.form.TextField;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.javaindex 0d8660201d..863eb231f9 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java@@ -12,7 +12,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.ci.job.paramspec.ParamSpec;-import io.onedev.server.model.support.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListCssResourceReference.javasimilarity index 85%rename from server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListCssResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListCssResourceReference.javaindex 0da8a713a8..f0737203d9 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListCssResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListCssResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.job.param;+package io.onedev.server.web.editable.job.paramsupply;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.htmlsimilarity index 89%rename from server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.htmlindex b211ce6a62..5b303a9773 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.html@@ -7,16 +7,16 @@</label><select wicket:id="valuesProvider" class="form-control values-provider"></select><div wicket:id="values" class="values"></div>+ <div wicket:id="feedback" class="feedback"></div>+ <p wicket:id="description" class="help-block"></p></div></div><wicket:fragment wicket:id="specifiedValuesFrag"><div wicket:id="values" class="specified-value"><div wicket:id="value"></div>- <p wicket:id="description" class="help-block"></p><a wicket:id="delete" title="Delete this value"><i class="fa fa-trash"></i></a><div wicket:id="feedback" class="feedback"></div></div>- <div wicket:id="feedback" class="feedback"></div><a wicket:id="add" class="btn btn-success btn-sm"><i class="fa fa-plus"></i> Add Value</a><a class="help" title="Add additional values to run matrix build. The job will run for each possible combination of different values across all parameters"><i class="fa fa-question-circle"></i></a></wicket:fragment>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.javaindex 966eefa02c..1cc4623613 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.job.param;+package io.onedev.server.web.editable.job.paramsupply;import java.io.Serializable;import java.util.ArrayList;@@ -34,17 +34,18 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.server.ci.job.param.JobParam;-import io.onedev.server.ci.job.param.ScriptingValues;-import io.onedev.server.ci.job.param.SpecifiedValues;-import io.onedev.server.ci.job.param.ValuesProvider;import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.ci.job.paramspec.SecretParam;+import io.onedev.server.ci.job.paramsupply.ParamSupply;+import io.onedev.server.ci.job.paramsupply.ScriptingValues;+import io.onedev.server.ci.job.paramsupply.SpecifiedValues;+import io.onedev.server.ci.job.paramsupply.ValuesProvider;import io.onedev.server.util.ComponentContext;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.SecretEditBean;import io.onedev.server.web.editable.annotation.ParamSpecProvider;import io.onedev.server.web.editable.annotation.Password;@@ -53,7 +54,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {private static final Logger logger = LoggerFactory.getLogger(ParamListEditPanel.class);- private final Map<String, JobParam> params = new HashMap<>();+ private final Map<String, ParamSupply> params = new HashMap<>();private final String paramSpecProviderMethodName;@@ -69,7 +70,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {paramSpecProviderMethodName = paramSpecProvider.value();for (Serializable each: model.getObject()) {- JobParam param = (JobParam) each;+ ParamSupply param = (ParamSupply) each;params.put(param.getName(), param);}}@@ -94,7 +95,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {private Serializable getDefaultParamBean() {if (defaultParamBean == null) {try {- defaultParamBean = JobParam.defineBeanClass(new ArrayList<>(getParamSpecs().values())).newInstance();+ defaultParamBean = ParamSupply.defineBeanClass(new ArrayList<>(getParamSpecs().values())).newInstance();} catch (InstantiationException | IllegalAccessException e) {throw new RuntimeException(e);}@@ -108,8 +109,17 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {BeanDescriptor beanDescriptor = new BeanDescriptor(paramBeanClass);for (List<PropertyDescriptor> groupProperties: beanDescriptor.getProperties().values()) {for (PropertyDescriptor property: groupProperties) {- WebMarkupContainer item = new WebMarkupContainer(paramsView.newChildId());- item.add(new Label("name", property.getDisplayName()));+ WebMarkupContainer container = new WebMarkupContainer(paramsView.newChildId());+ container.add(new Label("name", property.getDisplayName()));++ ParamSupply param = params.get(property.getDisplayName());+ if (param != null) {+ container.add(newValuesEditor("values", property, param.getValuesProvider()));+ container.setDefaultModel(Model.of(param.getValuesProvider().getClass()));+ } else {+ container.add(newValuesEditor("values", property, newSpecifiedValuesProvider(property)));+ container.setDefaultModel(Model.of(SpecifiedValues.class));+ }String required;if (property.isPropertyRequired()@@ -120,7 +130,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {required = " ";}- item.add(new Label("required", required).setEscapeModelStrings(false));+ container.add(new Label("required", required).setEscapeModelStrings(false));boolean isSecret = property.getPropertyGetter().getAnnotation(Password.class) != null;@@ -140,22 +150,24 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic String getObject() {- if (item.get("values") instanceof Fragment)+ Class<?> valuesProviderClass = (Class<?>) container.getDefaultModelObject();+ if (valuesProviderClass == SpecifiedValues.class)return isSecret?SpecifiedValues.SECRET_DISPLAY_NAME:SpecifiedValues.DISPLAY_NAME;- else+ elsereturn isSecret?ScriptingValues.SECRET_DISPLAY_NAME:ScriptingValues.DISPLAY_NAME;}@Overridepublic void setObject(String object) {ValuesProvider valuesProvider;- if (object.equals(SpecifiedValues.DISPLAY_NAME) || object.endsWith(SpecifiedValues.SECRET_DISPLAY_NAME))- valuesProvider = newSpecifiedValueProvider(property);- else+ if (object.equals(SpecifiedValues.DISPLAY_NAME) || object.equals(SpecifiedValues.SECRET_DISPLAY_NAME))+ valuesProvider = newSpecifiedValuesProvider(property);+ elsevaluesProvider = new ScriptingValues();- item.replace(newValuesEditor(property, valuesProvider));+ container.replace(newValuesEditor("values", property, valuesProvider));+ container.setDefaultModelObject(valuesProvider.getClass());}-+}, choices);valuesProviderChoice.setNullValid(false);@@ -165,19 +177,15 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected void onUpdate(AjaxRequestTarget target) {onPropertyUpdating(target);- target.add(item.get("values"));+ target.add(container);}});- item.add(valuesProviderChoice);-- JobParam param = params.get(property.getDisplayName());- if (param != null)- item.add(newValuesEditor(property, param.getValuesProvider()));- else- item.add(newValuesEditor(property, newSpecifiedValueProvider(property)));-- paramsView.add(item);+ container.add(valuesProviderChoice);+ container.add(new Label("description", property.getDescription()));+ container.add(new FencedFeedbackPanel("feedback", container));+ container.setOutputMarkupId(true);+ paramsView.add(container);}}@@ -206,11 +214,11 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {public void validate(IValidatable<List<Serializable>> validatable) {int index = 0;for (Serializable each: validatable.getValue()) {- JobParam param = (JobParam) each;+ ParamSupply param = (ParamSupply) each;if (param.getValuesProvider() instanceof SpecifiedValues) {SpecifiedValues specifiedValues = (SpecifiedValues) param.getValuesProvider();try {- JobParam.validateParamValues(specifiedValues.getValues());+ ParamSupply.validateParamValues(specifiedValues.getValues());} catch (ValidationException e) {if (!getFlag(FLAG_RENDERING)) {RepeatingView paramsView = (RepeatingView) get("params");@@ -227,7 +235,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {setOutputMarkupId(true);}- private SpecifiedValues newSpecifiedValueProvider(PropertyDescriptor property) {+ private SpecifiedValues newSpecifiedValuesProvider(PropertyDescriptor property) {SpecifiedValues specifiedValues = new SpecifiedValues();Object typedValue = property.getPropertyValue(getDefaultParamBean());ParamSpec paramSpec = getParamSpecs().get(property.getDisplayName());@@ -259,12 +267,10 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {if (property.getPropertyGetter().getAnnotation(Password.class) == null) {item.add(PropertyContext.edit("value", paramBean, property.getPropertyName()));- item.add(new WebMarkupContainer("description").setVisible(false));} else {SecretEditBean bean = new SecretEditBean();bean.setSecret((String) property.getPropertyValue(paramBean));item.add(PropertyContext.edit("value", bean, "secret"));- item.add(new Label("description", "Secrets can be defined in project setting"));}item.add(new AjaxLink<Void>("delete") {@@ -289,10 +295,10 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {return item;}- private Component newValuesEditor(PropertyDescriptor property, ValuesProvider valuesProvider) {+ private Component newValuesEditor(String componentId, PropertyDescriptor property, ValuesProvider valuesProvider) {if (valuesProvider instanceof SpecifiedValues) {SpecifiedValues specifiedValues = (SpecifiedValues) valuesProvider;- Fragment fragment = new Fragment("values", "specifiedValuesFrag", this);+ Fragment fragment = new Fragment(componentId, "specifiedValuesFrag", this);RepeatingView valuesView = new RepeatingView("values");fragment.add(valuesView);@@ -303,8 +309,6 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {logger.error("Error creating value editors", e);}- fragment.add(new FencedFeedbackPanel("feedback", fragment));-fragment.add(new AjaxLink<Void>("add") {@Override@@ -328,7 +332,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {fragment.setOutputMarkupId(true);return fragment;} else {- return PropertyContext.edit("values", valuesProvider, "scriptName").setOutputMarkupId(true);+ return PropertyContext.edit(componentId, valuesProvider, "scriptName").setOutputMarkupId(true);}}@@ -336,21 +340,22 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected List<Serializable> convertInputToValue() throws ConversionException {List<Serializable> value = new ArrayList<>();- for (Component paramItem: (WebMarkupContainer)get("params")) {- Label label = (Label) paramItem.get("name");- JobParam param = new JobParam();+ for (Component paramContainer: (WebMarkupContainer)get("params")) {+ Label label = (Label) paramContainer.get("name");+ ParamSupply param = new ParamSupply();param.setName((String) label.getDefaultModelObject());ParamSpec paramSpec = Preconditions.checkNotNull(getParamSpecs().get(param.getName()));param.setSecret(paramSpec instanceof SecretParam);- Component valuesEditor = paramItem.get("values");- if (valuesEditor instanceof PropertyEditor) {+ Class<?> valuesProviderClass = (Class<?>) paramContainer.getDefaultModelObject();+ Component valuesEditor = paramContainer.get("values");+ if (valuesProviderClass == ScriptingValues.class) {ScriptingValues scriptingValues = new ScriptingValues();scriptingValues.setScriptName((String) ((PropertyEditor<Serializable>) valuesEditor).getConvertedInput());param.setValuesProvider(scriptingValues);} else {SpecifiedValues specifiedValues = new SpecifiedValues();- for (Component valueItem: (WebMarkupContainer)valuesEditor.get("values")) {- Object propertyValue = ((PropertyEditor<Serializable>) valueItem.get("value")).getConvertedInput();+ for (Component valueContainer: (WebMarkupContainer)valuesEditor.get("values")) {+ Object propertyValue = ((PropertyEditor<Serializable>) valueContainer.get("value")).getConvertedInput();specifiedValues.getValues().add(paramSpec.convertToStrings(propertyValue));}param.setValuesProvider(specifiedValues);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditSupport.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditSupport.javaindex 495919dbe8..834ede23d4 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.job.param;+package io.onedev.server.web.editable.job.paramsupply;import java.io.Serializable;import java.util.List;@@ -8,7 +8,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.model.IModel;import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.server.ci.job.param.JobParam;+import io.onedev.server.ci.job.paramsupply.ParamSupply;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyDescriptor;@@ -23,7 +23,7 @@ public class ParamListEditSupport implements EditSupport {public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());- if (elementClass == JobParam.class && descriptor.getPropertyGetter().getAnnotation(ParamSpecProvider.class) != null) {+ if (elementClass == ParamSupply.class && descriptor.getPropertyGetter().getAnnotation(ParamSpecProvider.class) != null) {return new PropertyContext<List<Serializable>>(descriptor) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.javaindex ded8e9275b..411932a652 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.job.param;+package io.onedev.server.web.editable.job.paramsupply;import java.io.Serializable;import java.util.ArrayList;@@ -12,21 +12,21 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.RepeatingView;-import io.onedev.server.ci.job.param.JobParam;-import io.onedev.server.ci.job.param.ScriptingValues;-import io.onedev.server.ci.job.param.SpecifiedValues;+import io.onedev.server.ci.job.paramsupply.ParamSupply;+import io.onedev.server.ci.job.paramsupply.ScriptingValues;+import io.onedev.server.ci.job.paramsupply.SpecifiedValues;import io.onedev.server.web.editable.PropertyContext;@SuppressWarnings("serial")class ParamListViewPanel extends Panel {- private final List<JobParam> params = new ArrayList<>();+ private final List<ParamSupply> params = new ArrayList<>();public ParamListViewPanel(String id, List<Serializable> elements) {super(id);for (Serializable each: elements)- params.add((JobParam) each);+ params.add((ParamSupply) each);}@Override@@ -34,7 +34,7 @@ class ParamListViewPanel extends Panel {super.onInitialize();RepeatingView paramsView = new RepeatingView("params");- for (JobParam param: params) {+ for (ParamSupply param: params) {WebMarkupContainer paramItem = new WebMarkupContainer(paramsView.newChildId());paramItem.add(new Label("name", param.getName()));diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/param/param-list.css b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/param-list.csssimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/job/param/param-list.cssrename to server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/param-list.cssdiff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionBean.java b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionBean.javaindex 093d9825f2..df30fd441d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionBean.java@@ -14,7 +14,7 @@ public class ActionBean implements Serializable {private PostBuildAction action;- @Editable(name="Type", order=100)+ @Editable(order=100, name="Type")@NotNull(message="may not be empty")public PostBuildAction getAction() {return action;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/action.css b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/action.cssindex 4bdef9330e..545b0fda26 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/action.css+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/action.css@@ -2,4 +2,49 @@width: 160px !important;word-break: break-all !important;white-space: normal !important;-}\ No newline at end of file+}+.post-build-action-edit .group-issue-detail>.toggle {+ cursor: default;+ font-weight: bold;+ color: inherit;+ font-family: inherit;+ background: none;+ border-bottom: 1px solid #E5E5E5;+ padding-left: 0;+ padding-bottom: 8px;+ border-radius: 0;+ font-size: 16px;+}+.post-build-action-edit .group-issue-detail>.toggle:after {+ display: none;+}+.post-build-action-edit .group-issue-detail>div {+ display: block;+}++.post-build-action.def-detail .group-issue-detail>table {+ display: table;+}+.post-build-action.def-detail .group-issue-detail>.toggle {+ cursor: default;+ font-weight: bold;+}+.post-build-action.def-detail .group-issue-detail>.toggle:after {+ display: none;+}+.post-build-action.def-detail .group-issue-detail td.name {+ width: 100px;+}+.post-build-action.def-detail .group-issue-detail .issue-fields-view td {+ padding: 0 8px 16px 0;+}+.post-build-action.def-detail .group-issue-detail .issue-fields-view td.name {+ font-weight: bold;+ text-align: right;+ font-size: 12px;+ line-height: 20px;+ border-right: 1px solid #E0E0E0;+}+.post-build-action.def-detail .group-issue-detail .issue-fields-view td.value {+ padding-left: 8px;+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditSupport.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditSupport.javaindex 1fa0b97f73..ec7f7ac0cb 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.pullrequestchoice;+package io.onedev.server.web.editable.pullrequest.choice;import java.lang.reflect.Method;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.javarename to server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.javaindex af4b6883e7..b473564a27 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.pullrequestchoice;+package io.onedev.server.web.editable.pullrequest.choice;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/query/PullRequestQueryEditSupport.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/pullrequest/query/PullRequestQueryEditSupport.javaindex 893b5ea2bc..2ff59cc86f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/query/PullRequestQueryEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.pullrequestquery;+package io.onedev.server.web.editable.pullrequest.query;import java.lang.reflect.Method;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/query/PullRequestQueryEditor.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/pullrequest/query/PullRequestQueryEditor.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/query/PullRequestQueryEditor.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.javarename to server-core/src/main/java/io/onedev/server/web/editable/pullrequest/query/PullRequestQueryEditor.javaindex 272cbd81bd..d4f97c4bbe 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/query/PullRequestQueryEditor.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.pullrequestquery;+package io.onedev.server.web.editable.pullrequest.query;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.form.TextField;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.javaindex 21f82861fe..60d6377ebb 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java@@ -11,16 +11,14 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import com.google.common.base.Preconditions;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.GroovyScript;-import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.util.script.ScriptContribution;+import io.onedev.server.util.script.identity.ScriptIdentity;import io.onedev.server.web.component.stringchoice.StringSingleChoice;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.annotation.ScriptChoice;@SuppressWarnings("serial")public class ScriptChoiceEditor extends PropertyEditor<String> {@@ -40,12 +38,17 @@ public class ScriptChoiceEditor extends PropertyEditor<String> {@Overrideprotected Map<String, String> load() {Map<String, String> choices = new LinkedHashMap<>();- ScriptChoice scriptChoice = descriptor.getPropertyGetter().getAnnotation(ScriptChoice.class);- Preconditions.checkNotNull(scriptChoice);for (GroovyScript script: OneDev.getInstance(SettingManager.class).getGroovyScripts()) {if (script.isAuthorized(ScriptIdentity.get()))- choices.put(script.getName(), null);+ choices.put(script.getName(), script.getName());+ }+ for (ScriptContribution contribution: OneDev.getExtensions(ScriptContribution.class)) {+ GroovyScript script = contribution.getScript();+ if (script.isAuthorized(ScriptIdentity.get())) {+ String displayName = GroovyScript.BUILTIN_PREFIX + script.getName();+ choices.put(displayName, displayName);+ }}return choices;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.javaindex d6fb0256b7..ae32172296 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java@@ -5,9 +5,9 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.scriptidentity.ScriptIdentity;-import io.onedev.server.util.scriptidentity.ScriptIdentityAware;-import io.onedev.server.util.scriptidentity.SiteAdministrator;+import io.onedev.server.util.script.identity.ScriptIdentity;+import io.onedev.server.util.script.identity.ScriptIdentityAware;+import io.onedev.server.util.script.identity.SiteAdministrator;import io.onedev.server.web.page.layout.LayoutPage;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.javaindex e36604c515..18d845d691 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java@@ -105,6 +105,25 @@ public class GroovyScriptListPage extends AdministrationPage {}});+ columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("Description")) {++ @Override+ public void populateItem(Item<ICellPopulator<GroovyScript>> cellItem, String componentId, IModel<GroovyScript> rowModel) {+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(LoopItem.class).getIndex()) {++ @Override+ protected Component newLabel(String componentId) {+ String description = rowModel.getObject().getDescription();+ if (description != null)+ return new Label(componentId, description);+ else+ return new Label(componentId, "<i>No description</i>").setEscapeModelStrings(false);+ }++ });+ }+ });+columns.add(new AbstractColumn<GroovyScript, Void>(Model.of("Can be Used by Jobs")) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.javaindex 8b4adc6396..323b3d17eb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java@@ -31,9 +31,9 @@ import com.google.common.collect.Sets;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.BoardSpec;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.issue.BoardSpec;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.javaindex 3dff50f804..9055d6a8f2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java@@ -4,7 +4,7 @@ import java.io.Serializable;import javax.validation.constraints.NotNull;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.web.editable.annotation.Editable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.javaindex 3e59814841..d9c8802d70 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java@@ -18,14 +18,14 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldspec.ChoiceField;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.inputspec.InputContext;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.Choice;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;-import io.onedev.server.model.support.issue.fieldspec.ChoiceField;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.Choice;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.javaindex d20e5060bd..6a8b69bdf0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java@@ -32,8 +32,8 @@ import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.asset.inputspec.InputSpecCssResourceReference;import io.onedev.server.web.behavior.sortable.SortBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.javaindex 5eaad85193..507d320e2c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java@@ -32,8 +32,8 @@ import com.google.common.collect.Sets;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.StateSpec;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.javaindex 04b8ee9cec..c91fe04806 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java@@ -11,8 +11,8 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.StateSpec;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex caf42b7b82..de125ec74a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -80,9 +80,9 @@ import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.query.BlobQuery;import io.onedev.server.search.code.query.TextQuery;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.scriptidentity.JobIdentity;-import io.onedev.server.util.scriptidentity.ScriptIdentity;-import io.onedev.server.util.scriptidentity.ScriptIdentityAware;+import io.onedev.server.util.script.identity.JobIdentity;+import io.onedev.server.util.script.identity.ScriptIdentity;+import io.onedev.server.util.script.identity.ScriptIdentityAware;import io.onedev.server.web.PrioritizedComponentRenderer;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.commit.status.CommitStatusPanel;@@ -1361,7 +1361,10 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S@Overridepublic ScriptIdentity getScriptIdentity() {- return new JobIdentity(getProject(), getCommit().copy());+ if (getBlobIdent().revision != null)+ return new JobIdentity(getProject(), getCommit().copy());+ else // when we add file to an empty project+ return new JobIdentity(getProject(), null);}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.cssindex 99fa5a3223..fafb6292f7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css@@ -109,7 +109,7 @@}.ci-spec>.valid>div>.body>.contents>.content {border-radius: 4px;- border: 2px solid #666;+ border: 1px solid #BBB;padding: 20px;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex f51a002704..14e6fa646c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -37,18 +37,18 @@ import com.google.common.collect.Sets;import io.onedev.commons.utils.LockUtils;import io.onedev.server.OneDev;import io.onedev.server.ci.job.JobManager;-import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.paramspec.ParamSpec;+import io.onedev.server.ci.job.paramsupply.ParamSupply;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;-import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.scriptidentity.JobIdentity;-import io.onedev.server.util.scriptidentity.ScriptIdentity;-import io.onedev.server.util.scriptidentity.ScriptIdentityAware;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.script.identity.JobIdentity;+import io.onedev.server.util.script.identity.ScriptIdentity;+import io.onedev.server.util.script.identity.ScriptIdentityAware;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;@@ -75,12 +75,14 @@ import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPimport io.onedev.server.web.page.project.builds.detail.issues.FixedIssuesPage;import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.util.BuildAware;import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QueryPositionSupport;@SuppressWarnings("serial")-public abstract class BuildDetailPage extends ProjectPage implements InputContext, ScriptIdentityAware {+public abstract class BuildDetailPage extends ProjectPage+ implements InputContext, ScriptIdentityAware, BuildAware {public static final String PARAM_BUILD = "build";@@ -109,6 +111,7 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContexposition = QueryPosition.from(params);}+ @Overridepublic Build getBuild() {return buildModel.getObject();}@@ -190,7 +193,7 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContexsummary.add(new AjaxLink<Void>("rebuild") {private void resubmit(Serializable paramBean) {- Map<String, List<String>> paramMap = JobParam.getParamMap(getBuild().getJob(), paramBean,+ Map<String, List<String>> paramMap = ParamSupply.getParamMap(getBuild().getJob(), paramBean,getBuild().getJob().getParamSpecMap().keySet());OneDev.getInstance(JobManager.class).resubmit(getBuild(), paramMap, SecurityUtils.getUser());setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(getBuild(), position));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.javaindex 421d2ca31e..19f377fcf8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java@@ -15,9 +15,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.util.scriptidentity.ScriptIdentity;-import io.onedev.server.util.scriptidentity.ScriptIdentityAware;-import io.onedev.server.util.scriptidentity.SiteAdministrator;+import io.onedev.server.util.script.identity.ScriptIdentity;+import io.onedev.server.util.script.identity.ScriptIdentityAware;+import io.onedev.server.util.script.identity.SiteAdministrator;import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.tabbable.PageTab;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex bed970d01c..a59901e0ce 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -23,9 +23,9 @@ import org.hibernate.Hibernate;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Issue;import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.Input;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.SecurityUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 42d4cf48ed..bfe7c1d9db 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -35,20 +35,19 @@ import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.issue.BoardSpec;+import io.onedev.server.issue.StateSpec;+import io.onedev.server.issue.TransitionSpec;+import io.onedev.server.issue.fieldspec.ChoiceField;+import io.onedev.server.issue.fieldspec.FieldSpec;+import io.onedev.server.issue.fieldspec.UserChoiceField;+import io.onedev.server.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.model.support.issue.ProjectIssueSetting;-import io.onedev.server.model.support.issue.StateSpec;-import io.onedev.server.model.support.issue.TransitionSpec;-import io.onedev.server.model.support.issue.fieldspec.ChoiceField;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;-import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;-import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.search.entity.issue.ChoiceFieldCriteria;import io.onedev.server.search.entity.issue.FieldOperatorCriteria;import io.onedev.server.search.entity.issue.IssueCriteria;@@ -60,6 +59,7 @@ import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.modal.ModalLink;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.javaindex 83f038a7eb..67137cfdb2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java@@ -8,8 +8,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import com.google.common.collect.Sets;+import io.onedev.server.issue.BoardSpec;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.web.behavior.WebSocketObserver;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex b63af4934e..b1c0038b8d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -27,11 +27,11 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.support.inputspec.InputContext;-import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.search.entity.build.FixedIssueCriteria;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.component.build.list.BuildListPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.javaindex 7d328443c5..925accc2f0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java@@ -17,9 +17,9 @@ import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.issue.BoardSpec;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.WebConstants;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex 884c6eb8ed..78eca86915 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -40,9 +40,9 @@ import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.issue.BoardSpec;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.DateUtils;import io.onedev.server.util.SecurityUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.javaindex d0e07a3459..92941cfa5f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java@@ -12,8 +12,8 @@ import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.issue.BoardSpec;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.javaindex e699496027..a4515ae4c4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java@@ -14,13 +14,13 @@ import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.TransitionSpec;+import io.onedev.server.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.model.Issue;-import io.onedev.server.model.support.inputspec.InputContext;-import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.issue.TransitionSpec;-import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.javaindex 7b32bcd600..0419b7373f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java@@ -16,13 +16,13 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.inputspec.InputContext;-import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.util.scriptidentity.ScriptIdentity;-import io.onedev.server.util.scriptidentity.ScriptIdentityAware;-import io.onedev.server.util.scriptidentity.SiteAdministrator;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.script.identity.ScriptIdentity;+import io.onedev.server.util.script.identity.ScriptIdentityAware;+import io.onedev.server.util.script.identity.SiteAdministrator;import io.onedev.server.web.component.issue.create.NewIssueEditor;import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;import io.onedev.server.web.page.project.ProjectPage;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 580dc9c4d3..e186f4eb3b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -29,13 +29,13 @@ import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.cache.UserInfoManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Issue;-import io.onedev.server.model.support.inputspec.InputContext;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.scriptidentity.ScriptIdentity;-import io.onedev.server.util.scriptidentity.ScriptIdentityAware;-import io.onedev.server.util.scriptidentity.SiteAdministrator;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.script.identity.ScriptIdentity;+import io.onedev.server.util.script.identity.ScriptIdentityAware;+import io.onedev.server.util.script.identity.SiteAdministrator;import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;import io.onedev.server.web.component.issue.pullrequests.IssuePullRequestsPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.javaindex 86cfd29d11..36dd449c6f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java@@ -8,9 +8,9 @@ import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.issue.StateSpec;import io.onedev.server.model.Milestone;import io.onedev.server.model.support.administration.IssueSetting;-import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.web.component.milestone.progress.MilestoneProgressBar;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.javaindex 98cc66e7dd..4e3d5ae03d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.java@@ -7,7 +7,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.support.issue.TransitionSpec;+import io.onedev.server.issue.TransitionSpec;import io.onedev.server.web.component.issue.statetransition.StateTransitionListPanel;import io.onedev.server.web.component.issue.statetransition.UseDefaultListener;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.javaindex 0caaf244fa..02ddd1bc96 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.java@@ -10,7 +10,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.support.inputspec.SecretInput;+import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.page.project.setting.ProjectSettingPage;diff --git a/server-core/src/main/java/io/onedev/server/web/util/BuildAware.java b/server-core/src/main/java/io/onedev/server/web/util/BuildAware.javanew file mode 100644index 0000000000..851df859e2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/util/BuildAware.java@@ -0,0 +1,9 @@+package io.onedev.server.web.util;++import io.onedev.server.model.Build;++public interface BuildAware {++ Build getBuild();++}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 6603e76cf4..10428b7450 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@@ -29,7 +29,6 @@ import io.onedev.server.OneDev;import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobVariable;-import io.onedev.server.ci.job.NamedFunction;import io.onedev.server.ci.job.VariableInterpolator;import io.onedev.server.ci.job.paramspec.ParamSpec;import io.onedev.server.entitymanager.BuildManager;@@ -52,7 +51,8 @@ import io.onedev.server.model.support.Secret;import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.scriptidentity.ScriptIdentity;+import io.onedev.server.util.script.ScriptContribution;+import io.onedev.server.util.script.identity.ScriptIdentity;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;public class SuggestionUtils {@@ -129,8 +129,10 @@ public class SuggestionUtils {if (!variables.containsKey(varName) && script.isAuthorized(ScriptIdentity.get()))variables.put(varName, null);}- for (NamedFunction function: OneDev.getExtensions(NamedFunction.class)) {- String varName = VariableInterpolator.FUNCTIONS_PREFIX + function.getName();++ for (ScriptContribution contribution: OneDev.getExtensions(ScriptContribution.class)) {+ String varName = VariableInterpolator.SCRIPTS_PREFIX + GroovyScript.BUILTIN_PREFIX+ + contribution.getScript().getName();if (!variables.containsKey(varName))variables.put(varName, null);}diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.javaindex 1f7ffde5d3..e560db2251 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java@@ -5,8 +5,8 @@ import javax.inject.Singleton;import io.onedev.commons.launcher.loader.Listen;import io.onedev.server.event.issue.IssueEvent;+import io.onedev.server.issue.BoardSpec;import io.onedev.server.model.Issue;-import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.web.util.WicketUtils;@Singletondiff --git a/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java b/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.javaindex 09a190255a..8f6f254832 100644--- a/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java+++ b/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java@@ -29,7 +29,7 @@ import org.apache.wicket.Application;import org.apache.wicket.WicketRuntimeException;import org.apache.wicket.util.collections.UrlExternalFormComparator;-import io.onedev.server.ci.job.param.JobParam;+import io.onedev.server.ci.job.paramsupply.ParamSupply;import io.onedev.server.util.IssueUtils;/**@@ -64,7 +64,7 @@ public abstract class AbstractClassResolver implements IClassResolverif (clazz != null)return clazz;- clazz = JobParam.loadBeanClass(className);+ clazz = ParamSupply.loadBeanClass(className);if (clazz != null)return clazz;diff --git a/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleJobSuggestion.java b/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleJobSuggestion.javaindex ee7622e61f..d7152f39f2 100644--- a/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleJobSuggestion.java+++ b/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleJobSuggestion.java@@ -24,9 +24,9 @@ import io.onedev.server.plugin.report.html.JobHtmlReport;public class GradleJobSuggestion implements JobSuggestion {- public static final String DETERMINE_DOCKER_IMAGE = "gradle-determine-docker-image";+ public static final String DETERMINE_DOCKER_IMAGE = "gradle:determine-docker-image";- public static final String DETERMINE_PROJECT_VERSION = "gradle-determine-project-version";+ public static final String DETERMINE_PROJECT_VERSION = "gradle:determine-project-version";@Overridepublic Collection<Job> suggestJobs(Project project, ObjectId commitId) {@@ -100,31 +100,37 @@ public class GradleJobSuggestion implements JobSuggestion {}return null;}-- public static String determineDockerImage(Build build) {- String jdkVersion = null;- Blob blob = getGradlePropertiesBlob(build.getProject(), build.getCommitId());- if (blob != null)- jdkVersion = getJdkVersion(blob);- if (jdkVersion == null) {- blob = getGradleBlob(build.getProject(), build.getCommitId());- if (blob != null)- jdkVersion = getJdkVersion(blob);- }- if (jdkVersion == null) {- blob = getKotlinGradleBlob(build.getProject(), build.getCommitId());++ @Nullable+ public static String determineDockerImage() {+ Build build = Build.get();+ if (build != null) {+ String jdkVersion = null;+ Blob blob = getGradlePropertiesBlob(build.getProject(), build.getCommitId());if (blob != null)jdkVersion = getJdkVersion(blob);- }- if (jdkVersion != null) {- try {- if (Integer.parseInt(jdkVersion) > 8)- return "gradle";- } catch (NumberFormatException e) {+ if (jdkVersion == null) {+ blob = getGradleBlob(build.getProject(), build.getCommitId());+ if (blob != null)+ jdkVersion = getJdkVersion(blob);+ }+ if (jdkVersion == null) {+ blob = getKotlinGradleBlob(build.getProject(), build.getCommitId());+ if (blob != null)+ jdkVersion = getJdkVersion(blob);+ }+ if (jdkVersion != null) {+ try {+ if (Integer.parseInt(jdkVersion) > 8)+ return "gradle";+ } catch (NumberFormatException e) {+ }+ return "gradle:5.6.3-jdk8";+ } else {+ return "gradle";}- return "gradle:5.6.3-jdk8";} else {- return "gradle";+ return null;}}diff --git a/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleModule.java b/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleModule.javaindex 61dad0c3e1..af41418878 100644--- a/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleModule.java+++ b/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleModule.java@@ -1,9 +1,11 @@package org.server.plugin.cispec.gradle;+import com.google.common.collect.Lists;+import io.onedev.commons.launcher.loader.AbstractPluginModule;import io.onedev.server.ci.job.JobSuggestion;-import io.onedev.server.ci.job.NamedFunction;-import io.onedev.server.model.Build;+import io.onedev.server.model.support.administration.GroovyScript;+import io.onedev.server.util.script.ScriptContribution;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.@@ -18,16 +20,14 @@ public class GradleModule extends AbstractPluginModule {// put your guice bindings herecontribute(JobSuggestion.class, GradleJobSuggestion.class);- contribute(NamedFunction.class, new NamedFunction() {-- @Override- public String getName() {- return GradleJobSuggestion.DETERMINE_DOCKER_IMAGE;- }+ contribute(ScriptContribution.class, new ScriptContribution() {@Override- public String call(Build build) {- return GradleJobSuggestion.determineDockerImage(build);+ public GroovyScript getScript() {+ GroovyScript script = new GroovyScript();+ script.setName(GradleJobSuggestion.DETERMINE_DOCKER_IMAGE);+ script.setContent(Lists.newArrayList("org.server.plugin.cispec.gradle.GradleJobSuggestion.determineDockerImage()"));+ return script;}});diff --git a/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenJobSuggestion.java b/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenJobSuggestion.javaindex 1fb57b7a74..a13a5dc4e3 100644--- a/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenJobSuggestion.java+++ b/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenJobSuggestion.java@@ -4,6 +4,8 @@ import java.io.StringReader;import java.util.ArrayList;import java.util.Collection;+import javax.annotation.Nullable;+import org.dom4j.Document;import org.dom4j.DocumentException;import org.dom4j.Node;@@ -28,7 +30,7 @@ public class MavenJobSuggestion implements JobSuggestion {private static final Logger logger = LoggerFactory.getLogger(MavenJobSuggestion.class);- public static final String DETERMINE_DOCKER_IMAGE = "maven-determine-docker-image";+ public static final String DETERMINE_DOCKER_IMAGE = "maven:determine-docker-image";@Overridepublic Collection<Job> suggestJobs(Project project, ObjectId commitId) {@@ -69,48 +71,54 @@ public class MavenJobSuggestion implements JobSuggestion {return jobs;}- public static String determineDockerImage(Build build) {- Project project = build.getProject();- ObjectId commitId = build.getCommitId();-- Blob blob = project.getBlob(new BlobIdent(commitId.name(), "pom.xml", FileMode.TYPE_FILE), false);-- Document document;- try {- document = new SAXReader().read(new StringReader(blob.getText().getContent()));- } catch (DocumentException e) {- logger.debug("Error parsing pom.xml (project: {}, commit: {})",- project.getName(), commitId.getName(), e);- return null;- }-- String javaVersion = "1.8";-- // Use XPath with localname as POM project element may contain xmlns definition- Node node = document.selectSingleNode("//*[local-name()='maven.compiler.source']");- if (node != null) {- javaVersion = node.getText().trim();- } else {- node = document.selectSingleNode("//*[local-name()='artifactId' and text()='maven-compiler-plugin']");- if (node != null)- node = node.getParent().selectSingleNode(".//*[local-name()='source']");+ @Nullable+ public static String determineDockerImage() {+ Build build = Build.get();+ if (build != null) {+ Project project = build.getProject();+ ObjectId commitId = build.getCommitId();++ Blob blob = project.getBlob(new BlobIdent(commitId.name(), "pom.xml", FileMode.TYPE_FILE), false);++ Document document;+ try {+ document = new SAXReader().read(new StringReader(blob.getText().getContent()));+ } catch (DocumentException e) {+ logger.debug("Error parsing pom.xml (project: {}, commit: {})",+ project.getName(), commitId.getName(), e);+ return null;+ }++ String javaVersion = "1.8";++ // Use XPath with localname as POM project element may contain xmlns definition+ Node node = document.selectSingleNode("//*[local-name()='maven.compiler.source']");if (node != null) {javaVersion = node.getText().trim();} else {- // detect java version from Spring initializer generated projects- node = document.selectSingleNode("//*[local-name()='java.version']");+ node = document.selectSingleNode("//*[local-name()='artifactId' and text()='maven-compiler-plugin']");if (node != null)+ node = node.getParent().selectSingleNode(".//*[local-name()='source']");+ if (node != null) {javaVersion = node.getText().trim();+ } else {+ // detect java version from Spring initializer generated projects+ node = document.selectSingleNode("//*[local-name()='java.version']");+ if (node != null)+ javaVersion = node.getText().trim();+ }}- }-- try {- if (Integer.parseInt(javaVersion) <= 8)++ try {+ if (Integer.parseInt(javaVersion) <= 8)+ return "maven:3.6.1-jdk-8";+ else+ return "maven:latest";+ } catch (NumberFormatException e) {return "maven:3.6.1-jdk-8";- else- return "maven:latest";- } catch (NumberFormatException e) {- return "maven:3.6.1-jdk-8";- }+ }+ } else {+ return null;+ }}}\ No newline at end of filediff --git a/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenModule.java b/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenModule.javaindex 7848bcbdad..4ce729d0a1 100644--- a/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenModule.java+++ b/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenModule.java@@ -1,9 +1,11 @@package io.onedev.server.plugin.cispec.maven;+import com.google.common.collect.Lists;+import io.onedev.commons.launcher.loader.AbstractPluginModule;import io.onedev.server.ci.job.JobSuggestion;-import io.onedev.server.ci.job.NamedFunction;-import io.onedev.server.model.Build;+import io.onedev.server.model.support.administration.GroovyScript;+import io.onedev.server.util.script.ScriptContribution;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.@@ -18,16 +20,14 @@ public class MavenModule extends AbstractPluginModule {// put your guice bindings herecontribute(JobSuggestion.class, MavenJobSuggestion.class);- contribute(NamedFunction.class, new NamedFunction() {-- @Override- public String getName() {- return MavenJobSuggestion.DETERMINE_DOCKER_IMAGE;- }+ contribute(ScriptContribution.class, new ScriptContribution() {@Override- public String call(Build build) {- return MavenJobSuggestion.determineDockerImage(build);+ public GroovyScript getScript() {+ GroovyScript script = new GroovyScript();+ script.setName(MavenJobSuggestion.DETERMINE_DOCKER_IMAGE);+ script.setContent(Lists.newArrayList("io.onedev.server.plugin.cispec.maven.MavenJobSuggestion.determineDockerImage()"));+ return script;}});diff --git a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodeJobSuggestion.java b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodeJobSuggestion.javaindex 7e7e364235..d098ae587c 100644--- a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodeJobSuggestion.java+++ b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodeJobSuggestion.java@@ -30,7 +30,7 @@ public class NodeJobSuggestion implements JobSuggestion {private static final Logger logger = LoggerFactory.getLogger(NodeJobSuggestion.class);- public static final String DETERMINE_PROJECT_VERSION = "node-determine-project-version";+ public static final String DETERMINE_PROJECT_VERSION = "node:determine-project-version";@Overridepublic Collection<Job> suggestJobs(Project project, ObjectId commitId) {@@ -254,11 +254,17 @@ public class NodeJobSuggestion implements JobSuggestion {return null;}- public static String determineProjectVersion(Build build) {- JsonNode jsonNode = getPackageJson(build.getProject(), build.getCommitId());- if (jsonNode != null)- return jsonNode.findValue("version").asText();- else+ @Nullable+ public static String determineProjectVersion() {+ Build build = Build.get();+ if (build != null) {+ JsonNode jsonNode = getPackageJson(build.getProject(), build.getCommitId());+ if (jsonNode != null)+ return jsonNode.findValue("version").asText();+ else+ return null;+ } else {return null;+ }}}diff --git a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodePluginModule.java b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodePluginModule.javaindex 073a7ef894..2fc1aff0e2 100644--- a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodePluginModule.java+++ b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodePluginModule.java@@ -1,9 +1,11 @@package io.onedev.server.plugin.cispec.node;+import com.google.common.collect.Lists;+import io.onedev.commons.launcher.loader.AbstractPluginModule;import io.onedev.server.ci.job.JobSuggestion;-import io.onedev.server.ci.job.NamedFunction;-import io.onedev.server.model.Build;+import io.onedev.server.model.support.administration.GroovyScript;+import io.onedev.server.util.script.ScriptContribution;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.@@ -18,16 +20,14 @@ public class NodePluginModule extends AbstractPluginModule {// put your guice bindings herecontribute(JobSuggestion.class, NodeJobSuggestion.class);- contribute(NamedFunction.class, new NamedFunction() {-- @Override- public String getName() {- return NodeJobSuggestion.DETERMINE_PROJECT_VERSION;- }+ contribute(ScriptContribution.class, new ScriptContribution() {@Override- public String call(Build build) {- return NodeJobSuggestion.determineProjectVersion(build);+ public GroovyScript getScript() {+ GroovyScript script = new GroovyScript();+ script.setName(NodeJobSuggestion.DETERMINE_PROJECT_VERSION);+ script.setContent(Lists.newArrayList("io.onedev.server.plugin.cispec.node.NodeJobSuggestion.determineProjectVersion()"));+ return script;}});diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.javaindex 82c424d3f0..ca5b4d6edc 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java@@ -55,11 +55,11 @@ import io.onedev.server.model.support.RegistryLogin;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.model.support.administration.jobexecutor.NodeSelectorEntry;import io.onedev.server.model.support.administration.jobexecutor.ServiceLocator;-import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.plugin.executor.kubernetes.KubernetesExecutor.TestData;import io.onedev.server.util.JobLogger;import io.onedev.server.util.PKCS12CertExtractor;import io.onedev.server.util.ServerConfig;+import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.util.validation.annotation.DnsName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;