The Unified and Autonomous Development Platform
Enhance build spec with import/step/template concept
Robin Shen8ac7615738f1
diff --git a/pom.xml b/pom.xmlindex c640d28e14..d2ab2fe4e6 100644--- a/pom.xml+++ b/pom.xml@@ -9,7 +9,7 @@<version>1.0.5</version></parent><artifactId>server</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 1dbdcdc6e2..46791af358 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version></parent><build><plugins>diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 971ab2d3b1..2375ed4715 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -30,6 +30,7 @@ import javax.persistence.Transient;import javax.persistence.Version;import javax.validation.Configuration;import javax.validation.Validation;+import javax.validation.ValidationException;import javax.validation.Validator;import javax.validation.ValidatorFactory;@@ -624,7 +625,8 @@ public class CoreModule extends AbstractPluginModule {public Collection<Class<? extends Exception>> getExpectedExceptionClasses() {return Sets.newHashSet(ConstraintViolationException.class, EntityNotFoundException.class,ObjectNotFoundException.class, StaleStateException.class, UnauthorizedException.class,- ExplicitException.class, PageExpiredException.class, StalePageException.class);+ ExplicitException.class, ValidationException.class, PageExpiredException.class,+ StalePageException.class);}});diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.javaindex e1dc12a937..505dec9369 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java@@ -3,6 +3,7 @@ package io.onedev.server.buildspec;import java.io.Serializable;import java.nio.charset.StandardCharsets;import java.util.ArrayList;+import java.util.Collection;import java.util.HashSet;import java.util.Iterator;import java.util.LinkedHashMap;@@ -10,15 +11,17 @@ import java.util.List;import java.util.Map;import java.util.Set;import java.util.Stack;+import java.util.function.Function;import javax.annotation.Nullable;import javax.validation.ConstraintValidatorContext;+import javax.validation.ConstraintViolation;import javax.validation.Valid;import javax.validation.ValidationException;+import javax.validation.Validator;import org.apache.commons.lang3.SerializationUtils;import org.apache.wicket.Component;-import org.eclipse.jgit.revwalk.RevCommit;import org.yaml.snakeyaml.DumperOptions.FlowStyle;import org.yaml.snakeyaml.nodes.MappingNode;import org.yaml.snakeyaml.nodes.Node;@@ -27,22 +30,26 @@ import org.yaml.snakeyaml.nodes.ScalarNode;import org.yaml.snakeyaml.nodes.SequenceNode;import org.yaml.snakeyaml.nodes.Tag;+import com.google.common.base.Preconditions;import com.google.common.cache.CacheBuilder;import com.google.common.cache.CacheLoader;import com.google.common.cache.LoadingCache;import com.google.common.collect.Lists;+import io.onedev.commons.codeassist.InputCompletion;+import io.onedev.commons.codeassist.InputStatus;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.commons.utils.LinearRange;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;import io.onedev.server.buildspec.job.Job;-import io.onedev.server.buildspec.job.JobAware;import io.onedev.server.buildspec.job.JobDependency;-import io.onedev.server.buildspec.job.action.PostBuildAction;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;-import io.onedev.server.buildspec.job.retrycondition.RetryCondition;-import io.onedev.server.buildspec.job.trigger.JobTrigger;+import io.onedev.server.buildspec.param.ParamUtils;+import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.buildspec.step.Step;import io.onedev.server.buildspec.step.StepTemplate;+import io.onedev.server.buildspec.step.UseTemplateStep;import io.onedev.server.migration.VersionedYamlDoc;import io.onedev.server.migration.XmlBuildSpecMigrator;import io.onedev.server.util.ComponentContext;@@ -69,7 +76,7 @@ public class BuildSpec implements Serializable, Validatable {try {return SerializationUtils.serialize(VersionedYamlDoc.fromYaml(buildSpecString).toBean(BuildSpec.class));} catch (Exception e) {- throw new InvalidBuildSpecException("Invalid build spec", e);+ throw new BuildSpecParseException("Malformed build spec", e);}}@@ -77,21 +84,35 @@ public class BuildSpec implements Serializable, Validatable {public static final String BLOB_PATH = ".onedev-buildspec.yml";- public static final String PROP_JOBS = "jobs";+ private static final String PROP_JOBS = "jobs";++ private static final String PROP_SERVICES = "services";++ private static final String PROP_STEP_TEMPLATES = "stepTemplates";++ private static final String PROP_PROPERTIES = "properties";++ private static final String PROP_IMPORTS = "imports";private List<Job> jobs = new ArrayList<>();private List<StepTemplate> stepTemplates = new ArrayList<>();++ private List<Service> services = new ArrayList<>();private List<Property> properties = new ArrayList<>();- private List<BuildSpecImport> imports = new ArrayList<>();+ private List<Import> imports = new ArrayList<>();++ private transient List<BuildSpec> importedBuildSpecs;private transient Map<String, Job> jobMap;private transient Map<String, StepTemplate> stepTemplateMap;- private transient Map<String, String> propertyMap;+ private transient Map<String, Service> serviceMap;++ private transient Map<String, Property> propertyMap;@Editable@Valid@@ -101,6 +122,7 @@ public class BuildSpec implements Serializable, Validatable {public void setJobs(List<Job> jobs) {this.jobs = jobs;+ jobMap = null;}@Editable@@ -111,6 +133,18 @@ public class BuildSpec implements Serializable, Validatable {public void setStepTemplates(List<StepTemplate> stepTemplates) {this.stepTemplates = stepTemplates;+ stepTemplateMap = null;+ }++ @Editable+ @Valid+ public List<Service> getServices() {+ return services;+ }++ public void setServices(List<Service> services) {+ this.services = services;+ serviceMap = null;}@Editable@@ -120,32 +154,62 @@ public class BuildSpec implements Serializable, Validatable {public void setProperties(List<Property> properties) {this.properties = properties;+ propertyMap = null;}@Editable@Valid- public List<BuildSpecImport> getImports() {+ public List<Import> getImports() {return imports;}- public void setImports(List<BuildSpecImport> imports) {+ public void setImports(List<Import> imports) {this.imports = imports;+ importedBuildSpecs = null;}-++ private List<BuildSpec> getImportedBuildSpecs(Collection<String> projectChain) {+ if (importedBuildSpecs == null) {+ importedBuildSpecs = new ArrayList<>();+ for (Import aImport: getImports()) {+ if (!projectChain.contains(aImport.getProjectName())) {+ Collection<String> newProjectChain = new HashSet<>(projectChain);+ newProjectChain.add(aImport.getProjectName());+ try {+ importedBuildSpecs.addAll(aImport.getBuildSpec().getImportedBuildSpecs(newProjectChain));+ importedBuildSpecs.add(aImport.getBuildSpec());+ } catch (Exception e) {+ // Ignore here as we rely on this method to show viewer/editor+ // Errors relating to this will be shown when validated+ }+ }+ }+ }+ return importedBuildSpecs;+ }+public Map<String, Job> getJobMap() {if (jobMap == null) {jobMap = new LinkedHashMap<>();- for (Job job: jobs)+ for (BuildSpec buildSpec: getImportedBuildSpecs(new HashSet<>())) {+ for (Job job: buildSpec.getJobs())+ jobMap.put(job.getName(), job);+ }+ for (Job job: getJobs())jobMap.put(job.getName(), job);}return jobMap;}- public Map<String, String> getPropertyMap() {+ public Map<String, Property> getPropertyMap() {if (propertyMap == null) {propertyMap = new LinkedHashMap<>();- for (Property property: properties)- propertyMap.put(property.getName(), property.getValue());+ for (BuildSpec buildSpec: getImportedBuildSpecs(new HashSet<>())) {+ for (Property property: buildSpec.getProperties())+ propertyMap.put(property.getName(), property);+ }+ for (Property property: getProperties())+ propertyMap.put(property.getName(), property);}return propertyMap;}@@ -153,154 +217,340 @@ public class BuildSpec implements Serializable, Validatable {public Map<String, StepTemplate> getStepTemplateMap() {if (stepTemplateMap == null) {stepTemplateMap = new LinkedHashMap<>();- for (StepTemplate template: stepTemplates)+ for (BuildSpec buildSpec: getImportedBuildSpecs(new HashSet<>())) {+ for (StepTemplate template: buildSpec.getStepTemplates())+ stepTemplateMap.put(template.getName(), template);+ }+ for (StepTemplate template: getStepTemplates())stepTemplateMap.put(template.getName(), template);}return stepTemplateMap;}+ public Map<String, Service> getServiceMap() {+ if (serviceMap == null) {+ serviceMap = new LinkedHashMap<>();+ for (BuildSpec buildSpec: getImportedBuildSpecs(new HashSet<>())) {+ for (Service service: buildSpec.getServices())+ serviceMap.put(service.getName(), service);+ }+ for (Service service: services)+ serviceMap.put(service.getName(), service);+ }+ return serviceMap;+ }++ private <T> int getImportIndex(String namedElementName, Function<BuildSpec, Map<String, T>> namedElementMapProvider) {+ for (int i=imports.size()-1; i>=0; i--) {+ if (namedElementMapProvider.apply(imports.get(i).getBuildSpec()).containsKey(namedElementName))+ return i;+ }+ return -1;+ }++ private <T extends NamedElement> boolean validateImportedElements(ConstraintValidatorContext context,+ List<T> namedElements, Function<BuildSpec, Map<String, T>> namedElementMapProvider, String elementTypeName) {+ boolean isValid = true;+ Validator validator = OneDev.getInstance(Validator.class);+ for (T element: namedElementMapProvider.apply(this).values()) {+ int elementIndex = namedElements.indexOf(element);+ if (elementIndex == -1) {+ int importIndex = getImportIndex(element.getName(), namedElementMapProvider);+ for (ConstraintViolation<T> violation: validator.validate(element)) {+ String location;+ if (violation.getPropertyPath().toString().length() != 0)+ location = "location: " + violation.getPropertyPath() + ", ";+ else+ location = "";++ String errorMessage = String.format("Error validating imported %s (%s: %s, %serror message: %s)",+ elementTypeName, elementTypeName, element.getName(), location, violation.getMessage());+ context.buildConstraintViolationWithTemplate(errorMessage)+ .addPropertyNode(PROP_IMPORTS)+ .addBeanNode()+ .inIterable().atIndex(importIndex)+ .addConstraintViolation();+ isValid = false;+ }+ }+ }+ return isValid;+ }+@Overridepublic boolean isValid(ConstraintValidatorContext context) {- boolean valid = true;+ boolean isValid = true;++ if (!validateImportedElements(context, jobs, it->it.getJobMap(), "job"))+ isValid = false;+ if (!validateImportedElements(context, services, it->it.getServiceMap(), "service"))+ isValid = false;+ if (!validateImportedElements(context, stepTemplates, it->it.getStepTemplateMap(), "step template"))+ isValid = false;+ if (!validateImportedElements(context, properties, it->it.getPropertyMap(), "property"))+ isValid = false;Set<String> jobNames = new HashSet<>();for (Job job: jobs) {if (!jobNames.add(job.getName())) {- context.buildConstraintViolationWithTemplate("Duplicate names found: " + job.getName())+ context.buildConstraintViolationWithTemplate("Duplicate job name (" + job.getName() + ")").addPropertyNode(PROP_JOBS).addConstraintViolation();- valid = false;+ isValid = false;}}-- for (int i=0; i<jobs.size(); i++) {- Job job = jobs.get(i);-- int j=1;- for (JobDependency dependency: job.getJobDependencies()) {- Job dependencyJob = getJobMap().get(dependency.getJobName());- if (dependencyJob != null) {- try {- ParamSupply.validateParams(null, dependencyJob.getParamSpecs(), dependency.getJobParams());- } catch (ValidationException e) {- String message = "Item #" + j + ": Error validating parameters of dependency job '"- + dependencyJob.getName() + "': " + e.getMessage();- context.buildConstraintViolationWithTemplate(message)- .addPropertyNode(PROP_JOBS).addPropertyNode(Job.PROP_JOB_DEPENDENCIES)- .inIterable().atIndex(i)- .addConstraintViolation();- valid = false;+ Set<String> serviceNames = new HashSet<>();+ for (Service service: services) {+ if (!serviceNames.add(service.getName())) {+ context.buildConstraintViolationWithTemplate("Duplicate service name (" + service.getName() + ")")+ .addPropertyNode(PROP_SERVICES).addConstraintViolation();+ isValid = false;+ }+ }+ Set<String> stepTemplateNames = new HashSet<>();+ for (StepTemplate template: stepTemplates) {+ if (!stepTemplateNames.add(template.getName())) {+ context.buildConstraintViolationWithTemplate("Duplicate template name (" + template.getName() + ")")+ .addPropertyNode(PROP_STEP_TEMPLATES).addConstraintViolation();+ isValid = false;+ }+ }+ Set<String> propertyNames = new HashSet<>();+ for (Property property: properties) {+ if (!propertyNames.add(property.getName())) {+ context.buildConstraintViolationWithTemplate("Duplicate property name (" + property.getName() + ")")+ .addPropertyNode(PROP_PROPERTIES).addConstraintViolation();+ isValid = false;+ }+ }+ Set<String> importProjectNames = new HashSet<>();+ for (Import aImport: imports) {+ if (!importProjectNames.add(aImport.getProjectName())) {+ context.buildConstraintViolationWithTemplate("Duplicate import (" + aImport.getProjectName() + ")")+ .addPropertyNode(PROP_IMPORTS).addConstraintViolation();+ isValid = false;+ }+ }++ if (isValid) {+ for (StepTemplate template: getStepTemplateMap().values()) {+ int templateIndex = stepTemplates.indexOf(template);+ for (int stepIndex=0; stepIndex<template.getSteps().size(); stepIndex++) {+ Step step = template.getSteps().get(stepIndex);+ if (step instanceof UseTemplateStep) {+ try {+ checkTemplateUsages((UseTemplateStep) step, new ArrayList<>());+ } catch (Exception e) {+ if (templateIndex != -1) {+ context.buildConstraintViolationWithTemplate(e.getMessage())+ .addPropertyNode(PROP_STEP_TEMPLATES)+ .addPropertyNode(StepTemplate.PROP_STEPS)+ .inIterable().atIndex(templateIndex)+ .addPropertyNode(UseTemplateStep.PROP_TEMPLATE_NAME)+ .inIterable().atIndex(stepIndex)+ .addConstraintViolation();+ } else {+ int importIndex = getImportIndex(template.getName(), it->it.getStepTemplateMap());+ String errorMessage = String.format("Error validating imported step template (step template: %s, error message: %s)",+ template.getName(), e.getMessage());+ context.buildConstraintViolationWithTemplate(errorMessage)+ .addPropertyNode(PROP_IMPORTS)+ .addBeanNode()+ .inIterable().atIndex(importIndex)+ .addConstraintViolation();+ }+ isValid = false;+ }}- } else {- context.buildConstraintViolationWithTemplate("Dependency job not found: " + dependency.getJobName())- .addPropertyNode("jobs").addPropertyNode(Job.PROP_JOB_DEPENDENCIES)- .inIterable().atIndex(i)- .addConstraintViolation();- valid = false;- }- List<String> dependencyChain = Lists.newArrayList(job.getName());- if (hasCircularDependencies(dependencyChain, dependency.getJobName())) {- context.buildConstraintViolationWithTemplate("Circular dependencies found: " + dependencyChain)- .addPropertyNode(PROP_JOBS).addPropertyNode(Job.PROP_JOB_DEPENDENCIES)- .inIterable().atIndex(i)- .addConstraintViolation();- valid = false;}- j++;}- j=1;- for (JobTrigger trigger: job.getTriggers()) {+ for (Job job: getJobMap().values()) {+ int jobIndex = jobs.indexOf(job);try {- ParamSupply.validateParams(null, job.getParamSpecs(), trigger.getParams());+ checkDependencies(job, new ArrayList<>());} catch (Exception e) {- String message = "Item #" + j + ": Error validating job parameters: " + e.getMessage();- context.buildConstraintViolationWithTemplate(message)- .addPropertyNode(PROP_JOBS).addPropertyNode(Job.PROP_TRIGGERS)- .inIterable().atIndex(i)+ if (jobIndex != -1) {+ context.buildConstraintViolationWithTemplate(e.getMessage())+ .addPropertyNode(PROP_JOBS)+ .addPropertyNode(Job.PROP_JOB_DEPENDENCIES)+ .inIterable().atIndex(jobIndex)+ .addConstraintViolation();+ } else {+ int importIndex = getImportIndex(job.getName(), it->it.getJobMap());+ String errorMessage = String.format("Error validating imported job (job: %s, error message: %s)",+ job.getName(), e.getMessage());+ context.buildConstraintViolationWithTemplate(errorMessage)+ .addPropertyNode(PROP_IMPORTS)+ .addBeanNode()+ .inIterable().atIndex(importIndex).addConstraintViolation();- valid = false;+ }+ isValid = false;}- j++;- }-- if (job.getRetryCondition() != null) {- try {- RetryCondition.parse(job, job.getRetryCondition());- } catch (Exception e) {- String message = e.getMessage();- if (message == null)- message = "Malformed retry condition";- context.buildConstraintViolationWithTemplate(message)- .addPropertyNode(PROP_JOBS).addPropertyNode(Job.PROP_RETRY_CONDITION)- .inIterable().atIndex(i)- .addConstraintViolation();- valid = false;++ for (String serviceName: job.getRequiredServices()) {+ if (!getServiceMap().containsKey(serviceName)) {+ context.buildConstraintViolationWithTemplate("Undefined service (" + serviceName + ")")+ .addPropertyNode(PROP_JOBS)+ .addPropertyNode(Job.PROP_REQUIRED_SERVICES)+ .inIterable().atIndex(jobIndex)+ .addConstraintViolation();+ isValid = false;+ }+ }++ for (int stepIndex=0; stepIndex<job.getSteps().size(); stepIndex++) {+ Step step = job.getSteps().get(stepIndex);+ if (step instanceof UseTemplateStep) {+ try {+ checkTemplateUsages((UseTemplateStep) step, new ArrayList<>());+ } catch (Exception e) {+ if (jobIndex != -1) {+ context.buildConstraintViolationWithTemplate(e.getMessage())+ .addPropertyNode(PROP_JOBS)+ .addPropertyNode(Job.PROP_STEPS)+ .inIterable().atIndex(jobIndex)+ .addPropertyNode(UseTemplateStep.PROP_TEMPLATE_NAME)+ .inIterable().atIndex(stepIndex)+ .addConstraintViolation();+ } else {+ int importIndex = getImportIndex(job.getName(), it->it.getJobMap());+ String errorMessage = String.format("Error validating imported job (job: %s, location: steps[%d].templateName, error message: %s)",+ job.getName(), stepIndex, e.getMessage());+ context.buildConstraintViolationWithTemplate(errorMessage)+ .addPropertyNode(PROP_IMPORTS)+ .addBeanNode()+ .inIterable().atIndex(importIndex)+ .addConstraintViolation();+ }+ isValid = false;+ }+ }}}-- j=1;- for (PostBuildAction action: job.getPostBuildActions()) {- try {- action.validateWithContext(this, job);- } catch (Exception e) {- context.buildConstraintViolationWithTemplate("Item #" + j + ": " + e.getMessage())- .addPropertyNode(PROP_JOBS).addPropertyNode(Job.PROP_POST_BUILD_ACTIONS)- .inIterable().atIndex(i)- .addConstraintViolation();- valid = false;+ }++ if (isValid) {+ // Build spec and jobs are valid so far, we can do more validations with them safely+ for (Job job: getJobMap().values()) {+ int jobIndex = jobs.indexOf(job);+ for (int actionIndex=0; actionIndex<job.getPostBuildActions().size(); actionIndex++) {+ try {+ job.getPostBuildActions().get(actionIndex).validateWith(this, job);+ } catch (Exception e) {+ if (jobIndex != -1) {+ String errorMessage = String.format("Error validating post build action (index: %d, error message: %s)",+ actionIndex+1, e.getMessage());+ context.buildConstraintViolationWithTemplate(errorMessage)+ .addPropertyNode(PROP_JOBS)+ .addPropertyNode(Job.PROP_POST_BUILD_ACTIONS)+ .inIterable().atIndex(jobIndex)+ .addConstraintViolation();+ } else {+ int importIndex = getImportIndex(job.getName(), it->it.getJobMap());+ String errorMessage = String.format("Error validating imported job (job: %s, error message: %s)",+ job.getName(), e.getMessage());+ context.buildConstraintViolationWithTemplate(errorMessage)+ .addPropertyNode(PROP_IMPORTS)+ .addBeanNode()+ .inIterable().atIndex(importIndex)+ .addConstraintViolation();+ }+ isValid = false;+ }}- j++;}}- if (!valid)+ if (!isValid)context.disableDefaultConstraintViolation();- return valid;+ return isValid;}- private boolean hasCircularDependencies(List<String> dependencyChain, String jobName) {- if (dependencyChain.iterator().next().equals(jobName)) {- dependencyChain.add(jobName);- return true;- } else if (dependencyChain.contains(jobName)) {- // loop not at start of chain will be detected as a separate violation- return false;+ private void checkTemplateUsages(UseTemplateStep step, List<String> templateChain) {+ if(templateChain.contains(step.getTemplateName())) {+ templateChain.add(step.getTemplateName());+ throw new ValidationException("Circular template usages (" + templateChain + ")");} else {- dependencyChain.add(jobName);- Job job = getJobMap().get(jobName);- if (job != null) {- for (JobDependency dependency: job.getJobDependencies()) {- if (hasCircularDependencies(new ArrayList<>(dependencyChain), dependency.getJobName()))- return true;+ StepTemplate template = getStepTemplateMap().get(step.getTemplateName());+ if (template != null) {+ if (templateChain.isEmpty()) {+ try {+ ParamUtils.validateParams(template.getParamSpecs(), step.getParams());+ } catch (Exception e) {+ throw new ValidationException(String.format("Error validating step template parameters (%s)", e.getMessage()));+ }}- }- return false;+ templateChain.add(step.getTemplateName());+ for (Step templateStep: template.getSteps()) {+ if (templateStep instanceof UseTemplateStep)+ checkTemplateUsages((UseTemplateStep) templateStep, new ArrayList<>(templateChain));+ }+ } else if (templateChain.isEmpty()) {+ throw new ValidationException("Step template not found (" + step.getTemplateName() + ")");+ }}}- public static List<InputSuggestion> suggestVariables(String matchWith) {- Component component = ComponentContext.get().getComponent();- List<InputSuggestion> suggestions = new ArrayList<>();- ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();- BuildSpecAware buildSpecAware = WicketUtils.findInnermost(component, BuildSpecAware.class);- if (buildSpecAware != null) {- BuildSpec buildSpec = buildSpecAware.getBuildSpec();- if (buildSpec != null) {- JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);- if (jobAware != null) {- Job job = jobAware.getJob();- if (job != null) {- RevCommit commit;- if (page.getBlobIdent().revision != null)- commit = page.getCommit();- else- commit = null;- suggestions.addAll(SuggestionUtils.suggestVariables(- page.getProject(), commit, buildSpec, job, matchWith));+ private void checkDependencies(Job job, List<String> dependencyChain) {+ for (JobDependency dependency: job.getJobDependencies()) {+ if (dependencyChain.contains(dependency.getJobName())) {+ dependencyChain.add(dependency.getJobName());+ throw new ValidationException("Circular dependencies (" + dependencyChain + ")");+ } else {+ Job dependencyJob = getJobMap().get(dependency.getJobName());+ if (dependencyJob != null) {+ if (dependencyChain.isEmpty()) {+ try {+ ParamUtils.validateParams(dependencyJob.getParamSpecs(), dependency.getJobParams());+ } catch (ValidationException e) {+ String message = String.format("Error validating dependency job parameters (dependency job: %s, error message: %s)",+ dependencyJob.getName(), e.getMessage());+ throw new ValidationException(message);+ }}+ List<String> newDependencyChain = new ArrayList<>(dependencyChain);+ newDependencyChain.add(dependency.getJobName());+ checkDependencies(dependencyJob, newDependencyChain);+ } else if (dependencyChain.isEmpty()) {+ throw new ValidationException("Dependency job not found (" + dependency.getJobName() + ")");}}}+ }++ public static List<InputCompletion> suggestOverrides(List<String> imported, InputStatus status) {+ List<InputCompletion> completions = new ArrayList<>();+ String matchWith = status.getContentBeforeCaret().toLowerCase();+ for (String each: imported) {+ LinearRange match = LinearRange.match(each, matchWith);+ if (match != null) {+ completions.add(new InputCompletion(each, each + status.getContentAfterCaret(),+ each.length(), "override imported", match));+ }+ }++ return completions;+ }++ @Nullable+ public static BuildSpec get() {+ Component component = ComponentContext.get().getComponent();+ BuildSpecAware buildSpecAware = WicketUtils.findInnermost(component, BuildSpecAware.class);+ if (buildSpecAware != null)+ return buildSpecAware.getBuildSpec();+ else+ return null;+ }++ public static List<InputSuggestion> suggestVariables(String matchWith) {+ List<InputSuggestion> suggestions = new ArrayList<>();+ BuildSpec buildSpec = get();+ if (buildSpec != null) {+ ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();+ suggestions.addAll(SuggestionUtils.suggestVariables(+ page.getProject(), buildSpec, ParamSpec.list(), matchWith));+ }return suggestions;}@@ -311,9 +561,9 @@ public class BuildSpec implements Serializable, Validatable {try {return SerializationUtils.deserialize(parseCache.getUnchecked(buildSpecString));} catch (Exception e) {- InvalidBuildSpecException invalidBuildSpecException = ExceptionUtils.find(e, InvalidBuildSpecException.class);- if (invalidBuildSpecException != null)- throw invalidBuildSpecException;+ BuildSpecParseException parseException = ExceptionUtils.find(e, BuildSpecParseException.class);+ if (parseException != null)+ throw parseException;elsethrow e;}@@ -426,4 +676,80 @@ public class BuildSpec implements Serializable, Validatable {}}+ @SuppressWarnings("unused")+ private void migrate5(VersionedYamlDoc doc, Stack<Integer> versions) {+ List<Node> newServiceNodes = new ArrayList<>();+ for (NodeTuple specTuple: doc.getValue()) {+ if (((ScalarNode)specTuple.getKeyNode()).getValue().equals("jobs")) {+ SequenceNode jobsNode = (SequenceNode) specTuple.getValueNode();+ for (Node jobsNodeItem: jobsNode.getValue()) {+ MappingNode jobNode = (MappingNode) jobsNodeItem;+ Node imageNode = null;+ Node commandsNode = null;+ Node servicesNode = null;+ String jobName = null;+ for (Iterator<NodeTuple> itJobTuple = jobNode.getValue().iterator(); itJobTuple.hasNext();) {+ NodeTuple jobTuple = itJobTuple.next();+ String jobTupleKey = ((ScalarNode)jobTuple.getKeyNode()).getValue();+ if (jobTupleKey.equals("name")) {+ jobName = ((ScalarNode)jobTuple.getValueNode()).getValue();+ } else if (jobTupleKey.equals("image")) {+ imageNode = jobTuple.getValueNode();+ itJobTuple.remove();+ } else if (jobTupleKey.equals("commands")) {+ commandsNode = jobTuple.getValueNode();+ itJobTuple.remove();+ } else if (jobTupleKey.equals("services")) {+ servicesNode = jobTuple.getValueNode();+ itJobTuple.remove();+ }+ }++ Preconditions.checkState(jobName != null && imageNode != null && commandsNode != null);++ List<NodeTuple> stepTuples = new ArrayList<>();+ stepTuples.add(new NodeTuple(new ScalarNode(Tag.STR, "image"), imageNode));+ stepTuples.add(new NodeTuple(new ScalarNode(Tag.STR, "commands"), commandsNode));+ stepTuples.add(new NodeTuple(+ new ScalarNode(Tag.STR, "condition"),+ new ScalarNode(Tag.STR, "ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL")));+ Node stepNode = new MappingNode(new Tag("!CommandStep"), stepTuples, FlowStyle.BLOCK);+ Node stepsNode = new SequenceNode(Tag.SEQ, Lists.newArrayList(stepNode), FlowStyle.BLOCK);+ NodeTuple stepsTuple = new NodeTuple(new ScalarNode(Tag.STR, "steps"), stepsNode);+ jobNode.getValue().add(stepsTuple);++ if (servicesNode != null) {+ List<Node> serviceNameNodes = new ArrayList<>();+ for (Node serviceNodeItem: ((SequenceNode) servicesNode).getValue()) {+ MappingNode serviceNode = (MappingNode) serviceNodeItem;+ List<NodeTuple> newServiceTuples = new ArrayList<>();+ for (NodeTuple serviceTuple: serviceNode.getValue()) {+ if (((ScalarNode)serviceTuple.getKeyNode()).getValue().equals("name")) {+ String newServiceName = jobName + "-"+ + ((ScalarNode)serviceTuple.getValueNode()).getValue();+ serviceNameNodes.add(new ScalarNode(Tag.STR, newServiceName));+ newServiceTuples.add(new NodeTuple(+ new ScalarNode(Tag.STR, "name"),+ new ScalarNode(Tag.STR, newServiceName)));+ } else {+ newServiceTuples.add(serviceTuple);+ }+ }+ newServiceNodes.add(new MappingNode(Tag.MAP, newServiceTuples, FlowStyle.BLOCK));+ }+ jobNode.getValue().add(new NodeTuple(+ new ScalarNode(Tag.STR, "requiredServices"),+ new SequenceNode(Tag.SEQ, serviceNameNodes, FlowStyle.BLOCK)));+ }+ }+ }+ }++ if (!newServiceNodes.isEmpty()) {+ doc.getValue().add(new NodeTuple(+ new ScalarNode(Tag.STR, "services"),+ new SequenceNode(Tag.SEQ, newServiceNodes, FlowStyle.BLOCK)));+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecImport.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecImport.javadeleted file mode 100644index 869dcd3ab8..0000000000--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecImport.java+++ /dev/null@@ -1,120 +0,0 @@-package io.onedev.server.buildspec;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;-import java.util.stream.Collectors;--import javax.annotation.Nullable;--import org.hibernate.validator.constraints.NotEmpty;--import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.Project;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.security.permission.AccessProject;-import io.onedev.server.util.EditContext;-import io.onedev.server.web.editable.annotation.ChoiceProvider;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.Interpolative;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.util.SuggestionUtils;-import io.onedev.server.web.util.WicketUtils;--@Editable-public class BuildSpecImport implements Serializable {-- private static final long serialVersionUID = 1L;-- private String projectName;-- private String tag;-- private String accessTokenSecret;-- // change Named("projectName") also if change name of this property- @Editable(order=100, name="Project", description="Specify project to import build spec from")- @ChoiceProvider("getProjectChoices")- @NotEmpty- public String getProjectName() {- return projectName;- }-- public void setProjectName(String projectName) {- this.projectName = projectName;- }-- @SuppressWarnings("unused")- private static List<String> getProjectChoices() {- List<String> choices = new ArrayList<>();- Project project = ((ProjectPage)WicketUtils.getPage()).getProject();- for (Project each: OneDev.getInstance(ProjectManager.class).getPermittedProjects(new AccessProject())) {- if (!each.equals(project))- choices.add(each.getName());- }-- Collections.sort(choices);-- return choices;- }-- @Nullable- private static Project getInputProject() {- String projectName = (String) EditContext.get().getInputValue("projectName");- if (projectName != null) {- Project project = OneDev.getInstance(ProjectManager.class).find(projectName);- if (project != null && SecurityUtils.canReadCode(project))- return project;- }- return null;- }-- @Editable(order=200, description="Specify tag in above project to import build spec from")- @Interpolative(variableSuggester="suggestTags", literalSuggester="suggestTags")- @NotEmpty- public String getTag() {- return tag;- }-- public void setTag(String tag) {- this.tag = tag;- }-- @SuppressWarnings("unused")- private static List<InputSuggestion> suggestTags(String matchWith) {- Project project = getInputProject();- if (project != null)- return SuggestionUtils.suggestTags(project, matchWith);- else- return new ArrayList<>();- }-- @SuppressWarnings("unused")- private static List<InputSuggestion> suggestVariables(String matchWith) {- return BuildSpec.suggestVariables(matchWith);- }-- @Editable(order=500, description="Specify a secret to be used as access token to import build spec "- + "from specified project. Leave empty if the project code can be read anonymously")- @ChoiceProvider("getAccessTokenSecretChoices")- @Nullable- @NameOfEmptyValue("Access Anonymously")- public String getAccessTokenSecret() {- return accessTokenSecret;- }-- public void setAccessTokenSecret(String accessTokenSecret) {- this.accessTokenSecret = accessTokenSecret;- }-- @SuppressWarnings("unused")- private static List<String> getAccessTokenSecretChoices() {- return Project.get().getBuildSetting().getJobSecrets()- .stream().map(it->it.getName()).collect(Collectors.toList());- }--}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/InvalidBuildSpecException.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecParseException.javasimilarity index 54%rename from server-core/src/main/java/io/onedev/server/buildspec/InvalidBuildSpecException.javarename to server-core/src/main/java/io/onedev/server/buildspec/BuildSpecParseException.javaindex 227a882952..f859ee155d 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/InvalidBuildSpecException.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecParseException.java@@ -2,11 +2,11 @@ package io.onedev.server.buildspec;import io.onedev.commons.utils.ExplicitException;-public class InvalidBuildSpecException extends ExplicitException {+public class BuildSpecParseException extends ExplicitException {private static final long serialVersionUID = 1L;- public InvalidBuildSpecException(String message, Throwable cause) {+ public BuildSpecParseException(String message, Throwable cause) {super(message, cause);}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Import.java b/server-core/src/main/java/io/onedev/server/buildspec/Import.javanew file mode 100644index 0000000000..5969f640af--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/Import.java@@ -0,0 +1,196 @@+package io.onedev.server.buildspec;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;+import java.util.Stack;++import javax.annotation.Nullable;+import javax.validation.ConstraintValidatorContext;+import javax.validation.ConstraintViolation;+import javax.validation.ValidationException;+import javax.validation.Validator;++import org.eclipse.jgit.revwalk.RevCommit;+import org.hibernate.validator.constraints.NotEmpty;++import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.AccessProject;+import io.onedev.server.security.permission.ProjectPermission;+import io.onedev.server.security.permission.ReadCode;+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.web.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.util.SuggestionUtils;+import io.onedev.server.web.util.WicketUtils;++@Editable+@ClassValidating+public class Import implements Serializable, Validatable {++ private static final long serialVersionUID = 1L;++ private String projectName;++ private String tag;++ private transient BuildSpec buildSpec;++ private static ThreadLocal<Stack<String>> importChain = new ThreadLocal<Stack<String>>() {++ @Override+ protected Stack<String> initialValue() {+ return new Stack<>();+ }++ };++ // change Named("projectName") also if change name of this property+ @Editable(order=100, name="Project", description="Specify project to import build spec from. "+ + "Default role of this project should have <tt>read code</tt> permission")+ @ChoiceProvider("getProjectChoices")+ @NotEmpty+ public String getProjectName() {+ return projectName;+ }++ public void setProjectName(String projectName) {+ this.projectName = projectName;+ }++ @SuppressWarnings("unused")+ private static List<String> getProjectChoices() {+ List<String> choices = new ArrayList<>();+ Project project = ((ProjectPage)WicketUtils.getPage()).getProject();+ for (Project each: OneDev.getInstance(ProjectManager.class).getPermittedProjects(new AccessProject())) {+ if (!each.equals(project))+ choices.add(each.getName());+ }++ Collections.sort(choices);++ return choices;+ }++ @Nullable+ private static Project getInputProject() {+ String projectName = (String) EditContext.get().getInputValue("projectName");+ if (projectName != null) {+ Project project = OneDev.getInstance(ProjectManager.class).find(projectName);+ if (project != null && SecurityUtils.canReadCode(project))+ return project;+ }+ return null;+ }++ @Editable(order=200, description="Specify tag in above project to import build spec from")+ @Interpolative(variableSuggester="suggestTags", literalSuggester="suggestTags")+ @NotEmpty+ public String getTag() {+ return tag;+ }++ public void setTag(String tag) {+ this.tag = tag;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestTags(String matchWith) {+ Project project = getInputProject();+ if (project != null)+ return SuggestionUtils.suggestTags(project, matchWith);+ else+ return new ArrayList<>();+ }++ private boolean canReadCode(Project project) {+ return SecurityUtils.asAnonymous().isPermitted(new ProjectPermission(project, new ReadCode()));+ }++ public BuildSpec getBuildSpec() {+ if (buildSpec == null) {+ Project project = getProject();++ if (canReadCode(project)) {+ RevCommit commit = project.getRevCommit(tag, false);+ if (commit == null) {+ String errorMessage = String.format("Unable to find tag to import build spec (project: %s, tag: %s)",+ projectName, tag);+ throw new ExplicitException(errorMessage);+ }+ try {+ buildSpec = project.getBuildSpec(commit);+ } catch (BuildSpecParseException e) {+ String errorMessage = String.format("Malformed build spec (project: %s, tag: %s)",+ projectName, tag);+ throw new ExplicitException(errorMessage);+ }+ if (buildSpec == null) {+ String errorMessage = String.format("Build spec not defined (project: %s, tag: %s)",+ projectName, tag);+ throw new ExplicitException(errorMessage);+ }+ } else {+ String errorMessage = String.format("Unable to read build spec. Make sure default role of the project "+ + "has permission to read code (project: %s, tag: %s)", projectName, tag);+ throw new ExplicitException(errorMessage);+ }++ }+ return buildSpec;+ }++ @Override+ public boolean isValid(ConstraintValidatorContext context) {+ if (importChain.get().contains(projectName)) {+ List<String> circular = new ArrayList<>(importChain.get());+ circular.add(projectName);+ String errorMessage = "Circular build spec imports (" + circular + ")";+ context.disableDefaultConstraintViolation();+ context.buildConstraintViolationWithTemplate(errorMessage).addConstraintViolation();+ return false;+ } else {+ importChain.get().push(projectName);+ try {+ Validator validator = OneDev.getInstance(Validator.class);+ for (int i=0; i<getBuildSpec().getImports().size(); i++) {+ Import aImport = getBuildSpec().getImports().get(i);+ for (ConstraintViolation<Import> violation: validator.validate(aImport)) {+ String location = "imports[" + i + "]";+ if (violation.getPropertyPath().toString().length() != 0)+ location += "." + violation.getPropertyPath();+ String message = String.format("Error validating imported build spec (project: %s, location: %s, message: %s)",+ projectName, location, violation.getMessage());+ throw new ValidationException(message);+ }+ }+ return true;+ } catch (Exception e) {+ context.disableDefaultConstraintViolation();+ context.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();+ return false;+ } finally {+ importChain.get().pop();+ }+ }+ }++ public Project getProject() {+ Project project = OneDev.getInstance(ProjectManager.class).find(projectName);+ if (project == null)+ throw new ExplicitException("Unable to find project to import build spec (" + projectName + ")");+ else+ return project;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/ParamSpecAware.java b/server-core/src/main/java/io/onedev/server/buildspec/ParamSpecAware.javanew file mode 100644index 0000000000..6d79187889--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/ParamSpecAware.java@@ -0,0 +1,11 @@+package io.onedev.server.buildspec;++import java.util.List;++import io.onedev.server.buildspec.param.spec.ParamSpec;++public interface ParamSpecAware {++ List<ParamSpec> getParamSpecs();++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Property.java b/server-core/src/main/java/io/onedev/server/buildspec/Property.javaindex 5cc4f2287f..a6446a17eb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/Property.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/Property.java@@ -1,13 +1,20 @@package io.onedev.server.buildspec;import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputCompletion;+import io.onedev.commons.codeassist.InputStatus;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;+import io.onedev.server.web.editable.annotation.SuggestionProvider;@Editable-public class Property implements Serializable {+public class Property implements NamedElement, Serializable {private static final long serialVersionUID = 1L;@@ -16,7 +23,9 @@ public class Property implements Serializable {private String value;@Editable(order=100)+ @SuggestionProvider("getNameSuggestions")@NotEmpty+ @Overridepublic String getName() {return name;}@@ -25,7 +34,19 @@ public class Property implements Serializable {this.name = name;}+ @SuppressWarnings("unused")+ private static List<InputCompletion> getNameSuggestions(InputStatus status) {+ BuildSpec buildSpec = BuildSpec.get();+ if (buildSpec != null) {+ List<String> candidates = new ArrayList<>(buildSpec.getPropertyMap().keySet());+ buildSpec.getProperties().forEach(it->candidates.remove(it.getName()));+ return BuildSpec.suggestOverrides(candidates, status);+ }+ return new ArrayList<>();+ }+@Editable(order=200)+ @Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getValue() {return value;@@ -35,4 +56,9 @@ public class Property implements Serializable {this.value = value;}+ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestVariables(String matchWith) {+ return BuildSpec.suggestVariables(matchWith);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.java b/server-core/src/main/java/io/onedev/server/buildspec/Service.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/buildspec/job/JobService.javarename to server-core/src/main/java/io/onedev/server/buildspec/Service.javaindex 10db2edd1f..a330d7cb37 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/Service.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.job;+package io.onedev.server.buildspec;import java.io.Serializable;import java.util.ArrayList;@@ -6,14 +6,17 @@ import java.util.List;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputCompletion;+import io.onedev.commons.codeassist.InputStatus;import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.buildspec.job.EnvVar;import io.onedev.server.util.validation.annotation.DnsName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;+import io.onedev.server.web.editable.annotation.SuggestionProvider;@Editable-public class JobService implements Serializable {+public class Service implements NamedElement, Serializable {private static final long serialVersionUID = 1L;@@ -32,9 +35,10 @@ public class JobService implements Serializable {private String memoryRequirement = "128m";@Editable(order=100, description="Specify name of the service, which will be used as host name to access the service")- @Interpolative(variableSuggester="suggestVariables")+ @SuggestionProvider("getNameSuggestions")@DnsName@NotEmpty+ @Overridepublic String getName() {return name;}@@ -42,6 +46,17 @@ public class JobService implements Serializable {public void setName(String name) {this.name = name;}++ @SuppressWarnings("unused")+ private static List<InputCompletion> getNameSuggestions(InputStatus status) {+ BuildSpec buildSpec = BuildSpec.get();+ if (buildSpec != null) {+ List<String> candidates = new ArrayList<>(buildSpec.getServiceMap().keySet());+ buildSpec.getServices().forEach(it->candidates.remove(it.getName()));+ return BuildSpec.suggestOverrides(candidates, status);+ }+ return new ArrayList<>();+ }@Editable(order=200, description="Specify docker image of the service")@Interpolative(variableSuggester="suggestVariables")diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex 2c1c138c8c..c6ed11603f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -8,7 +8,6 @@ import java.util.Date;import java.util.HashMap;import java.util.HashSet;import java.util.Iterator;-import java.util.LinkedHashSet;import java.util.List;import java.util.Map;import java.util.Optional;@@ -51,19 +50,22 @@ import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;+import io.onedev.k8shelper.Action;import io.onedev.k8shelper.CacheInstance;import io.onedev.k8shelper.CloneInfo;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.buildspec.Service;import io.onedev.server.buildspec.job.action.PostBuildAction;import io.onedev.server.buildspec.job.action.condition.ActionCondition;import io.onedev.server.buildspec.job.log.LogManager;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;-import io.onedev.server.buildspec.job.paramspec.SecretParam;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;import io.onedev.server.buildspec.job.retrycondition.RetryCondition;import io.onedev.server.buildspec.job.trigger.JobTrigger;import io.onedev.server.buildspec.job.trigger.ScheduleTrigger;+import io.onedev.server.buildspec.param.ParamUtils;+import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.buildspec.param.spec.SecretParam;+import io.onedev.server.buildspec.step.Step;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.entitymanager.ProjectManager;@@ -105,6 +107,7 @@ import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.util.CommitAware;import io.onedev.server.util.MatrixRunner;import io.onedev.server.util.SimpleLogger;+import io.onedev.server.util.interpolative.VariableInterpolator;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.schedule.SchedulableTask;import io.onedev.server.util.schedule.TaskScheduler;@@ -175,7 +178,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizProject.push(project);try {for (ConstraintViolation<?> violation: validator.validate(project.getBuildSpec(commitId))) {- String message = String.format("Error validating build spec (project: %s, commit: %s, property: %s, message: %s)",+ String message = String.format("Error validating build spec (project: %s, commit: %s, location: %s, message: %s)",project.getName(), commitId.name(), violation.getPropertyPath(), violation.getMessage());throw new ExplicitException(message);}@@ -204,14 +207,14 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizvalidate(project, commitId);- return submit(project, commitId, jobName, paramMap, reason, new LinkedHashSet<>());+ return doSubmit(project, commitId, jobName, paramMap, reason);} catch (Throwable e) {throw ExceptionUtils.unchecked(e);}}- private Build submit(Project project, ObjectId commitId, String jobName,- Map<String, List<String>> paramMap, SubmitReason reason, Set<String> checkedJobNames) {+ private Build doSubmit(Project project, ObjectId commitId, String jobName,+ Map<String, List<String>> paramMap, SubmitReason reason) {ScriptIdentity.push(new JobIdentity(project, commitId));try {@@ -226,13 +229,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizbuild.setRefName(reason.getRefName());build.setRequest(reason.getPullRequest());- ParamSupply.validateParamMap(build.getJob().getParamSpecMap(), paramMap);+ ParamUtils.validateParamMap(build.getJob().getParamSpecs(), paramMap);- if (!checkedJobNames.add(jobName)) {- String message = String.format("Circular job dependencies found (%s)", checkedJobNames);- throw new ExplicitException(message);- }-Map<String, List<String>> paramMapToQuery = new HashMap<>(paramMap);for (ParamSpec paramSpec: build.getJob().getParamSpecs()) {if (paramSpec instanceof SecretParam)@@ -264,18 +262,21 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}}+ VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());for (JobDependency dependency: build.getJob().getJobDependencies()) {- new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(build, dependency.getJobParams())) {+ JobDependency interpolated = interpolator.interpolateProperties(dependency);+ new MatrixRunner<List<String>>(ParamUtils.getParamMatrix(build, build.getParamCombination(),+ interpolated.getJobParams())) {@Override- public void run(Map<String, List<String>> params) {- Build dependencyBuild = submit(project, commitId, dependency.getJobName(),- params, reason, new LinkedHashSet<>(checkedJobNames));+ public void run(Map<String, List<String>> paramMap) {+ Build dependencyBuild = doSubmit(project, commitId,+ interpolated.getJobName(), paramMap, reason);BuildDependence dependence = new BuildDependence();dependence.setDependency(dependencyBuild);dependence.setDependent(build);- dependence.setRequireSuccessful(dependency.isRequireSuccessful());- dependence.setArtifacts(build.interpolate(dependency.getArtifacts()));+ dependence.setRequireSuccessful(interpolated.isRequireSuccessful());+ dependence.setArtifacts(interpolated.getArtifacts());build.getDependencies().add(dependence);}@@ -283,6 +284,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}for (ProjectDependency dependency: build.getJob().getProjectDependencies()) {+ dependency = interpolator.interpolateProperties(dependency);Project dependencyProject = projectManager.find(dependency.getProjectName());if (dependencyProject == null)throw new ExplicitException("Unable to find dependency project: " + dependency.getProjectName());@@ -299,7 +301,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz} else {subject = SecurityUtils.asSubject(0L);}- String buildNumberStr = build.interpolate(dependency.getBuildNumber());+ String buildNumberStr = dependency.getBuildNumber();if (buildNumberStr.startsWith("#"))buildNumberStr = buildNumberStr.substring(1);Long buildNumber = Long.parseLong(buildNumberStr);@@ -319,7 +321,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizBuildDependence dependence = new BuildDependence();dependence.setDependency(dependencyBuild);dependence.setDependent(build);- dependence.setArtifacts(build.interpolate(dependency.getArtifacts()));+ dependence.setArtifacts(dependency.getArtifacts());build.getDependencies().add(dependence);}@@ -350,7 +352,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizCollection<String> jobSecretsToMask = Sets.newHashSet(jobToken);BuildSpec buildSpec = build.getProject().getBuildSpec(build.getCommitId());- Job job = (Job) VariableInterpolator.installInterceptor(build.getJob());+ Job job = build.getJob();JobExecutor executor = getJobExecutor(build);if (executor != null) {@@ -376,7 +378,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizAtomicInteger maxRetries = new AtomicInteger(0);AtomicInteger retryDelay = new AtomicInteger(0);List<CacheSpec> caches = new ArrayList<>();- List<JobService> services = new ArrayList<>();+ List<Service> services = new ArrayList<>();+ List<Action> actions = new ArrayList<>();sessionManager.run(new Runnable() {@@ -392,21 +395,34 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizdependence.getArtifacts(), serverWorkspace);}}++ VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());- if (job.getArtifacts() != null) {- PatternSet patternSet = PatternSet.parse(job.getArtifacts());+ String artifacts = interpolator.interpolate(job.getArtifacts());+ if (artifacts != null) {+ PatternSet patternSet = PatternSet.parse(artifacts);includeFiles.addAll(patternSet.getIncludes());excludeFiles.addAll(patternSet.getExcludes());}for (JobReport report: job.getReports()) {+ report = interpolator.interpolateProperties(report);PatternSet patternSet = PatternSet.parse(report.getFilePatterns());includeFiles.addAll(patternSet.getIncludes());excludeFiles.addAll(patternSet.getExcludes());}- for (CacheSpec cache: job.getCaches())- caches.add(build.interpolateProperties(cache));- for (JobService service: job.getServices())- services.add(build.interpolateProperties(service));++ for (Step step: job.getSteps()) {+ step = interpolator.interpolateProperties(step);+ actions.add(step.getAction(build, build.getParamCombination()));+ }++ for (CacheSpec cache: job.getCaches())+ caches.add(interpolator.interpolateProperties(cache));++ for (String serviceName: job.getRequiredServices()) {+ Service service = buildSpec.getServiceMap().get(serviceName);+ services.add(interpolator.interpolateProperties(service));+ }maxRetries.set(job.getMaxRetries());retryDelay.set(job.getRetryDelay());} finally {@@ -425,11 +441,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizBuild build = buildManager.load(buildId);Build.push(build);try {- return new JobContext(projectName, buildNumber, projectGitDir, job.getActions(buildSpec),- serverWorkspace, job.isRetrieveSource(), job.getCloneDepth(),- cloneInfo, job.getCpuRequirement(), job.getMemoryRequirement(),- commitId, caches, new PatternSet(includeFiles, excludeFiles),- executor.getCacheTTL(), retried.get(), services, jobLogger) {+ return new JobContext(projectName, buildNumber, projectGitDir,+ actions, serverWorkspace, job.isRetrieveSource(),+ job.getCloneDepth(), cloneInfo, job.getCpuRequirement(),+ job.getMemoryRequirement(), commitId, caches,+ new PatternSet(includeFiles, excludeFiles), executor.getCacheTTL(),+ retried.get(), services, jobLogger) {@Overridepublic void notifyJobRunning() {@@ -548,15 +565,19 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizpublic void run() {Build build = buildManager.load(buildId);Build.push(build);+ VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());try {- if (job.getArtifacts() != null) {+ String artifacts = interpolator.interpolate(job.getArtifacts());+ if (artifacts != null) {jobLogger.log("Publishing job artifacts...");- build.publishArtifacts(serverWorkspace, job.getArtifacts());+ build.publishArtifacts(serverWorkspace, artifacts);}- jobLogger.log("Processing job reports...");- for (JobReport report: job.getReports())+ jobLogger.log("Processing job reports...");+ for (JobReport report: job.getReports()) {+ report = interpolator.interpolateProperties(report);report.process(build, serverWorkspace, jobLogger);+ }} finally {Build.pop();}@@ -627,11 +648,11 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriztry {BuildSpec buildSpec = event.getProject().getBuildSpec(commitId);if (buildSpec != null) {- for (Job job: buildSpec.getJobs()) {+ for (Job job: buildSpec.getJobMap().values()) {JobTriggerMatch match = job.getTriggerMatch(event);if (match != null) {Map<String, List<List<String>>> paramMatrix =- ParamSupply.getParamMatrix(null, match.getTrigger().getParams());+ ParamUtils.getParamMatrix(null, null, match.getTrigger().getParams());Long projectId = event.getProject().getId();// run asynchrously as session may get closed due to exception@@ -852,7 +873,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizBuildSpec buildSpec = project.getBuildSpec(commitId);if (buildSpec != null) {ScheduledTimeReaches event = new ScheduledTimeReaches(project);- for (Job job: buildSpec.getJobs()) {+ for (Job job: buildSpec.getJobMap().values()) {for (JobTrigger trigger: job.getTriggers()) {if (trigger instanceof ScheduleTrigger) {ScheduleTrigger scheduledTrigger = (ScheduleTrigger) trigger;@@ -890,7 +911,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizThreadContext.bind(userManager.getSystem().asSubject());Project project = projectManager.load(projectId);- new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(null, trigger.getParams())) {+ new MatrixRunner<List<String>>(ParamUtils.getParamMatrix(null, null, trigger.getParams())) {@Overridepublic void run(Map<String, List<String>> paramMap) {@@ -1043,9 +1064,10 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizBuild build = OneDev.getInstance(BuildManager.class).load(buildId);Build.push(build);try {- Job job = (Job) VariableInterpolator.installInterceptor(build.getJob());- for (PostBuildAction action: job.getPostBuildActions()) {- if (ActionCondition.parse(job, action.getCondition()).matches(build))+ VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());+ for (PostBuildAction action: build.getJob().getPostBuildActions()) {+ action = interpolator.interpolateProperties(action);+ if (ActionCondition.parse(build.getJob(), action.getCondition()).matches(build))action.execute(build);}} catch (Throwable e) {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex a505fdecaa..bee5d2f160 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -15,6 +15,7 @@ import java.util.HashSet;import java.util.List;import java.util.Map;import java.util.Set;+import java.util.stream.Collectors;import javax.annotation.Nullable;import javax.servlet.http.HttpServletRequest;@@ -22,14 +23,16 @@ import javax.validation.ConstraintValidatorContext;import javax.validation.Valid;import javax.validation.constraints.Min;import javax.validation.constraints.NotNull;+import javax.validation.constraints.Size;import javax.ws.rs.core.HttpHeaders;import org.apache.wicket.Component;import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputCompletion;+import io.onedev.commons.codeassist.InputStatus;import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.k8shelper.Action;import io.onedev.k8shelper.KubernetesHelper;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.BuildSpecAware;@@ -37,28 +40,27 @@ import io.onedev.server.buildspec.NamedElement;import io.onedev.server.buildspec.job.action.PostBuildAction;import io.onedev.server.buildspec.job.gitcredential.DefaultCredential;import io.onedev.server.buildspec.job.gitcredential.GitCredential;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;import io.onedev.server.buildspec.job.trigger.JobTrigger;+import io.onedev.server.buildspec.param.ParamUtils;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.buildspec.step.CommandStep;import io.onedev.server.buildspec.step.Step;import io.onedev.server.event.ProjectEvent;import io.onedev.server.git.GitUtils;-import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;+import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.editable.annotation.RetryCondition;import io.onedev.server.web.editable.annotation.ShowCondition;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.util.SuggestionUtils;+import io.onedev.server.web.editable.annotation.SuggestionProvider;import io.onedev.server.web.util.WicketUtils;@Editable@@ -71,15 +73,19 @@ public class Job implements NamedElement, Serializable, Validatable {public static final String PROP_JOB_DEPENDENCIES = "jobDependencies";+ public static final String PROP_REQUIRED_SERVICES = "requiredServices";+public static final String PROP_TRIGGERS = "triggers";+ public static final String PROP_STEPS = "steps";+public static final String PROP_RETRY_CONDITION = "retryCondition";public static final String PROP_POST_BUILD_ACTIONS = "postBuildActions";private String name;- private List<Step> steps;+ private List<Step> steps = new ArrayList<>();private List<ParamSpec> paramSpecs = new ArrayList<>();@@ -93,7 +99,7 @@ public class Job implements NamedElement, Serializable, Validatable {private List<ProjectDependency> projectDependencies = new ArrayList<>();- private List<JobService> services = new ArrayList<>();+ private List<String> requiredServices = new ArrayList<>();private String artifacts;@@ -124,6 +130,7 @@ public class Job implements NamedElement, Serializable, Validatable {}@Editable(order=100, description="Specify name of the job")+ @SuggestionProvider("getNameSuggestions")@NotEmpty@Overridepublic String getName() {@@ -133,7 +140,20 @@ public class Job implements NamedElement, Serializable, Validatable {public void setName(String name) {this.name = name;}++ @SuppressWarnings("unused")+ private static List<InputCompletion> getNameSuggestions(InputStatus status) {+ BuildSpec buildSpec = BuildSpec.get();+ if (buildSpec != null) {+ List<String> candidates = new ArrayList<>(buildSpec.getJobMap().keySet());+ buildSpec.getJobs().forEach(it->candidates.remove(it.getName()));+ return BuildSpec.suggestOverrides(candidates, status);+ }+ return new ArrayList<>();+ }+ @Editable(order=200)+ @Size(min=1, max=1000, message="At least one step needs to be configured")public List<Step> getSteps() {return steps;}@@ -142,27 +162,7 @@ public class Job implements NamedElement, Serializable, Validatable {this.steps = steps;}- public List<Action> getActions(BuildSpec buildSpec) {- List<Action> actions = new ArrayList<>();- for (Step step: getSteps())- actions.add(step.getAction(buildSpec));- return actions;- }-- @SuppressWarnings("unused")- private static List<String> getVariables() {- List<String> variables = new ArrayList<>();- ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();- Project project = page.getProject();- ObjectId commitId = page.getCommit();- BuildSpec buildSpec = ComponentContext.get().getComponent().findParent(BuildSpecAware.class).getBuildSpec();- Job job = ComponentContext.get().getComponent().findParent(JobAware.class).getJob();- for (InputSuggestion suggestion: SuggestionUtils.suggestVariables(project, commitId, buildSpec, job, ""))- variables.add(suggestion.getContent());- return variables;- }-- @Editable(order=130, name="Parameter Specs", description="Optionally define parameter specifications of the job")+ @Editable(order=300, name="Parameter Specs", group="Params & Triggers", description="Optionally define parameter specifications of the job")@Validpublic List<ParamSpec> getParamSpecs() {return paramSpecs;@@ -172,7 +172,7 @@ public class Job implements NamedElement, Serializable, Validatable {this.paramSpecs = paramSpecs;}- @Editable(order=500, description="Use triggers to run the job automatically under certain conditions")+ @Editable(order=500, group="Params & Triggers", description="Use triggers to run the job automatically under certain conditions")@Validpublic List<JobTrigger> getTriggers() {return triggers;@@ -182,7 +182,7 @@ public class Job implements NamedElement, Serializable, Validatable {this.triggers = triggers;}- @Editable(order=9000, group="Source Retrieval", description="Whether or not to retrieve repository files")+ @Editable(order=250, group="Source Retrieval", description="Whether or not to retrieve repository files")public boolean isRetrieveSource() {return retrieveSource;}@@ -191,7 +191,7 @@ public class Job implements NamedElement, Serializable, Validatable {this.retrieveSource = retrieveSource;}- @Editable(order=9050, group="Source Retrieval", description="Optionally specify depth for a shallow clone in order "+ @Editable(order=251, group="Source Retrieval", description="Optionally specify depth for a shallow clone in order "+ "to speed up source retrieval")@ShowCondition("isRetrieveSourceEnabled")public Integer getCloneDepth() {@@ -202,7 +202,7 @@ public class Job implements NamedElement, Serializable, Validatable {this.cloneDepth = cloneDepth;}- @Editable(order=9060, group="Source Retrieval", description="By default code is cloned via an auto-generated credential, "+ @Editable(order=252, group="Source Retrieval", description="By default code is cloned via an auto-generated credential, "+ "which only has read permission over current project. In case the job needs to <a href='$docRoot/pages/push-in-job.md' target='_blank'>push code to server</a>, or want "+ "to <a href='$docRoot/pages/clone-submodules-via-ssh.md' target='_blank'>clone private submodules</a>, you should supply custom credential with appropriate permissions here")@ShowCondition("isRetrieveSourceEnabled")@@ -242,14 +242,29 @@ public class Job implements NamedElement, Serializable, Validatable {this.projectDependencies = projectDependencies;}- @Editable(order=9114, group="Dependencies & Services", description="Optionally define services used by this job")- @Valid- public List<JobService> getServices() {- return services;+ @Editable(order=9114, group="Dependencies & Services", description="Optionally specify services required by this job")+ @ChoiceProvider("getServiceChoices")+ public List<String> getRequiredServices() {+ return requiredServices;}- public void setServices(List<JobService> services) {- this.services = services;+ public void setRequiredServices(List<String> requiredServices) {+ this.requiredServices = requiredServices;+ }++ @SuppressWarnings("unused")+ private static List<String> getServiceChoices() {+ List<String> choices = new ArrayList<>();+ Component component = ComponentContext.get().getComponent();+ BuildSpecAware buildSpecAware = WicketUtils.findInnermost(component, BuildSpecAware.class);+ if (buildSpecAware != null) {+ BuildSpec buildSpec = buildSpecAware.getBuildSpec();+ if (buildSpec != null) {+ choices.addAll(buildSpec.getServiceMap().values().stream()+ .map(it->it.getName()).collect(Collectors.toList()));+ }+ }+ return choices;}@Editable(order=9115, group="Artifacts & Reports", description="Optionally specify files to publish as job artifacts relative to "@@ -275,7 +290,7 @@ public class Job implements NamedElement, Serializable, Validatable {this.reports = reports;}- @Editable(order=9400, group="Retry Upon Failure", description="Specify condition to retry build upon failure")+ @Editable(order=9400, group="More Settings", description="Specify condition to retry build upon failure")@NotEmpty@RetryConditionpublic String getRetryCondition() {@@ -286,7 +301,7 @@ public class Job implements NamedElement, Serializable, Validatable {this.retryCondition = retryCondition;}- @Editable(order=9410, group="Retry Upon Failure", description="Maximum of retries before giving up")+ @Editable(order=9410, group="More Settings", description="Maximum of retries before giving up")@Min(value=1, message="This value should not be less than 1")public int getMaxRetries() {return maxRetries;@@ -296,7 +311,7 @@ public class Job implements NamedElement, Serializable, Validatable {this.maxRetries = maxRetries;}- @Editable(order=9420, group="Retry Upon Failure", description="Delay for the first retry in seconds. "+ @Editable(order=9420, group="More Settings", description="Delay for the first retry in seconds. "+ "Delay of subsequent retries will be calculated using an exponential back-off "+ "based on this delay")@Min(value=1, message="This value should not be less than 1")@@ -308,7 +323,7 @@ public class Job implements NamedElement, Serializable, Validatable {this.retryDelay = retryDelay;}- @Editable(order=9200, name="CPU Requirement", group="Resource Requirements", description="Specify CPU requirement of the job. "+ @Editable(order=10050, name="CPU Requirement", group="More Settings", description="Specify CPU requirement of the job. "+ "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu' target='_blank'>kubernetes documentation</a> for details")@Interpolative(variableSuggester="suggestVariables")@NotEmpty@@ -320,7 +335,7 @@ public class Job implements NamedElement, Serializable, Validatable {this.cpuRequirement = cpuRequirement;}- @Editable(order=9300, group="Resource Requirements", description="Specify memory requirement of the job. "+ @Editable(order=10060, group="More Settings", description="Specify memory requirement of the job. "+ "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory' target='_blank'>kubernetes documentation</a> for details")@Interpolative(variableSuggester="suggestVariables")@NotEmpty@@ -375,46 +390,77 @@ public class Job implements NamedElement, Serializable, Validatable {@Overridepublic boolean isValid(ConstraintValidatorContext context) {+ boolean isValid = true;+Set<String> keys = new HashSet<>();Set<String> paths = new HashSet<>();-- boolean isValid = true;for (CacheSpec cache: caches) {- if (keys.contains(cache.getKey())) {+ if (!keys.add(cache.getKey())) {isValid = false;- context.buildConstraintViolationWithTemplate("Duplicate key: " + cache.getKey())+ context.buildConstraintViolationWithTemplate("Duplicate key (" + cache.getKey() + ")").addPropertyNode("caches").addConstraintViolation();- } else {- keys.add(cache.getKey());}- if (paths.contains(cache.getPath())) {+ if (!paths.add(cache.getPath())) {isValid = false;- context.buildConstraintViolationWithTemplate("Duplicate path: " + cache.getPath())+ context.buildConstraintViolationWithTemplate("Duplicate path (" + cache.getPath() + ")").addPropertyNode("caches").addConstraintViolation();- } else {- paths.add(cache.getPath());- }+ }}- Set<String> dependencyJobs = new HashSet<>();+ Set<String> dependencyJobNames = new HashSet<>();for (JobDependency dependency: jobDependencies) {- if (dependencyJobs.contains(dependency.getJobName())) {+ if (!dependencyJobNames.add(dependency.getJobName())) {isValid = false;- context.buildConstraintViolationWithTemplate("Duplicate dependency: " + dependency.getJobName())- .addPropertyNode("dependencies").addConstraintViolation();- } else {- dependencyJobs.add(dependency.getJobName());+ context.buildConstraintViolationWithTemplate("Duplicate dependency (" + dependency.getJobName() + ")")+ .addPropertyNode("jobDependencies").addConstraintViolation();+ }+ }++ Set<String> dependencyProjectNames = new HashSet<>();+ for (ProjectDependency dependency: projectDependencies) {+ if (!dependencyProjectNames.add(dependency.getProjectName())) {+ isValid = false;+ context.buildConstraintViolationWithTemplate("Duplicate dependency (" + dependency.getProjectName() + ")")+ .addPropertyNode("projectDependencies").addConstraintViolation();}}Set<String> paramSpecNames = new HashSet<>();for (ParamSpec paramSpec: paramSpecs) {- if (paramSpecNames.contains(paramSpec.getName())) {+ if (!paramSpecNames.add(paramSpec.getName())) {isValid = false;- context.buildConstraintViolationWithTemplate("Duplicate parameter spec: " + paramSpec.getName())+ context.buildConstraintViolationWithTemplate("Duplicate parameter spec (" + paramSpec.getName() + ")").addPropertyNode("paramSpecs").addConstraintViolation();- } else {- paramSpecNames.add(paramSpec.getName());+ }+ }++ if (getRetryCondition() != null) {+ try {+ io.onedev.server.buildspec.job.retrycondition.RetryCondition.parse(this, getRetryCondition());+ } catch (Exception e) {+ String message = e.getMessage();+ if (message == null)+ message = "Malformed retry condition";+ context.buildConstraintViolationWithTemplate(message)+ .addPropertyNode(PROP_RETRY_CONDITION)+ .addConstraintViolation();+ isValid = false;+ }+ }++ if (isValid) {+ for (int triggerIndex=0; triggerIndex<getTriggers().size(); triggerIndex++) {+ JobTrigger trigger = getTriggers().get(triggerIndex);+ try {+ ParamUtils.validateParams(getParamSpecs(), trigger.getParams());+ } catch (Exception e) {+ String errorMessage = String.format("Error validating job parameters (item: #%s, error message: %s)",+ (triggerIndex+1), e.getMessage());+ context.buildConstraintViolationWithTemplate(errorMessage)+ .addPropertyNode(PROP_TRIGGERS)+ .addConstraintViolation();+ isValid = false;+ }}}@@ -426,7 +472,7 @@ public class Job implements NamedElement, Serializable, Validatable {public Map<String, ParamSpec> getParamSpecMap() {if (paramSpecMap == null)- paramSpecMap = ParamSupply.getParamSpecMap(paramSpecs);+ paramSpecMap = ParamUtils.getParamSpecMap(paramSpecs);return paramSpecMap;}@@ -465,10 +511,8 @@ public class Job implements NamedElement, Serializable, Validatable {if (buildSpecAware != null) {BuildSpec buildSpec = buildSpecAware.getBuildSpec();if (buildSpec != null) {- for (Job eachJob: buildSpec.getJobs()) {- if (eachJob.getName() != null)- choices.add(eachJob.getName());- }+ choices.addAll(buildSpec.getJobMap().values().stream()+ .map(it->it.getName()).collect(Collectors.toList()));}JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);if (jobAware != null) {@@ -489,4 +533,9 @@ public class Job implements NamedElement, Serializable, Validatable {return null;}+ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestVariables(String matchWith) {+ return BuildSpec.suggestVariables(matchWith);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobAware.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobAware.javaindex 9ca34237c4..619e309eb1 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobAware.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobAware.java@@ -2,7 +2,9 @@ package io.onedev.server.buildspec.job;import javax.annotation.Nullable;-public interface JobAware {+import io.onedev.server.buildspec.ParamSpecAware;++public interface JobAware extends ParamSpecAware {@NullableJob getJob();diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.javaindex 4f21d68b72..23517f58ea 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java@@ -11,6 +11,7 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.k8shelper.Action;import io.onedev.k8shelper.CloneInfo;+import io.onedev.server.buildspec.Service;import io.onedev.server.util.SimpleLogger;import io.onedev.server.util.patternset.PatternSet;@@ -42,7 +43,7 @@ public abstract class JobContext {private final PatternSet collectFiles;- private final List<JobService> services;+ private final List<Service> services;private final int cacheTTL;@@ -59,7 +60,7 @@ public abstract class JobContext {boolean retrieveSource, Integer cloneDepth, CloneInfo cloneInfo,String cpuRequirement, String memoryRequirement, ObjectId commitId,Collection<CacheSpec> caches, PatternSet collectFiles, int cacheTTL,- int retried, List<JobService> services, SimpleLogger logger) {+ int retried, List<Service> services, SimpleLogger logger) {this.projectName = projectName;this.buildNumber = buildNumber;this.projectGitDir = projectGitDir;@@ -147,7 +148,7 @@ public abstract class JobContext {return allocatedCaches;}- public List<JobService> getServices() {+ public List<Service> getServices() {return services;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.javaindex 2895aacd31..05b1492598 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java@@ -10,8 +10,8 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.BuildSpecAware;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;+import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.buildspec.param.supply.ParamSupply;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.javadeleted file mode 100644index ee4b6d3bd8..0000000000--- a/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java+++ /dev/null@@ -1,175 +0,0 @@-package io.onedev.server.buildspec.job;--import java.io.Serializable;-import java.lang.reflect.Field;-import java.lang.reflect.InvocationTargetException;-import java.lang.reflect.Method;-import java.util.ArrayList;-import java.util.HashMap;-import java.util.List;-import java.util.Map;-import java.util.Map.Entry;-import java.util.function.Function;--import io.onedev.commons.utils.ExplicitException;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;-import io.onedev.server.model.Build;-import io.onedev.server.util.BeanUtils;-import io.onedev.server.util.GroovyUtils;-import io.onedev.server.util.Input;-import io.onedev.server.web.editable.annotation.Editable;-import net.sf.cglib.proxy.Enhancer;-import net.sf.cglib.proxy.MethodInterceptor;-import net.sf.cglib.proxy.MethodProxy;--public class VariableInterpolator implements Function<String, String> {-- public static final String PREFIX_PARAMS = "params:";-- public static final String PREFIX_PROPERTIES = "properties:";-- public static final String PREFIX_SECRETS = "secrets:";-- public static final String PREFIX_SCRIPTS = "scripts:";-- private final Build build;-- public VariableInterpolator(Build build) {- this.build = build;- }-- @Override- public String apply(String t) {- for (JobVariable var: JobVariable.values()) {- if (var.name().toLowerCase().equals(t)) {- String value = var.getValue(build);- return value!=null?value:"";- }- }- if (t.startsWith(PREFIX_PARAMS)) {- String paramName = t.substring(PREFIX_PARAMS.length());- for (Entry<String, Input> entry: build.getParamInputs().entrySet()) {- if (paramName.equals(entry.getKey())) {- if (build.isParamVisible(paramName)) {- String paramType = entry.getValue().getType();- List<String> paramValues = new ArrayList<>();- for (String value: entry.getValue().getValues()) {- if (paramType.equals(ParamSpec.SECRET))- value = build.getSecretValue(value);- paramValues.add(value);- }- return StringUtils.join(paramValues, ",");- } else {- throw new ExplicitException("Invisible param: " + paramName);- }- }- }- throw new ExplicitException("Undefined param: " + paramName);- } else if (t.startsWith(PREFIX_PROPERTIES)) {- String propertyName = t.substring(PREFIX_PROPERTIES.length());- String propertyValue = build.getSpec().getPropertyMap().get(propertyName);- if (propertyValue != null)- return propertyValue;- else- throw new ExplicitException("Undefined property: " + propertyName);- } else if (t.startsWith(PREFIX_SECRETS)) {- String secretName = t.substring(PREFIX_SECRETS.length());- return build.getSecretValue(secretName);- } else if (t.startsWith(PREFIX_SCRIPTS)) {- String scriptName = t.substring(PREFIX_SCRIPTS.length());- Map<String, Object> context = new HashMap<>();- context.put("build", build);- Object result = GroovyUtils.evalScriptByName(scriptName, context);- if (result != null)- return result.toString();- else- return "";- } else {- throw new ExplicitException("Unrecognized interpolation variable: " + t);- }- }--- public static <T> T installInterceptor(T object) {- Enhancer enhancer = new Enhancer();- enhancer.setSuperclass(object.getClass());- enhancer.setCallback(new InterpolatorInterceptor());-- @SuppressWarnings("unchecked")- T intercepted = (T) enhancer.create();-- for (Field field: BeanUtils.findFields(object.getClass())) {- field.setAccessible(true);- try {- field.set(intercepted, field.get(object));- } catch (IllegalArgumentException | IllegalAccessException e) {- throw new RuntimeException(e);- }- }-- for (Method getter: BeanUtils.findGetters(object.getClass())) {- if (getter.getAnnotation(Editable.class) != null) {- Method setter = BeanUtils.findSetter(getter);- if (setter != null) {- try {- Object propertyValue = getter.invoke(object);- if (propertyValue != null) {- if (propertyValue.getClass().getAnnotation(Editable.class) != null) {- setter.invoke(intercepted, installInterceptor(propertyValue));- } else if (propertyValue instanceof List) {- List<Object> interceptedList = new ArrayList<>();- for (Object element: (List<?>)propertyValue) {- if (element != null && element.getClass().getAnnotation(Editable.class) != null)- interceptedList.add(installInterceptor(element));- else- interceptedList.add(element);- }- setter.invoke(intercepted, interceptedList);- }- }- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {- throw new RuntimeException(e);- }- }- }- }-- return intercepted;- }-- @SuppressWarnings("unchecked")- public static <T> Class<T> getUninterceptedClass(T object) {- Class<T> clazz = (Class<T>) object.getClass();- while (Enhancer.isEnhanced(clazz))- clazz = (Class<T>) clazz.getSuperclass();- return clazz;- }-- private static class InterpolatorInterceptor implements MethodInterceptor, Serializable {-- private static final long serialVersionUID = 1L;-- @SuppressWarnings("unchecked")- public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {- if (BeanUtils.isGetter(method)- && method.getAnnotation(Editable.class) != null- && method.getAnnotation(io.onedev.server.web.editable.annotation.Interpolative.class) != null) {- Serializable propertyValue = (Serializable) methodProxy.invokeSuper(proxy, args);- Build build = Build.get();- if (build == null) {- throw new RuntimeException("No build context");- } else if (propertyValue instanceof String) {- return build.interpolate((String) propertyValue);- } else if (propertyValue instanceof List) {- List<String> interpolatedList = new ArrayList<>();- for (String element: (List<String>) propertyValue)- interpolatedList.add(build.interpolate(element));- return interpolatedList;- }- }- return methodProxy.invokeSuper(proxy, args);- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.javaindex 8d533657e9..565bcbe978 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java@@ -20,7 +20,8 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.issue.fieldsupply.FieldSupply;+import io.onedev.server.model.support.issue.field.FieldUtils;+import io.onedev.server.model.support.issue.field.supply.FieldSupply;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.annotation.Editable;@@ -118,12 +119,12 @@ public class CreateIssueAction extends PostBuildAction {}@Override- public void validateWithContext(BuildSpec buildSpec, Job job) {- super.validateWithContext(buildSpec, job);+ public void validateWith(BuildSpec buildSpec, Job job) {+ super.validateWith(buildSpec, job);GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();try {- FieldSupply.validateFields(issueSetting.getFieldSpecMap(getFieldNames()), issueFields);+ FieldUtils.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/buildspec/job/action/PostBuildAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/PostBuildAction.javaindex 04dc958e88..8e11296164 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/PostBuildAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/PostBuildAction.java@@ -32,7 +32,7 @@ public abstract class PostBuildAction implements Serializable {public abstract String getDescription();- public void validateWithContext(BuildSpec buildSpec, Job job) {+ public void validateWith(BuildSpec buildSpec, Job job) {io.onedev.server.buildspec.job.action.condition.ActionCondition.parse(job, condition);}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.javaindex 095c17777d..61fb1dbe88 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java@@ -16,8 +16,9 @@ import io.onedev.server.buildspec.BuildSpecAware;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobManager;import io.onedev.server.buildspec.job.SubmitReason;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;+import io.onedev.server.buildspec.param.ParamUtils;+import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.buildspec.param.supply.ParamSupply;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;import io.onedev.server.util.ComponentContext;@@ -86,10 +87,12 @@ public class RunJobAction extends PostBuildAction {@Overridepublic void execute(Build build) {- new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(build, getJobParams())) {+ new MatrixRunner<List<String>>(ParamUtils.getParamMatrix(build,+ build.getParamCombination(), getJobParams())) {@Overridepublic void run(Map<String, List<String>> paramMap) {+SubmitReason reason = new SubmitReason() {@Override@@ -122,19 +125,20 @@ public class RunJobAction extends PostBuildAction {}@Override- public void validateWithContext(BuildSpec buildSpec, Job job) {- super.validateWithContext(buildSpec, job);+ public void validateWith(BuildSpec buildSpec, Job job) {+ super.validateWith(buildSpec, job);Job jobToRun = buildSpec.getJobMap().get(jobName);if (jobToRun != null) {try {- ParamSupply.validateParams(null, jobToRun.getParamSpecs(), jobParams);+ ParamUtils.validateParams(jobToRun.getParamSpecs(), jobParams);} catch (ValidationException e) {- throw new ValidationException("Error validating parameters of run job '"- + jobToRun.getName() + "': " + e.getMessage());+ String errorMessage = String.format("Error validating job parameters (job: %s, error message: %s)",+ jobToRun.getName(), e.getMessage());+ throw new ValidationException(errorMessage);}} else {- throw new ValidationException("Run job not found: " + jobName);+ throw new ValidationException("Job not found (" + jobName + ")");}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.javaindex 6be10185f2..276b10869d 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java@@ -3,6 +3,8 @@ package io.onedev.server.buildspec.job.gitcredential;import java.util.List;import java.util.stream.Collectors;+import javax.validation.ConstraintValidatorContext;+import org.hibernate.validator.constraints.NotEmpty;import io.onedev.k8shelper.CloneInfo;@@ -11,11 +13,14 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.util.validation.Validatable;+import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;@Editable(name="HTTP(S)", order=200)-public class HttpCredential implements GitCredential {+@ClassValidating+public class HttpCredential implements GitCredential, Validatable {private static final long serialVersionUID = 1L;@@ -44,4 +49,18 @@ public class HttpCredential implements GitCredential {build.getSecretValue(accessTokenSecret));}+ @Override+ public boolean isValid(ConstraintValidatorContext context) {+ if (!Project.get().getBuildSetting().getJobSecrets().stream()+ .anyMatch(it->it.getName().equals(accessTokenSecret))) {+ context.disableDefaultConstraintViolation();+ context.buildConstraintViolationWithTemplate("Secret not found (" + accessTokenSecret + ")")+ .addPropertyNode("accessTokenSecret")+ .addConstraintViolation();+ return false;+ } else {+ return true;+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.javaindex 2b73f3b379..08fafba5c8 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java@@ -4,6 +4,8 @@ import java.io.IOException;import java.util.List;import java.util.stream.Collectors;+import javax.validation.ConstraintValidatorContext;+import org.apache.sshd.common.config.keys.PublicKeyEntry;import org.hibernate.validator.constraints.NotEmpty;@@ -15,11 +17,14 @@ import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.SshSetting;+import io.onedev.server.util.validation.Validatable;+import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;@Editable(name="SSH", order=300)-public class SshCredential implements GitCredential {+@ClassValidating+public class SshCredential implements GitCredential, Validatable {private static final long serialVersionUID = 1L;@@ -54,5 +59,19 @@ public class SshCredential implements GitCredential {}return new SshCloneInfo(cloneUrl, build.getSecretValue(keySecret), knownHosts.toString());}++ @Override+ public boolean isValid(ConstraintValidatorContext context) {+ if (!Project.get().getBuildSetting().getJobSecrets().stream()+ .anyMatch(it->it.getName().equals(keySecret))) {+ context.disableDefaultConstraintViolation();+ context.buildConstraintViolationWithTemplate("Secret not found (" + keySecret + ")")+ .addPropertyNode("keySecret")+ .addConstraintViolation();+ return false;+ } else {+ return true;+ }+ }}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/PassthroughValues.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/PassthroughValues.javadeleted file mode 100644index 9367d1d419..0000000000--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/PassthroughValues.java+++ /dev/null@@ -1,54 +0,0 @@-package io.onedev.server.buildspec.job.paramsupply;--import java.util.ArrayList;-import java.util.List;--import org.apache.commons.lang3.builder.HashCodeBuilder;--import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.model.Build;-import io.onedev.server.web.editable.annotation.Editable;--@Editable(name="Use specified values or job secrets")-public class PassthroughValues implements ValuesProvider {-- private static final long serialVersionUID = 1L;-- public static final String DISPLAY_NAME = "Use same parameter as current build";-- public static final String SECRET_DISPLAY_NAME = "Use same secret as current build";-- @Override- public List<List<String>> getValues(Build build, String paramName) {- if (build != null) {- List<String> paramValue = build.getParamMap().get(paramName);- if (paramValue != null) {- List<List<String>> values = new ArrayList<>();- values.add(paramValue);- return values;- } else {- String message = String.format("Param not found (build: %s, param: %s)", build.getFQN(), paramName);- throw new ExplicitException(message);- }- } else {- return new ArrayList<>();- }- }-- @Override- public boolean equals(Object other) {- if (!(other instanceof PassthroughValues))- return false;- if (this == other)- return true;- else- return false;- }-- @Override- public int hashCode() {- return new HashCodeBuilder(17, 37)- .toHashCode();- }--}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.javaindex 7df579c804..a4eb3fc866 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java@@ -5,7 +5,7 @@ import java.util.List;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobDependency;import io.onedev.server.buildspec.job.SubmitReason;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;+import io.onedev.server.buildspec.param.supply.ParamSupply;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.build.BuildFinished;import io.onedev.server.model.Build;@@ -29,7 +29,7 @@ public class DependencyFinishedTrigger extends JobTrigger {for (ParamSupply param: dependency.getJobParams()) {if (!param.isSecret()) {List<String> paramValue = build.getParamMap().get(param.getName());- if (!param.getValuesProvider().getValues(null, param.getName()).contains(paramValue))+ if (!param.getValuesProvider().getValues(null, null).contains(paramValue))return null;}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.javaindex 6bdb8c06f3..b5304496a9 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java@@ -13,8 +13,8 @@ import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobAware;import io.onedev.server.buildspec.job.SubmitReason;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;+import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.buildspec.param.supply.ParamSupply;import io.onedev.server.event.ProjectEvent;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.match.Matcher;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamCombination.java b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamCombination.javanew file mode 100644index 0000000000..8cf956e0c1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamCombination.java@@ -0,0 +1,95 @@+package io.onedev.server.buildspec.param;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collections;+import java.util.Comparator;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.Set;++import com.google.common.base.Preconditions;+import com.google.common.collect.Lists;+import com.google.common.collect.Sets;++import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.util.Input;++public class ParamCombination implements Serializable {++ private static final long serialVersionUID = 1L;++ private final List<ParamSpec> paramSpecs;++ private final Map<String, List<String>> paramMap;++ private final Map<String, Input> paramInputs;++ private transient Map<String, ParamSpec> paramSpecMap;++ public ParamCombination(List<ParamSpec> paramSpecs, Map<String, List<String>> paramMap) {+ this.paramSpecs = paramSpecs;+ this.paramMap = paramMap;++ paramInputs = new LinkedHashMap<>();+ for (ParamSpec paramSpec: paramSpecs) {+ String paramName = paramSpec.getName();+ List<String> paramValues = paramMap.get(paramName);+ if (paramValues != null) {+ List<String> normalizedValues = new ArrayList<>();+ for (String paramValue: paramValues) {+ if (paramValue != null)+ normalizedValues.add(paramValue);+ }+ Collections.sort(normalizedValues, new Comparator<String>() {++ @Override+ public int compare(String o1, String o2) {+ return (int) (paramSpec.getOrdinal(o1) - paramSpec.getOrdinal(o2));+ }++ });+ if (!paramSpec.isAllowMultiple() && normalizedValues.size() > 1)+ normalizedValues = Lists.newArrayList(normalizedValues.iterator().next());+ paramInputs.put(paramName, new Input(paramName, paramSpec.getType(), normalizedValues));+ }+ }+ }++ public Map<String, ParamSpec> getParamSpecMap() {+ if (paramSpecMap == null)+ paramSpecMap = ParamUtils.getParamSpecMap(paramSpecs);+ return paramSpecMap;+ }++ public Map<String, Input> getParamInputs() {+ return paramInputs;+ }++ public Map<String, List<String>> getParamMap() {+ return paramMap;+ }++ public boolean isParamVisible(String paramName) {+ return isParamVisible(paramName, Sets.newHashSet());+ }++ private boolean isParamVisible(String paramName, Set<String> checkedParamNames) {+ if (!checkedParamNames.add(paramName))+ return false;++ ParamSpec paramSpec = Preconditions.checkNotNull(getParamSpecMap().get(paramName));+ if (paramSpec.getShowCondition() != null) {+ Input dependentInput = paramInputs.get(paramSpec.getShowCondition().getInputName());+ Preconditions.checkNotNull(dependentInput);+ if (paramSpec.getShowCondition().getValueMatcher().matches(dependentInput.getValues()))+ return isParamVisible(dependentInput.getName(), checkedParamNames);+ else+ return false;+ } else {+ return true;+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ParamSupply.java b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.javasimilarity index 59%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ParamSupply.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.javaindex 1441a5183d..c04555c6db 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ParamSupply.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java@@ -1,286 +1,231 @@-package io.onedev.server.buildspec.job.paramsupply;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashMap;-import java.util.HashSet;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;-import java.util.Set;--import javax.annotation.Nullable;-import javax.validation.Valid;-import javax.validation.ValidationException;-import javax.validation.constraints.NotNull;--import org.apache.commons.codec.DecoderException;-import org.apache.commons.codec.binary.Hex;-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.buildspec.job.Job;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;-import io.onedev.server.buildspec.job.paramspec.SecretParam;-import io.onedev.server.model.Build;-import io.onedev.server.model.support.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 ParamSupply implements Serializable {-- private static final long serialVersionUID = 1L;-- private static final Logger logger = LoggerFactory.getLogger(ParamSupply.class);-- private static final String PARAM_BEAN_PREFIX = "ParamSupplyBean";-- private String name;-- private boolean secret;-- private ValuesProvider valuesProvider = new SpecifiedValues();-- private static ThreadLocal<String> paramName = new ThreadLocal<String>();-- @Editable- @NotEmpty- public String getName() {- return name;- }-- public void setName(String name) {- this.name = name;- }-- @Editable- @NotNull- @Valid- public ValuesProvider getValuesProvider() {- return valuesProvider;- }-- public void setValuesProvider(ValuesProvider valuesProvider) {- this.valuesProvider = valuesProvider;- }-- @Editable- public boolean isSecret() {- return secret;- }-- public void setSecret(boolean secret) {- this.secret = secret;- }-- @Override- public boolean equals(Object other) {- if (!(other instanceof ParamSupply))- return false;- if (this == other)- return true;- ParamSupply otherParamValue = (ParamSupply) other;- return new EqualsBuilder()- .append(name, otherParamValue.name)- .append(valuesProvider, otherParamValue.valuesProvider)- .isEquals();- }-- @Override- public int hashCode() {- return new HashCodeBuilder(17, 37)- .append(name)- .append(valuesProvider)- .toHashCode();- }-- public static void validateParamValues(List<List<String>> values) {- if (values.isEmpty())- throw new ValidationException("At least one value needs to be specified");- Set<List<String>> encountered = new HashSet<>();- for (List<String> value: values) {- if (encountered.contains(value))- throw new ValidationException("Duplicate values not allowed");- else- encountered.add(value);- }- }-- 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()) {- if (entry.getValue() != null) {- try {- validateParamValues(entry.getValue());- } catch (ValidationException e) {- throw new ValidationException("Error validating values of parameter '"- + entry.getKey() + "': " + e.getMessage());- }-- ParamSpec paramSpec = Preconditions.checkNotNull(paramSpecMap.get(entry.getKey()));- for (List<String> value: entry.getValue())- validateParamValue(paramSpec, entry.getKey(), value);- }- }- }-- private static void validateParamValue(ParamSpec paramSpec, String paramName, List<String> paramValue) {- try {- paramSpec.convertToObject(paramValue);- } catch (Exception e) {- String displayValue;- if (paramSpec instanceof SecretParam)- displayValue = SecretInput.MASK;- else- displayValue = 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());- }- }-- private static void validateParamNames(Collection<String> paramSpecNames, Collection<String> paramNames) {- for (String paramSpecName: paramSpecNames) {- if (!paramNames.contains(paramSpecName))- throw new ValidationException("Missing job parameter: " + paramSpecName);- }- for (String paramName: paramNames) {- if (!paramSpecNames.contains(paramName))- throw new ValidationException("Unknown job parameter: " + paramName);- }- }-- public static void validateParamMap(Map<String, ParamSpec> paramSpecMap, Map<String, List<String>> paramMap) {- validateParamNames(paramSpecMap.keySet(), paramMap.keySet());- for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {- ParamSpec paramSpec = Preconditions.checkNotNull(paramSpecMap.get(entry.getKey()));- validateParamValue(paramSpec, entry.getKey(), entry.getValue());- }- }-- public static Map<String, ParamSpec> getParamSpecMap(List<ParamSpec> paramSpecs) {- Map<String, ParamSpec> paramSpecMap = new LinkedHashMap<>();- for (ParamSpec paramSpec: paramSpecs)- paramSpecMap.put(paramSpec.getName(), paramSpec);- return paramSpecMap;- }-- public static void validateParams(Build build, List<ParamSpec> paramSpecs, List<ParamSupply> params) {- Map<String, List<List<String>>> paramMap = new HashMap<>();- for (ParamSupply param: params) {- List<List<String>> values;- if (param.getValuesProvider() instanceof SpecifiedValues)- values = param.getValuesProvider().getValues(build, param.getName());- else- values = null;- if (paramMap.put(param.getName(), values) != null)- throw new ValidationException("Duplicate param: " + param.getName());- }- validateParamMatrix(getParamSpecMap(paramSpecs), paramMap);- }-- @SuppressWarnings("unchecked")- public static Class<? extends Serializable> defineBeanClass(Collection<ParamSpec> paramSpecs) {- byte[] bytes = SerializationUtils.serialize((Serializable) paramSpecs);- String className = PARAM_BEAN_PREFIX + "_" + Hex.encodeHexString(bytes);-- List<ParamSpec> paramSpecsCopy = new ArrayList<>(paramSpecs);- for (int i=0; i<paramSpecsCopy.size(); i++) {- ParamSpec paramSpec = paramSpecsCopy.get(i);- if (paramSpec instanceof SecretParam) {- ParamSpec paramSpecClone = (ParamSpec) SerializationUtils.clone(paramSpec);- String description = paramSpecClone.getDescription();- if (description == null)- description = "";- description += String.format("<div style='margin-top: 12px;'><b>Note:</b> Secret less than %d characters "- + "will not be masked in build log</div>", SecretInput.MASK.length());- paramSpecClone.setDescription(description);- paramSpecsCopy.set(i, paramSpecClone);- }- }- return (Class<? extends Serializable>) ParamSpec.defineClass(className, "Build Parameters", paramSpecsCopy);- }-- @SuppressWarnings("unchecked")- @Nullable- public static Class<? extends Serializable> loadBeanClass(String className) {- if (className.startsWith(PARAM_BEAN_PREFIX)) {- byte[] bytes;- try {- bytes = Hex.decodeHex(className.substring(PARAM_BEAN_PREFIX.length()+1).toCharArray());- } catch (DecoderException e) {- throw new RuntimeException(e);- }- List<ParamSpec> paramSpecs = (List<ParamSpec>) SerializationUtils.deserialize(bytes);- return defineBeanClass(paramSpecs);- } else {- return null;- }- }-- public static Map<String, List<String>> getParamMap(Job job, Object paramBean, Collection<String> paramNames) {- Map<String, List<String>> paramMap = new HashMap<>();- BeanDescriptor descriptor = new BeanDescriptor(paramBean.getClass());- for (List<PropertyDescriptor> groupProperties: descriptor.getProperties().values()) {- for (PropertyDescriptor property: groupProperties) {- if (paramNames.contains(property.getDisplayName())) {- Object typedValue = property.getPropertyValue(paramBean);- ParamSpec paramSpec = Preconditions.checkNotNull(job.getParamSpecMap().get(property.getDisplayName()));- List<String> values = new ArrayList<>();- for (String value: paramSpec.convertToStrings(typedValue)) {- if (paramSpec instanceof SecretParam)- value = SecretInput.LITERAL_VALUE_PREFIX + value;- values.add(value);- }- paramMap.put(paramSpec.getName(), values);- }- }- }- return paramMap;- }-- public static Map<String, List<List<String>>> getParamMatrix(@Nullable Build build, List<ParamSupply> params) {- Map<String, List<List<String>>> paramMatrix = new LinkedHashMap<>();- for (ParamSupply param: params) {- paramName.set(param.getName());- try {- /*- * Resolve secret value with current build context as otherwise we may not be authorized to- * access the secret value. This is possible for instance if a pull request triggers a job,- * and then post-action of the job triggers another job with a parameter taking value of- * a secret accessible by the pull request- */- if (param.isSecret() && build != null) {- List<List<String>> resolvedValues = new ArrayList<>();- for (List<String> value: param.getValuesProvider().getValues(build, param.getName())) {- List<String> resolvedValue = new ArrayList<>();- for (String each: value)- resolvedValue.add(SecretInput.LITERAL_VALUE_PREFIX + build.getSecretValue(each));- resolvedValues.add(resolvedValue);- }- paramMatrix.put(param.getName(), resolvedValues);- } else {- paramMatrix.put(param.getName(), param.getValuesProvider().getValues(build, param.getName()));- }- } finally {- paramName.set(null);- }- }- return paramMatrix;- }-- public static String getParamName() {- return paramName.get();- }--}+package io.onedev.server.buildspec.param;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.HashSet;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.Set;++import javax.annotation.Nullable;+import javax.validation.ValidationException;++import org.apache.commons.codec.DecoderException;+import org.apache.commons.codec.binary.Hex;+import org.apache.commons.lang.SerializationUtils;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.base.Preconditions;++import io.onedev.server.buildspec.job.Job;+import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.buildspec.param.spec.SecretParam;+import io.onedev.server.buildspec.param.supply.ParamSupply;+import io.onedev.server.buildspec.param.supply.SpecifiedValues;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.inputspec.SecretInput;+import io.onedev.server.web.editable.BeanDescriptor;+import io.onedev.server.web.editable.PropertyDescriptor;++public class ParamUtils {++ private static final Logger logger = LoggerFactory.getLogger(ParamSupply.class);++ private static final String PARAM_BEAN_PREFIX = "ParamSupplyBean";++ public static void validateParamValues(List<List<String>> values) {+ if (values.isEmpty())+ throw new ValidationException("At least one value needs to be specified");+ Set<List<String>> encountered = new HashSet<>();+ for (List<String> value: values) {+ if (encountered.contains(value))+ throw new ValidationException("Duplicate values not allowed");+ else+ encountered.add(value);+ }+ }++ 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()) {+ if (entry.getValue() != null) {+ try {+ validateParamValues(entry.getValue());+ } catch (ValidationException e) {+ String errorMessage = String.format("Error validating param values (param: %s, error message: %s)",+ entry.getKey(), e.getMessage());+ throw new ValidationException(errorMessage);+ }++ ParamSpec paramSpec = Preconditions.checkNotNull(paramSpecMap.get(entry.getKey()));+ for (List<String> value: entry.getValue())+ validateParamValue(paramSpec, entry.getKey(), value);+ }+ }+ }++ private static void validateParamValue(ParamSpec paramSpec, String paramName, List<String> paramValue) {+ try {+ Object object = paramSpec.convertToObject(paramValue);+ if (paramSpec instanceof SecretParam && object != null+ && !((String)object).startsWith(SecretInput.LITERAL_VALUE_PREFIX)) {+ if (!Project.get().getBuildSetting().getJobSecrets().stream()+ .anyMatch(it->it.getName().equals(object))) {+ throw new ValidationException("Secret not found");+ }+ }+ } catch (Exception e) {+ if (e.getMessage() == null)+ logger.error("Error validating field value", e);++ List<String> displayValue;+ if (paramSpec instanceof SecretParam) {+ displayValue = new ArrayList<>();+ for (String each: paramValue) {+ if (each.startsWith(SecretInput.LITERAL_VALUE_PREFIX))+ displayValue.add(SecretInput.MASK);+ else+ displayValue.add(each);+ }+ } else {+ displayValue = paramValue;+ }+ String errorMessage = String.format("Error validating param value (param: %s, value: %s, error message: %s",+ paramName, displayValue, e.getMessage());+ throw new ValidationException(errorMessage);+ }+ }++ private static void validateParamNames(Collection<String> paramSpecNames, Collection<String> paramNames) {+ for (String paramSpecName: paramSpecNames) {+ if (!paramNames.contains(paramSpecName))+ throw new ValidationException("Missing job parameter (" + paramSpecName + ")");+ }+ for (String paramName: paramNames) {+ if (!paramSpecNames.contains(paramName))+ throw new ValidationException("Unknown job parameter (" + paramName + ")");+ }+ }++ public static void validateParamMap(List<ParamSpec> paramSpecs, Map<String, List<String>> paramMap) {+ Map<String, ParamSpec> paramSpecMap = ParamUtils.getParamSpecMap(paramSpecs);+ validateParamNames(paramSpecMap.keySet(), paramMap.keySet());+ for (Map.Entry<String, List<String>> entry: paramMap.entrySet()) {+ ParamSpec paramSpec = Preconditions.checkNotNull(paramSpecMap.get(entry.getKey()));+ validateParamValue(paramSpec, entry.getKey(), entry.getValue());+ }+ }++ public static Map<String, ParamSpec> getParamSpecMap(List<ParamSpec> paramSpecs) {+ Map<String, ParamSpec> paramSpecMap = new LinkedHashMap<>();+ for (ParamSpec paramSpec: paramSpecs)+ paramSpecMap.put(paramSpec.getName(), paramSpec);+ return paramSpecMap;+ }++ public static void validateParams(List<ParamSpec> paramSpecs, List<ParamSupply> params) {+ Map<String, List<List<String>>> paramMap = new HashMap<>();+ for (ParamSupply param: params) {+ List<List<String>> values;+ if (param.getValuesProvider() instanceof SpecifiedValues)+ values = param.getValuesProvider().getValues(null, null);+ else+ values = null;+ if (paramMap.put(param.getName(), values) != null)+ throw new ValidationException("Duplicate param (" + param.getName() + ")");+ }+ validateParamMatrix(getParamSpecMap(paramSpecs), paramMap);+ }++ @SuppressWarnings("unchecked")+ public static Class<? extends Serializable> defineBeanClass(Collection<ParamSpec> paramSpecs) {+ byte[] bytes = SerializationUtils.serialize((Serializable) paramSpecs);+ String className = PARAM_BEAN_PREFIX + "_" + Hex.encodeHexString(bytes);++ List<ParamSpec> paramSpecsCopy = new ArrayList<>(paramSpecs);+ for (int i=0; i<paramSpecsCopy.size(); i++) {+ ParamSpec paramSpec = paramSpecsCopy.get(i);+ if (paramSpec instanceof SecretParam) {+ ParamSpec paramSpecClone = (ParamSpec) SerializationUtils.clone(paramSpec);+ String description = paramSpecClone.getDescription();+ if (description == null)+ description = "";+ description += String.format("<div style='margin-top: 12px;'><b>Note:</b> Secret less than %d characters "+ + "will not be masked in build log</div>", SecretInput.MASK.length());+ paramSpecClone.setDescription(description);+ paramSpecsCopy.set(i, paramSpecClone);+ }+ }+ return (Class<? extends Serializable>) ParamSpec.defineClass(className, "Parameters", paramSpecsCopy);+ }++ @SuppressWarnings("unchecked")+ @Nullable+ public static Class<? extends Serializable> loadBeanClass(String className) {+ if (className.startsWith(PARAM_BEAN_PREFIX)) {+ byte[] bytes;+ try {+ bytes = Hex.decodeHex(className.substring(PARAM_BEAN_PREFIX.length()+1).toCharArray());+ } catch (DecoderException e) {+ throw new RuntimeException(e);+ }+ List<ParamSpec> paramSpecs = (List<ParamSpec>) SerializationUtils.deserialize(bytes);+ return defineBeanClass(paramSpecs);+ } else {+ return null;+ }+ }++ public static Map<String, List<String>> getParamMap(Job job, Object paramBean, Collection<String> paramNames) {+ Map<String, List<String>> paramMap = new HashMap<>();+ BeanDescriptor descriptor = new BeanDescriptor(paramBean.getClass());+ for (List<PropertyDescriptor> groupProperties: descriptor.getProperties().values()) {+ for (PropertyDescriptor property: groupProperties) {+ if (paramNames.contains(property.getDisplayName())) {+ Object typedValue = property.getPropertyValue(paramBean);+ ParamSpec paramSpec = Preconditions.checkNotNull(job.getParamSpecMap().get(property.getDisplayName()));+ List<String> values = new ArrayList<>();+ for (String value: paramSpec.convertToStrings(typedValue)) {+ if (paramSpec instanceof SecretParam)+ value = SecretInput.LITERAL_VALUE_PREFIX + value;+ values.add(value);+ }+ paramMap.put(paramSpec.getName(), values);+ }+ }+ }+ return paramMap;+ }++ public static Map<String, List<List<String>>> getParamMatrix(@Nullable Build build,+ @Nullable ParamCombination paramCombination, List<ParamSupply> params) {+ Map<String, List<List<String>>> paramMatrix = new LinkedHashMap<>();+ for (ParamSupply param: params) {+ /*+ * Resolve secret value with current build context as otherwise we may not be authorized to+ * access the secret value. This is possible for instance if a pull request triggers a job,+ * and then post-action of the job triggers another job with a parameter taking value of+ * a secret accessible by the pull request+ */+ if (param.isSecret() && build != null) {+ List<List<String>> resolvedValues = new ArrayList<>();+ for (List<String> value: param.getValuesProvider().getValues(build, paramCombination)) {+ List<String> resolvedValue = new ArrayList<>();+ for (String each: value)+ resolvedValue.add(SecretInput.LITERAL_VALUE_PREFIX + build.getSecretValue(each));+ resolvedValues.add(resolvedValue);+ }+ paramMatrix.put(param.getName(), resolvedValues);+ } else {+ paramMatrix.put(param.getName(), param.getValuesProvider().getValues(build, paramCombination));+ }+ }+ return paramMatrix;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BooleanParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BooleanParam.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BooleanParam.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/BooleanParam.javaindex ecf5a663b3..c860b5f56a 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BooleanParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BooleanParam.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.job.paramspec;+package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BuildChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BuildChoiceParam.javasimilarity index 94%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BuildChoiceParam.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/BuildChoiceParam.javaindex 786821b57a..411bd35393 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BuildChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BuildChoiceParam.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.job.paramspec;+package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ChoiceParam.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ChoiceParam.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/ChoiceParam.javaindex e6ec371528..b5b26e55f4 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ChoiceParam.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.job.paramspec;+package io.onedev.server.buildspec.param.spec;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/CommitParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/CommitParam.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/CommitParam.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/CommitParam.javaindex 6cec105c00..61cbeb71c2 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/CommitParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/CommitParam.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.job.paramspec;+package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/DateParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/DateParam.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.javaindex fa21e9d9a0..aa0c1ab507 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/DateParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.job.paramspec;+package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/GroupChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/GroupChoiceParam.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.javaindex 250e01c98b..b5af3fdb42 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/GroupChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.job.paramspec;+package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/IssueChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IssueChoiceParam.javasimilarity index 94%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/IssueChoiceParam.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/IssueChoiceParam.javaindex 0addfb808a..e32ffdfe70 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/IssueChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IssueChoiceParam.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.job.paramspec;+package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/NumberParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/NumberParam.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/NumberParam.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/NumberParam.javaindex 49d53d454d..3fec9b1534 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/NumberParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/NumberParam.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.job.paramspec;+package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ParamSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.javasimilarity index 73%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ParamSpec.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.javaindex 86813c3139..251180e90b 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ParamSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java@@ -1,14 +1,21 @@-package io.onedev.server.buildspec.job.paramspec;+package io.onedev.server.buildspec.param.spec;+import java.util.List;++import javax.annotation.Nullable;import javax.validation.Valid;+import org.apache.wicket.Component;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.buildspec.ParamSpecAware;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;+import io.onedev.server.util.ComponentContext;import io.onedev.server.util.validation.annotation.ParamName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.util.WicketUtils;@Editablepublic abstract class ParamSpec extends InputSpec {@@ -75,4 +82,15 @@ public abstract class ParamSpec extends InputSpec {super.setAllowEmpty(allowEmpty);}+ @Nullable+ public static List<ParamSpec> list() {+ Component component = ComponentContext.get().getComponent();+ ParamSpecAware paramSpecAware = WicketUtils.findInnermost(component, ParamSpecAware.class);+ if (paramSpecAware != null)+ return paramSpecAware.getParamSpecs();+ else+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/PullRequestChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/PullRequestChoiceParam.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/PullRequestChoiceParam.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/PullRequestChoiceParam.javaindex 32177e2f3f..59715a1e27 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/PullRequestChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/PullRequestChoiceParam.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.job.paramspec;+package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/SecretParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/SecretParam.javasimilarity index 94%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/SecretParam.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/SecretParam.javaindex 4d1a452d9c..947c5a9360 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/SecretParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/SecretParam.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.job.paramspec;+package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/TextParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/TextParam.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.javaindex 9853f4cc46..31a7507bf6 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/TextParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.job.paramspec;+package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/UserChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/UserChoiceParam.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.javaindex bd0f15d0ec..0c46abb901 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/UserChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.job.paramspec;+package io.onedev.server.buildspec.param.spec;import java.util.List;import java.util.Map;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/Ignore.java b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/Ignore.javasimilarity index 78%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/Ignore.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/supply/Ignore.javaindex 77252e5b2c..63da9585f4 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/Ignore.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/Ignore.java@@ -1,10 +1,11 @@-package io.onedev.server.buildspec.job.paramsupply;+package io.onedev.server.buildspec.param.supply;import java.util.ArrayList;import java.util.List;import org.apache.commons.lang3.builder.HashCodeBuilder;+import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.model.Build;import io.onedev.server.web.editable.annotation.Editable;@@ -27,7 +28,7 @@ public class Ignore implements ValuesProvider {}@Override- public List<List<String>> getValues(Build build, String paramName) {+ public List<List<String>> getValues(Build build, ParamCombination paramCombination) {List<List<String>> values = new ArrayList<>();values.add(new ArrayList<>());return values;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/supply/ParamSupply.java b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/ParamSupply.javanew file mode 100644index 0000000000..33ea50d851--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/ParamSupply.java@@ -0,0 +1,76 @@+package io.onedev.server.buildspec.param.supply;++import java.io.Serializable;++import javax.validation.Valid;+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 io.onedev.server.web.editable.annotation.Editable;++@Editable+public class ParamSupply implements Serializable {++ private static final long serialVersionUID = 1L;++ private String name;++ private boolean secret;++ private ValuesProvider valuesProvider = new SpecifiedValues();++ @Editable+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable+ @NotNull+ @Valid+ public ValuesProvider getValuesProvider() {+ return valuesProvider;+ }++ public void setValuesProvider(ValuesProvider valuesProvider) {+ this.valuesProvider = valuesProvider;+ }++ @Editable+ public boolean isSecret() {+ return secret;+ }++ public void setSecret(boolean secret) {+ this.secret = secret;+ }++ @Override+ public boolean equals(Object other) {+ if (!(other instanceof ParamSupply))+ return false;+ if (this == other)+ return true;+ ParamSupply otherParamValue = (ParamSupply) other;+ return new EqualsBuilder()+ .append(name, otherParamValue.name)+ .append(valuesProvider, otherParamValue.valuesProvider)+ .isEquals();+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37)+ .append(name)+ .append(valuesProvider)+ .toHashCode();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/supply/PassthroughValues.java b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/PassthroughValues.javanew file mode 100644index 0000000000..f134ef89f5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/PassthroughValues.java@@ -0,0 +1,84 @@+package io.onedev.server.buildspec.param.supply;++import java.util.ArrayList;+import java.util.List;+import java.util.stream.Collectors;++import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;+import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.buildspec.param.ParamCombination;+import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.model.Build;+import io.onedev.server.util.Input;+import io.onedev.server.web.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;++@Editable(name="Use value of specified parameter/secret")+public class PassthroughValues implements ValuesProvider {++ private static final long serialVersionUID = 1L;++ public static final String DISPLAY_NAME = "Use value of specified parameter";++ private String paramName;++ @Editable+ @ChoiceProvider("getParamChoices")+ @NotEmpty+ public String getParamName() {+ return paramName;+ }++ public void setParamName(String paramName) {+ this.paramName = paramName;+ }++ @SuppressWarnings("unused")+ private static List<String> getParamChoices() {+ List<ParamSpec> paramSpecs = ParamSpec.list();+ if (paramSpecs != null)+ return paramSpecs.stream().map(it->it.getName()).collect(Collectors.toList());+ else+ return new ArrayList<>();+ }++ @Override+ public List<List<String>> getValues(Build build, ParamCombination paramCombination) {+ if (paramCombination != null) {+ Input param = paramCombination.getParamInputs().get(paramName);+ if (param != null) {+ List<List<String>> values = new ArrayList<>();+ values.add(param.getValues());+ return values;+ } else {+ String message = String.format("Param not found: %s", paramName);+ throw new ExplicitException(message);+ }+ } else {+ return new ArrayList<>();+ }+ }++ @Override+ public boolean equals(Object other) {+ if (!(other instanceof PassthroughValues))+ return false;+ if (this == other)+ return true;+ PassthroughValues otherPassthroughValues = (PassthroughValues) other;+ return new EqualsBuilder()+ .append(paramName, otherPassthroughValues.paramName)+ .isEquals();+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37)+ .append(paramName)+ .toHashCode();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ScriptingValues.java b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/ScriptingValues.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ScriptingValues.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/supply/ScriptingValues.javaindex 231035400d..442567f228 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ScriptingValues.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/ScriptingValues.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.job.paramsupply;+package io.onedev.server.buildspec.param.supply;import java.util.ArrayList;import java.util.Collection;@@ -10,6 +10,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.model.Build;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;@@ -58,9 +59,12 @@ public class ScriptingValues implements ValuesProvider {@SuppressWarnings("unchecked")@Override- public List<List<String>> getValues(Build build, String paramName) {+ public List<List<String>> getValues(Build build, ParamCombination paramCombination) {Map<String, Object> variables = new HashMap<>();variables.put("build", build);+ if (paramCombination != null)+ variables.put("params", paramCombination.getParamMap());+List<List<String>> values = new ArrayList<>();Object result = GroovyUtils.evalScriptByName(scriptName, variables);if (result instanceof List) {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/SpecifiedValues.java b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/SpecifiedValues.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/SpecifiedValues.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/supply/SpecifiedValues.javaindex 8e05dcfd2b..a1a550a407 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/SpecifiedValues.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/SpecifiedValues.java@@ -1,4 +1,4 @@-package io.onedev.server.buildspec.job.paramsupply;+package io.onedev.server.buildspec.param.supply;import java.util.ArrayList;import java.util.List;@@ -6,8 +6,10 @@ import java.util.List;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;+import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.model.Build;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;@Editable(name="Use specified values or job secrets")public class SpecifiedValues implements ValuesProvider {@@ -21,6 +23,7 @@ public class SpecifiedValues implements ValuesProvider {private List<List<String>> values = new ArrayList<>();@Editable+ @Interpolativepublic List<List<String>> getValues() {return values;}@@ -30,7 +33,7 @@ public class SpecifiedValues implements ValuesProvider {}@Override- public List<List<String>> getValues(Build build, String paramName) {+ public List<List<String>> getValues(Build build, ParamCombination paramCombination) {return getValues();}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ValuesProvider.java b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/ValuesProvider.javasimilarity index 53%rename from server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ValuesProvider.javarename to server-core/src/main/java/io/onedev/server/buildspec/param/supply/ValuesProvider.javaindex e608c22145..feb92087e5 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ValuesProvider.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/ValuesProvider.java@@ -1,16 +1,17 @@-package io.onedev.server.buildspec.job.paramsupply;+package io.onedev.server.buildspec.param.supply;import java.io.Serializable;import java.util.List;import javax.annotation.Nullable;+import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.model.Build;import io.onedev.server.web.editable.annotation.Editable;@Editablepublic interface ValuesProvider extends Serializable {- List<List<String>> getValues(@Nullable Build build, String paramName);+ List<List<String>> getValues(@Nullable Build build, @Nullable ParamCombination paramCombination);}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.javaindex 62b3b9d749..9a8e739bee 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java@@ -5,20 +5,17 @@ import java.util.List;import javax.validation.constraints.Size;-import org.apache.wicket.Component;import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.k8shelper.CommandExecutable;import io.onedev.k8shelper.Executable;import io.onedev.server.buildspec.BuildSpec;-import io.onedev.server.buildspec.BuildSpecAware;-import io.onedev.server.buildspec.job.Job;-import io.onedev.server.buildspec.job.JobAware;+import io.onedev.server.buildspec.param.ParamCombination;+import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.util.ComponentContext;import io.onedev.server.web.editable.annotation.Code;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;@@ -59,30 +56,9 @@ public class CommandStep extends Step {this.commands = commands;}- public static List<InputSuggestion> suggestVariables(String matchWith) {- Component component = ComponentContext.get().getComponent();- List<InputSuggestion> suggestions = new ArrayList<>();- ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();- BuildSpecAware buildSpecAware = WicketUtils.findInnermost(component, BuildSpecAware.class);- if (buildSpecAware != null) {- BuildSpec buildSpec = buildSpecAware.getBuildSpec();- if (buildSpec != null) {- JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);- if (jobAware != null) {- Job job = jobAware.getJob();- if (job != null) {- RevCommit commit;- if (page.getBlobIdent().revision != null)- commit = page.getCommit();- else- commit = null;- suggestions.addAll(SuggestionUtils.suggestVariables(- page.getProject(), commit, buildSpec, job, matchWith));- }- }- }- }- return suggestions;+ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestVariables(String matchWith) {+ return BuildSpec.suggestVariables(matchWith);}@SuppressWarnings("unused")@@ -91,16 +67,16 @@ public class CommandStep extends Step {ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();Project project = page.getProject();ObjectId commitId = page.getCommit();- BuildSpec buildSpec = ComponentContext.get().getComponent().findParent(BuildSpecAware.class).getBuildSpec();- Job job = ComponentContext.get().getComponent().findParent(JobAware.class).getJob();- for (InputSuggestion suggestion: SuggestionUtils.suggestVariables(project, commitId, buildSpec, job, ""))+ for (InputSuggestion suggestion: SuggestionUtils+ .suggestVariables(project, BuildSpec.get(), ParamSpec.list(), "")) {variables.add(suggestion.getContent());+ }return variables;}@Override- public Executable getExecutable(BuildSpec buildSpec) {- return new CommandExecutable(image, commands);+ public Executable getExecutable(Build build, ParamCombination paramCombination) {+ return new CommandExecutable(getImage(), getCommands());}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.javaindex 6bdd09efac..49cbbaf737 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java@@ -2,9 +2,13 @@ package io.onedev.server.buildspec.step;import java.io.Serializable;+import javax.validation.constraints.NotNull;+import io.onedev.k8shelper.Action;import io.onedev.k8shelper.Executable;-import io.onedev.server.buildspec.BuildSpec;+import io.onedev.k8shelper.ExecuteCondition;+import io.onedev.server.buildspec.param.ParamCombination;+import io.onedev.server.model.Build;import io.onedev.server.web.editable.annotation.Editable;@Editable@@ -12,20 +16,22 @@ public abstract class Step implements Serializable {private static final long serialVersionUID = 1L;- private boolean alwaysExecute;+ private ExecuteCondition condition = ExecuteCondition.ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL;- public abstract Executable getExecutable(BuildSpec buildSpec);+ public abstract Executable getExecutable(Build build, ParamCombination paramCombination);- @Editable(order=100000)- public boolean isAlwaysExecute() {- return alwaysExecute;+ @Editable(order=10000, description="Under which condition this step should run")+ @NotNull+ public ExecuteCondition getCondition() {+ return condition;}- public void setAlwaysExecute(boolean alwaysExecute) {- this.alwaysExecute = alwaysExecute;+ public void setCondition(ExecuteCondition condition) {+ this.condition = condition;}-- public Action getAction(BuildSpec buildSpec) {- return new Action(alwaysExecute, getExecutable(buildSpec));++ public Action getAction(Build build, ParamCombination paramCombination) {+ return new Action(getExecutable(build, paramCombination), condition);}+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplate.java b/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplate.javaindex 23989edd9c..4f0cbece3e 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplate.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplate.java@@ -5,25 +5,37 @@ import java.util.ArrayList;import java.util.List;import javax.validation.Valid;+import javax.validation.constraints.Size;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputCompletion;+import io.onedev.commons.codeassist.InputStatus;+import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.NamedElement;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.SuggestionProvider;@Editablepublic class StepTemplate implements NamedElement, Serializable {private static final long serialVersionUID = 1L;+ public static final String PROP_STEPS = "steps";+private String name;private List<Step> steps = new ArrayList<>();private List<ParamSpec> paramSpecs = new ArrayList<>();+ public StepTemplate() {+ steps.add(new CommandStep());+ }+@Editable(order=100)+ @SuggestionProvider("getNameSuggestions")@NotEmpty@Overridepublic String getName() {@@ -34,7 +46,19 @@ public class StepTemplate implements NamedElement, Serializable {this.name = name;}+ @SuppressWarnings("unused")+ private static List<InputCompletion> getNameSuggestions(InputStatus status) {+ BuildSpec buildSpec = BuildSpec.get();+ if (buildSpec != null) {+ List<String> candidates = new ArrayList<>(buildSpec.getStepTemplateMap().keySet());+ buildSpec.getStepTemplates().forEach(it->candidates.remove(it.getName()));+ return BuildSpec.suggestOverrides(candidates, status);+ }+ return new ArrayList<>();+ }+@Editable(order=200, name="Steps to Execute")+ @Size(min=1, max=1000, message="At least one step needs to be defined")public List<Step> getSteps() {return steps;}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplateAware.java b/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplateAware.javadeleted file mode 100644index 04d0eaf4e2..0000000000--- a/server-core/src/main/java/io/onedev/server/buildspec/step/StepTemplateAware.java+++ /dev/null@@ -1,10 +0,0 @@-package io.onedev.server.buildspec.step;--import javax.annotation.Nullable;--public interface StepTemplateAware {-- @Nullable- StepTemplate getTemplate();--}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.javaindex fb84b87a2d..b185c347ae 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/UseTemplateStep.java@@ -2,6 +2,7 @@ package io.onedev.server.buildspec.step;import java.util.ArrayList;import java.util.List;+import java.util.Map;import javax.validation.Valid;@@ -13,26 +14,33 @@ import io.onedev.k8shelper.Action;import io.onedev.k8shelper.CompositeExecutable;import io.onedev.k8shelper.Executable;import io.onedev.server.buildspec.BuildSpec;-import io.onedev.server.buildspec.job.Job;-import io.onedev.server.buildspec.job.JobAware;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;-import io.onedev.server.util.ComponentContext;+import io.onedev.server.buildspec.param.ParamCombination;+import io.onedev.server.buildspec.param.ParamUtils;+import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.buildspec.param.supply.ParamSupply;+import io.onedev.server.model.Build;+import io.onedev.server.util.EditContext;+import io.onedev.server.util.MatrixRunner;+import io.onedev.server.util.interpolative.VariableInterpolator;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.ParamSpecProvider;-import io.onedev.server.web.util.WicketUtils;@Editable(order=200, name="Use Step Template", description="Step to use specified template")public class UseTemplateStep extends Step {private static final long serialVersionUID = 1L;-++ public static final String PROP_TEMPLATE_NAME = "templateName";+private String templateName;private List<ParamSupply> params = new ArrayList<>();@Editable(order=100)+ @ChoiceProvider("getTemplateChoices")@NotEmptypublic String getTemplateName() {return templateName;@@ -41,6 +49,17 @@ public class UseTemplateStep extends Step {public void setTemplateName(String templateName) {this.templateName = templateName;}++ @SuppressWarnings("unused")+ private static List<String> getTemplateChoices() {+ List<String> templateNames = new ArrayList<>(BuildSpec.get().getStepTemplateMap().keySet());++ EditContext editContext = EditContext.get(1);+ BeanEditor beanEditor = ((Component) editContext).findParent(BeanEditor.class);+ if (beanEditor.getDescriptor().getBeanClass() == StepTemplate.class)+ templateNames.remove(editContext.getInputValue("name"));+ return templateNames;+ }@Editable(name="Step Parameters", order=200)@ParamSpecProvider("getParamSpecs")@@ -56,24 +75,39 @@ public class UseTemplateStep extends Step {@SuppressWarnings("unused")private static List<ParamSpec> getParamSpecs() {- Component component = ComponentContext.get().getComponent();- JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);- if (jobAware != null) {- Job job = jobAware.getJob();- if (job != null)- return job.getParamSpecs();- }+ String templateName = (String) EditContext.get().getInputValue(PROP_TEMPLATE_NAME);+ if (templateName != null) {+ BuildSpec buildSpec = BuildSpec.get();+ StepTemplate template = buildSpec.getStepTemplateMap().get(templateName);+ if (template != null)+ return template.getParamSpecs();+ }return new ArrayList<>();}@Override- public Executable getExecutable(BuildSpec buildSpec) {- StepTemplate template = buildSpec.getStepTemplateMap().get(templateName);+ public Executable getExecutable(Build build, ParamCombination paramCombination) {+ StepTemplate template = build.getSpec().getStepTemplateMap().get(templateName);if (template == null)throw new ExplicitException("Step template not found: " + templateName);+List<Action> actions = new ArrayList<>();- for (Step step: template.getSteps())- actions.add(step.getAction(buildSpec));+ new MatrixRunner<List<String>>(ParamUtils.getParamMatrix(build, paramCombination, getParams())) {++ @Override+ public void run(Map<String, List<String>> paramMap) {+ ParamUtils.validateParamMap(template.getParamSpecs(), paramMap);++ ParamCombination newParamCombination = new ParamCombination(template.getParamSpecs(), paramMap);+ VariableInterpolator interpolator = new VariableInterpolator(build, newParamCombination);+ for (Step step: template.getSteps()) {+ step = interpolator.interpolateProperties(step);+ actions.add(step.getAction(build, newParamCombination));+ }+ }++ }.run();+return new CompositeExecutable(actions);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.javaindex 82baf7d355..daa2e6c3f2 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java@@ -21,7 +21,5 @@ public interface GroupManager extends EntityManager<Group> {@NullableGroup find(String name);-- @Nullable- Group findAnonymous();+}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 c3205250ae..70f6ce4c62 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@@ -49,7 +49,6 @@ import io.onedev.commons.utils.FileUtils;import io.onedev.server.entitymanager.BuildDependenceManager;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildParamManager;-import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.entity.EntityRemoved;@@ -103,8 +102,6 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buiprivate final StorageManager storageManager;- private final GroupManager groupManager;-private final ProjectManager projectManager;private final TaskScheduler taskScheduler;@@ -126,14 +123,12 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui@Injectpublic DefaultBuildManager(Dao dao, BuildParamManager buildParamManager,TaskScheduler taskScheduler, BuildDependenceManager buildDependenceManager,- GroupManager groupManager, StorageManager storageManager,- ProjectManager projectManager, SessionManager sessionManager,- TransactionManager transactionManager) {+ StorageManager storageManager, ProjectManager projectManager,+ SessionManager sessionManager, TransactionManager transactionManager) {super(dao);this.buildParamManager = buildParamManager;this.buildDependenceManager = buildDependenceManager;this.storageManager = storageManager;- this.groupManager = groupManager;this.projectManager = projectManager;this.taskScheduler = taskScheduler;this.sessionManager = sessionManager;@@ -890,12 +885,9 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui}}}- Group group = groupManager.findAnonymous();- if (group != null) {- for (GroupAuthorization authorization: group.getAuthorizations()) {- populateAccessibleJobNames(accessibleJobNames, jobNames,- authorization.getProject(), authorization.getRole());- }+ for (Project project: projectManager.query()) {+ if (project.getDefaultRole() != null)+ populateAccessibleJobNames(accessibleJobNames, jobNames, project, project.getDefaultRole());}}return accessibleJobNames;@@ -931,15 +923,8 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui}}}- Group group = groupManager.findAnonymous();- if (group != null) {- for (GroupAuthorization authorization: group.getAuthorizations()) {- if (project == null || project.equals(authorization.getProject())) {- populateAccessibleJobNames(accessibleJobNames, availableJobNames,- authorization.getRole());- }- }- }+ if (project.getDefaultRole() != null)+ populateAccessibleJobNames(accessibleJobNames, availableJobNames, project.getDefaultRole());}}return accessibleJobNames;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.javaindex f06328814c..09fbb5219d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildMetricManager.java@@ -35,7 +35,6 @@ import com.google.common.base.Preconditions;import io.onedev.commons.launcher.loader.Listen;import io.onedev.server.entitymanager.BuildMetricManager;-import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStarted;@@ -68,17 +67,14 @@ public class DefaultBuildMetricManager implements BuildMetricManager {private final TransactionManager transactionManager;- private final GroupManager groupManager;-private final Map<Key, Map<String, Collection<String>>> reportNames = new HashMap<>();private final ReadWriteLock reportNamesLock = new ReentrantReadWriteLock();@Inject- public DefaultBuildMetricManager(Dao dao, TransactionManager transactionManager, GroupManager groupManager) {+ public DefaultBuildMetricManager(Dao dao, TransactionManager transactionManager) {this.dao = dao;this.transactionManager = transactionManager;- this.groupManager = groupManager;}@SuppressWarnings("resource")@@ -290,14 +286,9 @@ public class DefaultBuildMetricManager implements BuildMetricManager {}}}- Group group = groupManager.findAnonymous();- if (group != null) {- for (GroupAuthorization authorization: group.getAuthorizations()) {- if (project.equals(authorization.getProject())) {- populateAccessibleReportNames(accessibleReportNames, availableReportNames,- project, authorization.getRole());- }- }+ if (project.getDefaultRole() != null) {+ populateAccessibleReportNames(accessibleReportNames, availableReportNames,+ project, project.getDefaultRole());}}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.javaindex 2f6636421a..04904f76de 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java@@ -18,7 +18,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.loader.Listen;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.entitymanager.BuildParamManager;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStarted;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.javaindex e032297c02..fc14cc45f4 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java@@ -6,10 +6,7 @@ import javax.inject.Inject;import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.IssueFieldManager;import io.onedev.server.entitymanager.ProjectManager;@@ -18,7 +15,6 @@ import io.onedev.server.model.Group;import io.onedev.server.model.Project;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.TagProtection;-import io.onedev.server.model.support.administration.SecuritySetting;import io.onedev.server.model.support.administration.authenticator.Authenticator;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -30,8 +26,6 @@ import io.onedev.server.util.usage.Usage;@Singletonpublic class DefaultGroupManager extends BaseEntityManager<Group> implements GroupManager {- private static final Logger logger = LoggerFactory.getLogger(DefaultGroupManager.class);-private final ProjectManager projectManager;private final SettingManager settingManager;@@ -66,7 +60,6 @@ public class DefaultGroupManager extends BaseEntityManager<Group> implements GroissueFieldManager.onRenameGroup(oldName, group.getName());settingManager.getIssueSetting().onRenameGroup(oldName, group.getName());- settingManager.getSecuritySetting().onRenameGroup(oldName, group.getName());}dao.persist(group);}@@ -91,8 +84,6 @@ public class DefaultGroupManager extends BaseEntityManager<Group> implements Groif (authenticator != null)usage.add(authenticator.onDeleteGroup(group.getName()).prefix("administration"));- usage.add(settingManager.getSecuritySetting().onDeleteGroup(group.getName()).prefix("administration"));-usage.checkInUse("Group '" + group.getName() + "'");dao.remove(group);@@ -117,17 +108,4 @@ public class DefaultGroupManager extends BaseEntityManager<Group> implements Groreturn count(true);}- @Override- public Group findAnonymous() {- SecuritySetting securitySetting = OneDev.getInstance(SettingManager.class).getSecuritySetting();- if (securitySetting.isEnableAnonymousAccess()) {- Group group = find(securitySetting.getAnonymousGroup());- if (group != null)- return group;- else- logger.error("Undefined anonymous group: " + securitySetting.getAnonymousGroup());- }- return null;- }-}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 6b79240051..0e15c113f4 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,7 +14,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.entitymanager.IssueFieldManager;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.model.support.issue.field.spec.FieldSpec;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;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 40b839c033..fd7126f6d9 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@@ -61,7 +61,7 @@ import io.onedev.server.model.support.issue.changedata.IssueChangeData;import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData;import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData;import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 072192eff6..e26297bced 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -49,7 +49,6 @@ import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.buildspec.job.JobManager;import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;@@ -63,7 +62,6 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.git.command.CloneCommand;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build;-import io.onedev.server.model.Group;import io.onedev.server.model.GroupAuthorization;import io.onedev.server.model.Issue;import io.onedev.server.model.Membership;@@ -104,8 +102,6 @@ public class DefaultProjectManager extends BaseEntityManager<Project>private final BuildManager buildManager;- private final GroupManager groupManager;-private final AvatarManager avatarManager;private final SettingManager settingManager;@@ -134,7 +130,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>@Injectpublic DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager,- BuildManager buildManager, AvatarManager avatarManager, GroupManager groupManager,+ BuildManager buildManager, AvatarManager avatarManager,SettingManager settingManager, TransactionManager transactionManager,SessionManager sessionManager, ListenerRegistry listenerRegistry,TaskScheduler taskScheduler, UserAuthorizationManager userAuthorizationManager,@@ -143,7 +139,6 @@ public class DefaultProjectManager extends BaseEntityManager<Project>this.commitInfoManager = commitInfoManager;this.buildManager = buildManager;- this.groupManager = groupManager;this.avatarManager = avatarManager;this.settingManager = settingManager;this.transactionManager = transactionManager;@@ -525,16 +520,9 @@ public class DefaultProjectManager extends BaseEntityManager<Project>projects.add(authorization.getProject());}}- Group group = groupManager.findAnonymous();- if (group != null) {- if (group.isAdministrator()) {- projects.addAll(query());- } else {- for (GroupAuthorization authorization: group.getAuthorizations()) {- if (authorization.getRole().implies(permission))- projects.add(authorization.getProject());- }- }+ for (Project project: query()) {+ if (project.getDefaultRole() != null && project.getDefaultRole().implies(permission))+ projects.add(project);}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.javaindex 26b3314b8a..2b12e69d9a 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java@@ -10,6 +10,7 @@ import javax.inject.Singleton;import org.hibernate.ReplicationMode;import org.hibernate.criterion.Restrictions;+import org.hibernate.query.Query;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;@@ -69,6 +70,10 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleMusage.add(settingManager.getIssueSetting().onDeleteRole(role.getName()).prefix("administration"));usage.checkInUse("Role '" + role.getName() + "'");++ Query<?> query = getSession().createQuery("update Project set defaultRole=null where defaultRole=:role");+ query.setParameter("role", role);+ query.executeUpdate();dao.remove(role);}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 335edc2e7e..1e4006dbe6 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@@ -13,7 +13,7 @@ import io.onedev.server.event.MarkdownAware;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.model.support.issue.field.spec.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/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 7350345f63..edac5becc4 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -6,9 +6,11 @@ import java.io.InputStream;import java.nio.charset.StandardCharsets;import java.nio.file.Files;import java.nio.file.Path;+import java.util.ArrayList;import java.util.Collections;import java.util.HashMap;import java.util.HashSet;+import java.util.List;import java.util.Map;import java.util.Set;import java.util.Stack;@@ -18,6 +20,7 @@ import javax.inject.Singleton;import org.apache.commons.io.IOUtils;import org.apache.commons.lang3.RandomStringUtils;+import org.apache.commons.lang3.tuple.Triple;import org.dom4j.Element;import org.dom4j.Node;@@ -27,6 +30,7 @@ import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.util.Pair;@Singleton@SuppressWarnings("unused")@@ -2362,5 +2366,87 @@ public class DataMigrator {}}}++ // Migrate to 4.3.0+ private void migrate53(File dataDir, Stack<Integer> versions) {+ String anonymousGroupName = null;+ Map<String, String> groupIds = new HashMap<>();+ List<Triple<String, String, String>> authorizations = new ArrayList<>();++ for (File file: dataDir.listFiles()) {+ try {+ String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);+ content = StringUtils.replace(content,+ "io.onedev.server.model.support.issue.fieldspec.",+ "io.onedev.server.model.support.issue.field.spec.");+ content = StringUtils.replace(content,+ "io.onedev.server.model.support.issue.fieldsupply.",+ "io.onedev.server.model.support.issue.field.supply.");+ content = StringUtils.replace(content,+ "org.server.plugin.report.checkstyle.",+ "io.onedev.server.plugin.report.checkstyle.");+ content = StringUtils.replace(content,+ "org.server.plugin.report.clover.",+ "io.onedev.server.plugin.report.clover.");++ FileUtils.writeStringToFile(file, content, StandardCharsets.UTF_8);++ if (file.getName().startsWith("Settings.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ if (element.elementTextTrim("key").equals("SECURITY")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ Element anonymousGroupElement = valueElement.element("anonymousGroup");+ if (anonymousGroupElement != null) {+ if (valueElement.elementTextTrim("enableAnonymousAccess").equals("true"))+ anonymousGroupName = anonymousGroupElement.getText().trim();+ anonymousGroupElement.detach();+ }+ }+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Groups.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements())+ groupIds.put(element.elementText("name").trim(), element.elementText("id").trim());+ } else if (file.getName().startsWith("GroupAuthorizations.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String groupId = element.elementText("group").trim();+ String projectId = element.elementText("project").trim();+ String roleId = element.elementText("role").trim();+ authorizations.add(Triple.of(groupId, projectId, roleId));+ }+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ Map<String, String> defaultRoles = new HashMap<>();++ if (anonymousGroupName != null) {+ String anonymousGroupId = groupIds.get(anonymousGroupName);+ for (Triple<String, String, String> authorization: authorizations) {+ if (authorization.getLeft().equals(anonymousGroupId))+ defaultRoles.put(authorization.getMiddle(), authorization.getRight());+ }+ }++ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Projects.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String defaultRoleId = defaultRoles.get(element.elementText("id").trim());+ if (defaultRoleId != null)+ element.addElement("defaultRole").setText(defaultRoleId);+ }+ dom.writeToFile(file, false);+ }+ }++ }}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 f7663c0c4c..41bd71a6be 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@@ -17,20 +17,16 @@ import static io.onedev.server.model.Build.PROP_VERSION;import java.io.File;import java.io.IOException;import java.io.Serializable;-import java.lang.reflect.Field;-import java.lang.reflect.InvocationTargetException;-import java.lang.reflect.Method;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;-import java.util.Comparator;import java.util.Date;import java.util.HashMap;import java.util.HashSet;import java.util.Iterator;-import java.util.LinkedHashMap;import java.util.List;import java.util.Map;+import java.util.Optional;import java.util.Set;import java.util.Stack;import java.util.concurrent.Callable;@@ -65,10 +61,11 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;-import io.onedev.server.buildspec.job.VariableInterpolator;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;-import io.onedev.server.buildspec.job.paramspec.SecretParam;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;+import io.onedev.server.buildspec.param.ParamCombination;+import io.onedev.server.buildspec.param.ParamUtils;+import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.buildspec.param.spec.SecretParam;+import io.onedev.server.buildspec.param.supply.ParamSupply;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;@@ -78,7 +75,6 @@ import io.onedev.server.model.support.build.JobSecret;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.BeanUtils;import io.onedev.server.util.CollectionUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.Day;@@ -88,14 +84,12 @@ import io.onedev.server.util.MatrixRunner;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.Referenceable;import io.onedev.server.util.facade.BuildFacade;-import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.script.identity.JobIdentity;import io.onedev.server.util.script.identity.ScriptIdentity;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;@@ -334,17 +328,15 @@ public class Build extends AbstractEntity implements Referenceable {@ManyToOne(fetch=FetchType.LAZY)private PullRequest request;- private transient Map<String, List<String>> paramMap;-private transient Collection<Long> fixedIssueNumbers;private transient Map<Build.Status, Collection<RevCommit>> commitsCache;- private transient BuildSpec spec;+ private transient Optional<BuildSpec> spec;- private transient Job job;+ private transient Map<String, List<String>> paramMap;- private transient Map<String, Input> paramInputs;+ private transient ParamCombination paramCombination;private transient Map<Build.Status, Build> streamPreviousCache = new HashMap<>();@@ -644,7 +636,25 @@ public class Build extends AbstractEntity implements Referenceable {}return paramMap;}-++ public ParamCombination getParamCombination() {+ if (paramCombination == null) {+ if (getJob() != null)+ paramCombination = new ParamCombination(getJob().getParamSpecs(), getParamMap());+ else+ paramCombination = new ParamCombination(new ArrayList<>(), getParamMap());+ }+ return paramCombination;+ }++ public Map<String, Input> getParamInputs() {+ return getParamCombination().getParamInputs();+ }++ public boolean isParamVisible(String paramName) {+ return getParamCombination().isParamVisible(paramName);+ }+/*** Get fixed issue numbers*@@ -694,45 +704,6 @@ public class Build extends AbstractEntity implements Referenceable {return commitsCache.get(sincePrevStatus);}- public Map<String, Input> getParamInputs() {- if (paramInputs == null) {- paramInputs = new LinkedHashMap<>();- Map<String, List<BuildParam>> paramMap = new HashMap<>();- for (BuildParam param: getParams()) {- List<BuildParam> paramsOfName = paramMap.get(param.getName());- if (paramsOfName == null) {- paramsOfName = new ArrayList<>();- paramMap.put(param.getName(), paramsOfName);- }- paramsOfName.add(param);- }- for (ParamSpec paramSpec: getJob().getParamSpecs()) {- String paramName = paramSpec.getName();- List<BuildParam> params = paramMap.get(paramName);- if (params != null) {- String type = params.iterator().next().getType();- List<String> values = new ArrayList<>();- for (BuildParam param: params) {- if (param.getValue() != null)- values.add(param.getValue());- }- Collections.sort(values, new Comparator<String>() {-- @Override- public int compare(String o1, String o2) {- return (int) (paramSpec.getOrdinal(o1) - paramSpec.getOrdinal(o2));- }-- });- if (!paramSpec.isAllowMultiple() && values.size() > 1)- values = Lists.newArrayList(values.iterator().next());- paramInputs.put(paramName, new Input(paramName, type, values));- }- }- }- return paramInputs;- }-public BuildFacade getFacade() {return new BuildFacade(getId(), getProject().getId(), getCommitHash());}@@ -758,27 +729,6 @@ public class Build extends AbstractEntity implements Referenceable {return secretValuesToMask;}- public boolean isParamVisible(String paramName) {- return isParamVisible(paramName, Sets.newHashSet());- }-- private boolean isParamVisible(String paramName, Set<String> checkedParamNames) {- if (!checkedParamNames.add(paramName))- return false;-- ParamSpec paramSpec = Preconditions.checkNotNull(getJob().getParamSpecMap().get(paramName));- if (paramSpec.getShowCondition() != null) {- Input dependentInput = getParamInputs().get(paramSpec.getShowCondition().getInputName());- Preconditions.checkNotNull(dependentInput);- if (paramSpec.getShowCondition().getValueMatcher().matches(dependentInput.getValues()))- return isParamVisible(dependentInput.getName(), checkedParamNames);- else- return false;- } else {- return true;- }- }-public String getSecretValue(String secretName) {if (secretName.startsWith(SecretInput.LITERAL_VALUE_PREFIX)) {return secretName.substring(SecretInput.LITERAL_VALUE_PREFIX.length());@@ -795,22 +745,22 @@ public class Build extends AbstractEntity implements Referenceable {}}+ @Nullablepublic BuildSpec getSpec() {if (spec == null)- spec = Preconditions.checkNotNull(getProject().getBuildSpec(getCommitId()));- return spec;+ spec = Optional.ofNullable(getProject().getBuildSpec(getCommitId()));+ return spec.orElse(null);}+ @Nullablepublic Job getJob() {- if (job == null)- job = Preconditions.checkNotNull(getSpec().getJobMap().get(getJobName()));- return job;+ return getSpec()!=null? getSpec().getJobMap().get(getJobName()): null;}public Serializable getParamBean() {Serializable paramBean;try {- paramBean = (Serializable) ParamSupply.defineBeanClass(getJob().getParamSpecs()).newInstance();+ paramBean = (Serializable) ParamUtils.defineBeanClass(getJob().getParamSpecs()).newInstance();} catch (InstantiationException | IllegalAccessException e) {throw new RuntimeException(e);}@@ -819,7 +769,7 @@ public class Build extends AbstractEntity implements Referenceable {for (PropertyDescriptor property: groupProperties) {ParamSpec paramSpec = getJob().getParamSpecMap().get(property.getDisplayName());Preconditions.checkNotNull(paramSpec);- Input input = Preconditions.checkNotNull(getParamInputs().get(paramSpec.getName()));+ Input input = Preconditions.checkNotNull(getParamCombination().getParamInputs().get(paramSpec.getName()));property.setPropertyValue(paramBean, paramSpec.convertToObject(input.getValues()));}}@@ -911,79 +861,6 @@ public class Build extends AbstractEntity implements Referenceable {return "build-artifacts:" + getId();}- public String interpolate(@Nullable String interpolativeString) {- if (interpolativeString != null)- return Interpolative.parse(interpolativeString).interpolateWith(new VariableInterpolator(this));- else- return null;- }-- @SuppressWarnings("unchecked")- public <T> T interpolateProperties(T object) {- Class<T> clazz = VariableInterpolator.getUninterceptedClass(object);-- T unintercepted;- try {- unintercepted = clazz.newInstance();- } catch (InstantiationException | IllegalAccessException e) {- throw new RuntimeException(e);- }-- for (Field field: BeanUtils.findFields(clazz)) {- field.setAccessible(true);- try {- field.set(unintercepted, field.get(object));- } catch (IllegalArgumentException | IllegalAccessException e) {- throw new RuntimeException(e);- }- }-- for (Method getter: BeanUtils.findGetters(clazz)) {- if (getter.getAnnotation(Editable.class) != null) {- Method setter = BeanUtils.findSetter(getter);- if (setter != null) {- try {- Object propertyValue = getter.invoke(unintercepted);- if (propertyValue != null) {- Class<?> propertyClass = VariableInterpolator.getUninterceptedClass(propertyValue);- if (getter.getAnnotation(io.onedev.server.web.editable.annotation.Interpolative.class) != null) {- try {- if (propertyValue instanceof String) {- setter.invoke(unintercepted, interpolate((String) propertyValue));- } else if (propertyValue instanceof List) {- List<String> interpolatedList = new ArrayList<>();- for (String element: (List<String>) propertyValue)- interpolatedList.add(interpolate(element));- setter.invoke(unintercepted, interpolatedList);- }- } catch (Exception e) {- String message = String.format("Error interpolating (class: %s, property: %s)",- propertyClass, BeanUtils.getPropertyName(getter));- throw new RuntimeException(message, e);- }- } else if (propertyClass.getAnnotation(Editable.class) != null) {- setter.invoke(unintercepted, interpolateProperties(propertyValue));- } else if (propertyValue instanceof List) {- List<Object> uninterceptedList = new ArrayList<>();- for (Object element: (List<?>)propertyValue) {- if (element != null && VariableInterpolator.getUninterceptedClass(element).getAnnotation(Editable.class) != null)- uninterceptedList.add(interpolateProperties(element));- else- uninterceptedList.add(element);- }- setter.invoke(unintercepted, uninterceptedList);- }- }- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {- throw new RuntimeException(e);- }- }- }- }-- return unintercepted;- }-public ProjectScopedNumber getFQN() {return new ProjectScopedNumber(getProject(), getNumber());}@@ -1066,7 +943,7 @@ public class Build extends AbstractEntity implements Referenceable {public boolean matchParams(List<ParamSupply> paramSupplies) {AtomicBoolean matches = new AtomicBoolean(false);- new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(null, paramSupplies)) {+ new MatrixRunner<List<String>>(ParamUtils.getParamMatrix(null, null, paramSupplies)) {@Overridepublic void run(Map<String, List<String>> params) {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 a27039a684..291b90b123 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@@ -59,7 +59,7 @@ import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.LastUpdate;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.security.SecurityUtils;import io.onedev.server.storage.AttachmentStorageSupport;import io.onedev.server.util.CollectionUtils;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 4ed6ecc67d..a4f184723b 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@@ -230,6 +230,10 @@ public class Project extends AbstractEntity {@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<Project> forks = new ArrayList<>();+ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=true)+ private Role defaultRole;+@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)private Collection<GroupAuthorization> groupAuthorizations = new ArrayList<>();@@ -390,6 +394,15 @@ public class Project extends AbstractEntity {this.outgoingRequests = outgoingRequests;}+ @Nullable+ public Role getDefaultRole() {+ return defaultRole;+ }++ public void setDefaultRole(Role defaultRole) {+ this.defaultRole = defaultRole;+ }+public Collection<GroupAuthorization> getGroupAuthorizations() {return groupAuthorizations;}diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.javaindex 9ea5772037..ddc0e1d147 100644--- a/server-core/src/main/java/io/onedev/server/model/Role.java+++ b/server-core/src/main/java/io/onedev/server/model/Role.java@@ -86,6 +86,9 @@ public class Role extends AbstractEntity implements Permission {@Column(length=65535, nullable=false)private ArrayList<JobPrivilege> jobPrivileges = new ArrayList<>();+ @OneToMany(mappedBy="defaultRole")+ private Collection<Project> defaultProjects = new ArrayList<>();+@OneToMany(mappedBy="role", cascade=CascadeType.REMOVE)private Collection<UserAuthorization> userAuthorizations = new ArrayList<>();@@ -225,6 +228,14 @@ public class Role extends AbstractEntity implements Permission {this.jobPrivileges = (ArrayList<JobPrivilege>) jobPrivileges;}+ public Collection<Project> getDefaultProjects() {+ return defaultProjects;+ }++ public void setDefaultProjects(Collection<Project> defaultProjects) {+ this.defaultProjects = defaultProjects;+ }+public Collection<UserAuthorization> getUserAuthorizations() {return userAuthorizations;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javaindex 4afd69216e..5caceb78aa 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java@@ -27,10 +27,10 @@ import io.onedev.server.model.support.issue.IssueTemplate;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.BuildChoiceField;-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.field.spec.BuildChoiceField;+import io.onedev.server.model.support.issue.field.spec.ChoiceField;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.UserChoiceField;import io.onedev.server.model.support.issue.transitiontrigger.BranchUpdateTrigger;import io.onedev.server.model.support.issue.transitiontrigger.BuildSuccessfulTrigger;import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.javaindex cda7f75869..ee7f1a2dd8 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SecuritySetting.java@@ -2,13 +2,7 @@ package io.onedev.server.model.support.administration;import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;--import io.onedev.server.util.EditContext;-import io.onedev.server.util.usage.Usage;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.GroupChoice;-import io.onedev.server.web.editable.annotation.ShowCondition;@Editablepublic class SecuritySetting implements Serializable {@@ -17,8 +11,6 @@ public class SecuritySetting implements Serializable {private boolean enableAnonymousAccess = false;- private String anonymousGroup;-private boolean enableSelfRegister = true;@Editable(order=100, description="Whether or not to allow anonymous users to access this server")@@ -30,24 +22,7 @@ public class SecuritySetting implements Serializable {this.enableAnonymousAccess = enableAnonymousAccess;}- @Editable(order=150, description="Specify the group to grant permissions for anonymous access")- @GroupChoice- @ShowCondition("isAnonymousGroupVisible")- @NotEmpty- public String getAnonymousGroup() {- return anonymousGroup;- }-- public void setAnonymousGroup(String anonymousGroup) {- this.anonymousGroup = anonymousGroup;- }-- @SuppressWarnings("unused")- private static boolean isAnonymousGroupVisible() {- return (boolean) EditContext.get().getInputValue("enableAnonymousAccess");- }-- @Editable(order=200, name="Enable Sign-Up", description="User can sign up if this option is enabled")+ @Editable(order=200, name="Enable Self Sign-Up", description="User can sign up if this option is enabled")public boolean isEnableSelfRegister() {return enableSelfRegister;}@@ -56,16 +31,4 @@ public class SecuritySetting implements Serializable {this.enableSelfRegister = enableSelfRegister;}- public void onRenameGroup(String oldName, String newName) {- if (enableAnonymousAccess && oldName.equals(anonymousGroup))- anonymousGroup = newName;- }-- public Usage onDeleteGroup(String groupName) {- Usage usage = new Usage();- if (enableAnonymousAccess && groupName.equals(anonymousGroup))- usage.add("anonymous group");- return usage.prefix("security setting");- }-}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.javaindex 04284f51a4..128b713544 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java@@ -6,7 +6,7 @@ import java.util.List;import javax.validation.constraints.Size;-import io.onedev.server.buildspec.job.JobService;+import io.onedev.server.buildspec.Service;import io.onedev.server.util.match.Matcher;import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;@@ -61,7 +61,7 @@ public class ServiceLocator implements Serializable {this.nodeSelector = nodeSelector;}- public final boolean isApplicable(JobService service) {+ public final boolean isApplicable(Service service) {Matcher matcher = new PathMatcher();return (getServiceNames() == null || PatternSet.parse(getServiceNames()).matches(matcher, service.getName()))&& (getServiceImages() == null || PatternSet.parse(getServiceImages()).matches(matcher, service.getImage()));diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.javaindex ab52a0f273..a0cc549d37 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java@@ -220,4 +220,5 @@ public class ProjectBuildSetting implements Serializable {}}}+}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/model/support/inputspec/choiceinput/choiceprovider/SpecifiedChoices.javaindex c0ce507785..2b8066958a 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/model/support/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java@@ -12,9 +12,9 @@ import javax.annotation.Nullable;import javax.validation.ConstraintValidatorContext;import javax.validation.constraints.Size;-import io.onedev.server.buildspec.job.paramspec.ChoiceParam;+import io.onedev.server.buildspec.param.spec.ChoiceParam;import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.issue.fieldspec.ChoiceField;+import io.onedev.server.model.support.issue.field.spec.ChoiceField;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/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.javaindex 21f10f1f29..c11f28bb57 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java@@ -24,10 +24,10 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;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.model.support.issue.fieldspec.GroupChoiceField;-import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;+import io.onedev.server.model.support.issue.field.spec.ChoiceField;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;+import io.onedev.server.model.support.issue.field.spec.UserChoiceField;import io.onedev.server.util.EditContext;import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;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/model/support/issue/TransitionSpec.javaindex 5bd56aa837..c2ac5f4b30 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java@@ -18,7 +18,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.model.support.issue.transitiontrigger.TransitionTrigger;import io.onedev.server.search.entity.issue.IssueQuery;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 31f698f799..59cd6d2afc 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@@ -19,7 +19,7 @@ import io.onedev.server.model.Group;import io.onedev.server.model.Issue;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.model.support.issue.field.spec.FieldSpec;import io.onedev.server.util.CommentAware;import io.onedev.server.util.Input;import io.onedev.server.web.component.propertychangepanel.PropertyChangePanel;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/FieldSupply.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.javasimilarity index 58%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/FieldSupply.javarename to server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.javaindex 5a53f0ebdf..b5e26d45ff 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/FieldSupply.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java@@ -1,92 +1,27 @@-package io.onedev.server.model.support.issue.fieldsupply;+package io.onedev.server.model.support.issue.field;-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.model.support.inputspec.SecretInput;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;-import io.onedev.server.model.support.issue.fieldspec.SecretField;-import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.SecretField;+import io.onedev.server.model.support.issue.field.supply.FieldSupply;+import io.onedev.server.model.support.issue.field.supply.SpecifiedValue;-@Editable-public class FieldSupply implements Serializable {-- private static final long serialVersionUID = 1L;+public class FieldUtils {private static final Logger logger = LoggerFactory.getLogger(FieldSupply.class);- private String name;-- private boolean secret;-- private ValueProvider valueProvider = new SpecifiedValue();-- @Editable- @NotEmpty- public String getName() {- return name;- }-- public void setName(String name) {- this.name = name;- }-- @Editable- @NotNull- @Valid- public ValueProvider getValueProvider() {- return valueProvider;- }-- public void setValueProvider(ValueProvider valueProvider) {- this.valueProvider = valueProvider;- }-- @Editable- 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);@@ -137,5 +72,5 @@ public class FieldSupply implements Serializable {}validateFieldMap(fieldSpecs, fieldMap);}-+}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/model/support/issue/field/spec/BooleanField.javasimilarity index 96%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/model/support/issue/field/spec/BooleanField.javaindex c974ce53c9..3981d2ed13 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/model/support/issue/field/spec/BooleanField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;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/model/support/issue/field/spec/BuildChoiceField.javasimilarity index 93%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/model/support/issue/field/spec/BuildChoiceField.javaindex 78d81db20d..3b7a2c0d77 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/model/support/issue/field/spec/BuildChoiceField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;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/model/support/issue/field/spec/ChoiceField.javasimilarity index 98%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/model/support/issue/field/spec/ChoiceField.javaindex 06fcefa36f..81ec19123e 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/model/support/issue/field/spec/ChoiceField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.model.support.issue.field.spec;import java.util.ArrayList;import java.util.List;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/model/support/issue/field/spec/CommitField.javasimilarity index 92%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/model/support/issue/field/spec/CommitField.javaindex 059f59184e..58eacf6f2b 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/model/support/issue/field/spec/CommitField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;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/model/support/issue/field/spec/DateField.javasimilarity index 96%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/model/support/issue/field/spec/DateField.javaindex 185c835125..41613abe3c 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/model/support/issue/field/spec/DateField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;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/model/support/issue/field/spec/FieldSpec.javasimilarity index 96%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/model/support/issue/field/spec/FieldSpec.javaindex b02df56cae..b65889fb64 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/model/support/issue/field/spec/FieldSpec.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.model.support.issue.field.spec;import java.util.Collection;import java.util.HashSet;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/model/support/issue/field/spec/GroupChoiceField.javasimilarity index 98%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/model/support/issue/field/spec/GroupChoiceField.javaindex b5fec22208..c165889263 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/model/support/issue/field/spec/GroupChoiceField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;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/model/support/issue/field/spec/IssueChoiceField.javasimilarity index 94%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/model/support/issue/field/spec/IssueChoiceField.javaindex 0262bbefc2..407dcf465d 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/model/support/issue/field/spec/IssueChoiceField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;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/model/support/issue/field/spec/NumberField.javasimilarity index 97%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/model/support/issue/field/spec/NumberField.javaindex bd590a6caf..96970ae34d 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/model/support/issue/field/spec/NumberField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;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/model/support/issue/field/spec/PullRequestChoiceField.javasimilarity index 94%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/model/support/issue/field/spec/PullRequestChoiceField.javaindex 2d09d3cd20..d25fd0a496 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/model/support/issue/field/spec/PullRequestChoiceField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;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/model/support/issue/field/spec/SecretField.javasimilarity index 93%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/model/support/issue/field/spec/SecretField.javaindex 03398af75e..36f1aa217c 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/model/support/issue/field/spec/SecretField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;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/model/support/issue/field/spec/TextField.javasimilarity index 96%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/model/support/issue/field/spec/TextField.javaindex 4671830fd1..b71c5d2006 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/model/support/issue/field/spec/TextField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;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/model/support/issue/field/spec/UserChoiceField.javasimilarity index 98%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/model/support/issue/field/spec/UserChoiceField.javaindex 4d10096243..9b2825fddf 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/model/support/issue/field/spec/UserChoiceField.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldspec;+package io.onedev.server.model.support.issue.field.spec;import java.util.List;import java.util.Map;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/FieldSupply.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/FieldSupply.javanew file mode 100644index 0000000000..7510aff907--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/FieldSupply.java@@ -0,0 +1,76 @@+package io.onedev.server.model.support.issue.field.supply;++import java.io.Serializable;++import javax.validation.Valid;+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 io.onedev.server.web.editable.annotation.Editable;++@Editable+public class FieldSupply implements Serializable {++ private static final long serialVersionUID = 1L;++ private String name;++ private boolean secret;++ private ValueProvider valueProvider = new SpecifiedValue();++ @Editable+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable+ @NotNull+ @Valid+ public ValueProvider getValueProvider() {+ return valueProvider;+ }++ public void setValueProvider(ValueProvider valueProvider) {+ this.valueProvider = valueProvider;+ }++ @Editable+ 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();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/Ignore.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/Ignore.javasimilarity index 91%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/Ignore.javarename to server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/Ignore.javaindex 680fe7831b..91a88e3427 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/Ignore.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/Ignore.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldsupply;+package io.onedev.server.model.support.issue.field.supply;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/ScriptingValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/ScriptingValue.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/ScriptingValue.javarename to server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/ScriptingValue.javaindex 4bc4798427..724af5effe 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/ScriptingValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/ScriptingValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldsupply;+package io.onedev.server.model.support.issue.field.supply;import java.util.ArrayList;import java.util.Collection;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/SpecifiedValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/SpecifiedValue.javasimilarity index 90%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/SpecifiedValue.javarename to server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/SpecifiedValue.javaindex 7524f2fff6..610efb08b1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/SpecifiedValue.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/SpecifiedValue.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldsupply;+package io.onedev.server.model.support.issue.field.supply;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/ValueProvider.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/ValueProvider.javasimilarity index 74%rename from server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/ValueProvider.javarename to server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/ValueProvider.javaindex 8ff413eead..1bdfd309ab 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/fieldsupply/ValueProvider.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/ValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue.fieldsupply;+package io.onedev.server.model.support.issue.field.supply;import java.io.Serializable;import java.util.List;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/model/support/issue/transitiontrigger/PressButtonTrigger.javaindex 37137f8678..e8533a52ea 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/model/support/issue/transitiontrigger/PressButtonTrigger.java@@ -11,7 +11,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.usage.Usage;import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.javaindex c619429945..03cee4657a 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java@@ -19,7 +19,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;public abstract class FieldCriteria extends IssueCriteria {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 382b14ebb9..a7400ebfe9 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@@ -18,9 +18,9 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.fieldspec.BuildChoiceField;-import io.onedev.server.model.support.issue.fieldspec.CommitField;-import io.onedev.server.model.support.issue.fieldspec.PullRequestChoiceField;+import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;+import io.onedev.server.model.support.issue.field.spec.CommitField;+import io.onedev.server.model.support.issue.field.spec.PullRequestChoiceField;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectScopedCommit;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 59c9fa1143..0e53b1e664 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@@ -24,18 +24,18 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;-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.CommitField;-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.model.support.issue.field.spec.BooleanField;+import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;+import io.onedev.server.model.support.issue.field.spec.ChoiceField;+import io.onedev.server.model.support.issue.field.spec.CommitField;+import io.onedev.server.model.support.issue.field.spec.DateField;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;+import io.onedev.server.model.support.issue.field.spec.IssueChoiceField;+import io.onedev.server.model.support.issue.field.spec.NumberField;+import io.onedev.server.model.support.issue.field.spec.PullRequestChoiceField;+import io.onedev.server.model.support.issue.field.spec.TextField;+import io.onedev.server.model.support.issue.field.spec.UserChoiceField;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex 736694834b..aab7e3ccd8 100644--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java@@ -22,7 +22,6 @@ import com.google.common.collect.Sets;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Build;@@ -67,17 +66,13 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {private static final Logger logger = LoggerFactory.getLogger(SecurityUtils.class);public static Collection<User> getAuthorizedUsers(Project project, Permission permission) {+ UserManager userManager = OneDev.getInstance(UserManager.class);Collection<User> authorizedUsers = new HashSet<>();- authorizedUsers.add(OneDev.getInstance(UserManager.class).getRoot());- Group anonymousGroup = OneDev.getInstance(GroupManager.class).findAnonymous();+ authorizedUsers.add(userManager.getRoot());for (GroupAuthorization authorization: project.getGroupAuthorizations()) {Group group = authorization.getGroup();- if (group.isAdministrator() || authorization.getRole().implies(permission)) {- if (group.equals(anonymousGroup))- authorizedUsers.addAll(OneDev.getInstance(UserManager.class).query());- else- authorizedUsers.addAll(group.getMembers());- }+ if (group.isAdministrator() || authorization.getRole().implies(permission))+ authorizedUsers.addAll(group.getMembers());}for (UserAuthorization authorization: project.getUserAuthorizations()) {@@ -85,6 +80,9 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {authorizedUsers.add(authorization.getUser());}+ if (project.getDefaultRole() != null && project.getDefaultRole().implies(permission))+ authorizedUsers.addAll(userManager.query());+return authorizedUsers;}@@ -162,14 +160,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}}}- Group group = OneDev.getInstance(GroupManager.class).findAnonymous();- if (group != null) {- for (GroupAuthorization authorization: group.getAuthorizations()) {- if (project.equals(authorization.getProject()) && authorization.getRole().equals(role))- return true;- }- }- return false;+ return role.getDefaultProjects().contains(project);} else {logger.error("Undefined role: " + roleName);return false;@@ -303,6 +294,10 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {return new Subject.Builder(securityManager).principals(asPrincipal(userId)).buildSubject();}+ public static Subject asAnonymous() {+ return asSubject(0L);+ }+public static void bindAsSystem() {ThreadContext.bind(asSubject(User.SYSTEM_ID));}diff --git a/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.javaindex 6b536f4efc..f7c9d82a7e 100644--- a/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/realm/AbstractAuthorizingRealm.java@@ -29,7 +29,7 @@ import io.onedev.server.model.GroupAuthorization;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.persistence.SessionManager;import io.onedev.server.security.permission.AccessBuildLog;import io.onedev.server.security.permission.CreateProjects;@@ -102,9 +102,10 @@ public abstract class AbstractAuthorizingRealm extends AuthorizingRealm {for (UserAuthorization authorization: user.getAuthorizations())permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));}- Group group = groupManager.findAnonymous();- if (group != null)- permissions.addAll(getGroupPermissions(group, user));+ for (Project project: projectManager.query()) {+ if (project.getDefaultRole() != null)+ permissions.add(new ProjectPermission(project, project.getDefaultRole()));+ }return permissions;}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..8b9dde4d24 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@@ -15,7 +15,7 @@ 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.model.support.issue.field.spec.FieldSpec;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 5a7114a92c..6c16fdb47e 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@@ -21,7 +21,7 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.validation.ProjectNameValidator;import io.onedev.server.web.editable.BeanDescriptor;diff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.javaindex b538cc579c..44fa919fd5 100644--- a/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java@@ -3,7 +3,6 @@ package io.onedev.server.util.interpolative;import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import java.util.function.Function;import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -24,15 +23,15 @@ import io.onedev.server.util.interpolative.InterpolativeParser.SegmentContext;public class Interpolative implements Serializable {private static final long serialVersionUID = 1L;-+private final List<Segment> segments;public Interpolative(List<Segment> segments) {this.segments = segments;}- public static Interpolative parse(String interpolativeString) {- CharStream is = CharStreams.fromString(interpolativeString);+ public static Interpolative parse(String value) {+ CharStream is = CharStreams.fromString(value);InterpolativeLexer lexer = new InterpolativeLexer(is);lexer.removeErrorListeners();lexer.addErrorListener(new BaseErrorListener() {@@ -41,7 +40,7 @@ public class Interpolative implements Serializable {public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,int charPositionInLine, String msg, RecognitionException e) {throw new ExplicitException("Last appearance of @ is a surprise to me. Either use @...@ to reference "- + "a variable, or use @@ for literal @: " + interpolativeString);+ + "a variable, or use @@ for literal @: " + value);}});@@ -64,20 +63,6 @@ public class Interpolative implements Serializable {return segments.stream().filter(it -> type==null || it.getType() == type).collect(Collectors.toList());}- public String interpolateWith(Function<String, String> interpolator) {- StringBuilder builder = new StringBuilder();- for (Segment segment: segments) {- if (segment.getType() == Type.LITERAL) {- builder.append(segment.getContent());- } else {- String interpolated = interpolator.apply(segment.getContent());- if (interpolated != null)- builder.append(interpolated);- }- }- return builder.toString();- }-public static class Segment implements Serializable {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.javanew file mode 100644index 0000000000..516217e8d9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java@@ -0,0 +1,206 @@+package io.onedev.server.util.interpolative;++import java.lang.reflect.Field;+import java.lang.reflect.InvocationTargetException;+import java.lang.reflect.Method;+import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;+import java.util.Map.Entry;+import java.util.function.Function;++import javax.annotation.Nullable;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.buildspec.Property;+import io.onedev.server.buildspec.job.JobVariable;+import io.onedev.server.buildspec.param.ParamCombination;+import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.model.Build;+import io.onedev.server.util.BeanUtils;+import io.onedev.server.util.GroovyUtils;+import io.onedev.server.util.Input;+import io.onedev.server.util.interpolative.Interpolative.Segment;+import io.onedev.server.util.interpolative.Interpolative.Segment.Type;+import io.onedev.server.web.editable.annotation.Editable;++public class VariableInterpolator {++ public static final String HELP = "<b>NOTE: </b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>. "+ + "Use <tt>@@</tt> for literal <tt>@</tt>";++ public static final String PREFIX_PARAMS = "params:";++ public static final String PREFIX_PROPERTIES = "properties:";++ public static final String PREFIX_SECRETS = "secrets:";++ public static final String PREFIX_SCRIPTS = "scripts:";++ private final Function<String, String> variableResolver;++ public VariableInterpolator(Build build, ParamCombination paramCombination) {+ this(new Function<String, String>() {++ @Override+ public String apply(String t) {+ for (JobVariable var: JobVariable.values()) {+ if (var.name().toLowerCase().equals(t)) {+ String value = var.getValue(build);+ return value!=null?value:"";+ }+ }+ if (t.startsWith(PREFIX_PARAMS)) {+ String paramName = t.substring(PREFIX_PARAMS.length());+ for (Entry<String, Input> entry: paramCombination.getParamInputs().entrySet()) {+ if (paramName.equals(entry.getKey())) {+ if (paramCombination.isParamVisible(paramName)) {+ String paramType = entry.getValue().getType();+ List<String> paramValues = new ArrayList<>();+ for (String value: entry.getValue().getValues()) {+ if (paramType.equals(ParamSpec.SECRET))+ value = build.getSecretValue(value);+ paramValues.add(value);+ }+ return StringUtils.join(paramValues, ",");+ } else {+ throw new ExplicitException("Invisible param: " + paramName);+ }+ }+ }+ throw new ExplicitException("Undefined param: " + paramName);+ } else if (t.startsWith(PREFIX_PROPERTIES)) {+ String propertyName = t.substring(PREFIX_PROPERTIES.length());+ Property property = build.getSpec().getPropertyMap().get(propertyName);+ if (property != null)+ return property.getValue();+ else+ throw new ExplicitException("Undefined property: " + propertyName);+ } else if (t.startsWith(PREFIX_SECRETS)) {+ String secretName = t.substring(PREFIX_SECRETS.length());+ return build.getSecretValue(secretName);+ } else if (t.startsWith(PREFIX_SCRIPTS)) {+ String scriptName = t.substring(PREFIX_SCRIPTS.length());+ Map<String, Object> context = new HashMap<>();+ context.put("build", build);+ Object result = GroovyUtils.evalScriptByName(scriptName, context);+ if (result != null)+ return result.toString();+ else+ return "";+ } else {+ throw new ExplicitException("Unrecognized interpolation variable: " + t);+ }+ }++ });+ }++ public VariableInterpolator(Function<String, String> variableResolver) {+ this.variableResolver = variableResolver;+ }++ public VariableInterpolator(Build build) {+ this(build, build.getParamCombination());+ }++ public String interpolate(@Nullable String value) {+ if (value != null) {+ Interpolative interpolative = Interpolative.parse(value);+ StringBuilder builder = new StringBuilder();+ for (Segment segment: interpolative.getSegments(null)) {+ if (segment.getType() == Type.LITERAL) {+ builder.append(segment.getContent());+ } else {+ String interpolated = variableResolver.apply(segment.getContent());+ if (interpolated != null)+ builder.append(interpolated);+ }+ }+ return builder.toString();+ } else {+ return null;+ }+ }++ @SuppressWarnings("unchecked")+ public <T> T interpolateProperties(T object) {+ Class<T> clazz = (Class<T>) object.getClass();++ T interpolated;+ try {+ interpolated = clazz.newInstance();+ } catch (InstantiationException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }++ for (Field field: BeanUtils.findFields(clazz)) {+ field.setAccessible(true);+ try {+ field.set(interpolated, field.get(object));+ } catch (IllegalArgumentException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }+ }++ for (Method getter: BeanUtils.findGetters(clazz)) {+ if (getter.getAnnotation(Editable.class) != null) {+ Method setter = BeanUtils.findSetter(getter);+ if (setter != null) {+ try {+ Object propertyValue = getter.invoke(interpolated);+ if (propertyValue != null) {+ Class<?> propertyClass = propertyValue.getClass();+ if (getter.getAnnotation(io.onedev.server.web.editable.annotation.Interpolative.class) != null) {+ try {+ if (propertyValue instanceof String) {+ setter.invoke(interpolated, interpolate((String) propertyValue));+ } else if (propertyValue instanceof List) {+ List<Object> interpolatedList = new ArrayList<>();+ for (Object element: (List<String>) propertyValue) {+ if (element == null) {+ interpolatedList.add(element);+ } else if (element instanceof String) {+ interpolatedList.add(interpolate((String) element));+ } else if (element instanceof List) {+ List<String> interpolatedList2 = new ArrayList<>();+ for (String element2: (List<String>) element)+ interpolatedList2.add(interpolate(element2));+ interpolatedList.add(interpolatedList2);+ } else {+ throw new RuntimeException("Unexpected list element type: " + element.getClass());+ }+ }+ setter.invoke(interpolated, interpolatedList);+ }+ } catch (Exception e) {+ String message = String.format("Error interpolating (class: %s, property: %s)",+ propertyClass, BeanUtils.getPropertyName(getter));+ throw new RuntimeException(message, e);+ }+ } else if (propertyClass.getAnnotation(Editable.class) != null) {+ setter.invoke(interpolated, interpolateProperties(propertyValue));+ } else if (propertyValue instanceof List) {+ List<Object> interpolatedList = new ArrayList<>();+ for (Object element: (List<?>)propertyValue) {+ if (element != null && element.getClass().getAnnotation(Editable.class) != null)+ interpolatedList.add(interpolateProperties(element));+ else+ interpolatedList.add(element);+ }+ setter.invoke(interpolated, interpolatedList);+ }+ }+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {+ throw new RuntimeException(e);+ }+ }+ }+ }++ return interpolated;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/InterpolativeValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/InterpolativeValidator.javaindex 0d994b80ed..2f68d7f5e8 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/InterpolativeValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/InterpolativeValidator.java@@ -7,6 +7,8 @@ import java.util.List;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import com.google.common.collect.Lists;+import io.onedev.server.web.editable.annotation.Interpolative;public class InterpolativeValidator implements ConstraintValidator<Interpolative, Object> {@@ -24,24 +26,33 @@ public class InterpolativeValidator implements ConstraintValidator<Interpolativeif (value == null)return true;- List<String> values = new ArrayList<>();- if (value instanceof Collection)- values.addAll((Collection<String>)value);- else- values.add((String) value);+ List<List<String>> values = new ArrayList<>();+ if (value instanceof Collection) {+ for (Object element: (Collection<Object>)value) {+ if (element instanceof String) {+ values.add(Lists.newArrayList((String)element));+ } else if (element instanceof Collection) {+ values.add((List<String>) element);+ }+ }+ } else {+ values.add(Lists.newArrayList((String) value));+ }- for (String each: values) {- try {- io.onedev.server.util.interpolative.Interpolative.parse(each);- } catch (Exception e) {- constraintContext.disableDefaultConstraintViolation();- String message = this.message;- if (message.length() == 0) {- message = "Last appearance of @ is a surprise to me. Either use @...@ to reference a variable, "- + "or use @@ for literal @";+ for (List<String> each: values) {+ for (String each2: each) {+ try {+ io.onedev.server.util.interpolative.Interpolative.parse(each2);+ } catch (Exception e) {+ constraintContext.disableDefaultConstraintViolation();+ String message = this.message;+ if (message.length() == 0) {+ message = "Last appearance of @ is a surprise to me. Either use @...@ to reference a variable, "+ + "or use @@ for literal @";+ }+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;}- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;}}return true;diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.javaindex bb018d43cd..95174d8618 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/ParamNameValidator.java@@ -10,7 +10,7 @@ import io.onedev.server.util.validation.annotation.ParamName;public class ParamNameValidator implements ConstraintValidator<ParamName, String> {- private static final Pattern PATTERN = Pattern.compile("\\w([\\w-\\.]*\\w)?");+ private static final Pattern PATTERN = Pattern.compile("\\w([\\w-\\.\\s]*\\w)?");private String message;@@ -28,7 +28,7 @@ public class ParamNameValidator implements ConstraintValidator<ParamName, Stringif (!PATTERN.matcher(value).matches()) {if (message.length() == 0) {message = "Should start and end with alphanumeric or underscore. "- + "Only alphanumeric, underscore, dash, and dot are allowed in the middle.";+ + "Only alphanumeric, underscore, dash, space and dot are allowed in the middle.";}constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.javaindex b0d6499251..8ad590159e 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java@@ -20,9 +20,9 @@ import io.onedev.commons.utils.ExplicitException;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobAware;import io.onedev.server.buildspec.job.action.condition.ActionCondition;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;import io.onedev.server.buildspec.job.action.condition.ActionConditionLexer;import io.onedev.server.buildspec.job.action.condition.ActionConditionParser;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.model.Project;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 e643b823a6..da9ce044d8 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@@ -50,18 +50,18 @@ import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;-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.CommitField;-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.model.support.issue.field.spec.BooleanField;+import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;+import io.onedev.server.model.support.issue.field.spec.ChoiceField;+import io.onedev.server.model.support.issue.field.spec.CommitField;+import io.onedev.server.model.support.issue.field.spec.DateField;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;+import io.onedev.server.model.support.issue.field.spec.IssueChoiceField;+import io.onedev.server.model.support.issue.field.spec.NumberField;+import io.onedev.server.model.support.issue.field.spec.PullRequestChoiceField;+import io.onedev.server.model.support.issue.field.spec.TextField;+import io.onedev.server.model.support.issue.field.spec.UserChoiceField;import io.onedev.server.search.entity.issue.IssueQueryParser;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.util.ComponentContext;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.javaindex f694190286..961e272147 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/RetryConditionBehavior.java@@ -19,10 +19,10 @@ import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobAware;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;import io.onedev.server.buildspec.job.retrycondition.RetryCondition;import io.onedev.server.buildspec.job.retrycondition.RetryConditionLexer;import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.model.Build;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.java b/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.javaindex 8c7a22e3e1..f8a9fc9fb9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.java@@ -4,7 +4,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.Model;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.util.Input;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 80ea47b436..b7972dc0c9 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@@ -561,6 +561,12 @@ public abstract class BuildListPanel extends Panel {protected Project getProject() {return rowModel.getObject().getProject();}++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(isEnabled() && build.getJob() != null);+ }};link.add(new Label("label", build.getJobName()));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 32ba30ae57..ae32720653 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@@ -149,13 +149,21 @@ public abstract class BuildSidePanel extends Panel {protected Project getProject() {return BuildSidePanel.this.getProject();}-++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(isEnabled() && getBuild().getJob() != null);+ }+};jobLink.add(new Label("label", getBuild().getJobName()));general.add(jobLink);if (branch != null) {- if (SecurityUtils.canModify(getProject(), branch, BuildSpec.BLOB_PATH)) {+ if (SecurityUtils.canModify(getProject(), branch, BuildSpec.BLOB_PATH)+ && getBuild().getSpec() != null+ && getBuild().getSpec().getJobs().stream().anyMatch(it->it.getName().equals(getBuild().getJobName()))) {state = new ProjectBlobPage.State();state.blobIdent = new BlobIdent(getBuild().getBranch(), BuildSpec.BLOB_PATH,FileMode.REGULAR_FILE.getBits());diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.javaindex 72a2beb2e3..68c9fb3b8d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java@@ -48,7 +48,7 @@ public abstract class CommitStatusPanel extends Panel {try {BuildSpec buildSpec = getProject().getBuildSpec(commitId);if (buildSpec != null)- jobs.addAll(buildSpec.getJobs());+ jobs.addAll(buildSpec.getJobMap().values());} catch (Exception e) {logger.error("Error retrieving build spec (project: {}, commit: {})",getProject().getName(), commitId.name(), e);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 09ff45643b..5f5a549777 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@@ -17,7 +17,7 @@ import org.eclipse.jgit.lib.ObjectId;import org.unbescape.html.HtmlEscape;import io.onedev.server.OneDev;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.PullRequestManager;@@ -32,8 +32,8 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.administration.GlobalIssueSetting;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.model.support.issue.field.spec.ChoiceField;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ColorUtils;import io.onedev.server.util.ComponentContext;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 8373060936..fdd25924d8 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@@ -39,7 +39,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;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.model.support.issue.field.spec.FieldSpec;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.IssueUtils;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 007dcbff78..4eac21060a 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@@ -60,10 +60,10 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.LastUpdate;import io.onedev.server.model.support.administration.GlobalIssueSetting;-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.NumberField;+import io.onedev.server.model.support.issue.field.spec.ChoiceField;+import io.onedev.server.model.support.issue.field.spec.DateField;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.NumberField;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.issue.IssueQuery;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..8691d6a5d9 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.model.support.issue.field.spec.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 f598be30ec..4829785010 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@@ -13,8 +13,8 @@ import com.google.common.base.Preconditions;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.GlobalIssueSetting;-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.field.spec.ChoiceField;+import io.onedev.server.model.support.issue.field.spec.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 bc6dd3d97e..ab7ddceff9 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@@ -25,8 +25,8 @@ import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobManager;import io.onedev.server.buildspec.job.SubmitReason;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;+import io.onedev.server.buildspec.param.ParamUtils;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.git.RefInfo;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build;@@ -91,7 +91,7 @@ public abstract class RunJobLink extends AjaxLink<Void> {if (refNames.size() > 1 || !job.getParamSpecs().isEmpty()) {Serializable paramBean;try {- paramBean = ParamSupply.defineBeanClass(job.getParamSpecs()).newInstance();+ paramBean = ParamUtils.defineBeanClass(job.getParamSpecs()).newInstance();} catch (InstantiationException | IllegalAccessException e) {throw new RuntimeException(e);}@@ -101,7 +101,7 @@ public abstract class RunJobLink extends AjaxLink<Void> {@Overrideprotected void onSave(AjaxRequestTarget target, Collection<String> selectedRefNames,Serializable populatedParamBean) {- Map<String, List<String>> paramMap = ParamSupply.getParamMap(+ Map<String, List<String>> paramMap = ParamUtils.getParamMap(job, populatedParamBean, job.getParamSpecMap().keySet());List<Build> builds = new ArrayList<>();for (String refName: selectedRefNames) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/BuildSpecLink.java b/server-core/src/main/java/io/onedev/server/web/component/link/BuildSpecLink.javanew file mode 100644index 0000000000..e555f8fc75--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/link/BuildSpecLink.java@@ -0,0 +1,49 @@+package io.onedev.server.web.component.link;++import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;++import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;++@SuppressWarnings("serial")+public abstract class BuildSpecLink extends BookmarkablePageLink<Void> {++ private final ObjectId commitId;++ public BuildSpecLink(String id, ObjectId commitId) {+ super(id, ProjectBlobPage.class);+ this.commitId = commitId;+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(SecurityUtils.canReadCode(getProject()));+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (!isEnabled())+ tag.setName("span");+ }++ protected abstract Project getProject();++ @Override+ public PageParameters getPageParameters() {+ ProjectBlobPage.State state = new ProjectBlobPage.State();+ state.blobIdent = new BlobIdent(commitId.name(), BuildSpec.BLOB_PATH, FileMode.REGULAR_FILE.getBits());+ if (getProject().getBlob(state.blobIdent, false) == null)+ state.blobIdent = new BlobIdent(commitId.name(), ".onedev-buildspec", FileMode.REGULAR_FILE.getBits());+ return ProjectBlobPage.paramsOf(getProject(), state);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/modal/modal.js b/server-core/src/main/java/io/onedev/server/web/component/modal/modal.jsindex a758f532c3..922c926438 100644--- a/server-core/src/main/java/io/onedev/server/web/component/modal/modal.js+++ b/server-core/src/main/java/io/onedev/server/web/component/modal/modal.js@@ -3,9 +3,6 @@ onedev.server.modal = {var $modal = $("#" + containerId);$modal.data("closeCallback", closeCallback);- $modal.on("shown.bs.modal", function(e) {- $(window).resize();- });$modal.data("keydown", function(e) {if (e.keyCode == 27diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.htmlindex bda79739bb..53ff2f9079 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.html@@ -6,6 +6,7 @@</div><div class="modal-body"><div wicket:id="editor"></div>+ <div wicket:id="defaultRoleEditor"></div></div><div class="modal-footer"><button wicket:id="save" class="btn btn-primary">Ok</button>diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.javaindex 5f92d043bb..bbd0cf6415 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ForkOptionPanel.java@@ -21,6 +21,7 @@ import io.onedev.server.util.PathNode;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.setting.general.DefaultRoleBean;@SuppressWarnings("serial")abstract class ForkOptionPanel extends Panel {@@ -41,6 +42,9 @@ abstract class ForkOptionPanel extends Panel {project.setName(getProject().getName() + "." + SecurityUtils.getUser().getName());project.setIssueManagementEnabled(false);+ DefaultRoleBean defaultRoleBean = new DefaultRoleBean();+ defaultRoleBean.setRole(getProject().getDefaultRole());+Collection<String> properties = Sets.newHashSet("name", "description", "issueManagementEnabled");BeanEditor editor = BeanContext.edit("editor", project, properties, false);@@ -49,6 +53,7 @@ abstract class ForkOptionPanel extends Panel {form.setOutputMarkupId(true);form.add(editor);+ form.add(BeanContext.edit("defaultRoleEditor", defaultRoleBean));form.add(new AjaxButton("save") {@@ -62,6 +67,7 @@ abstract class ForkOptionPanel extends Panel {"This name has already been used by another project");target.add(form);} else {+ project.setDefaultRole(defaultRoleBean.getRole());projectManager.fork(getProject(), project);Session.get().success("Project forked");setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));diff --git a/server-core/src/main/java/io/onedev/server/web/editable/ActionConditionEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/ActionConditionEditSupport.javaindex caed370b7e..833b523636 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/ActionConditionEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/ActionConditionEditSupport.java@@ -7,7 +7,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import io.onedev.server.web.behavior.ActionConditionBehavior;-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.annotation.ActionCondition;import io.onedev.server.web.editable.string.StringPropertyEditor;@@ -43,14 +42,8 @@ public class ActionConditionEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {-- @Override- protected InputAssistBehavior getInputAssistBehavior() {- return new ActionConditionBehavior();- }-- };+ return new StringPropertyEditor(componentId, descriptor, model)+ .setInputAssist(new ActionConditionBehavior());}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.javaindex d69ec7b062..85404ebbe0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/CodeCommentQueryEditSupport.java@@ -13,6 +13,7 @@ import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.annotation.CodeCommentQuery;import io.onedev.server.web.editable.string.StringPropertyEditor;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.util.WicketUtils;@SuppressWarnings("serial")public class CodeCommentQueryEditSupport implements EditSupport {@@ -46,21 +47,15 @@ public class CodeCommentQueryEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {+ InputAssistBehavior inputAssist = new CodeCommentQueryBehavior(new AbstractReadOnlyModel<Project>() {@Override- protected InputAssistBehavior getInputAssistBehavior() {- return new CodeCommentQueryBehavior(new AbstractReadOnlyModel<Project>() {-- @Override- public Project getObject() {- return ((ProjectPage) getPage()).getProject();- }-- });+ public Project getObject() {+ return ((ProjectPage) WicketUtils.getPage()).getProject();}-- };++ });+ return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(inputAssist);}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.javaindex 3e0934f46b..6c90e386bc 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/CommitQueryEditSupport.java@@ -13,6 +13,7 @@ import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.annotation.CommitQuery;import io.onedev.server.web.editable.string.StringPropertyEditor;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.util.WicketUtils;@SuppressWarnings("serial")public class CommitQueryEditSupport implements EditSupport {@@ -46,21 +47,15 @@ public class CommitQueryEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {+ InputAssistBehavior inputAssist = new CommitQueryBehavior(new AbstractReadOnlyModel<Project>() {- @Override- protected InputAssistBehavior getInputAssistBehavior() {- return new CommitQueryBehavior(new AbstractReadOnlyModel<Project>() {-- @Override- public Project getObject() {- return ((ProjectPage) getPage()).getProject();- }-- });- }-- };+ @Override+ public Project getObject() {+ return ((ProjectPage) WicketUtils.getPage()).getProject();+ }++ });+ return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(inputAssist);}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.javaindex bbe8ec325d..bfb4268138 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java@@ -5,8 +5,12 @@ import java.util.List;import javax.annotation.Nullable;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;import io.onedev.server.util.BeanUtils;+import io.onedev.server.util.interpolative.VariableInterpolator;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;public class EditableUtils {@@ -70,11 +74,23 @@ public class EditableUtils {*/public static @Nullable String getDescription(AnnotatedElement element) {Editable editable = element.getAnnotation(Editable.class);- if (editable != null) {- if (editable.description().length() != 0)- return editable.description();+ if (editable == null) {+ return null;+ } else if (element.getAnnotation(Interpolative.class) != null) {+ String description = editable.description();+ if (description.length() != 0) {+ if (!description.endsWith("."))+ description += ".";+ description += " " + VariableInterpolator.HELP;+ } else {+ description = VariableInterpolator.HELP;+ }+ return StringUtils.replace(description, "$docRoot", OneDev.getInstance().getDocRoot());+ } else if (editable.description().length() != 0) {+ return editable.description();+ } else {+ return null;}- return null;}/**diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InterpolativeEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/InterpolativeEditSupport.javaindex 6677cb1383..89c746d90b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/InterpolativeEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/InterpolativeEditSupport.java@@ -10,7 +10,6 @@ import com.google.common.collect.Lists;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.behavior.InterpolativeAssistBehavior;-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.annotation.Interpolative;import io.onedev.server.web.editable.string.StringPropertyEditor;import io.onedev.server.web.editable.string.StringPropertyViewer;@@ -33,40 +32,34 @@ public class InterpolativeEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {+ return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(+ new InterpolativeAssistBehavior() {- @Override- protected InputAssistBehavior getInputAssistBehavior() {- return new InterpolativeAssistBehavior() {-- @SuppressWarnings("unchecked")- @Override- protected List<InputSuggestion> suggestVariables(String matchWith) {- String suggestionMethod = interpolative.variableSuggester();- if (suggestionMethod.length() != 0) {- return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(- descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});- } else {- return Lists.newArrayList();- }- }-- @SuppressWarnings("unchecked")- @Override- protected List<InputSuggestion> suggestLiterals(String matchWith) {- String suggestionMethod = interpolative.literalSuggester();- if (suggestionMethod.length() != 0) {- return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(- descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});- } else {- return Lists.newArrayList();- }- }-- };- }-- };+ @SuppressWarnings("unchecked")+ @Override+ protected List<InputSuggestion> suggestVariables(String matchWith) {+ String suggestionMethod = interpolative.variableSuggester();+ if (suggestionMethod.length() != 0) {+ return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});+ } else {+ return Lists.newArrayList();+ }+ }++ @SuppressWarnings("unchecked")+ @Override+ protected List<InputSuggestion> suggestLiterals(String matchWith) {+ String suggestionMethod = interpolative.literalSuggester();+ if (suggestionMethod.length() != 0) {+ return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});+ } else {+ return Lists.newArrayList();+ }+ }++ });}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.javaindex 81b4e93ed0..7c36fdbb00 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.java@@ -11,7 +11,6 @@ import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.behavior.InterpolativePatternSetAssistBehavior;-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.annotation.Interpolative;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.editable.string.StringPropertyEditor;@@ -37,47 +36,41 @@ public class InterpolativePatternsEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {+ return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(+ new InterpolativePatternSetAssistBehavior() {- @Override- protected InputAssistBehavior getInputAssistBehavior() {- return new InterpolativePatternSetAssistBehavior() {-- @SuppressWarnings("unchecked")- @Override- protected List<InputSuggestion> suggestPatterns(String matchWith) {- String suggestionMethod = patterns.suggester();- if (suggestionMethod.length() != 0) {- return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(- descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});- } else {- return Lists.newArrayList();- }- }-- @SuppressWarnings("unchecked")- @Override- protected List<InputSuggestion> suggestVariables(String matchWith) {- String suggestionMethod = interpolative.variableSuggester();- if (suggestionMethod.length() != 0) {- return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(- descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});- } else {- return Lists.newArrayList();- }- }-- @Override- protected List<String> getHints(TerminalExpect terminalExpect) {- return Lists.newArrayList(- "Pattern containing spaces or starting with dash needs to be quoted",- patterns.path()? "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude": "Use '*' or '?' for wildcard match. Prefix with '-' to exclude");- }-- };- }-- };+ @SuppressWarnings("unchecked")+ @Override+ protected List<InputSuggestion> suggestPatterns(String matchWith) {+ String suggestionMethod = patterns.suggester();+ if (suggestionMethod.length() != 0) {+ return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});+ } else {+ return Lists.newArrayList();+ }+ }++ @SuppressWarnings("unchecked")+ @Override+ protected List<InputSuggestion> suggestVariables(String matchWith) {+ String suggestionMethod = interpolative.variableSuggester();+ if (suggestionMethod.length() != 0) {+ return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});+ } else {+ return Lists.newArrayList();+ }+ }++ @Override+ protected List<String> getHints(TerminalExpect terminalExpect) {+ return Lists.newArrayList(+ "Pattern containing spaces or starting with dash needs to be quoted",+ patterns.path()? "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude": "Use '*' or '?' for wildcard match. Prefix with '-' to exclude");+ }++ });}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/JobMatchEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/JobMatchEditSupport.javaindex 58ae461070..e8562cc71f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/JobMatchEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/JobMatchEditSupport.java@@ -7,7 +7,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import io.onedev.server.web.behavior.JobMatchBehavior;-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.annotation.JobMatch;import io.onedev.server.web.editable.string.StringPropertyEditor;@@ -42,14 +41,8 @@ public class JobMatchEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {-- @Override- protected InputAssistBehavior getInputAssistBehavior() {- return new JobMatchBehavior();- }-- };+ return new StringPropertyEditor(componentId, descriptor, model)+ .setInputAssist(new JobMatchBehavior());}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/NotificationReceiverEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/NotificationReceiverEditSupport.javaindex 5a52c0bb4d..ef8ccff352 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/NotificationReceiverEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/NotificationReceiverEditSupport.java@@ -11,7 +11,6 @@ import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.annotation.NotificationReceiver;import io.onedev.server.web.editable.string.StringPropertyEditor;import io.onedev.server.web.editable.string.StringPropertyViewer;-import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public class NotificationReceiverEditSupport implements EditSupport {@@ -33,21 +32,16 @@ public class NotificationReceiverEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {+ InputAssistBehavior inputAssist = new NotificationReceiverBehavior(+ new AbstractReadOnlyModel<Project>() {@Override- protected InputAssistBehavior getInputAssistBehavior() {- return new NotificationReceiverBehavior(new AbstractReadOnlyModel<Project>() {-- @Override- public Project getObject() {- return ((ProjectPage) getPage()).getProject();- }-- });+ public Project getObject() {+ return Project.get();}-- };++ });+ return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(inputAssist);}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.javaindex 9a730acda5..12a94733f9 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java@@ -11,7 +11,6 @@ import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.behavior.PatternSetAssistBehavior;-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.editable.string.StringPropertyEditor;import io.onedev.server.web.editable.string.StringPropertyViewer;@@ -34,36 +33,30 @@ public class PatternsEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {+ return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(+ new PatternSetAssistBehavior() {- @Override- protected InputAssistBehavior getInputAssistBehavior() {- return new PatternSetAssistBehavior() {-- @SuppressWarnings("unchecked")- @Override- protected List<InputSuggestion> suggest(String matchWith) {- String suggestionMethod = patterns.suggester();- if (suggestionMethod.length() != 0) {- return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(- descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});- } else {- return Lists.newArrayList();- }- }-- @Override- protected List<String> getHints(TerminalExpect terminalExpect) {- return Lists.newArrayList(- "Pattern containing spaces or starting with dash needs to be quoted",- patterns.path()? "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude": "Use '*' or '?' for wildcard match. Prefix with '-' to exclude"- );- }-- };- }-- };+ @SuppressWarnings("unchecked")+ @Override+ protected List<InputSuggestion> suggest(String matchWith) {+ String suggestionMethod = patterns.suggester();+ if (suggestionMethod.length() != 0) {+ return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});+ } else {+ return Lists.newArrayList();+ }+ }++ @Override+ protected List<String> getHints(TerminalExpect terminalExpect) {+ return Lists.newArrayList(+ "Pattern containing spaces or starting with dash needs to be quoted",+ patterns.path()? "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude": "Use '*' or '?' for wildcard match. Prefix with '-' to exclude"+ );+ }++ });}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.javaindex 2e6cc19232..14cb85915a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java@@ -17,12 +17,9 @@ import org.hibernate.validator.constraints.NotEmpty;import com.google.common.base.Preconditions;import com.google.common.collect.Sets;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.OneDev;import io.onedev.server.util.BeanUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.ReflectionUtils;-import io.onedev.server.web.editable.annotation.Interpolative;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.ShowCondition;@@ -189,17 +186,7 @@ public class PropertyDescriptor implements Serializable {}public String getDescription() {- String description = EditableUtils.getDescription(getPropertyGetter());- if (description != null) {- if (getPropertyGetter().getAnnotation(Interpolative.class) != null) {- if (!description.endsWith("."))- description += ".";- description += " <b>NOTE: </b> Type <tt>@</tt> to <a href='$docRoot/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>. Use <tt>@@</tt> for literal <tt>@</tt>";- }- return StringUtils.replace(description, "$docRoot", OneDev.getInstance().getDocRoot());- } else {- return null;- }+ return EditableUtils.getDescription(getPropertyGetter());}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.javaindex f385df1b6c..320ae112a0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java@@ -2,6 +2,7 @@ package io.onedev.server.web.editable;import java.util.Set;+import javax.annotation.Nullable;import javax.validation.ConstraintViolation;import javax.validation.Validator;@@ -11,6 +12,8 @@ import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.event.Broadcast;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.util.visit.IVisit;+import org.apache.wicket.util.visit.IVisitor;import org.apache.wicket.validation.INullAcceptingValidator;import org.apache.wicket.validation.IValidatable;@@ -60,8 +63,18 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {// Do not call !isValid() here as otherwise all parent containers with invalid inputs// will also be marked as is-invalid- if (hasErrorMessage())- classes += "is-invalid";+ if (hasErrorMessage() && getInvalidClass() != null) {+ if (visitChildren(PropertyEditor.class, new IVisitor<PropertyEditor<?>, PropertyEditor<?>>() {++ @Override+ public void component(PropertyEditor<?> object, IVisit<PropertyEditor<?>> visit) {+ visit.stop(object);+ }++ }) == null) {+ classes += getInvalidClass();+ }+ }return classes;}@@ -70,6 +83,11 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {setOutputMarkupId(true);}+ @Nullable+ protected String getInvalidClass() {+ return "is-invalid";+ }+protected void markFormDirty(AjaxRequestTarget target) {String script = String.format(""+ "var $form = $('#%s').closest('form');"diff --git a/server-core/src/main/java/io/onedev/server/web/editable/ReferenceAwareEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/ReferenceAwareEditSupport.javaindex 77edea34c0..a67c1417d5 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/ReferenceAwareEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/ReferenceAwareEditSupport.java@@ -8,7 +8,6 @@ import org.apache.wicket.model.IModel;import io.onedev.server.model.Project;import io.onedev.server.web.behavior.ReferenceInputBehavior;-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.annotation.ReferenceAware;import io.onedev.server.web.editable.string.StringPropertyEditor;@@ -44,21 +43,15 @@ public class ReferenceAwareEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {-- @Override- protected InputAssistBehavior getInputAssistBehavior() {- return new ReferenceInputBehavior(true) {+ return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(+ new ReferenceInputBehavior(true) {- @Override- protected Project getProject() {- return Project.get();- }-- };- }-- };+ @Override+ protected Project getProject() {+ return Project.get();+ }++ });}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/RetryConditionEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/RetryConditionEditSupport.javaindex 06dc6831a1..953b68f56e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/RetryConditionEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/RetryConditionEditSupport.java@@ -7,7 +7,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import io.onedev.server.web.behavior.RetryConditionBehavior;-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.annotation.RetryCondition;import io.onedev.server.web.editable.string.StringPropertyEditor;@@ -43,14 +42,8 @@ public class RetryConditionEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {-- @Override- protected InputAssistBehavior getInputAssistBehavior() {- return new RetryConditionBehavior();- }-- };+ return new StringPropertyEditor(componentId, descriptor, model)+ .setInputAssist(new RetryConditionBehavior());}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/ReviewRequirementEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/ReviewRequirementEditSupport.javaindex 28d36d856d..cc1276056a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/ReviewRequirementEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/ReviewRequirementEditSupport.java@@ -6,12 +6,10 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import io.onedev.server.model.Project;-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.component.pullrequest.review.ReviewRequirementBehavior;import io.onedev.server.web.editable.annotation.ReviewRequirement;import io.onedev.server.web.editable.string.StringPropertyEditor;import io.onedev.server.web.editable.string.StringPropertyViewer;-import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public class ReviewRequirementEditSupport implements EditSupport {@@ -33,21 +31,16 @@ public class ReviewRequirementEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {+ IModel<Project> projectModel = new AbstractReadOnlyModel<Project>() {@Override- protected InputAssistBehavior getInputAssistBehavior() {- return new ReviewRequirementBehavior(new AbstractReadOnlyModel<Project>() {-- @Override- public Project getObject() {- return ((ProjectPage) getPage()).getProject();- }-- });+ public Project getObject() {+ return Project.get();}-- };++ };+ return new StringPropertyEditor(componentId, descriptor, model)+ .setInputAssist(new ReviewRequirementBehavior(projectModel));}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/SuggestionEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/SuggestionEditSupport.javaindex b18f70e2ac..f01d6a99d3 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/SuggestionEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/SuggestionEditSupport.java@@ -33,35 +33,29 @@ public class SuggestionEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {+ return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(+ new InputAssistBehavior() {- @Override- protected InputAssistBehavior getInputAssistBehavior() {- return new InputAssistBehavior() {+ @SuppressWarnings("unchecked")+ @Override+ protected List<InputCompletion> getSuggestions(InputStatus inputStatus) {+ String suggestionMethod = suggestionProvider.value();+ return (List<InputCompletion>) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(),+ suggestionMethod, new Object[] {inputStatus});+ }- @SuppressWarnings("unchecked")- @Override- protected List<InputCompletion> getSuggestions(InputStatus inputStatus) {- String suggestionMethod = suggestionProvider.value();- return (List<InputCompletion>) ReflectionUtils.invokeStaticMethod(- descriptor.getBeanClass(),- suggestionMethod, new Object[] {inputStatus});- }+ @Override+ protected List<LinearRange> getErrors(String inputContent) {+ return new ArrayList<>();+ }- @Override- protected List<LinearRange> getErrors(String inputContent) {- return new ArrayList<>();- }-- @Override- protected int getAnchor(String inputContent) {- return 0;- }-- };- }-- };+ @Override+ protected int getAnchor(String inputContent) {+ return 0;+ }++ });}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/UserMatchEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/UserMatchEditSupport.javaindex 1f8ef5e903..62eb66ec34 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/UserMatchEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/UserMatchEditSupport.java@@ -5,7 +5,6 @@ import java.lang.reflect.Method;import org.apache.wicket.model.IModel;import io.onedev.server.web.behavior.UserMatchBehavior;-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.annotation.UserMatch;import io.onedev.server.web.editable.string.StringPropertyEditor;import io.onedev.server.web.editable.string.StringPropertyViewer;@@ -30,14 +29,8 @@ public class UserMatchEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {-- @Override- protected InputAssistBehavior getInputAssistBehavior() {- return new UserMatchBehavior();- }-- };+ return new StringPropertyEditor(componentId, descriptor, model)+ .setInputAssist(new UserMatchBehavior());}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.javaindex 3101684908..472ab9e335 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListEditSupport.java@@ -34,7 +34,7 @@ public class BeanListEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {if (model.getObject() != null) {- return new BeanListPropertyViewer(id, propertyDescriptor, elementClass, model.getObject());+ return new BeanListPropertyViewer(id, propertyDescriptor, model.getObject());} else {return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.htmlindex d6311f6c8c..e131b000c6 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html@@ -30,6 +30,6 @@</tr></tfoot></table>- <div class="foot mt-3"><a wicket:id="addElement" title="Add new" class="add-element btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a></div>+ <div class="foot"><a wicket:id="addElement" title="Add new" class="add-element btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a></div></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.javaindex 473cfb41eb..e6d96e686c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java@@ -25,6 +25,7 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import io.onedev.commons.utils.ClassUtils;+import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;import io.onedev.server.util.PathNode.Indexed;@@ -134,7 +135,7 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {String description = EditableUtils.getDescription(propertyContext.getPropertyGetter());if (description != null) {WebMarkupContainer help = new WebMarkupContainer("help");- help.add(AttributeAppender.append("title", description));+ help.add(AttributeAppender.append("title", HtmlUtils.parse(description).text()));item.add(help);} else {item.add(new WebMarkupContainer("help").setVisible(false));@@ -326,6 +327,11 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {}}+ @Override+ protected String getInvalidClass() {+ return null;+ }+@Overrideprotected List<Serializable> convertInputToValue() throws ConversionException {List<Serializable> newList = newList();diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.javaindex afe24d7bb8..fe4b16c70c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java@@ -16,6 +16,7 @@ import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.Model;+import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.EditableUtils;@@ -30,7 +31,7 @@ public class BeanListPropertyViewer extends Panel {private final List<Serializable> elements;- public BeanListPropertyViewer(String id, PropertyDescriptor descriptor, Class<?> elementClass, List<Serializable> elements) {+ public BeanListPropertyViewer(String id, PropertyDescriptor descriptor, List<Serializable> elements) {super(id);Set<String> excludedProperties = new HashSet<>();@@ -41,6 +42,8 @@ public class BeanListPropertyViewer extends Panel {excludedProperties.add(each);}+ Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());+propertyContexts = new ArrayList<>();for (List<PropertyDescriptor> groupProperties: new BeanDescriptor(elementClass).getProperties().values()) {for (PropertyDescriptor property: groupProperties)diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/BuildQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/build/BuildQueryEditSupport.javaindex abe483101f..b0c195a4c7 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/build/BuildQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/BuildQueryEditSupport.java@@ -52,21 +52,16 @@ public class BuildQueryEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {+ InputAssistBehavior inputAssist = new BuildQueryBehavior(new AbstractReadOnlyModel<Project>() {@Override- protected InputAssistBehavior getInputAssistBehavior() {- return new BuildQueryBehavior(new AbstractReadOnlyModel<Project>() {-- @Override- public Project getObject() {- return Project.get();- }-- }, buildQuery.withOrder(), buildQuery.withCurrentUserCriteria(), buildQuery.withUnfinishedCriteria());- };-- };+ public Project getObject() {+ return Project.get();+ }++ }, buildQuery.withOrder(), buildQuery.withCurrentUserCriteria(), buildQuery.withUnfinishedCriteria());++ return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(inputAssist);}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportEditPanel.htmldeleted file mode 100644index a0c4b54bae..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportEditPanel.html+++ /dev/null@@ -1,16 +0,0 @@-<wicket:panel>- <form wicket:id="form" class="import-edit leave-confirm">- <div class="modal-header">- <h5 id="modal-title" class="modal-title">Import</h5>- <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>- </div>- <div class="modal-body">- <div wicket:id="feedback"></div>- <div wicket:id="editor"></div>- </div>- <div class="modal-footer">- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>- </div>- </form>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportEditPanel.javadeleted file mode 100644index efa82cccbf..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportEditPanel.java+++ /dev/null@@ -1,137 +0,0 @@-package io.onedev.server.web.editable.buildspec.buildspecimport;--import java.util.List;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.request.cycle.RequestCycle;--import io.onedev.server.buildspec.BuildSpecImport;-import io.onedev.server.util.Path;-import io.onedev.server.util.PathNode;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;--@SuppressWarnings("serial")-abstract class BuildSpecImportEditPanel extends Panel {-- private final List<BuildSpecImport> imports;-- private final int importIndex;-- public BuildSpecImportEditPanel(String id, List<BuildSpecImport> imports, int importIndex) {- super(id);-- this.imports = imports;- this.importIndex = importIndex;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- BuildSpecImport buildSpecImport;- if (importIndex != -1)- buildSpecImport = imports.get(importIndex);- else- buildSpecImport = new BuildSpecImport();-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onError() {- super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);- }-- };-- form.add(new FencedFeedbackPanel("feedback", form));-- form.add(new AjaxLink<Void>("close") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(BuildSpecImportEditPanel.this));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });-- BeanEditor editor = BeanContext.edit("editor", buildSpecImport);- form.add(editor);- form.add(new AjaxButton("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- if (importIndex != -1) {- BuildSpecImport oldImport = imports.get(importIndex);- if (!buildSpecImport.getProjectName().equals(oldImport.getProjectName())- && getImport(buildSpecImport.getProjectName()) != null) {- editor.error(new Path(new PathNode.Named("projectName")),- "Build spec of this project is already imported");- }- } else if (getImport(buildSpecImport.getProjectName()) != null) {- editor.error(new Path(new PathNode.Named("projectName")),- "Build spec of this project is already imported");- }-- if (editor.isValid()) {- if (importIndex != -1) {- imports.set(importIndex, buildSpecImport);- } else {- imports.add(buildSpecImport);- }- onSave(target);- } else {- target.add(form);- }- }-- });-- form.add(new AjaxLink<Void>("cancel") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(BuildSpecImportEditPanel.this));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });- form.setOutputMarkupId(true);-- add(form);- }-- private BuildSpecImport getImport(String projectName) {- for (BuildSpecImport buildSpecImport: imports) {- if (projectName.equals(buildSpecImport.getProjectName()))- return buildSpecImport;- }- return null;- }-- protected abstract void onSave(AjaxRequestTarget target);-- protected abstract void onCancel(AjaxRequestTarget target);--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditPanel.htmldeleted file mode 100644index 36f6ab2914..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditPanel.html+++ /dev/null@@ -1,12 +0,0 @@-<wicket:panel>- <div class="import-list">- <table wicket:id="imports"></table>- <div class="foot mt-3">- <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>- </div>- </div>- <wicket:fragment wicket:id="actionColumnFrag">- <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>- <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>- </wicket:fragment>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditPanel.javadeleted file mode 100644index 19ec9a747e..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditPanel.java+++ /dev/null@@ -1,227 +0,0 @@-package io.onedev.server.web.editable.buildspec.buildspecimport;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collections;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.event.IEvent;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.markup.repeater.data.IDataProvider;-import org.apache.wicket.markup.repeater.data.ListDataProvider;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.util.convert.ConversionException;--import io.onedev.server.buildspec.BuildSpecImport;-import io.onedev.server.web.behavior.NoRecordsBehavior;-import io.onedev.server.web.behavior.sortable.SortBehavior;-import io.onedev.server.web.behavior.sortable.SortPosition;-import io.onedev.server.web.component.modal.ModalLink;-import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.svg.SpriteImage;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.PropertyUpdating;--@SuppressWarnings("serial")-class BuildSpecImportListEditPanel extends PropertyEditor<List<Serializable>> {-- private final List<BuildSpecImport> imports;-- public BuildSpecImportListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {- super(id, propertyDescriptor, model);-- imports = new ArrayList<>();- for (Serializable each: model.getObject()) {- imports.add((BuildSpecImport) each);- }- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(new ModalLink("addNew") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new BuildSpecImportEditPanel(id, imports, -1) {-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }-- @Override- protected void onSave(AjaxRequestTarget target) {- markFormDirty(target);- modal.close();- onPropertyUpdating(target);- target.add(BuildSpecImportListEditPanel.this);- }-- };- }-- });-- List<IColumn<BuildSpecImport, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<BuildSpecImport, Void>(Model.of("")) {-- @Override- public void populateItem(Item<ICellPopulator<BuildSpecImport>> cellItem, String componentId,- IModel<BuildSpecImport> rowModel) {- cellItem.add(new SpriteImage(componentId, "grip") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("svg");- tag.put("class", "icon drag-indicator");- }-- });- }-- @Override- public String getCssClass() {- return "minimum actions";- }-- });-- columns.add(new AbstractColumn<BuildSpecImport, Void>(Model.of("Project")) {-- @Override- public void populateItem(Item<ICellPopulator<BuildSpecImport>> cellItem, String componentId,- IModel<BuildSpecImport> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getProjectName()));- }- });-- columns.add(new AbstractColumn<BuildSpecImport, Void>(Model.of("Tag")) {-- @Override- public void populateItem(Item<ICellPopulator<BuildSpecImport>> cellItem, String componentId,- IModel<BuildSpecImport> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getTag()));- }-- });-- columns.add(new AbstractColumn<BuildSpecImport, Void>(Model.of("")) {-- @Override- public void populateItem(Item<ICellPopulator<BuildSpecImport>> cellItem, String componentId,- IModel<BuildSpecImport> rowModel) {- Fragment fragment = new Fragment(componentId, "actionColumnFrag", BuildSpecImportListEditPanel.this);- fragment.add(new ModalLink("edit") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new BuildSpecImportEditPanel(id, imports, cellItem.findParent(Item.class).getIndex()) {-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }-- @Override- protected void onSave(AjaxRequestTarget target) {- markFormDirty(target);- modal.close();- onPropertyUpdating(target);- target.add(BuildSpecImportListEditPanel.this);- }-- };- }-- });- fragment.add(new AjaxLink<Void>("delete") {-- @Override- public void onClick(AjaxRequestTarget target) {- markFormDirty(target);- imports.remove(rowModel.getObject());- onPropertyUpdating(target);- target.add(BuildSpecImportListEditPanel.this);- }-- });- cellItem.add(fragment);- }-- @Override- public String getCssClass() {- return "actions minimum";- }-- });-- IDataProvider<BuildSpecImport> dataProvider = new ListDataProvider<BuildSpecImport>() {-- @Override- protected List<BuildSpecImport> getData() {- return imports;- }-- };-- DataTable<BuildSpecImport, Void> dataTable;- add(dataTable = new DataTable<BuildSpecImport, Void>("imports", columns, dataProvider, Integer.MAX_VALUE));- dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));- dataTable.add(new NoRecordsBehavior());- dataTable.add(new SortBehavior() {-- @Override- protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {- int fromIndex = from.getItemIndex();- int toIndex = to.getItemIndex();- if (fromIndex < toIndex) {- for (int i=0; i<toIndex-fromIndex; i++)- Collections.swap(imports, fromIndex+i, fromIndex+i+1);- } else {- for (int i=0; i<fromIndex-toIndex; i++)- Collections.swap(imports, fromIndex-i, fromIndex-i-1);- }- onPropertyUpdating(target);- target.add(BuildSpecImportListEditPanel.this);- }-- }.sortable("tbody"));- }-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof PropertyUpdating) {- event.stop();- onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());- }- }-- @Override- protected List<Serializable> convertInputToValue() throws ConversionException {- List<Serializable> value = new ArrayList<>();- for (BuildSpecImport each: imports)- value.add(each);- return value;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListViewPanel.htmldeleted file mode 100644index c722a46fd2..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListViewPanel.html+++ /dev/null@@ -1,10 +0,0 @@-<wicket:panel>- <div class="import-list">- <div class="body">- <table wicket:id="imports"></table>- </div>- </div>- <wicket:fragment wicket:id="columnFrag">- <a wicket:id="link"><span wicket:id="label"></span></a>- </wicket:fragment>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListViewPanel.javadeleted file mode 100644index 8541ae3a6c..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListViewPanel.java+++ /dev/null@@ -1,182 +0,0 @@-package io.onedev.server.web.editable.buildspec.buildspecimport;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.markup.repeater.data.IDataProvider;-import org.apache.wicket.markup.repeater.data.ListDataProvider;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;--import io.onedev.server.buildspec.BuildSpecImport;-import io.onedev.server.web.behavior.NoRecordsBehavior;-import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;-import io.onedev.server.web.component.offcanvas.OffCanvasPanel;-import io.onedev.server.web.component.svg.SpriteImage;-import io.onedev.server.web.editable.BeanContext;--@SuppressWarnings("serial")-class BuildSpecImportListViewPanel extends Panel {-- private final List<BuildSpecImport> imports = new ArrayList<>();-- public BuildSpecImportListViewPanel(String id, List<Serializable> elements) {- super(id);-- for (Serializable each: elements)- imports.add((BuildSpecImport) each);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- List<IColumn<BuildSpecImport, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<BuildSpecImport, Void>(Model.of("Project")) {-- @Override- public void populateItem(Item<ICellPopulator<BuildSpecImport>> cellItem, String componentId,- IModel<BuildSpecImport> rowModel) {- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {-- @Override- protected Component newLabel(String componentId) {- return new Label(componentId, rowModel.getObject().getProjectName());- }-- });- }- });-- columns.add(new AbstractColumn<BuildSpecImport, Void>(Model.of("Tag")) {-- @Override- public void populateItem(Item<ICellPopulator<BuildSpecImport>> cellItem, String componentId,- IModel<BuildSpecImport> rowModel) {- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {-- @Override- protected Component newLabel(String componentId) {- return new Label(componentId, rowModel.getObject().getTag());- }-- });- }- });-- columns.add(new AbstractColumn<BuildSpecImport, Void>(Model.of("")) {-- @Override- public void populateItem(Item<ICellPopulator<BuildSpecImport>> cellItem, String componentId,- IModel<BuildSpecImport> rowModel) {- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {-- @Override- protected Component newLabel(String componentId) {- return new SpriteImage(componentId, "ellipsis") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("svg");- tag.put("class", "icon");- }-- };- }-- });- }-- @Override- public String getCssClass() {- return "ellipsis text-right";- }-- });-- IDataProvider<BuildSpecImport> dataProvider = new ListDataProvider<BuildSpecImport>() {-- @Override- protected List<BuildSpecImport> getData() {- return imports;- }-- };-- add(new DataTable<BuildSpecImport, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE) {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new NoRecordsBehavior());- addTopToolbar(new HeadersToolbar<Void>(this, null));- addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));- }-- });- }-- private abstract class ColumnFragment extends Fragment {-- private final int index;-- public ColumnFragment(String id, int index) {- super(id, "columnFrag", BuildSpecImportListViewPanel.this);- this.index = index;- }-- protected abstract Component newLabel(String componentId);-- @Override- protected void onInitialize() {- super.onInitialize();- AjaxLink<Void> link = new AjaxLink<Void>("link") {-- @Override- public void onClick(AjaxRequestTarget target) {- new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {-- @Override- protected Component newTitle(String componentId) {- return new Label(componentId, "Import");- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(AttributeAppender.append("class", "import"));- }-- @Override- protected Component newBody(String id) {- return BeanContext.view(id, imports.get(index));- }-- };- }-- };- link.add(newLabel("label"));- add(link);- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportCssResourceReference.javanew file mode 100644index 0000000000..9e81b92bc5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.editable.buildspec.imports;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class ImportCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public ImportCssResourceReference() {+ super(ImportCssResourceReference.class, "import.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditPanel.htmlnew file mode 100644index 0000000000..4e79068147--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditPanel.html@@ -0,0 +1,23 @@+<wicket:panel>+ <div class="imports imports-editor flex-grow-1">+ <div class="alert alert-light-info">+ <wicket:svg href="bulb" class="icon"></wicket:svg> Import build spec elements (jobs, services, step templates and properties) from other projects.+ Imported elements are treated as if they are defined locally. Locally defined elements will+ override imported elements with same name+ </div>+ <div wicket:id="imports" class="import"></div>+ <a wicket:id="add" class="add btn btn-light btn-hover-primary btn-block" title="Add new import"><wicket:svg href="plus" class="icon align-middle mr-1"></wicket:svg></a>+ </div>+ <wicket:fragment wicket:id="importEditFrag">+ <div class="head import-head d-flex align-items-center">+ <span class="drag-indicator mr-2"><wicket:svg href="grip" class="icon"></wicket:svg></span>+ <a wicket:id="delete" title="Delete this import" class="btn btn-light btn-xs btn-icon btn-hover-danger text-muted mr-4">+ <wicket:svg href="trash" class="icon"/>+ </a>+ </div>+ <div class="body">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ </div>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditPanel.javanew file mode 100644index 0000000000..06fad50581--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditPanel.java@@ -0,0 +1,150 @@+package io.onedev.server.web.editable.buildspec.imports;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.event.IEvent;+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.html.panel.Fragment;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.IModel;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.buildspec.Import;+import io.onedev.server.util.Path;+import io.onedev.server.util.PathNode;+import io.onedev.server.util.PathNode.Indexed;+import io.onedev.server.web.behavior.sortable.SortBehavior;+import io.onedev.server.web.behavior.sortable.SortPosition;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyUpdating;++@SuppressWarnings("serial")+class ImportListEditPanel extends PropertyEditor<List<Serializable>> {++ private final List<Import> imports;++ private RepeatingView importsView;++ public ImportListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ super(id, propertyDescriptor, model);++ imports = new ArrayList<>();+ for (Serializable each: model.getObject())+ imports.add((Import) each);+ }++ @Override+ protected String getInvalidClass() {+ return null;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ importsView = new RepeatingView("imports");+ for (Import aImport: imports)+ importsView.add(newImportEditor(importsView.newChildId(), aImport));+ add(importsView);++ add(new AjaxLink<Void>("add") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Component importEditor = newImportEditor(importsView.newChildId(), new Import());+ importsView.add(importEditor);+ target.add(importEditor);++ String script = String.format(""+ + "$('#%s').before('<div id=\"%s\"/>');",+ getMarkupId(), importEditor.getMarkupId());+ target.prependJavaScript(script);+ }++ });++ add(new SortBehavior() {++ @SuppressWarnings("deprecation")+ @Override+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {+ int fromIndex = from.getItemIndex();+ int toIndex = to.getItemIndex();+ if (fromIndex < toIndex) {+ for (int i=0; i<toIndex-fromIndex; i++)+ importsView.swap(fromIndex+i, fromIndex+i+1);+ } else {+ for (int i=0; i<fromIndex-toIndex; i++)+ importsView.swap(fromIndex-i, fromIndex-i-1);+ }+ }++ }.sortable(">.imports").items(".import").handle(".import-head"));++ }++ protected Component newImportEditor(String componentId, Import aImport) {+ Fragment fragment = new Fragment(componentId, "importEditFrag", this);+ fragment.add(new AjaxLink<Void>("delete") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ importsView.remove(fragment);++ String script = String.format("$('#%s').remove();", fragment.getMarkupId());+ target.appendJavaScript(script);+ }++ });+ fragment.add(new FencedFeedbackPanel("feedback", fragment));+ fragment.add(BeanContext.edit("editor", aImport));+ fragment.setOutputMarkupId(true);++ return fragment;+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PropertyUpdating) {+ event.stop();+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());+ }+ }++ @Override+ protected List<Serializable> convertInputToValue() throws ConversionException {+ List<Serializable> value = new ArrayList<>();+ for (Component each: importsView) {+ BeanEditor editor = (BeanEditor) each.get("editor");+ value.add(editor.getConvertedInput());+ }+ return value;+ }++ @SuppressWarnings("deprecation")+ @Override+ public void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {+ int index = ((Indexed) propertyNode).getIndex();+ BeanEditor editor = (BeanEditor) importsView.get(index).get("editor");+ editor.error(pathInProperty, errorMessage);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ImportCssResourceReference()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditSupport.javasimilarity index 78%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditSupport.javaindex b9dcfe2eae..b11f74f35e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.buildspec.job.service;+package io.onedev.server.web.editable.buildspec.imports;import java.io.Serializable;import java.util.List;@@ -6,7 +6,7 @@ import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;-import io.onedev.server.buildspec.job.JobService;+import io.onedev.server.buildspec.Import;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;@@ -16,13 +16,13 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyViewer;@SuppressWarnings("serial")-public class JobServiceListEditSupport implements EditSupport {+public class ImportListEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());- if (elementClass == JobService.class) {+ if (elementClass == Import.class) {return new PropertyContext<List<Serializable>>(descriptor) {@Override@@ -32,7 +32,7 @@ public class JobServiceListEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {if (model.getObject() != null)- return new JobServiceListViewPanel(id, model.getObject());+ return new ImportListViewPanel(id, model.getObject());elsereturn new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}@@ -42,7 +42,7 @@ public class JobServiceListEditSupport implements EditSupport {@Overridepublic PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {- return new JobServiceListEditPanel(componentId, descriptor, model);+ return new ImportListEditPanel(componentId, descriptor, model);}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListViewPanel.htmlnew file mode 100644index 0000000000..bd23bc08e5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListViewPanel.html@@ -0,0 +1,5 @@+<wicket:panel>+ <div class="imports imports-viewer flex-grow-1">+ <div wicket:id="imports" class="import"></div>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListViewPanel.javanew file mode 100644index 0000000000..99f8147459--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/ImportListViewPanel.java@@ -0,0 +1,43 @@+package io.onedev.server.web.editable.buildspec.imports;++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.panel.Panel;+import org.apache.wicket.markup.repeater.RepeatingView;++import io.onedev.server.buildspec.Import;+import io.onedev.server.web.editable.BeanContext;++@SuppressWarnings("serial")+public class ImportListViewPanel extends Panel {++ private final List<Import> imports = new ArrayList<>();++ public ImportListViewPanel(String id, List<Serializable> elements) {+ super(id);++ for (Serializable each: elements)+ imports.add((Import) each);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ RepeatingView importsView = new RepeatingView("imports");+ for (Import aImport: imports)+ importsView.add(BeanContext.view(importsView.newChildId(), aImport));+ add(importsView);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ImportCssResourceReference()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/import.css b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/import.cssnew file mode 100644index 0000000000..9a2946ee39--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/imports/import.css@@ -0,0 +1,14 @@+.imports>.import {+ border: 2px dashed var(--secondary);+ border-radius: 0.42rem;+ padding: 0.6rem 1.2rem;+ margin-bottom: 1.2rem;+ background: white;+}+.imports>.import:last-child {+ margin-bottom: 0;+}++.imports>.import>.head {+ margin-bottom: 1rem;+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.htmlindex a6843b9a30..609c94cf5d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.html@@ -1,8 +1,8 @@<wicket:panel><div class="job-dependency-list"><table wicket:id="dependencies"></table>- <div class="foot mt-3">- <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ <div class="foot">+ <a wicket:id="addNew" title="Add new job dependency" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a></div></div><wicket:fragment wicket:id="actionColumnFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.javaindex 904cb0aa56..0594cb1604 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/jobdependency/JobDependencyListEditPanel.java@@ -30,6 +30,7 @@ import io.onedev.server.buildspec.BuildSpecAware;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobAware;import io.onedev.server.buildspec.job.JobDependency;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;@@ -103,6 +104,11 @@ class JobDependencyListEditPanel extends PropertyEditor<List<Serializable>> {return JobDependencyListEditPanel.this.getJob();}+ @Override+ public List<ParamSpec> getParamSpecs() {+ return getJob()!=null? getJob().getParamSpecs(): null;+ }+};}@@ -193,6 +199,11 @@ class JobDependencyListEditPanel extends PropertyEditor<List<Serializable>> {return JobDependencyListEditPanel.this.getJob();}+ @Override+ public List<ParamSpec> getParamSpecs() {+ return getJob()!=null? getJob().getParamSpecs(): null;+ }+};}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.htmlindex e1bbf51c8a..400c03d97f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.html@@ -1,8 +1,8 @@<wicket:panel><div class="post-build-action-list"><table wicket:id="actions"></table>- <div class="foot mt-3">- <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ <div class="foot">+ <a wicket:id="addNew" title="Add new post-build action" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a></div></div><wicket:fragment wicket:id="actionColumnFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.javaindex 8b3007a987..4772993ae4 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/postbuildaction/PostBuildActionListEditPanel.java@@ -30,6 +30,7 @@ import io.onedev.server.buildspec.BuildSpecAware;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobAware;import io.onedev.server.buildspec.job.action.PostBuildAction;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;@@ -94,6 +95,11 @@ class PostBuildActionListEditPanel extends PropertyEditor<List<Serializable>> {return PostBuildActionListEditPanel.this.getBuildSpec();}+ @Override+ public List<ParamSpec> getParamSpecs() {+ return getJob()!=null? getJob().getParamSpecs(): null;+ }+};}@@ -174,6 +180,11 @@ class PostBuildActionListEditPanel extends PropertyEditor<List<Serializable>> {return PostBuildActionListEditPanel.this.getBuildSpec();}+ @Override+ public List<ParamSpec> getParamSpecs() {+ return getJob()!=null? getJob().getParamSpecs(): null;+ }+};}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditPanel.htmlindex 03a8eac54d..44068d94f3 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/privilege/JobPrivilegeListEditPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="job-privilege-list"><table wicket:id="privileges"></table>- <div class="foot mt-3">+ <div class="foot"><a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.htmlindex 5b6c7683f3..7e6cec73e6 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.html@@ -1,8 +1,8 @@<wicket:panel><div class="job-dependency-list"><table wicket:id="dependencies"></table>- <div class="foot mt-3">- <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ <div class="foot">+ <a wicket:id="addNew" title="Add new project dependency" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a></div></div><wicket:fragment wicket:id="actionColumnFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.javaindex b3d864c981..e7581671a2 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/projectdependency/ProjectDependencyListEditPanel.java@@ -30,6 +30,7 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobAware;import io.onedev.server.buildspec.job.ProjectDependency;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;@@ -81,6 +82,11 @@ class ProjectDependencyListEditPanel extends PropertyEditor<List<Serializable>>return ProjectDependencyListEditPanel.this.getJob();}+ @Override+ public List<ParamSpec> getParamSpecs() {+ return getJob()!=null? getJob().getParamSpecs(): null;+ }+};}@@ -158,6 +164,11 @@ class ProjectDependencyListEditPanel extends PropertyEditor<List<Serializable>>return ProjectDependencyListEditPanel.this.getJob();}+ @Override+ public List<ParamSpec> getParamSpecs() {+ return getJob()!=null? getJob().getParamSpecs(): null;+ }+};}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditPanel.htmlindex 23667dcde5..61cbccfb27 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditPanel.html@@ -1,8 +1,8 @@<wicket:panel><div class="job-report-list"><table wicket:id="reports"></table>- <div class="foot mt-3">- <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ <div class="foot">+ <a wicket:id="addNew" title="Add new job report" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a></div></div><wicket:fragment wicket:id="actionColumnFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditPanel.javaindex a415b4c203..99c178ddb9 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/report/JobReportListEditPanel.java@@ -30,6 +30,7 @@ import io.onedev.server.buildspec.BuildSpecAware;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobAware;import io.onedev.server.buildspec.job.JobReport;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;@@ -86,6 +87,11 @@ class JobReportListEditPanel extends PropertyEditor<List<Serializable>> {return JobReportListEditPanel.this.getJob();}+ @Override+ public List<ParamSpec> getParamSpecs() {+ return getJob()!=null? getJob().getParamSpecs(): null;+ }+};}@@ -174,6 +180,11 @@ class JobReportListEditPanel extends PropertyEditor<List<Serializable>> {return JobReportListEditPanel.this.getJob();}+ @Override+ public List<ParamSpec> getParamSpecs() {+ return getJob()!=null? getJob().getParamSpecs(): null;+ }+};}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceEditPanel.htmldeleted file mode 100644index 747194b37c..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceEditPanel.html+++ /dev/null@@ -1,16 +0,0 @@-<wicket:panel>- <form wicket:id="form" class="job-service-edit leave-confirm">- <div class="modal-header">- <h5 id="modal-title" class="modal-title">Service</h5>- <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>- </div>- <div class="modal-body">- <div wicket:id="feedback"></div>- <div wicket:id="editor"></div>- </div>- <div class="modal-footer">- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>- </div>- </form>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceEditPanel.javadeleted file mode 100644index f106d7688d..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceEditPanel.java+++ /dev/null@@ -1,138 +0,0 @@-package io.onedev.server.web.editable.buildspec.job.service;--import java.util.List;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.request.cycle.RequestCycle;--import io.onedev.server.buildspec.BuildSpecAware;-import io.onedev.server.buildspec.job.JobAware;-import io.onedev.server.buildspec.job.JobService;-import io.onedev.server.util.Path;-import io.onedev.server.util.PathNode;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;--@SuppressWarnings("serial")-abstract class JobServiceEditPanel extends Panel implements BuildSpecAware, JobAware {-- private final List<JobService> services;-- private final int serviceIndex;-- public JobServiceEditPanel(String id, List<JobService> services, int serviceIndex) {- super(id);-- this.services = services;- this.serviceIndex = serviceIndex;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- JobService service;- if (serviceIndex != -1)- service = services.get(serviceIndex);- else- service = new JobService();-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onError() {- super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);- }-- };-- form.add(new FencedFeedbackPanel("feedback", form));-- form.add(new AjaxLink<Void>("close") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobServiceEditPanel.this));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });-- BeanEditor editor = BeanContext.edit("editor", service);- form.add(editor);- form.add(new AjaxButton("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- if (serviceIndex != -1) {- JobService oldService = services.get(serviceIndex);- if (!service.getName().equals(oldService.getName()) && getService(service.getName()) != null) {- editor.error(new Path(new PathNode.Named("name")),- "Service is already defined");- }- } else if (getService(service.getName()) != null) {- editor.error(new Path(new PathNode.Named("name")),- "Service is already defined");- }-- if (editor.isValid()) {- if (serviceIndex != -1) {- services.set(serviceIndex, service);- } else {- services.add(service);- }- onSave(target);- } else {- target.add(form);- }- }-- });-- form.add(new AjaxLink<Void>("cancel") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobServiceEditPanel.this));- }-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });- form.setOutputMarkupId(true);-- add(form);- }-- private JobService getService(String name) {- for (JobService service: services) {- if (name.equals(service.getName()))- return service;- }- return null;- }-- protected abstract void onSave(AjaxRequestTarget target);-- protected abstract void onCancel(AjaxRequestTarget target);--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditPanel.htmldeleted file mode 100644index 3ba759e11f..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditPanel.html+++ /dev/null@@ -1,12 +0,0 @@-<wicket:panel>- <div class="job-service-list">- <table wicket:id="services"></table>- <div class="foot mt-3">- <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>- </div>- </div>- <wicket:fragment wicket:id="actionColumnFrag">- <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>- <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>- </wicket:fragment>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditPanel.javadeleted file mode 100644index 4f0cc539e7..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListEditPanel.java+++ /dev/null@@ -1,264 +0,0 @@-package io.onedev.server.web.editable.buildspec.job.service;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collections;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.event.IEvent;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.markup.repeater.data.IDataProvider;-import org.apache.wicket.markup.repeater.data.ListDataProvider;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.util.convert.ConversionException;--import io.onedev.server.buildspec.BuildSpec;-import io.onedev.server.buildspec.BuildSpecAware;-import io.onedev.server.buildspec.job.Job;-import io.onedev.server.buildspec.job.JobAware;-import io.onedev.server.buildspec.job.JobService;-import io.onedev.server.web.behavior.NoRecordsBehavior;-import io.onedev.server.web.behavior.sortable.SortBehavior;-import io.onedev.server.web.behavior.sortable.SortPosition;-import io.onedev.server.web.component.modal.ModalLink;-import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.svg.SpriteImage;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.PropertyUpdating;--@SuppressWarnings("serial")-class JobServiceListEditPanel extends PropertyEditor<List<Serializable>> {-- private final List<JobService> services;-- public JobServiceListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {- super(id, propertyDescriptor, model);-- services = new ArrayList<>();- for (Serializable each: model.getObject()) {- services.add((JobService) each);- }- }-- private BuildSpec getBuildSpec() {- BuildSpecAware buildSpecAware = findParent(BuildSpecAware.class);- if (buildSpecAware != null)- return buildSpecAware.getBuildSpec();- else- return null;- }-- private Job getJob() {- JobAware jobAware = findParent(JobAware.class);- if (jobAware != null)- return jobAware.getJob();- else- return null;- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(new ModalLink("addNew") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new JobServiceEditPanel(id, services, -1) {-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }-- @Override- protected void onSave(AjaxRequestTarget target) {- markFormDirty(target);- modal.close();- onPropertyUpdating(target);- target.add(JobServiceListEditPanel.this);- }-- @Override- public BuildSpec getBuildSpec() {- return JobServiceListEditPanel.this.getBuildSpec();- }-- @Override- public Job getJob() {- return JobServiceListEditPanel.this.getJob();- }-- };- }-- });-- List<IColumn<JobService, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<JobService, Void>(Model.of("")) {-- @Override- public void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {- cellItem.add(new SpriteImage(componentId, "grip") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("svg");- tag.put("class", "icon drag-indicator");- }-- });- }-- @Override- public String getCssClass() {- return "minimum actions";- }-- });-- columns.add(new AbstractColumn<JobService, Void>(Model.of("Name")) {-- @Override- public void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getName()));- }- });-- columns.add(new AbstractColumn<JobService, Void>(Model.of("Image")) {-- @Override- public void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getImage()));- }-- });-- columns.add(new AbstractColumn<JobService, Void>(Model.of("")) {-- @Override- public void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {- Fragment fragment = new Fragment(componentId, "actionColumnFrag", JobServiceListEditPanel.this);- fragment.add(new ModalLink("edit") {-- @Override- protected Component newContent(String id, ModalPanel modal) {- return new JobServiceEditPanel(id, services, cellItem.findParent(Item.class).getIndex()) {-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }-- @Override- protected void onSave(AjaxRequestTarget target) {- markFormDirty(target);- modal.close();- onPropertyUpdating(target);- target.add(JobServiceListEditPanel.this);- }-- @Override- public BuildSpec getBuildSpec() {- return JobServiceListEditPanel.this.getBuildSpec();- }-- @Override- public Job getJob() {- return JobServiceListEditPanel.this.getJob();- }-- };- }-- });- fragment.add(new AjaxLink<Void>("delete") {-- @Override- public void onClick(AjaxRequestTarget target) {- markFormDirty(target);- services.remove(rowModel.getObject());- onPropertyUpdating(target);- target.add(JobServiceListEditPanel.this);- }-- });- cellItem.add(fragment);- }-- @Override- public String getCssClass() {- return "actions minimum";- }-- });-- IDataProvider<JobService> dataProvider = new ListDataProvider<JobService>() {-- @Override- protected List<JobService> getData() {- return services;- }-- };-- DataTable<JobService, Void> dataTable;- add(dataTable = new DataTable<JobService, Void>("services", columns, dataProvider, Integer.MAX_VALUE));- dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));- dataTable.add(new NoRecordsBehavior());-- dataTable.add(new SortBehavior() {-- @Override- protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {- int fromIndex = from.getItemIndex();- int toIndex = to.getItemIndex();- if (fromIndex < toIndex) {- for (int i=0; i<toIndex-fromIndex; i++)- Collections.swap(services, fromIndex+i, fromIndex+i+1);- } else {- for (int i=0; i<fromIndex-toIndex; i++)- Collections.swap(services, fromIndex-i, fromIndex-i-1);- }- onPropertyUpdating(target);- target.add(JobServiceListEditPanel.this);- }-- }.sortable("tbody"));- }-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof PropertyUpdating) {- event.stop();- onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());- }- }-- @Override- protected List<Serializable> convertInputToValue() throws ConversionException {- List<Serializable> value = new ArrayList<>();- for (JobService each: services)- value.add(each);- return value;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListViewPanel.htmldeleted file mode 100644index 31e4bbea47..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListViewPanel.html+++ /dev/null@@ -1,10 +0,0 @@-<wicket:panel>- <div class="job-service-list">- <div class="body">- <table wicket:id="services"></table>- </div>- </div>- <wicket:fragment wicket:id="columnFrag">- <a wicket:id="link"><span wicket:id="label"></span></a>- </wicket:fragment>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListViewPanel.javadeleted file mode 100644index 31e6f15e8f..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/service/JobServiceListViewPanel.java+++ /dev/null@@ -1,179 +0,0 @@-package io.onedev.server.web.editable.buildspec.job.service;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.markup.repeater.data.IDataProvider;-import org.apache.wicket.markup.repeater.data.ListDataProvider;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;--import io.onedev.server.buildspec.job.JobService;-import io.onedev.server.web.behavior.NoRecordsBehavior;-import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;-import io.onedev.server.web.component.offcanvas.OffCanvasPanel.Placement;-import io.onedev.server.web.component.svg.SpriteImage;-import io.onedev.server.web.editable.BeanContext;--@SuppressWarnings("serial")-class JobServiceListViewPanel extends Panel {-- private final List<JobService> services = new ArrayList<>();-- public JobServiceListViewPanel(String id, List<Serializable> elements) {- super(id);-- for (Serializable each: elements)- services.add((JobService) each);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- List<IColumn<JobService, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<JobService, Void>(Model.of("Name")) {-- @Override- public void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {-- @Override- protected Component newLabel(String componentId) {- return new Label(componentId, rowModel.getObject().getName());- }-- });- }- });-- columns.add(new AbstractColumn<JobService, Void>(Model.of("Image")) {-- @Override- public void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {-- @Override- protected Component newLabel(String componentId) {- return new Label(componentId, rowModel.getObject().getImage());- }-- });- }- });-- columns.add(new AbstractColumn<JobService, Void>(Model.of("")) {-- @Override- public void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {-- @Override- protected Component newLabel(String componentId) {- return new SpriteImage(componentId, "ellipsis") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("svg");- tag.put("class", "icon");- }-- };- }-- });- }-- @Override- public String getCssClass() {- return "ellipsis text-right";- }-- });-- IDataProvider<JobService> dataProvider = new ListDataProvider<JobService>() {-- @Override- protected List<JobService> getData() {- return services;- }-- };-- add(new DataTable<JobService, Void>("services", columns, dataProvider, Integer.MAX_VALUE) {-- @Override- protected void onInitialize() {- super.onInitialize();- addTopToolbar(new HeadersToolbar<Void>(this, null));- addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));- add(new NoRecordsBehavior());- }-- });- }-- private abstract class ColumnFragment extends Fragment {-- private final int index;-- public ColumnFragment(String id, int index) {- super(id, "columnFrag", JobServiceListViewPanel.this);- this.index = index;- }-- protected abstract Component newLabel(String componentId);-- @Override- protected void onInitialize() {- super.onInitialize();- AjaxLink<Void> link = new AjaxLink<Void>("link") {-- @Override- public void onClick(AjaxRequestTarget target) {- new OffCanvasCardPanel(target, Placement.RIGHT, null) {-- @Override- protected Component newTitle(String componentId) {- return new Label(componentId, "Service");- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(AttributeAppender.append("class", "job-service"));- }-- @Override- protected Component newBody(String id) {- return BeanContext.view(id, services.get(index));- }-- };- }-- };- link.add(newLabel("label"));- add(link);- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.htmlindex 1d1b5c156a..1e55028fde 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.html@@ -1,8 +1,8 @@<wicket:panel><div class="job-trigger-list"><table wicket:id="triggers"></table>- <div class="foot mt-3">- <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ <div class="foot">+ <a wicket:id="addNew" title="Add new trigger" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a></div></div><wicket:fragment wicket:id="actionColumnFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.javaindex 6de32051ee..bc1b613a02 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/trigger/JobTriggerListEditPanel.java@@ -28,6 +28,7 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobAware;import io.onedev.server.buildspec.job.trigger.JobTrigger;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;@@ -87,6 +88,11 @@ class JobTriggerListEditPanel extends PropertyEditor<List<Serializable>> {return JobTriggerListEditPanel.this.getJob();}+ @Override+ public List<ParamSpec> getParamSpecs() {+ return getJob()!=null? getJob().getParamSpecs(): null;+ }+};}@@ -163,6 +169,11 @@ class JobTriggerListEditPanel extends PropertyEditor<List<Serializable>> {return JobTriggerListEditPanel.this.getJob();}+ @Override+ public List<ParamSpec> getParamSpecs() {+ return getJob()!=null? getJob().getParamSpecs(): null;+ }+};}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecBean.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecBean.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecBean.javarename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecBean.javaindex dc771bacf5..075d00b1ec 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecBean.java@@ -1,10 +1,10 @@-package io.onedev.server.web.editable.buildspec.job.paramspec;+package io.onedev.server.web.editable.buildspec.param.spec;import java.io.Serializable;import javax.validation.constraints.NotNull;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.web.editable.annotation.Editable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecCssResourceReference.javasimilarity index 83%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecCssResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecCssResourceReference.javaindex 14ec0b3d3b..0fc1fa9257 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecCssResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecCssResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.buildspec.job.paramspec;+package io.onedev.server.web.editable.buildspec.param.spec;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecEditPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecEditPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecEditPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecEditPanel.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecEditPanel.javaindex d975134c5c..11c13f9be4 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.buildspec.job.paramspec;+package io.onedev.server.web.editable.buildspec.param.spec;import java.util.ArrayList;import java.util.List;@@ -11,7 +11,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.htmlsimilarity index 70%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.htmlindex 21cb85e1db..06e7fa7654 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.html@@ -1,8 +1,8 @@<wicket:panel><div class="param-spec-list"><table wicket:id="paramSpecs"></table>- <div class="foot mt-3">- <a wicket:id="addNew" title="Add new" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ <div class="foot">+ <a wicket:id="addNew" title="Add new param" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a></div></div><wicket:fragment wicket:id="actionColumnFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.javaindex 1ff6ccd49b..562847f9ce 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.buildspec.job.paramspec;+package io.onedev.server.web.editable.buildspec.param.spec;import java.io.Serializable;import java.util.ArrayList;@@ -27,7 +27,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.web.asset.inputspec.InputSpecCssResourceReference;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.behavior.sortable.SortBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditSupport.javasimilarity index 90%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditSupport.javaindex 113643f553..26894b9955 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.buildspec.job.paramspec;+package io.onedev.server.web.editable.buildspec.param.spec;import java.io.Serializable;import java.util.List;@@ -6,7 +6,7 @@ import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListViewPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListViewPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.javaindex 862bae1617..d3f0e07265 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/ParamSpecListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecListViewPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.buildspec.job.paramspec;+package io.onedev.server.web.editable.buildspec.param.spec;import java.io.Serializable;import java.util.ArrayList;@@ -29,7 +29,7 @@ import org.apache.wicket.model.Model;import com.google.common.collect.Sets;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.web.asset.inputspec.InputSpecCssResourceReference;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/param-spec.css b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/param-spec.csssimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramspec/param-spec.cssrename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/param-spec.cssdiff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.htmlsimilarity index 86%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.htmlindex 90ce2071e3..cbaf5df1c2 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.html@@ -20,6 +20,6 @@<div wicket:id="feedback" class="feedback mb-3"></div></div><a wicket:id="add" class="btn btn-light btn-hover-primary btn-block mb-1" title="Add value"><wicket:svg href="plus" class="icon"></wicket:svg></a>- <div class="text-muted font-size-sm">Add additional values to run matrix build. The job will run for each possible combination of different values across all parameters</div>+ <div wicket:id="matrixDescription" class="text-muted font-size-sm"></div></wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.javasimilarity index 83%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.javaindex 945e4101fa..227c231a6b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.buildspec.job.paramsupply;+package io.onedev.server.web.editable.buildspec.param.supply;import java.io.Serializable;import java.util.ArrayList;@@ -31,17 +31,23 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;+import com.google.common.collect.Lists;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;-import io.onedev.server.buildspec.job.paramspec.SecretParam;-import io.onedev.server.buildspec.job.paramsupply.Ignore;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;-import io.onedev.server.buildspec.job.paramsupply.PassthroughValues;-import io.onedev.server.buildspec.job.paramsupply.ScriptingValues;-import io.onedev.server.buildspec.job.paramsupply.SpecifiedValues;-import io.onedev.server.buildspec.job.paramsupply.ValuesProvider;+import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.buildspec.job.Job;+import io.onedev.server.buildspec.param.ParamUtils;+import io.onedev.server.buildspec.param.spec.ParamSpec;+import io.onedev.server.buildspec.param.spec.SecretParam;+import io.onedev.server.buildspec.param.supply.Ignore;+import io.onedev.server.buildspec.param.supply.ParamSupply;+import io.onedev.server.buildspec.param.supply.PassthroughValues;+import io.onedev.server.buildspec.param.supply.ScriptingValues;+import io.onedev.server.buildspec.param.supply.SpecifiedValues;+import io.onedev.server.buildspec.param.supply.ValuesProvider;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.ReflectionUtils;+import io.onedev.server.web.behavior.InterpolativeAssistBehavior;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.JobSecretEditBean;import io.onedev.server.web.editable.PropertyContext;@@ -50,6 +56,7 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.annotation.ParamSpecProvider;import io.onedev.server.web.editable.annotation.Password;import io.onedev.server.web.editable.buildspec.job.trigger.JobTriggerEditPanel;+import io.onedev.server.web.editable.string.StringPropertyEditor;@SuppressWarnings("serial")class ParamListEditPanel extends PropertyEditor<List<Serializable>> {@@ -97,7 +104,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {private Serializable getDefaultParamBean() {if (defaultParamBean == null) {try {- defaultParamBean = ParamSupply.defineBeanClass(new ArrayList<>(getParamSpecs().values())).newInstance();+ defaultParamBean = ParamUtils.defineBeanClass(new ArrayList<>(getParamSpecs().values())).newInstance();} catch (InstantiationException | IllegalAccessException e) {throw new RuntimeException(e);}@@ -140,7 +147,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {if (isSecret) {choices.add(SpecifiedValues.SECRET_DISPLAY_NAME);if (findParent(JobTriggerEditPanel.class) == null)- choices.add(PassthroughValues.SECRET_DISPLAY_NAME);+ choices.add(PassthroughValues.DISPLAY_NAME);choices.add(ScriptingValues.SECRET_DISPLAY_NAME);choices.add(Ignore.DISPLAY_NAME);} else {@@ -164,7 +171,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {else if (valuesProviderClass == ScriptingValues.class)return isSecret?ScriptingValues.SECRET_DISPLAY_NAME:ScriptingValues.DISPLAY_NAME;else if (valuesProviderClass == PassthroughValues.class)- return isSecret?PassthroughValues.SECRET_DISPLAY_NAME:PassthroughValues.DISPLAY_NAME;+ return PassthroughValues.DISPLAY_NAME;elsereturn Ignore.DISPLAY_NAME;}@@ -176,7 +183,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {valuesProvider = newSpecifiedValuesProvider(property);else if (object.equals(ScriptingValues.DISPLAY_NAME) || object.equals(ScriptingValues.SECRET_DISPLAY_NAME))valuesProvider = new ScriptingValues();- else if (object.equals(PassthroughValues.DISPLAY_NAME) || object.equals(PassthroughValues.SECRET_DISPLAY_NAME))+ else if (object.equals(PassthroughValues.DISPLAY_NAME))valuesProvider = new PassthroughValues();elsevaluesProvider = new Ignore();@@ -234,7 +241,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {if (param.getValuesProvider() instanceof SpecifiedValues) {SpecifiedValues specifiedValues = (SpecifiedValues) param.getValuesProvider();try {- ParamSupply.validateParamValues(specifiedValues.getValues());+ ParamUtils.validateParamValues(specifiedValues.getValues());} catch (ValidationException e) {if (!getFlag(FLAG_RENDERING)) {RepeatingView paramsView = (RepeatingView) get("params");@@ -282,7 +289,23 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {}if (property.getPropertyGetter().getAnnotation(Password.class) == null) {- item.add(PropertyContext.edit("value", paramBean, property.getPropertyName()));+ PropertyEditor<?> propertyEditor = PropertyContext.edit("value", paramBean, property.getPropertyName());+ item.add(propertyEditor);+ if (propertyEditor instanceof StringPropertyEditor) {+ ((StringPropertyEditor) propertyEditor).setInputAssist(new InterpolativeAssistBehavior() {++ @Override+ protected List<InputSuggestion> suggestVariables(String matchWith) {+ return BuildSpec.suggestVariables(matchWith);+ }++ @Override+ protected List<InputSuggestion> suggestLiterals(String matchWith) {+ return Lists.newArrayList();+ }++ });+ }} else {JobSecretEditBean bean = new JobSecretEditBean();bean.setSecret((String) property.getPropertyValue(paramBean));@@ -317,6 +340,17 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {Fragment fragment = new Fragment(componentId, "specifiedValuesFrag", this);RepeatingView valuesView = new RepeatingView("values");fragment.add(valuesView);++ String matrixDescription;+ if (getDescriptor().getBeanClass() == Job.class) {+ matrixDescription = "Add additional values to run matrix job. The job will run for each possible "+ + "combination of different values across all parameters";+ } else {+ matrixDescription = "Add additional values to run matrix step. The step will run for each possible "+ + "combination of different values across all parameters";+ }++ fragment.add(new Label("matrixDescription", matrixDescription));try {for (List<String> value: specifiedValues.getValues())@@ -349,6 +383,8 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {return fragment;} else if (valuesProvider instanceof ScriptingValues) {return PropertyContext.edit(componentId, valuesProvider, "scriptName").setOutputMarkupId(true);+ } else if (valuesProvider instanceof PassthroughValues) {+ return PropertyContext.edit(componentId, valuesProvider, "paramName").setOutputMarkupId(true);} else {return new WebMarkupContainer(componentId);}@@ -378,7 +414,9 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {}param.setValuesProvider(specifiedValues);} else if (valuesProviderClass == PassthroughValues.class) {- param.setValuesProvider(new PassthroughValues());+ PassthroughValues passthroughValues = new PassthroughValues();+ passthroughValues.setParamName((String) ((PropertyEditor<Serializable>) valuesEditor).getConvertedInput());+ param.setValuesProvider(passthroughValues);} else {param.setValuesProvider(new Ignore());}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditSupport.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditSupport.javaindex 075a6020c0..5c057c0740 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.buildspec.job.paramsupply;+package io.onedev.server.web.editable.buildspec.param.supply;import java.io.Serializable;import java.util.List;@@ -7,7 +7,7 @@ import org.apache.wicket.Component;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.model.IModel;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;+import io.onedev.server.buildspec.param.supply.ParamSupply;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.PropertyContext;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListViewPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListViewPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListViewPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListViewPanel.javasimilarity index 85%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListViewPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListViewPanel.javaindex 10f8641861..7e9436a879 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/job/paramsupply/ParamListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/supply/ParamListViewPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.buildspec.job.paramsupply;+package io.onedev.server.web.editable.buildspec.param.supply;import java.io.Serializable;import java.util.ArrayList;@@ -10,11 +10,11 @@ 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.buildspec.job.paramsupply.Ignore;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;-import io.onedev.server.buildspec.job.paramsupply.PassthroughValues;-import io.onedev.server.buildspec.job.paramsupply.ScriptingValues;-import io.onedev.server.buildspec.job.paramsupply.SpecifiedValues;+import io.onedev.server.buildspec.param.supply.Ignore;+import io.onedev.server.buildspec.param.supply.ParamSupply;+import io.onedev.server.buildspec.param.supply.PassthroughValues;+import io.onedev.server.buildspec.param.supply.ScriptingValues;+import io.onedev.server.buildspec.param.supply.SpecifiedValues;import io.onedev.server.web.editable.PropertyContext;@SuppressWarnings("serial")@@ -66,7 +66,7 @@ class ParamListViewPanel extends Panel {paramItem.add(PropertyContext.view("values", param.getValuesProvider(), "scriptName"));} else if (param.getValuesProvider() instanceof PassthroughValues) {paramItem.add(new Label("valuesProvider", PassthroughValues.DISPLAY_NAME));- paramItem.add(new WebMarkupContainer("values"));+ paramItem.add(PropertyContext.view("values", param.getValuesProvider(), "paramName"));} else {paramItem.add(new Label("valuesProvider", Ignore.DISPLAY_NAME));paramItem.add(new WebMarkupContainer("values"));diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditBean.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditBean.javanew file mode 100644index 0000000000..f1a22acca4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditBean.java@@ -0,0 +1,27 @@+package io.onedev.server.web.editable.buildspec.step;++import java.io.Serializable;++import javax.validation.constraints.NotNull;++import io.onedev.server.buildspec.step.Step;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class StepEditBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private Step step;++ @Editable+ @NotNull+ public Step getStep() {+ return step;+ }++ public void setStep(Step step) {+ this.step = step;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.htmlnew file mode 100644index 0000000000..38dca5230f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.html@@ -0,0 +1,19 @@+<wicket:panel>+ <div class="steps steps-editor">+ <div wicket:id="steps" class="step"></div>+ <a wicket:id="add" class="add btn btn-light btn-hover-primary btn-block" title="Add new step"><wicket:svg href="plus" class="icon align-middle mr-1"></wicket:svg></a>+ </div>+ <wicket:fragment wicket:id="stepEditFrag">+ <div class="head step-head d-flex align-items-center">+ <span class="index badge badge-light-warning mr-2"></span>+ <span class="drag-indicator mr-2"><wicket:svg href="grip" class="icon"></wicket:svg></span>+ <a wicket:id="delete" title="Delete this step" class="btn btn-light btn-xs btn-icon btn-hover-danger text-muted mr-4">+ <wicket:svg href="trash" class="icon"/>+ </a>+ </div>+ <div class="body">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ </div>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.javanew file mode 100644index 0000000000..e2b0370383--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java@@ -0,0 +1,163 @@+package io.onedev.server.web.editable.buildspec.step;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.IModel;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.buildspec.step.CommandStep;+import io.onedev.server.buildspec.step.Step;+import io.onedev.server.util.Path;+import io.onedev.server.util.PathNode;+import io.onedev.server.util.PathNode.Indexed;+import io.onedev.server.web.behavior.sortable.SortBehavior;+import io.onedev.server.web.behavior.sortable.SortPosition;+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.PropertyUpdating;++@SuppressWarnings("serial")+class StepListEditPanel extends PropertyEditor<List<Serializable>> {++ private final List<StepEditBean> beans;++ private RepeatingView stepsView;++ public StepListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ super(id, propertyDescriptor, model);++ beans = new ArrayList<>();+ for (Serializable each: model.getObject()) {+ StepEditBean bean = new StepEditBean();+ bean.setStep((Step) each);+ beans.add(bean);+ }+ }++ @Override+ protected String getInvalidClass() {+ return null;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ stepsView = new RepeatingView("steps");+ for (StepEditBean bean: beans)+ stepsView.add(newStepEditor(stepsView.newChildId(), bean));+ add(stepsView);++ add(new AjaxLink<Void>("add") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ StepEditBean bean = new StepEditBean();+ bean.setStep(new CommandStep());+ Component stepEditor = newStepEditor(stepsView.newChildId(), bean);+ stepsView.add(stepEditor);+ target.add(stepEditor);++ String script = String.format(""+ + "$('#%s').before('<div id=\"%s\"/>');",+ getMarkupId(), stepEditor.getMarkupId());+ target.prependJavaScript(script);+ target.appendJavaScript("onedev.server.stepEdit.renderStepIndex();");+ }++ });++ add(new SortBehavior() {++ @SuppressWarnings("deprecation")+ @Override+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {+ int fromIndex = from.getItemIndex();+ int toIndex = to.getItemIndex();+ if (fromIndex < toIndex) {+ for (int i=0; i<toIndex-fromIndex; i++)+ stepsView.swap(fromIndex+i, fromIndex+i+1);+ } else {+ for (int i=0; i<fromIndex-toIndex; i++)+ stepsView.swap(fromIndex-i, fromIndex-i-1);+ }+ target.appendJavaScript("onedev.server.stepEdit.renderStepIndex();");+ }++ }.sortable(">.steps").items(".step").handle(".step-head"));++ }++ protected Component newStepEditor(String componentId, StepEditBean bean) {+ Fragment fragment = new Fragment(componentId, "stepEditFrag", this);+ fragment.add(new AjaxLink<Void>("delete") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ stepsView.remove(fragment);++ String script = String.format(""+ + "$('#%s').remove();"+ + "onedev.server.stepEdit.renderStepIndex();",+ fragment.getMarkupId());+ target.appendJavaScript(script);+ }++ });+ fragment.add(new FencedFeedbackPanel("feedback", fragment));+ fragment.add(PropertyContext.edit("editor", bean, "step"));+ fragment.setOutputMarkupId(true);++ return fragment;+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PropertyUpdating) {+ event.stop();+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());+ }+ }++ @SuppressWarnings("unchecked")+ @Override+ protected List<Serializable> convertInputToValue() throws ConversionException {+ List<Serializable> value = new ArrayList<>();+ for (Component each: stepsView) {+ PropertyEditor<Serializable> editor = (PropertyEditor<Serializable>) each.get("editor");+ value.add(editor.getConvertedInput());+ }+ return value;+ }++ @SuppressWarnings("deprecation")+ @Override+ public void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {+ int index = ((Indexed) propertyNode).getIndex();+ PropertyEditor<?> editor = (PropertyEditor<?>) stepsView.get(index).get("editor");+ editor.error(pathInProperty, errorMessage);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new StepResourceReference()));+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.stepEdit.renderStepIndex();"));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditSupport.javasimilarity index 77%rename from server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditSupport.javaindex d3828a9cd5..2be70abb58 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/buildspecimport/BuildSpecImportListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.buildspec.buildspecimport;+package io.onedev.server.web.editable.buildspec.step;import java.io.Serializable;import java.util.List;@@ -6,7 +6,7 @@ import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;-import io.onedev.server.buildspec.BuildSpecImport;+import io.onedev.server.buildspec.step.Step;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;@@ -16,13 +16,13 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyViewer;@SuppressWarnings("serial")-public class BuildSpecImportListEditSupport implements EditSupport {+public class StepListEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());- if (elementClass == BuildSpecImport.class) {+ if (elementClass == Step.class) {return new PropertyContext<List<Serializable>>(descriptor) {@Override@@ -32,7 +32,7 @@ public class BuildSpecImportListEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {if (model.getObject() != null)- return new BuildSpecImportListViewPanel(id, model.getObject());+ return new StepListViewPanel(id, model.getObject());elsereturn new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}@@ -42,7 +42,7 @@ public class BuildSpecImportListEditSupport implements EditSupport {@Overridepublic PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {- return new BuildSpecImportListEditPanel(componentId, descriptor, model);+ return new StepListEditPanel(componentId, descriptor, model);}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.htmlnew file mode 100644index 0000000000..2fc89c4a9e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.html@@ -0,0 +1,10 @@+<wicket:panel>+ <div class="steps steps-viewer">+ <div wicket:id="steps" class="step">+ <div wicket:id="title" class="head badge badge-light-warning"></div>+ <div class="body">+ <div wicket:id="viewer"></div>+ </div>+ </div>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.javanew file mode 100644index 0000000000..cf1e8a269e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.java@@ -0,0 +1,56 @@+package io.onedev.server.web.editable.buildspec.step;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Panel;++import io.onedev.server.buildspec.step.Step;+import io.onedev.server.web.editable.EditableUtils;+import io.onedev.server.web.editable.PropertyContext;++@SuppressWarnings("serial")+public class StepListViewPanel extends Panel {++ private final List<StepEditBean> beans = new ArrayList<>();++ public StepListViewPanel(String id, List<Serializable> elements) {+ super(id);++ for (Serializable each: elements) {+ StepEditBean bean = new StepEditBean();+ bean.setStep((Step) each);+ beans.add(bean);+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new ListView<StepEditBean>("steps", beans) {++ @Override+ protected void populateItem(ListItem<StepEditBean> item) {+ StepEditBean bean = item.getModelObject();+ String typeName = EditableUtils.getDisplayName(bean.getStep().getClass());+ item.add(new Label("title", "#" + (item.getIndex()+1) + " - " + typeName));+ item.add(PropertyContext.view("viewer", bean, "step"));+ }++ });+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new StepResourceReference()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepResourceReference.javanew file mode 100644index 0000000000..ba7e3e5e5c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepResourceReference.java@@ -0,0 +1,27 @@+package io.onedev.server.web.editable.buildspec.step;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class StepResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public StepResourceReference() {+ super(StepResourceReference.class, "step.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(+ StepResourceReference.class, "step.css")));+ return dependencies;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.cssnew file mode 100644index 0000000000..dea96209ee--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css@@ -0,0 +1,18 @@+.steps>.step {+ border: 2px dashed var(--secondary);+ border-radius: 0.42rem;+ padding: 0.6rem 1.2rem;+ margin-bottom: 1.2rem;+ background: white;+}+.steps>.step:last-child {+ margin-bottom: 0;+}++.steps>.step>.head {+ margin-bottom: 1rem;+}+.steps-viewer>.step>div>div>div>div>.type-selector {+ display: none;+}+diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.js b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.jsnew file mode 100644index 0000000000..f321592582--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.js@@ -0,0 +1,7 @@+onedev.server.stepEdit = {+ renderStepIndex: function() {+ $(".steps>.step").each(function() {+ $(this).find(".index").text("#" + ($(this).index()+1));+ });+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.htmlindex 7e7a9a79c2..ffc120e7e8 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.html@@ -1,5 +1,7 @@<wicket:panel><div wicket:id="container" class="code-support">- <textarea wicket:id="input" class="no-autosize deletion-aware resize-aware"></textarea>+ <div>+ <textarea wicket:id="input" class="no-autosize deletion-aware resize-aware"></textarea>+ </div></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.javaindex 30a6a48c49..ab86a7153c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java@@ -9,7 +9,7 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.attributes.CallbackParameter;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.model.IModel;@@ -134,11 +134,14 @@ public class CodePropertyEditor extends PropertyEditor<List<String>> {CallbackParameter start = CallbackParameter.explicit("start");CallbackParameter end = CallbackParameter.explicit("end");String script = String.format(- "onedev.server.codeSupport.onEditorDomReady('%s', '%s', %s);",+ "onedev.server.codeSupport.onEditorLoad('%s', '%s', %s);",input.getMarkupId(),getCode().language(),behavior.getCallbackFunction(matchWith, line, start, end));- response.render(OnDomReadyHeaderItem.forScript(script));++ // Initialize codemirror via onLoad; otherwise it will not be shown+ // correctly in a modal dialog+ response.render(OnLoadHeaderItem.forScript(script));}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.htmlindex 636992b06e..9d2fb2ab84 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.html@@ -1,5 +1,7 @@<wicket:panel><div class="code-support">- <textarea wicket:id="input" class="no-autosize resize-aware"></textarea>+ <div>+ <textarea wicket:id="input" class="no-autosize resize-aware"></textarea>+ </div></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.javaindex cfbcd695d8..69f20e44f6 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.java@@ -4,7 +4,7 @@ import java.util.List;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.Model;@@ -42,9 +42,12 @@ public class CodePropertyViewer extends Panel {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new CodeSupportResourceReference()));- String script = String.format("onedev.server.codeSupport.onViewerDomReady('%s', '%s');",+ String script = String.format("onedev.server.codeSupport.onViewerLoad('%s', '%s');",input.getMarkupId(), language);- response.render(OnDomReadyHeaderItem.forScript(script));++ // Initialize codemirror via onLoad; otherwise, it will not be shown+ // correctly in a modal dialog+ response.render(OnLoadHeaderItem.forScript(script));}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.css b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.cssindex 24eecf4a7b..15dfdc485c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.css+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.css@@ -3,18 +3,23 @@border-radius: 0.42rem;padding: 1px;}+.code-support>div {+ position: relative;+ height: 400px;+}.is-invalid .code-support {- border-color: #a94442;+ border-color: var(--danger);}.code-support .CodeMirror {- height: auto;-}-.code-support .CodeMirror-scroll {- min-height: 120px;+ position: absolute;+ left: 0;+ top: 0;+ width: 100%;+ height: 100%;}.property-viewer .CodeMirror .CodeMirror-cursor {border-left: none;}.CodeMirror-hint {padding: 4px;-}\ No newline at end of file+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.jsindex a1cfedaecf..1428bfbd22 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js@@ -1,57 +1,55 @@onedev.server.codeSupport = {- onEditorDomReady: function(inputId, modeName, varQueryCallback) {- var cm = CodeMirror.fromTextArea(document.getElementById(inputId), {- indentWithTabs: true,- indentUnit: 4,- tabSize: 4,- theme: "eclipse",- lineNumbers: true,- styleActiveLine: true,- styleSelectedText: true,- foldGutter: true,- matchBrackets: true,- scrollbarStyle: "simple",- gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],- highlightIdentifiers: {delay: 500}- });- onedev.server.codemirror.setModeByName(cm, modeName);-- var $input = $("#" + inputId);- cm.on("change", function() {- cm.save();- onedev.server.form.markDirty($input.closest("form"));- });-- cm.on("keypress", function(cm, event) {- if (event.key == "@") {- // Give codemirror a chance to handle keypress first- setTimeout(function() {- var cursor = cm.getCursor();- var line = cursor.line;- var start = cursor.ch;-- var beforeCursor = cm.doc.getLine(line).substring(0, start);-- var escapeFiltered = beforeCursor.replace("@@", "");- if ((escapeFiltered.match(/@/g) || []).length % 2 == 1) { // only show hint when type left @- function hint(cm, showHintCallback) {- var end = cm.getCursor().ch;- var matchWith = cm.doc.getLine(line).substring(start, end);- $input.data("showHintCallback", showHintCallback);- varQueryCallback(matchWith, line, start);- }- hint.async = true;- CodeMirror.showHint(cm, hint, {completeSingle: false});- }- }, 0);- }- });-- $input.on("beforeDelete", function() {- cm.toTextArea();- });-- onedev.server.codeSupport.trackWidth(inputId);+ onEditorLoad: function(inputId, modeName, varQueryCallback) {+ var cm = CodeMirror.fromTextArea(document.getElementById(inputId), {+ indentWithTabs: true,+ indentUnit: 4,+ tabSize: 4,+ theme: "eclipse",+ lineNumbers: true,+ styleActiveLine: true,+ styleSelectedText: true,+ foldGutter: true,+ matchBrackets: true,+ scrollbarStyle: "simple",+ gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],+ highlightIdentifiers: {delay: 500}+ });+ onedev.server.codemirror.setModeByName(cm, modeName);++ var $input = $("#" + inputId);+ cm.on("change", function() {+ cm.save();+ onedev.server.form.markDirty($input.closest("form"));+ });++ cm.on("keypress", function(cm, event) {+ if (event.key == "@") {+ // Give codemirror a chance to handle keypress first+ setTimeout(function() {+ var cursor = cm.getCursor();+ var line = cursor.line;+ var start = cursor.ch;++ var beforeCursor = cm.doc.getLine(line).substring(0, start);++ var escapeFiltered = beforeCursor.replace("@@", "");+ if ((escapeFiltered.match(/@/g) || []).length % 2 == 1) { // only show hint when type left @+ function hint(cm, showHintCallback) {+ var end = cm.getCursor().ch;+ var matchWith = cm.doc.getLine(line).substring(start, end);+ $input.data("showHintCallback", showHintCallback);+ varQueryCallback(matchWith, line, start);+ }+ hint.async = true;+ CodeMirror.showHint(cm, hint, {completeSingle: false});+ }+ }, 0);+ }+ });++ $input.on("beforeDelete", function() {+ cm.toTextArea();+ });},showVariables: function(inputId, variables, line, start) {var $input = $("#" + inputId);@@ -62,7 +60,7 @@ onedev.server.codeSupport = {to: CodeMirror.Pos(line, cm.getCursor().ch)});},- onViewerDomReady: function(inputId, modeName) {+ onViewerLoad: function(inputId, modeName) {var cm = CodeMirror.fromTextArea(document.getElementById(inputId), {readOnly: true,indentWithTabs: true,@@ -80,22 +78,5 @@ onedev.server.codeSupport = {});onedev.server.codemirror.setModeByName(cm, modeName);-- onedev.server.codeSupport.trackWidth(inputId);- $("#" + inputId).trigger("resized");- },- trackWidth: function(inputId) {- var $input = $("#" + inputId);- $input.on("resized", function() {- setTimeout(function() {- var $cm = $input.next();- if ($cm.length != 0) {- $cm.hide();- $cm[0].CodeMirror.setSize($cm.parent().width(), null);- $cm.show();- $cm[0].CodeMirror.refresh();- }- }, 0);- });- }+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.css b/server-core/src/main/java/io/onedev/server/web/editable/editable.cssindex 74f9bccfc9..39ee741265 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.css+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.css@@ -44,6 +44,16 @@background-image: none;height: auto;}+.editable.property-editor table.norecords {+ display: none;+}+.editable.property-editor table+.foot {+ margin-top: 1rem;+}+.editable.property-editor table.norecords+.foot {+ margin-top: 0;+}+.editable table.norecords tfoot td>div {display: block;}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.js b/server-core/src/main/java/io/onedev/server/web/editable/editable.jsindex bebae667c9..3277492d8f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.js+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.js@@ -22,7 +22,6 @@ onedev.server.editable = {var $groups = $container.children(".group");$groups.children("a").click(function() {$(this).parent().toggleClass("expanded");- $(window).resize();});$groups.each(function() {var $group = $(this);diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.javaindex 4347c2e741..508a776880 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/IssueQueryEditSupport.java@@ -11,7 +11,6 @@ import com.google.common.base.Preconditions;import io.onedev.server.model.Project;import io.onedev.server.web.behavior.IssueQueryBehavior;-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;@@ -54,26 +53,21 @@ public class IssueQueryEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {-- @Override- protected InputAssistBehavior getInputAssistBehavior() {- IssueQuery issueQuery = Preconditions.checkNotNull(- getDescriptor().getPropertyGetter().getAnnotation(IssueQuery.class));- return new IssueQueryBehavior(new AbstractReadOnlyModel<Project>() {+ IssueQuery issueQuery = Preconditions.checkNotNull(+ getDescriptor().getPropertyGetter().getAnnotation(IssueQuery.class));+ return new StringPropertyEditor(componentId, descriptor, model).setInputAssist(+ new IssueQueryBehavior(new AbstractReadOnlyModel<Project>() {- @Override- public Project getObject() {- return Project.get();- }-- }, issueQuery.withOrder(), issueQuery.withCurrentUserCriteria(), issueQuery.withCurrentBuildCriteria(),- issueQuery.withCurrentPullRequestCriteria(), issueQuery.withCurrentCommitCriteria());- }-- };- }-+ @Override+ public Project getObject() {+ return Project.get();+ }++ }, issueQuery.withOrder(), issueQuery.withCurrentUserCriteria(),+ issueQuery.withCurrentBuildCriteria(),+ issueQuery.withCurrentPullRequestCriteria(),+ issueQuery.withCurrentCommitCriteria()));+ };};} else {return null;diff --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.javaindex ab7b14f0dd..fae28a8658 100644--- 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.java@@ -30,13 +30,13 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;-import io.onedev.server.model.support.issue.fieldspec.SecretField;-import io.onedev.server.model.support.issue.fieldsupply.FieldSupply;-import io.onedev.server.model.support.issue.fieldsupply.Ignore;-import io.onedev.server.model.support.issue.fieldsupply.ScriptingValue;-import io.onedev.server.model.support.issue.fieldsupply.SpecifiedValue;-import io.onedev.server.model.support.issue.fieldsupply.ValueProvider;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.SecretField;+import io.onedev.server.model.support.issue.field.supply.FieldSupply;+import io.onedev.server.model.support.issue.field.supply.Ignore;+import io.onedev.server.model.support.issue.field.supply.ScriptingValue;+import io.onedev.server.model.support.issue.field.supply.SpecifiedValue;+import io.onedev.server.model.support.issue.field.supply.ValueProvider;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.editable.BeanDescriptor;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.javaindex d9a2195f0d..7194f760e8 100644--- 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.java@@ -7,7 +7,7 @@ import org.apache.wicket.Component;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.model.IModel;-import io.onedev.server.model.support.issue.fieldsupply.FieldSupply;+import io.onedev.server.model.support.issue.field.supply.FieldSupply;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.PropertyContext;diff --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.javaindex 061ca7f710..9e950a3e93 100644--- 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.java@@ -11,9 +11,9 @@ 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.model.support.issue.fieldsupply.FieldSupply;-import io.onedev.server.model.support.issue.fieldsupply.ScriptingValue;-import io.onedev.server.model.support.issue.fieldsupply.SpecifiedValue;+import io.onedev.server.model.support.issue.field.supply.FieldSupply;+import io.onedev.server.model.support.issue.field.supply.ScriptingValue;+import io.onedev.server.model.support.issue.field.supply.SpecifiedValue;import io.onedev.server.web.editable.PropertyContext;@SuppressWarnings("serial")diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.javaindex 7b61fb25a0..ae0049834b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/PullRequestQueryEditSupport.java@@ -9,7 +9,6 @@ import org.apache.wicket.model.IModel;import io.onedev.server.model.Project;import io.onedev.server.web.behavior.PullRequestQueryBehavior;-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;@@ -51,21 +50,16 @@ public class PullRequestQueryEditSupport implements EditSupport {@Overridepublic PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {- return new StringPropertyEditor(componentId, descriptor, model) {+ IModel<Project> projectModel = new AbstractReadOnlyModel<Project>() {@Override- protected InputAssistBehavior getInputAssistBehavior() {- return new PullRequestQueryBehavior(new AbstractReadOnlyModel<Project>() {-- @Override- public Project getObject() {- return Project.get();- }-- });+ public Project getObject() {+ return Project.get();}-- };++ };+ return new StringPropertyEditor(componentId, descriptor, model)+ .setInputAssist(new PullRequestQueryBehavior(projectModel));}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.htmlindex c7f6368895..1c20527e14 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="service-locator-list"><table wicket:id="locators" class="table"></table>- <div class="foot mt-3">+ <div class="foot"><a wicket:id="addNew" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.javaindex f38ee4c390..4c73869edb 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/ServiceLocatorListEditPanel.java@@ -29,6 +29,7 @@ import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.BuildSpecAware;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobAware;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.model.support.administration.jobexecutor.ServiceLocator;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.behavior.sortable.SortBehavior;@@ -103,6 +104,11 @@ class ServiceLocatorListEditPanel extends PropertyEditor<List<Serializable>> {return ServiceLocatorListEditPanel.this.getJob();}+ @Override+ public List<ParamSpec> getParamSpecs() {+ return getJob()!=null? getJob().getParamSpecs(): null;+ }+};}@@ -208,6 +214,11 @@ class ServiceLocatorListEditPanel extends PropertyEditor<List<Serializable>> {return ServiceLocatorListEditPanel.this.getJob();}+ @Override+ public List<ParamSpec> getParamSpecs() {+ return getJob()!=null? getJob().getParamSpecs(): null;+ }+};}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.javaindex bf2682d328..c13ad8e238 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java@@ -2,8 +2,6 @@ package io.onedev.server.web.editable.string;import java.lang.reflect.Method;-import javax.annotation.Nullable;-import org.apache.wicket.AttributeModifier;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;@@ -29,6 +27,8 @@ public class StringPropertyEditor extends PropertyEditor<String> {private FormComponent<String> input;+ private InputAssistBehavior inputAssist;+public StringPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {super(id, propertyDescriptor, propertyModel);}@@ -51,9 +51,8 @@ public class StringPropertyEditor extends PropertyEditor<String> {}input.setLabel(Model.of(getDescriptor().getDisplayName()));- InputAssistBehavior inputAssistBehavior = getInputAssistBehavior();- if (inputAssistBehavior != null) {- input.add(inputAssistBehavior);+ if (inputAssist != null) {+ input.add(inputAssist);input.add(AttributeAppender.append("spellcheck", "false"));input.add(AttributeAppender.append("autocomplete", "off"));if (!getDescriptor().isPropertyRequired())@@ -83,9 +82,9 @@ public class StringPropertyEditor extends PropertyEditor<String> {return input.getConvertedInput();}- @Nullable- protected InputAssistBehavior getInputAssistBehavior() {- return null;+ public StringPropertyEditor setInputAssist(InputAssistBehavior inputAssist) {+ this.inputAssist = inputAssist;+ return this;}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldBean.javaindex f6b9365072..d08969c1b0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/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.model.support.issue.field.spec.FieldSpec;import io.onedev.server.web.editable.annotation.Editable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.javaindex 2519f99f3a..c1c98bd668 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.java@@ -19,8 +19,8 @@ import io.onedev.server.model.support.administration.GlobalIssueSetting;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.SpecifiedChoices;-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.field.spec.ChoiceField;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.javaindex 2abeb86c6a..a702578e52 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.java@@ -34,7 +34,7 @@ import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.asset.inputspec.InputSpecCssResourceReference;import io.onedev.server.web.behavior.NoRecordsBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex 986aa5b1a5..a1fb5cd4ba 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -57,7 +57,7 @@ ul.feedbackPanel {ul.feedbackPanel>li {border-left: 4px solid;margin: 0;- padding: 0 0 0 1.25rem;+ padding: 0 1rem 0 1.25rem;}li.feedbackPanelERROR, li.feedbackPanelFATAL {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.htmlindex 5b531c4add..5048bdc9a9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html@@ -2,7 +2,8 @@<div class="card new-project m-2 m-sm-5"><div class="card-body"><form wicket:id="form" class="leave-confirm">- <div wicket:id="editor" class="mb-4"></div>+ <div wicket:id="editor"></div>+ <div wicket:id="defaultRoleEditor"></div><input class="btn btn-primary dirty-aware" value="Create" type="submit"></form></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.javaindex bba9f0eee6..ed167bdb80 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java@@ -20,6 +20,7 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.setting.general.DefaultRoleBean;@SuppressWarnings("serial")public class NewProjectPage extends LayoutPage {@@ -38,6 +39,8 @@ public class NewProjectPage extends LayoutPage {BeanEditor editor = BeanContext.edit("editor", project, properties, false);+ DefaultRoleBean defaultRoleBean = new DefaultRoleBean();+Form<?> form = new Form<Void>("form") {@Override@@ -50,6 +53,7 @@ public class NewProjectPage extends LayoutPage {editor.error(new Path(new PathNode.Named("name")),"This name has already been used by another project");} else {+ project.setDefaultRole(defaultRoleBean.getRole());projectManager.create(project);Session.get().success("New project created");setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));@@ -58,6 +62,7 @@ public class NewProjectPage extends LayoutPage {};form.add(editor);+ form.add(BeanContext.edit("defaultRoleEditor", defaultRoleBean));add(form);}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 1fb6943855..186df85486 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@@ -407,6 +407,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S@Overrideprotected List<MenuItem> getMenuItems(FloatingPanel dropdown) {List<MenuItem> menuItems = new ArrayList<>();+menuItems.add(new MenuItem() {@Override@@ -1021,7 +1022,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Ssuper.onPopState(target, data);State popState = (State) data;- if (!popState.blobIdent.revision.equals(state.blobIdent.revision)) {+ if (popState.blobIdent.revision != null+ && !popState.blobIdent.revision.equals(state.blobIdent.revision)) {state = popState;newSearchResult(target, null);onResolvedRevisionChange(target);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.htmlindex 76f4eb871d..b1864641ff 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html@@ -1,14 +1,20 @@<wicket:extend><div wicket:id="content" class="build-spec build-spec-view"></div>- <wicket:fragment wicket:id="validFrag">+ <wicket:fragment wicket:id="parseableFrag">+ <div wicket:id="feedback"></div><div class="head"><a wicket:id="jobs" class="jobs">Jobs</a>+ <a wicket:id="services" class="services">Services</a>+ <a wicket:id="stepTemplates" class="step-templates">Step Templates</a><a wicket:id="properties" class="properties">Properties</a>+ <a wicket:id="imports" class="imports">Imports</a></div>- <div wicket:id="body" class="body"></div>+ <div class="body">+ <div wicket:id="content" class="content"></div>+ </div></wicket:fragment>- <wicket:fragment wicket:id="invalidFrag">- <div class="title">Error rendering build spec</div>+ <wicket:fragment wicket:id="unparseableFrag">+ <div class="title">Error parsing build spec</div><div wicket:id="errorMessage" class="error-message"></div></wicket:fragment><wicket:fragment wicket:id="jobsFrag">@@ -18,6 +24,54 @@<a wicket:id="runJob" class="run btn btn-secondary btn-icon flex-grow-0 flex-shrink-0" title="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a></div></div></div>- <div wicket:id="job" class="main ml-4 flex-grow-1"></div>+ <div wicket:id="job" class="main ml-4 flex-grow-1">+ <div wicket:id="notice"></div>+ <div wicket:id="content" class="content"></div>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="servicesFrag">+ <div class="side flex-shrink-0">+ <div class="navs"><div wicket:id="navs" class="nav btn-group btn-block mb-3">+ <a wicket:id="service" class="select btn btn-secondary justify-content-start"><span wicket:id="label"></span></a>+ </div></div>+ </div>+ <div wicket:id="service" class="main ml-4 flex-grow-1">+ <div wicket:id="notice"></div>+ <div wicket:id="content" class="content"></div>+ </div></wicket:fragment>+ <wicket:fragment wicket:id="stepTemplatesFrag">+ <div class="side flex-shrink-0">+ <div class="navs"><div wicket:id="navs" class="nav btn-group btn-block mb-3">+ <a wicket:id="template" class="select btn btn-secondary justify-content-start"><span wicket:id="label"></span></a>+ </div></div>+ </div>+ <div wicket:id="template" class="main ml-4 flex-grow-1">+ <div wicket:id="notice"></div>+ <div wicket:id="content" class="content"></div>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="namedElementImportNoticeFrag">+ <div class="alert alert-light-info">+ This <span wicket:id="elementTypeName"></span> is imported from <a wicket:id="link" class="alert-link"><span wicket:id="label"></span></a>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="propertiesFrag">+ <table class="table">+ <thead>+ <th>Name</th>+ <th>Value</th>+ </thead>+ <tbody>+ <tr wicket:id="properties">+ <td>+ <div><span wicket:id="name"></span> <a wicket:id="imported"><wicket:svg href="arrow2" class="icon imported"></wicket:svg></a></div>+ </td>+ <td>+ <div wicket:id="value"></div>+ </td>+ </tr>+ </tbody>+ </table>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.javaindex cd6defc208..da4a673460 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java@@ -1,31 +1,64 @@package io.onedev.server.web.page.project.blob.render.renderers.buildspec;+import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRendererProvider.getActiveNamedElementIndex;+import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRendererProvider.getPosition;+import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRendererProvider.getSelection;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;+import java.util.Map;+import javax.annotation.Nullable;+import javax.validation.ConstraintViolation;+import javax.validation.Validator;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.behavior.Behavior;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;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.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.RepeatingView;+import org.eclipse.jgit.lib.FileMode;+import org.unbescape.html.HtmlEscape;import com.google.common.base.Throwables;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.buildspec.Import;+import io.onedev.server.buildspec.NamedElement;+import io.onedev.server.buildspec.Property;+import io.onedev.server.buildspec.Service;import io.onedev.server.buildspec.job.Job;+import io.onedev.server.buildspec.step.StepTemplate;import io.onedev.server.git.Blob;+import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.ReflectionUtils;+import io.onedev.server.web.asset.icon.IconScope;import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.component.job.RunJobLink;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;@@ -39,25 +72,89 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {@Overrideprotected void onInitialize() {super.onInitialize();-++ Serializable parseResult;try {Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);- BuildSpec buildSpec = BuildSpec.parse(blob.getBytes());-- if (buildSpec != null) {- add(new Fragment("content", "validFrag", this) {-- private void newPropertiesView(@Nullable AjaxRequestTarget target) {- Component propertiesView;- if (!buildSpec.getProperties().isEmpty()) {- propertiesView = PropertyContext.view("body", buildSpec, "properties");- propertiesView.add(AttributeAppender.append("class", "properties"));+ parseResult = BuildSpec.parse(blob.getBytes());+ } catch (Exception e) {+ parseResult = e;+ }+ if (parseResult != null) {+ if (parseResult instanceof BuildSpec) {+ BuildSpec buildSpec = (BuildSpec) parseResult;++ add(new Fragment("content", "parseableFrag", this) {++ private void setupPropertiesViewer(@Nullable AjaxRequestTarget target) {+ Component propertiesViewer;+ List<Property> properties = new ArrayList<>(buildSpec.getPropertyMap().values());++ if (!properties.isEmpty()) {+ propertiesViewer = new Fragment("content", "propertiesFrag", BuildSpecBlobViewPanel.this) {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new ListView<Property>("properties", properties) {++ @Override+ protected void populateItem(ListItem<Property> item) {+ Property property = item.getModelObject();+ item.add(new Label("name", property.getName()));++ Import aImport = null;+ for (Import each: buildSpec.getImports()) {+ try {+ if (each.getBuildSpec().getPropertyMap().get(property.getName()) == property) {+ aImport = each;+ break;+ }+ } catch (Exception e) {+ // Ignore. This error will be shown when validating+ }+ }++ if (aImport != null) {+ ProjectBlobPage.State state = new ProjectBlobPage.State();+ state.blobIdent = new BlobIdent(aImport.getTag(), BuildSpec.BLOB_PATH,+ FileMode.REGULAR_FILE.getBits());+ state.position = BuildSpecRendererProvider.getPosition("properties");+ Project project = aImport.getProject();+ Link<?> link = new ViewStateAwarePageLink<Void>("imported", ProjectBlobPage.class,+ ProjectBlobPage.paramsOf(project, state)) {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (!isEnabled())+ tag.setName("span");+ }++ };+ link.add(AttributeAppender.append("title",+ "This property is imported from " + aImport.getProjectName()));+ link.setEnabled(SecurityUtils.canReadCode(project));+ item.add(link);+ } else {+ item.add(new WebMarkupContainer("imported").setVisible(false));+ }++ item.add(new Label("value", property.getValue()));+ }++ });+ }++ };+ propertiesViewer.add(AttributeAppender.append("class", "properties"));} else {- propertiesView = new Label("body", "No properties defined");+ propertiesViewer = new Label("content", "No properties defined");String cssClasses = "properties not-defined alert alert-notice alert-light-warning d-flex";- propertiesView.add(AttributeAppender.append("class", cssClasses));+ propertiesViewer.add(AttributeAppender.append("class", cssClasses));}- propertiesView.add(new Behavior() {+ propertiesViewer.add(new Behavior() {@Overridepublic void renderHead(Component component, IHeaderResponse response) {@@ -66,92 +163,121 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {}});- propertiesView.setOutputMarkupId(true);+ propertiesViewer.setOutputMarkupId(true);if (target != null) {- replace(propertiesView);- target.add(propertiesView);+ replace(propertiesViewer);+ target.add(propertiesViewer);} else {- add(propertiesView);+ add(propertiesViewer);}}- private void newJobsView(@Nullable AjaxRequestTarget target) {- Component jobsView;- if (!buildSpec.getJobs().isEmpty()) {- jobsView = new Fragment("body", "jobsFrag", BuildSpecBlobViewPanel.this) {-+ private <T extends NamedElement> List<T> getNamedElementsToShow(List<T> elements, Map<String, T> elementMap) {+ List<T> elementsToShow = new ArrayList<>(elements);+ for (T element: elementMap.values()) {+ if (!elements.contains(element))+ elementsToShow.add(element);+ }+ return elementsToShow;+ }++ private void setupJobsViewer(@Nullable AjaxRequestTarget target) {+ Component jobsViewer;+ List<Job> jobs = getNamedElementsToShow(buildSpec.getJobs(), buildSpec.getJobMap());+ if (!jobs.isEmpty()) {+ jobsViewer = new Fragment("content", "jobsFrag", BuildSpecBlobViewPanel.this) {+@Overrideprotected void onInitialize() {super.onInitialize();RepeatingView navsView = new RepeatingView("navs");- for (int i=0; i<buildSpec.getJobs().size(); i++) {+ for (int i=0; i<jobs.size(); i++) {int jobIndex = i;- Job job = buildSpec.getJobs().get(jobIndex);+ Job job = jobs.get(jobIndex);WebMarkupContainer nav = new WebMarkupContainer(navsView.newChildId());AjaxLink<Void> jobLink = new AjaxLink<Void>("job") {-+@Overridepublic void onClick(AjaxRequestTarget target) {- String position = BuildSpecRendererProvider.getPosition("jobs/" + job.getName());+ String position = getPosition("jobs/" + job.getName());context.pushState(target, context.getBlobIdent(), position);- newJobView(target, jobIndex);+ newJobViewer(target, jobIndex);}};- jobLink.add(new Label("label", job.getName()));++ String label = HtmlEscape.escapeHtml5(job.getName());+ if (!buildSpec.getJobs().contains(job)) {+ String iconHtml = String.format(+ "<svg class='icon imported'><use xlink:href='%s'/></svg>",+ SpriteImage.getVersionedHref(IconScope.class, "arrow2"));+ label += iconHtml;+ }+ jobLink.add(new Label("label", label).setEscapeModelStrings(false));+nav.add(jobLink);nav.add(new RunJobLink("runJob", context.getCommit().copy(), job.getName(), getContext().getRefName()) {-+@Overrideprotected Project getProject() {return context.getProject();}-+@Overrideprotected PullRequest getPullRequest() {return context.getPullRequest();}-+});navsView.add(nav);}add(navsView);-- newJobView(null, BuildSpecRendererProvider.getActiveJobIndex(context, buildSpec));++ newJobViewer(null, getActiveNamedElementIndex(context, Job.class, jobs));- add(AttributeAppender.append("class", "jobs d-flex flex-nowrap"));+ add(AttributeAppender.append("class", "jobs elements d-flex flex-nowrap"));}-- private void newJobView(@Nullable AjaxRequestTarget target, int jobIndex) {- Component jobView = BeanContext.view("job", buildSpec.getJobs().get(jobIndex));- jobView.add(new Behavior() {++ private void newJobViewer(@Nullable AjaxRequestTarget target, int jobIndex) {+ WebMarkupContainer jobContainer = new WebMarkupContainer("job") {@Override- public void renderHead(Component component, IHeaderResponse response) {- super.renderHead(component, response);+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);String script = String.format("onedev.server.buildSpec.onNamedElementDomReady(%d);", jobIndex);response.render(OnDomReadyHeaderItem.forScript(script));}+ };+ Job job = jobs.get(jobIndex);+ jobContainer.add(new NamedElementImportNoticePanel<Job>(buildSpec, job.getName()) {++ @Override+ protected Map<String, Job> getElementMap(BuildSpec buildSpec) {+ return buildSpec.getJobMap();+ }+});- jobView.setOutputMarkupId(true);+ jobContainer.add(BeanContext.view("content", job));+ jobContainer.setOutputMarkupId(true);+if (target != null) {- replace(jobView);- target.add(jobView);+ replace(jobContainer);+ target.add(jobContainer);} else {- add(jobView);+ add(jobContainer);}}};} else {String cssClasses = "jobs not-defined alert alert-notice alert-light-warning d-flex";- jobsView = new Label("body", "No jobs defined").add(AttributeAppender.append("class", cssClasses));+ jobsViewer = new Label("content", "No jobs defined").add(AttributeAppender.append("class", cssClasses));}- jobsView.add(new Behavior() {+ jobsViewer.add(new Behavior() {@Overridepublic void renderHead(Component component, IHeaderResponse response) {@@ -160,60 +286,345 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {}});- jobsView.setOutputMarkupId(true);+ jobsViewer.setOutputMarkupId(true);+ if (target != null) {+ replace(jobsViewer);+ target.add(jobsViewer);+ } else {+ add(jobsViewer);+ }+ }++ private void setupServicesViewer(@Nullable AjaxRequestTarget target) {+ Component servicesViewer;+ List<Service> services = getNamedElementsToShow(buildSpec.getServices(), buildSpec.getServiceMap());+ if (!services.isEmpty()) {+ servicesViewer = new Fragment("content", "servicesFrag", BuildSpecBlobViewPanel.this) {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ RepeatingView navsView = new RepeatingView("navs");+ for (int i=0; i<services.size(); i++) {+ int serviceIndex = i;+ Service service = services.get(serviceIndex);+ WebMarkupContainer nav = new WebMarkupContainer(navsView.newChildId());+ AjaxLink<Void> serviceLink = new AjaxLink<Void>("service") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ String position = getPosition("services/" + service.getName());+ context.pushState(target, context.getBlobIdent(), position);+ newServiceViewer(target, serviceIndex);+ }++ };++ String label = HtmlEscape.escapeHtml5(service.getName());+ if (!buildSpec.getServices().contains(service)) {+ String iconHtml = String.format(+ "<svg class='icon imported'><use xlink:href='%s'/></svg>",+ SpriteImage.getVersionedHref(IconScope.class, "arrow2"));+ label += iconHtml;+ }+ serviceLink.add(new Label("label", label).setEscapeModelStrings(false));++ nav.add(serviceLink);++ navsView.add(nav);+ }+ add(navsView);++ newServiceViewer(null, getActiveNamedElementIndex(context, Service.class, services));++ add(AttributeAppender.append("class", "services elements d-flex flex-nowrap"));+ }++ private void newServiceViewer(@Nullable AjaxRequestTarget target, int serviceIndex) {+ WebMarkupContainer serviceContainer = new WebMarkupContainer("service") {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ String script = String.format("onedev.server.buildSpec.onNamedElementDomReady(%d);", serviceIndex);+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ };++ Service service = services.get(serviceIndex);++ serviceContainer.add(new NamedElementImportNoticePanel<Service>(buildSpec, service.getName()) {++ @Override+ protected Map<String, Service> getElementMap(BuildSpec buildSpec) {+ return buildSpec.getServiceMap();+ }++ });++ serviceContainer.add(BeanContext.view("content", service));+ serviceContainer.setOutputMarkupId(true);++ if (target != null) {+ replace(serviceContainer);+ target.add(serviceContainer);+ } else {+ add(serviceContainer);+ }+ }++ };+ } else {+ String cssClasses = "services not-defined alert alert-notice alert-light-warning d-flex";+ servicesViewer = new Label("content", "No services defined").add(AttributeAppender.append("class", cssClasses));+ }+ servicesViewer.add(new Behavior() {++ @Override+ public void renderHead(Component component, IHeaderResponse response) {+ super.renderHead(component, response);+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.buildSpec.onTabDomReady('.services');"));+ }++ });+ servicesViewer.setOutputMarkupId(true);if (target != null) {- replace(jobsView);- target.add(jobsView);+ replace(servicesViewer);+ target.add(servicesViewer);} else {- add(jobsView);+ add(servicesViewer);+ }+ }++ private void setupStepTemplatesViewer(@Nullable AjaxRequestTarget target) {+ Component templatesViewer;+ List<StepTemplate> templates = getNamedElementsToShow(buildSpec.getStepTemplates(), buildSpec.getStepTemplateMap());+ if (!templates.isEmpty()) {+ templatesViewer = new Fragment("content", "stepTemplatesFrag", BuildSpecBlobViewPanel.this) {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ RepeatingView navsView = new RepeatingView("navs");+ for (int i=0; i<templates.size(); i++) {+ int templateIndex = i;+ StepTemplate template = templates.get(templateIndex);+ WebMarkupContainer nav = new WebMarkupContainer(navsView.newChildId());+ AjaxLink<Void> templateLink = new AjaxLink<Void>("template") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ String position = getPosition("step-templates/" + template.getName());+ context.pushState(target, context.getBlobIdent(), position);+ newTemplateViewer(target, templateIndex);+ }++ };++ String label = HtmlEscape.escapeHtml5(template.getName());+ if (!buildSpec.getStepTemplates().contains(template)) {+ String iconHtml = String.format(+ "<svg class='icon imported'><use xlink:href='%s'/></svg>",+ SpriteImage.getVersionedHref(IconScope.class, "arrow2"));+ label += iconHtml;+ }+ templateLink.add(new Label("label", label).setEscapeModelStrings(false));++ nav.add(templateLink);++ navsView.add(nav);+ }+ add(navsView);++ newTemplateViewer(null, getActiveNamedElementIndex(context, StepTemplate.class, templates));++ add(AttributeAppender.append("class", "step-templates elements d-flex flex-nowrap"));+ }++ private void newTemplateViewer(@Nullable AjaxRequestTarget target, int templateIndex) {+ WebMarkupContainer templateContainer = new WebMarkupContainer("template") {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ String script = String.format("onedev.server.buildSpec.onNamedElementDomReady(%d);", templateIndex);+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ };++ StepTemplate template = templates.get(templateIndex);++ templateContainer.add(new NamedElementImportNoticePanel<StepTemplate>(buildSpec, template.getName()) {++ @Override+ protected Map<String, StepTemplate> getElementMap(BuildSpec buildSpec) {+ return buildSpec.getStepTemplateMap();+ }++ });++ templateContainer.add(BeanContext.view("content", template));+ templateContainer.setOutputMarkupId(true);++ if (target != null) {+ replace(templateContainer);+ target.add(templateContainer);+ } else {+ add(templateContainer);+ }+ }++ };+ } else {+ String cssClasses = "step-templates not-defined alert alert-notice alert-light-warning d-flex";+ templatesViewer = new Label("content", "No step templates defined").add(AttributeAppender.append("class", cssClasses));+ }+ templatesViewer.add(new Behavior() {++ @Override+ public void renderHead(Component component, IHeaderResponse response) {+ super.renderHead(component, response);+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.buildSpec.onTabDomReady('.step-templates');"));+ }++ });+ templatesViewer.setOutputMarkupId(true);+ if (target != null) {+ replace(templatesViewer);+ target.add(templatesViewer);+ } else {+ add(templatesViewer);+ }+ }++ private void setupImportsViewer(@Nullable AjaxRequestTarget target) {+ Component importsViewer;+ if (!buildSpec.getImports().isEmpty()) {+ importsViewer = PropertyContext.view("content", buildSpec, "imports");+ importsViewer.add(AttributeAppender.append("class", "imports"));+ } else {+ importsViewer = new Label("content", "No imports defined");+ String cssClasses = "imports not-defined alert alert-notice alert-light-warning d-flex";+ importsViewer.add(AttributeAppender.append("class", cssClasses));+ }+ importsViewer.add(new Behavior() {++ @Override+ public void renderHead(Component component, IHeaderResponse response) {+ super.renderHead(component, response);+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.buildSpec.onTabDomReady('.imports');"));+ }++ });+ importsViewer.setOutputMarkupId(true);+ if (target != null) {+ replace(importsViewer);+ target.add(importsViewer);+ } else {+ add(importsViewer);}}@Overrideprotected void onInitialize() {super.onInitialize();++ Validator validator = OneDev.getInstance(Validator.class);+ for (ConstraintViolation<BuildSpec> violation: validator.validate(buildSpec)) {+ if (StringUtils.isNotBlank(violation.getPropertyPath().toString())) {+ error(String.format("Error validating build spec (location: %s, error message: %s)",+ violation.getPropertyPath(), violation.getMessage()));+ } else {+ error(String.format("Error validating build spec: %s", violation.getMessage()));+ }+ }++ add(new FencedFeedbackPanel("feedback", this));+add(new AjaxLink<Void>("jobs") {-++ @Override+ public void onClick(AjaxRequestTarget target) {+ String position = getPosition("jobs");+ context.pushState(target, context.getBlobIdent(), position);+ setupJobsViewer(target);+ }++ });+ add(new AjaxLink<Void>("services") {+@Overridepublic void onClick(AjaxRequestTarget target) {- String position = BuildSpecRendererProvider.getPosition("jobs");+ String position = getPosition("services");context.pushState(target, context.getBlobIdent(), position);- newJobsView(target);+ setupServicesViewer(target);+ }++ });+ add(new AjaxLink<Void>("stepTemplates") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ String position = getPosition("step-templates");+ context.pushState(target, context.getBlobIdent(), position);+ setupStepTemplatesViewer(target);}});add(new AjaxLink<Void>("properties") {-+@Overridepublic void onClick(AjaxRequestTarget target) {- String position = BuildSpecRendererProvider.getPosition("properties");+ String position = getPosition("properties");context.pushState(target, context.getBlobIdent(), position);- newPropertiesView(target);+ setupPropertiesViewer(target);}});-- String selection = BuildSpecRendererProvider.getSelection(context.getPosition());+ add(new AjaxLink<Void>("imports") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ String position = getPosition("imports");+ context.pushState(target, context.getBlobIdent(), position);+ setupImportsViewer(target);+ }++ });++ String selection = getSelection(context.getPosition());if (selection == null || selection.startsWith("jobs"))- newJobsView(null);+ setupJobsViewer(null);+ else if (selection.startsWith("services"))+ setupServicesViewer(null);+ else if (selection.startsWith("step-templates"))+ setupStepTemplatesViewer(null);+ else if (selection.equals("imports"))+ setupImportsViewer(null);else- newPropertiesView(null);+ setupPropertiesViewer(null);- add(AttributeAppender.append("class", "valid"));+ add(AttributeAppender.append("class", "parseable"));}}.setOutputMarkupId(true));} else {- String cssClasses = "not-defined m-4 alert alert-notice alert-light-warning";- add(new Label("content", "Build spec not defined").add(AttributeAppender.append("class", cssClasses)));- }- } catch (Exception e) {- Fragment invalidFrag = new Fragment("content", "invalidFrag", this);- invalidFrag.add(AttributeAppender.append("class", "invalid"));- invalidFrag.add(new MultilineLabel("errorMessage", Throwables.getStackTraceAsString(e)));- add(invalidFrag);+ Fragment unparseableFrag = new Fragment("content", "unparseableFrag", this);+ unparseableFrag.add(AttributeAppender.append("class", "unparseable"));+ unparseableFrag.add(new MultilineLabel("errorMessage",+ Throwables.getStackTraceAsString((Throwable) parseResult)));+ add(unparseableFrag);+ }+ } else {+ String cssClasses = "not-defined m-4 alert alert-notice alert-light-warning";+ add(new Label("content", "Build spec not defined").add(AttributeAppender.append("class", cssClasses)));}-}@Override@@ -232,4 +643,77 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {return true;}+ private abstract class NamedElementImportNoticePanel<T extends NamedElement> extends Fragment {++ private final Class<T> elementClass;++ private final String elementName;++ private Import aImport;++ @SuppressWarnings("unchecked")+ public NamedElementImportNoticePanel(BuildSpec buildSpec, String elementName) {+ super("notice", "namedElementImportNoticeFrag", BuildSpecBlobViewPanel.this);++ List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(+ NamedElementImportNoticePanel.class, getClass());+ elementClass = (Class<T>) typeArguments.get(0);+ this.elementName = elementName;++ T element = getElementMap(buildSpec).get(elementName);+ for (Import aImport: buildSpec.getImports()) {+ try {+ if (getElementMap(aImport.getBuildSpec()).get(elementName) == element) {+ this.aImport = aImport;+ break;+ }+ } catch (Exception e) {+ // Ignore. This error will be shown when validating+ }+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("elementTypeName", EditableUtils.getDisplayName(elementClass).toLowerCase()));++ if (aImport != null) {+ ProjectBlobPage.State state = new ProjectBlobPage.State();+ state.blobIdent = new BlobIdent(aImport.getTag(), BuildSpec.BLOB_PATH,+ FileMode.REGULAR_FILE.getBits());+ String urlSegment = BuildSpecRendererProvider.getUrlSegment(elementClass);+ state.position = BuildSpecRendererProvider.getPosition(urlSegment+"s/" + elementName);+ Project project = aImport.getProject();+ Link<?> link = new ViewStateAwarePageLink<Void>("link", ProjectBlobPage.class,+ ProjectBlobPage.paramsOf(project, state)) {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (!isEnabled())+ tag.setName("span");+ }++ };+ link.setEnabled(SecurityUtils.canReadCode(project));+ add(link);+ link.add(new Label("label", project.getName()));+ } else {+ WebMarkupContainer link = new WebMarkupContainer("link");+ link.add(new WebMarkupContainer("label"));+ add(link);+ }+ }++ protected abstract Map<String, T> getElementMap(BuildSpec buildSpec);++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(aImport != null);+ }++ }}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.htmlindex 8eea9f4c00..00761f7984 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html@@ -1,16 +1,20 @@<wicket:panel><div wicket:id="content" class="build-spec build-spec-edit"></div>- <wicket:fragment wicket:id="validFrag">+ <wicket:fragment wicket:id="parseableFrag"><div class="head"><a wicket:id="jobs" class="jobs">Jobs</a>+ <a wicket:id="services" class="services">Services</a><a wicket:id="stepTemplates" class="step-templates">Step Templates</a><a wicket:id="properties" class="properties">Properties</a><a wicket:id="imports" class="imports">Imports</a></div>- <div wicket:id="body" class="body position-aware"></div>+ <div wicket:id="body" class="body">+ <div wicket:id="feedback"></div>+ <div wicket:id="content" class="content"></div>+ </div></wicket:fragment>- <wicket:fragment wicket:id="invalidFrag">- <div class="title">Error rendering build spec</div>+ <wicket:fragment wicket:id="unparseableFrag">+ <div class="title">Error parsing build spec</div><div wicket:id="errorMessage" class="error-message"></div></wicket:fragment><wicket:fragment wicket:id="namedElementsFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.javaindex 834e7e6513..7ee738f226 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java@@ -1,5 +1,8 @@package io.onedev.server.web.page.project.blob.render.renderers.buildspec;+import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRendererProvider.getActiveNamedElementIndex;+import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRendererProvider.getUrlSegment;+import java.io.Serializable;import java.nio.charset.StandardCharsets;import java.util.ArrayList;@@ -22,6 +25,7 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.behavior.Behavior;import org.apache.wicket.event.Broadcast;import org.apache.wicket.event.IEvent;+import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;@@ -42,14 +46,16 @@ import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.BuildSpecAware;-import io.onedev.server.buildspec.BuildSpecImport;+import io.onedev.server.buildspec.Import;import io.onedev.server.buildspec.NamedElement;+import io.onedev.server.buildspec.ParamSpecAware;import io.onedev.server.buildspec.Property;+import io.onedev.server.buildspec.Service;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobAware;import io.onedev.server.buildspec.job.JobSuggestion;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.buildspec.step.StepTemplate;-import io.onedev.server.buildspec.step.StepTemplateAware;import io.onedev.server.migration.VersionedYamlDoc;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;@@ -65,10 +71,8 @@ import io.onedev.server.web.component.menu.MenuItem;import io.onedev.server.web.component.menu.MenuLink;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.edit.EditCompleteAware;import io.onedev.server.web.util.AjaxPayload;@@ -92,18 +96,16 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu}}- private void resizeWindow(AjaxRequestTarget target) {- ((BasePage)getPage()).resizeWindow(target);- }-@Overrideprotected void onInitialize() {super.onInitialize();if (parseResult instanceof BuildSpec) {BuildSpec buildSpec = (BuildSpec) parseResult;- add(new ValidFragment("content") {+ add(new ParseableFragment("content") {+ private WebMarkupContainer body;+private void setupJobsEditor(@Nullable AjaxRequestTarget target) {Fragment jobsEditor = new NamedElementsEditor<Job>() {@@ -125,7 +127,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu@Overrideprotected int getActiveElementIndex() {- return BuildSpecRendererProvider.getActiveJobIndex(context, buildSpec);+ return getActiveNamedElementIndex(context, Job.class, buildSpec.getJobs());}@Override@@ -141,18 +143,29 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bupublic Job getJob() {return (Job) getConvertedInput();}++ @Override+ public List<ParamSpec> getParamSpecs() {+ return getJob().getParamSpecs();+ }+}return new JobEditor(componentId, element);}+ @Override+ protected void setElements(List<Job> elements) {+ buildSpec.setJobs(elements);+ }+};if (target != null) {- replace(jobsEditor);+ body.replace(jobsEditor);target.add(jobsEditor);} else {- add(jobsEditor);+ body.add(jobsEditor);}}@@ -171,39 +184,83 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu@Overrideprotected int getActiveElementIndex() {- return BuildSpecRendererProvider.getActiveStepTemplateIndex(context, buildSpec);+ return getActiveNamedElementIndex(context, StepTemplate.class, buildSpec.getStepTemplates());}@Overrideprotected BeanEditor newElementEditor(String componentId, StepTemplate element) {- class StepTemplateEditor extends BeanEditor implements StepTemplateAware {+ class StepTemplateEditor extends BeanEditor implements ParamSpecAware {public StepTemplateEditor(String id, NamedElement element) {super(id, new BeanDescriptor(StepTemplate.class), Model.of(element));}@Override- public StepTemplate getTemplate() {- return (StepTemplate) getConvertedInput();+ public List<ParamSpec> getParamSpecs() {+ return ((StepTemplate) getConvertedInput()).getParamSpecs();}+}return new StepTemplateEditor(componentId, element);}+ @Override+ protected void setElements(List<StepTemplate> elements) {+ buildSpec.setStepTemplates(elements);+ }+};if (target != null) {- replace(stepTemplatesEditor);+ body.replace(stepTemplatesEditor);target.add(stepTemplatesEditor);} else {- add(stepTemplatesEditor);+ body.add(stepTemplatesEditor);+ }+ }++ private void setupServicesEditor(@Nullable AjaxRequestTarget target) {+ Fragment servicesEditor = new NamedElementsEditor<Service>() {++ @Override+ protected List<Service> getElements() {+ return buildSpec.getServices();+ }++ @Override+ protected void setElements(List<Service> elements) {+ buildSpec.setServices(elements);+ }++ @Override+ protected List<Service> getSuggestedElements() {+ return new ArrayList<>();+ }++ @Override+ protected int getActiveElementIndex() {+ return getActiveNamedElementIndex(context, Service.class, buildSpec.getServices());+ }++ @Override+ protected BeanEditor newElementEditor(String componentId, Service element) {+ return new BeanEditor(componentId, new BeanDescriptor(Service.class), Model.of(element));+ }++ };++ if (target != null) {+ body.replace(servicesEditor);+ target.add(servicesEditor);+ } else {+ body.add(servicesEditor);}}private void setupPropertiesEditor(@Nullable AjaxRequestTarget target) {- PropertyEditor<Serializable> propertiesEditor = PropertyContext.edit("body", buildSpec, "properties");+ PropertyEditor<Serializable> propertiesEditor = PropertyContext.edit("content", buildSpec, "properties");propertiesEditor.add(new Behavior() {@SuppressWarnings("unchecked")@@ -221,18 +278,18 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu}});- propertiesEditor.add(AttributeAppender.append("class", "properties d-flex"));+ propertiesEditor.add(AttributeAppender.append("class", "properties"));propertiesEditor.setOutputMarkupId(true);if (target != null) {- replace(propertiesEditor);+ body.replace(propertiesEditor);target.add(propertiesEditor);} else {- add(propertiesEditor);+ body.add(propertiesEditor);}}private void setupImportsEditor(@Nullable AjaxRequestTarget target) {- PropertyEditor<Serializable> importsEditor = PropertyContext.edit("body", buildSpec, "imports");+ PropertyEditor<Serializable> importsEditor = PropertyContext.edit("content", buildSpec, "imports");importsEditor.add(new Behavior() {@SuppressWarnings("unchecked")@@ -240,7 +297,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bupublic void onEvent(Component component, IEvent<?> event) {super.onEvent(component, event);if (event.getPayload() instanceof FormSubmitted)- buildSpec.setImports((List<BuildSpecImport>) importsEditor.getConvertedInput());+ buildSpec.setImports((List<Import>) importsEditor.getConvertedInput());}@Override@@ -250,13 +307,13 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu}});- importsEditor.add(AttributeAppender.append("class", "imports d-flex"));+ importsEditor.add(AttributeAppender.append("class", "imports"));importsEditor.setOutputMarkupId(true);if (target != null) {- replace(importsEditor);+ body.replace(importsEditor);target.add(importsEditor);} else {- add(importsEditor);+ body.add(importsEditor);}}@@ -271,14 +328,29 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Busuper.onSubmit(target, form);pushState(target, "jobs");setupJobsEditor(target);- resizeWindow(target);}@Overrideprotected void onError(AjaxRequestTarget target, Form<?> form) {super.onError(target, form);target.add(getParent());- resizeWindow(target);+ }++ });++ add(new AjaxSubmitLink("services") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ pushState(target, "services");+ setupServicesEditor(target);+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(getParent());}});@@ -290,14 +362,12 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Busuper.onSubmit(target, form);pushState(target, "step-templates");setupStepTemplatesEditor(target);- resizeWindow(target);}@Overrideprotected void onError(AjaxRequestTarget target, Form<?> form) {super.onError(target, form);target.add(getParent());- resizeWindow(target);}});@@ -309,14 +379,12 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Busuper.onSubmit(target, form);pushState(target, "properties");setupPropertiesEditor(target);- resizeWindow(target);}@Overrideprotected void onError(AjaxRequestTarget target, Form<?> form) {super.onError(target, form);target.add(getParent());- resizeWindow(target);}});@@ -328,22 +396,25 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Busuper.onSubmit(target, form);pushState(target, "imports");setupImportsEditor(target);- resizeWindow(target);}@Overrideprotected void onError(AjaxRequestTarget target, Form<?> form) {super.onError(target, form);target.add(getParent());- resizeWindow(target);}});++ add(body = new WebMarkupContainer("body"));+ body.add(new FencedFeedbackPanel("feedback", body));String selection = getSelection();if (selection == null || selection.startsWith("jobs") || selection.equals("new-job"))setupJobsEditor(null);+ else if (selection.startsWith("services") || selection.equals("new-service"))+ setupServicesEditor(null);else if (selection.startsWith("step-templates") || selection.equals("new-step-template"))setupStepTemplatesEditor(null);else if (selection.equals("imports"))@@ -351,10 +422,11 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements BuelsesetupPropertiesEditor(null);- add(AttributeAppender.append("class", "valid"));+ add(AttributeAppender.append("class", "parseable"));setOutputMarkupId(true);}+ @SuppressWarnings("rawtypes")@Overridepublic boolean onEditComplete(AjaxRequestTarget target) {BuildSpec buildSpec = (BuildSpec) parseResult;@@ -371,51 +443,106 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bucase "jobs":path = new Path(path.getNodes().subList(1, path.getNodes().size()));if (path.getNodes().isEmpty()) {- replaceState(target, "jobs");+ replaceState(target, named.getName());setupJobsEditor(target);- error("Jobs: " + violation.getMessage());+ body.error(violation.getMessage());} else {PathNode.Indexed indexed = (Indexed) path.getNodes().iterator().next();path = new Path(path.getNodes().subList(1, path.getNodes().size()));- if (path.getNodes().isEmpty()) {- replaceState(target, "jobs");- setupJobsEditor(target);- error("Job '" + buildSpec.getJobs().get(indexed.getIndex()).getName() + "': " + violation.getMessage());- } else {- String selection = "jobs/" + buildSpec.getJobs().get(indexed.getIndex()).getName();- replaceState(target, selection);- setupJobsEditor(target);- ((BeanEditor)get("body:element")).error(path, violation.getMessage());- }+ String selection = "jobs/" + buildSpec.getJobs().get(indexed.getIndex()).getName();+ replaceState(target, selection);+ setupJobsEditor(target);+ ((BeanEditor)body.get("content:element")).error(path, violation.getMessage());}break;+ case "services":+ path = new Path(path.getNodes().subList(1, path.getNodes().size()));+ if (path.getNodes().isEmpty()) {+ replaceState(target, named.getName());+ setupServicesEditor(target);+ body.error(violation.getMessage());+ } else {+ PathNode.Indexed indexed = (Indexed) path.getNodes().iterator().next();+ path = new Path(path.getNodes().subList(1, path.getNodes().size()));+ String selection = "services/" + buildSpec.getServices().get(indexed.getIndex()).getName();+ replaceState(target, selection);+ setupServicesEditor(target);+ ((BeanEditor)body.get("content:element")).error(path, violation.getMessage());+ }+ break;+ case "stepTemplates":+ path = new Path(path.getNodes().subList(1, path.getNodes().size()));+ if (path.getNodes().isEmpty()) {+ replaceState(target, named.getName());+ setupStepTemplatesEditor(target);+ body.error(violation.getMessage());+ } else {+ PathNode.Indexed indexed = (Indexed) path.getNodes().iterator().next();+ path = new Path(path.getNodes().subList(1, path.getNodes().size()));+ String selection = "step-templates/" + buildSpec.getStepTemplates().get(indexed.getIndex()).getName();+ replaceState(target, selection);+ setupStepTemplatesEditor(target);+ ((BeanEditor)body.get("content:element")).error(path, violation.getMessage());+ }+ break;+ case "properties":+ path = new Path(path.getNodes().subList(1, path.getNodes().size()));+ replaceState(target, "properties");+ setupPropertiesEditor(target);+ ((PropertyEditor)body.get("content")).error(path, violation.getMessage());+ break;+ case "imports":+ path = new Path(path.getNodes().subList(1, path.getNodes().size()));+ replaceState(target, "imports");+ setupImportsEditor(target);+ ((PropertyEditor)body.get("content")).error(path, violation.getMessage());+ break;default:throw new RuntimeException("Unexpected element name: " + named.getName());}}- resizeWindow(target);return false;} else {- resizeWindow(target);+ fixState(target);return true;}}@Overridepublic void onEditCancel(AjaxRequestTarget target) {- if ("new-job".equals(getSelection()))+ fixState(target);+ }++ private void fixState(AjaxRequestTarget target) {+ String selection = getSelection();+ if (selection == null || selection.startsWith("jobs")) {+ int jobIndex = getActiveNamedElementIndex(context, Job.class, buildSpec.getJobs());+ if (jobIndex < buildSpec.getJobs().size())+ replaceState(target, "jobs/" + buildSpec.getJobs().get(jobIndex).getName());+ } else if (selection.startsWith("services")) {+ int serviceIndex = getActiveNamedElementIndex(context, Service.class, buildSpec.getServices());+ if (serviceIndex < buildSpec.getServices().size())+ replaceState(target, "services/" + buildSpec.getServices().get(serviceIndex).getName());+ } else if (selection.startsWith("step-templates")) {+ int stepTemplateIndex = getActiveNamedElementIndex(context, StepTemplate.class, buildSpec.getStepTemplates());+ if (stepTemplateIndex < buildSpec.getStepTemplates().size())+ replaceState(target, "step-templates/" + buildSpec.getStepTemplates().get(stepTemplateIndex).getName());+ } else if (selection.equals("new-job")) {replaceState(target, "jobs");- else if ("new-step-template".equals(getSelection()))+ } else if (selection.equals("new-service")) {+ replaceState(target, "services");+ } else if (selection.equals("new-step-template")) {replaceState(target, "step-templates");+ }}});} else {- Fragment invalidFrag = new Fragment("content", "invalidFrag", this);- invalidFrag.add(new MultilineLabel("errorMessage",+ Fragment unparseableFrag = new Fragment("content", "unparseableFrag", this);+ unparseableFrag.add(new MultilineLabel("errorMessage",Throwables.getStackTraceAsString((Throwable) parseResult)));- invalidFrag.add(AttributeAppender.append("class", "invalid"));- add(invalidFrag);+ unparseableFrag.add(AttributeAppender.append("class", "unparseable"));+ add(unparseableFrag);}}@@ -484,10 +611,10 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu((EditCompleteAware) content).onEditCancel(target);}- private abstract class ValidFragment extends Fragment implements EditCompleteAware {+ private abstract class ParseableFragment extends Fragment implements EditCompleteAware {- public ValidFragment(String id) {- super(id, "validFrag", BuildSpecEditPanel.this);+ public ParseableFragment(String id) {+ super(id, "parseableFrag", BuildSpecEditPanel.this);}}@@ -498,7 +625,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu@SuppressWarnings("unchecked")public NamedElementsEditor() {- super("body", "namedElementsFrag", BuildSpecEditPanel.this);+ super("content", "namedElementsFrag", BuildSpecEditPanel.this);List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(NamedElementsEditor.class, getClass());elementClass = (Class<T>) typeArguments.get(0);@@ -506,6 +633,8 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Buprotected abstract List<T> getElements();+ protected abstract void setElements(List<T> elements);+protected abstract List<T> getSuggestedElements();protected abstract int getActiveElementIndex();@@ -543,16 +672,14 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- pushState(target, getTypeName(elementClass) + "s/" + getElement().getName());+ pushState(target, getUrlSegment(elementClass) + "s/" + getElement().getName());setupElementEditor(target, nav);- resizeWindow(target);}@Overrideprotected void onError(AjaxRequestTarget target, Form<?> form) {super.onError(target, form);target.add(elementsEdit);- resizeWindow(target);}});@@ -574,11 +701,12 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu}}target.appendJavaScript(String.format(- "$('.build-spec>.elements>.side>.navs>.nav:eq(%d)').remove();",+ "$('.build-spec>.body>.elements>.side>.navs>.nav:eq(%d)').remove();",elementIndex));getElements().remove(elementIndex);int activeElementIndex = getElements().indexOf(elementEdit.getDefaultModelObject());- if (activeElementIndex == -1) {+ if (activeElementIndex == -1) {+ replaceState(target, getUrlSegment(elementClass) + "s");if (!getElements().isEmpty()) {setupElementEditor(target, navsView.iterator().next());} else {@@ -597,17 +725,13 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Buif (target != null) {String script = String.format(- "$('.build-spec>.elements>.side>.navs').append(\"<div id='%s'></div>\");",+ "$('.build-spec>.body>.elements>.side>.navs').append(\"<div id='%s'></div>\");",nav.getMarkupId(true));target.prependJavaScript(script);target.add(nav);}}- private String getTypeName(Class<?> typeClass) {- return EditableUtils.getDisplayName(typeClass).replace(' ', '-').toLowerCase();- }-private void setupElementEditor(@Nullable AjaxRequestTarget target, Component nav) {AbstractPostAjaxBehavior nameChangeBehavior = new AbstractPostAjaxBehavior() {@@ -616,7 +740,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements BuIRequestParameters params = RequestCycle.get().getRequest().getRequestParameters();String name = params.getParameterValue("name").toOptionalString();- String selection = getTypeName(elementClass) + "s";+ String selection = getUrlSegment(elementClass) + "s";if (StringUtils.isNotBlank(name))selection += "/" + name;replaceState(target, selection);@@ -635,7 +759,9 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Busuper.onEvent(component, event);if (event.getPayload() instanceof FormSubmitted) {int elementIndex = (int) nav.getDefaultModelObject();- getElements().set(elementIndex, (T) elementEditor.getConvertedInput());+ List<T> elements = new ArrayList<>(getElements());+ elements.set(elementIndex, (T) elementEditor.getConvertedInput());+ setElements(elements);}}@@ -663,7 +789,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu@SuppressWarnings("deprecation")private void addElement(AjaxRequestTarget target, RepeatingView elementNavs) {- pushState(target, "new-" + getTypeName(elementClass));+ pushState(target, "new-" + getUrlSegment(elementClass));int elementIndex = getElements().size()-1;newElementNav(target, elementNavs, elementIndex);setupElementEditor(target, elementNavs.get(elementNavs.size()-1));@@ -699,19 +825,17 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Buthrow new RuntimeException(e);}addElement(target, elementNavs);- resizeWindow(target);}@Overrideprotected void onError(AjaxRequestTarget target, Form<?> form) {super.onError(target, form);target.add(NamedElementsEditor.this);- resizeWindow(target);}};- List<T> suggestedElements = new ArrayList<>();+ List<T> suggestedElements = getSuggestedElements();if (suggestedElements.isEmpty())createLink.add(AttributeAppender.append("class", "no-suggestions"));@@ -741,7 +865,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Busuper.onSubmit(target, form);getElements().add(element);addElement(target, elementNavs);- resizeWindow(target);+ dropdown.close();}@Override@@ -749,7 +873,6 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Busuper.onError(target, form);dropdown.close();target.add(NamedElementsEditor.this);- resizeWindow(target);}};@@ -788,7 +911,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu}.sortable(".side>.navs"));- add(AttributeAppender.append("class", "d-flex flex-nowrap elements " + getTypeName(elementClass) + "s"));+ add(AttributeAppender.append("class", "elements d-flex flex-nowrap " + getUrlSegment(elementClass) + "s"));setOutputMarkupId(true);}@@ -796,7 +919,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bupublic void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(OnDomReadyHeaderItem.forScript(- String.format("onedev.server.buildSpec.onTabDomReady('.%ss');", getTypeName(elementClass))));+ String.format("onedev.server.buildSpec.onTabDomReady('.%ss');", getUrlSegment(elementClass))));}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.javaindex 7f20bccbfa..3d0e80b11d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java@@ -1,5 +1,6 @@package io.onedev.server.web.page.project.blob.render.renderers.buildspec;+import java.util.List;import java.util.stream.IntStream;import javax.annotation.Nullable;@@ -7,7 +8,9 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.buildspec.NamedElement;import io.onedev.server.web.PrioritizedComponentRenderer;+import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;@@ -38,25 +41,19 @@ public class BuildSpecRendererProvider implements BlobRendererContribution {return null;}- public static int getActiveJobIndex(BlobRenderContext context, BuildSpec buildSpec) {- String selection = getSelection(context.getPosition());- if (selection != null && selection.startsWith("jobs/")) {- String activeJobName = selection.substring("jobs/".length());- return IntStream.range(0, buildSpec.getJobs().size())- .filter(i -> activeJobName.equals(buildSpec.getJobs().get(i).getName()))- .findFirst()- .orElse(0);- } else {- return 0;- }+ public static String getUrlSegment(Class<?> namedElementClass) {+ return EditableUtils.getDisplayName(namedElementClass).replace(' ', '-').toLowerCase();}- public static int getActiveStepTemplateIndex(BlobRenderContext context, BuildSpec buildSpec) {+ public static <T extends NamedElement> int getActiveNamedElementIndex(BlobRenderContext context,+ Class<T> namedElementClass, List<T> elements) {String selection = getSelection(context.getPosition());- if (selection != null && selection.startsWith("step-templates/")) {- String activeTemplateName = selection.substring("step-templates/".length());- return IntStream.range(0, buildSpec.getStepTemplates().size())- .filter(i -> activeTemplateName.equals(buildSpec.getStepTemplates().get(i).getName()))+ String urlSegment = getUrlSegment(namedElementClass) + "s/";++ if (selection != null && selection.startsWith(urlSegment)) {+ String activeJobName = selection.substring(urlSegment.length());+ return IntStream.range(0, elements.size())+ .filter(i -> activeJobName.equals(elements.get(i).getName())).findFirst().orElse(0);} else {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.cssindex bedaa65700..e45dae7a9d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css@@ -1,57 +1,62 @@.build-spec {padding: 1.5rem;}-.build-spec.valid {+.build-spec.parseable {min-width: 800px;}-.build-spec.invalid>.title {+.build-spec.unparseable>.title {font-size: 1.5rem;color: red;margin-bottom: 1.5rem;}-.build-spec.invalid>.error-message {+.build-spec.unparseable>.error-message {white-space: pre-wrap;word-wrap: break-word;font-size: 1rem;font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;}-.build-spec.valid>.head {+.build-spec.parseable>.head {margin-bottom: 1.5rem;padding-bottom: 0.6rem;border-bottom: 1px solid var(--light-gray);}-.build-spec.valid>.head>a {+.build-spec.parseable>.head>a {font-weight: bold;font-size: 1.2rem;margin-bottom: 1.2rem;margin-right: 0.6rem;}-.build-spec.valid>.head>a.active {+.build-spec.parseable>.head>a.active {font-size: 1.5rem;color: var(--primary);}-.build-spec.valid>.body>.side {+.build-spec.parseable>.body>.content>.side {min-width: 220px;}-.build-spec.valid>.body>.side>.navs:not(:empty) {+.build-spec.parseable>.body>.content>.side>.navs:not(:empty) {margin-bottom: 1.5rem;}-.build-spec.valid>.body>.side>.navs>.nav.active a {+.build-spec.parseable>.body>.content>.side>.navs>.nav.active a {background: var(--gray-dark);border-color: var(--gray-dark);color: white;}-.build-spec.valid>.body>.side>.navs>.nav.active a.run:hover,-.build-spec.valid>.body>.side>.navs>.nav.active a.delete:hover {+.build-spec.parseable>.body>.content>.side>.navs>.nav.active a.run:hover,+.build-spec.parseable>.body>.content>.side>.navs>.nav.active a.delete:hover {background: #5c5e81;border-color: #5c5e81;color: white;}-.build-spec.valid>.body>.main:not(:empty) {+.build-spec.parseable>.body>.content>.main>.content:not(:empty) {border-radius: 0.42rem;border: 1px solid var(--light-gray);padding: 1.5rem;}-.build-spec.valid>.properties>.bean-list {+.build-spec.parseable>.properties>.bean-list {flex-grow: 1;}++.build-spec .icon.imported {+ transform: rotate(135deg);+ margin-left: 0.5rem;+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.jsindex 44ae05c583..2602d01703 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js@@ -3,7 +3,7 @@ onedev.server.buildSpec = {$(".build-spec>.head>a").removeClass("active").filter(tabClass).addClass("active");},onNamedElementDomReady: function(elementIndex, nameChangeCallback) {- var $elements = $(".build-spec>.elements");+ var $elements = $(".build-spec>.body>.elements");var $navs = $elements.find(">.side>.navs");$navs.children().removeClass("active").eq(elementIndex).addClass("active");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.htmlindex 5739132a0a..b2d8c4a7d4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html@@ -3,7 +3,8 @@<img src="/icon/empty.svg" class="text-center mb-5"/><h3 class="alert-heading mb-3">Project does not have any code yet</h3><div class="mb-4">- You may initialize code of the project by <a wicket:id="addFiles" class="link-primary">adding files</a>,+ You may initialize the project by <a wicket:id="addFiles" class="link-primary">adding files</a>,+ <a wicket:id="setupBuildSpec" class="link-primary">setting up build spec</a>,or <a wicket:id="pushInstructions" class="link-primary">pushing an existing repository</a></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.javaindex 427d052435..897711a546 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java@@ -5,6 +5,7 @@ import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;@@ -15,6 +16,7 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;+import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.event.RefUpdated;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;@@ -50,6 +52,7 @@ public class NoCommitsPanel extends Panel {@Overrideprotected List<MenuItem> getMenuItems(FloatingPanel dropdown) {List<MenuItem> menuItems = new ArrayList<>();+menuItems.add(new MenuItem() {@Override@@ -116,6 +119,15 @@ public class NoCommitsPanel extends Panel {});+ add(new AjaxLink<Void>("setupBuildSpec") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ context.onModeChange(target, Mode.ADD, BuildSpec.BLOB_PATH);+ }++ });+add(new DropdownLink("pushInstructions") {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.htmlindex 1798207ce0..3c77a5f7de 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html@@ -19,6 +19,8 @@</div><div class="card-body d-flex flex-grow-1 position-relative"><div class="main flex-grow-1 d-flex flex-column">+ <div wicket:id="jobNotFound" class="alert alert-danger">Job '<span wicket:id="jobName"></span>' associated with the build not found.+ Most probably there are import errors in the <a wicket:id="buildSpec" class="alert-link">build spec</a></div><pre wicket:id="errorMessage" class="error-message alert alert-notice alert-light-danger overflow-auto mb-4 flex-shrink-0 p-3 text-break"></pre><ul wicket:id="buildTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5 flex-shrink-0"></ul><wicket:child></wicket:child>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 65ab2b16e9..a04854328e 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@@ -31,7 +31,6 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.flow.RedirectToUrlException;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.base.Preconditions;import com.google.common.collect.Sets;import io.onedev.commons.utils.LockUtils;@@ -40,8 +39,8 @@ import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobDependency;import io.onedev.server.buildspec.job.JobManager;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;-import io.onedev.server.buildspec.job.paramsupply.ParamSupply;+import io.onedev.server.buildspec.param.ParamUtils;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;@@ -64,6 +63,7 @@ import io.onedev.server.web.component.build.status.BuildStatusIcon;import io.onedev.server.web.component.entity.nav.EntityNavPanel;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.job.joblist.JobListPanel;+import io.onedev.server.web.component.link.BuildSpecLink;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;@@ -101,7 +101,7 @@ public abstract class BuildDetailPage extends ProjectPageprotected List<Job> load() {List<Job> downstreamJobs = new ArrayList<>();BuildSpec buildSpec = getProject().getBuildSpec(getBuild().getCommitId());- for (Job job: buildSpec.getJobs()) {+ for (Job job: buildSpec.getJobMap().values()) {for (JobDependency dependency: job.getJobDependencies()) {if (dependency.getJobName().equals(getBuild().getJobName())&& getBuild().matchParams(dependency.getJobParams())) {@@ -231,7 +231,7 @@ public abstract class BuildDetailPage extends ProjectPageactionsContainer.add(new AjaxLink<Void>("rebuild") {private void resubmit(Serializable paramBean) {- Map<String, List<String>> paramMap = ParamSupply.getParamMap(getBuild().getJob(), paramBean,+ Map<String, List<String>> paramMap = ParamUtils.getParamMap(getBuild().getJob(), paramBean,getBuild().getJob().getParamSpecMap().keySet());OneDev.getInstance(JobManager.class).resubmit(getBuild(), paramMap, "Resubmitted manually");setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(getBuild()));@@ -289,7 +289,8 @@ public abstract class BuildDetailPage extends ProjectPage@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(getBuild().isFinished() && SecurityUtils.canRunJob(getProject(), getBuild().getJobName()));+ setVisible(getBuild().isFinished() && getBuild().getJob() != null+ && SecurityUtils.canRunJob(getProject(), getBuild().getJobName()));}});@@ -345,6 +346,28 @@ public abstract class BuildDetailPage extends ProjectPageadd(new SideInfoLink("moreInfo"));+ WebMarkupContainer jobNotFoundContainer = new WebMarkupContainer("jobNotFound") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getBuild().getJob() == null);+ }++ };++ jobNotFoundContainer.add(new Label("jobName", getBuild().getJobName()));+ jobNotFoundContainer.add(new BuildSpecLink("buildSpec", getBuild().getCommitId()) {++ @Override+ protected Project getProject() {+ return getBuild().getProject();+ }++ });++ add(jobNotFoundContainer);+add(new Label("errorMessage", new AbstractReadOnlyModel<String>() {@Override@@ -544,12 +567,18 @@ public abstract class BuildDetailPage extends ProjectPage@Overridepublic List<String> getInputNames() {- return new ArrayList<>(getBuild().getJob().getParamSpecMap().keySet());+ if (getBuild().getJob() != null)+ return new ArrayList<>(getBuild().getJob().getParamSpecMap().keySet());+ else+ return new ArrayList<>();}@Overridepublic ParamSpec getInputSpec(String paramName) {- return Preconditions.checkNotNull(getBuild().getJob().getParamSpecMap().get(paramName));+ if (getBuild().getJob() != null)+ return getBuild().getJob().getParamSpecMap().get(paramName);+ else+ return null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex afdbf7bf9f..64e2ee5b77 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -295,7 +295,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annotatry {BuildSpec buildSpec = getProject().getBuildSpec(getCommit().copy());if (buildSpec != null) {- for (Job job: buildSpec.getJobs()) {+ for (Job job: buildSpec.getJobMap().values()) {if (SecurityUtils.canAccess(getProject(), job.getName()))jobs.add(job);}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 cea2e8d184..8ffb2b355d 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@@ -24,7 +24,7 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.UserManager;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.model.support.issue.field.spec.FieldSpec;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Input;import io.onedev.server.web.WebSession;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 a4344c4b3a..d643c1ad4f 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@@ -44,9 +44,9 @@ import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.Choicimport io.onedev.server.model.support.issue.BoardSpec;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.field.spec.ChoiceField;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.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;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 93aa7d49a4..8d13e23908 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@@ -47,10 +47,10 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.BoardSpec;-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.NumberField;+import io.onedev.server.model.support.issue.field.spec.ChoiceField;+import io.onedev.server.model.support.issue.field.spec.DateField;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.NumberField;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.issue.IssueQuery;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 a47443d4c1..90755e0f33 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@@ -31,7 +31,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.infomanager.UserInfoManager;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.model.support.issue.field.spec.FieldSpec;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.security.SecurityUtils;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/DefaultRoleBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/DefaultRoleBean.javanew file mode 100644index 0000000000..fc77bbea84--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/DefaultRoleBean.java@@ -0,0 +1,45 @@+package io.onedev.server.web.page.project.setting.general;++import java.io.Serializable;++import javax.annotation.Nullable;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.RoleManager;+import io.onedev.server.model.Role;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.RoleChoice;++@Editable+public class DefaultRoleBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private String roleName;++ @Editable(name="Default Role", description="Default role determines default permissions granted to everyone in the system")+ @RoleChoice+ public String getRoleName() {+ return roleName;+ }++ public void setRoleName(String roleName) {+ this.roleName = roleName;+ }++ public void setRole(@Nullable Role role) {+ if (role != null)+ roleName = role.getName();+ else+ roleName = null;+ }++ @Nullable+ public Role getRole() {+ if (roleName != null)+ return OneDev.getInstance(RoleManager.class).find(roleName);+ else+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.htmlindex 01f2b8ab73..bf6078844a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.html@@ -5,10 +5,11 @@<wicket:svg href="bulb" class="icon mr-2"/> <span wicket:id="help"></span></div><form wicket:id="form" class="leave-confirm">- <div wicket:id="editor" class="mb-4"></div>+ <div wicket:id="editor"></div>+ <div wicket:id="defaultRoleEditor" class="mb-4"></div><div class="d-flex"><input class="btn btn-primary dirty-aware mr-1" value="Update" type="submit">- <a wicket:id="delete" class="delete btn btn-danger ml-auto">Delete</a>+ <a wicket:id="delete" class="delete btn btn-light-danger ml-auto">Delete</a></div></form></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.javaindex 27e4d9110e..f6267131d8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java@@ -46,6 +46,9 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {Collection<String> properties = Sets.newHashSet("name", "description", "issueManagementEnabled");+ DefaultRoleBean defaultRoleBean = new DefaultRoleBean();+ defaultRoleBean.setRole(getProject().getDefaultRole());+editor = BeanContext.editModel("editor", new IModel<Serializable>() {@Override@@ -84,6 +87,7 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {String errorMessage = "This name has already been used by another project";editor.error(new Path(new PathNode.Named("name")), errorMessage);} else {+ project.setDefaultRole(defaultRoleBean.getRole());projectManager.save(project, oldName);Session.get().success("General setting has been updated");setResponsePage(GeneralProjectSettingPage.class, paramsOf(project));@@ -92,7 +96,9 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {};form.add(editor);-++ form.add(BeanContext.edit("defaultRoleEditor", defaultRoleBean));+form.add(new AjaxLink<Void>("delete") {@Overridediff --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 299de931cf..d514dafca3 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@@ -15,7 +15,6 @@ import java.util.stream.Collectors;import javax.annotation.Nullable;import org.apache.commons.lang3.StringUtils;-import org.eclipse.jgit.lib.ObjectId;import org.hibernate.criterion.Restrictions;import com.google.common.base.Preconditions;@@ -28,11 +27,8 @@ import io.onedev.commons.utils.LinearRange;import io.onedev.commons.utils.LockUtils;import io.onedev.server.OneDev;import io.onedev.server.buildspec.BuildSpec;-import io.onedev.server.buildspec.Property;-import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobVariable;-import io.onedev.server.buildspec.job.VariableInterpolator;-import io.onedev.server.buildspec.job.paramspec.ParamSpec;+import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildMetricManager;import io.onedev.server.entitymanager.GroupManager;@@ -54,6 +50,7 @@ import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;+import io.onedev.server.util.interpolative.VariableInterpolator;import io.onedev.server.util.match.PatternApplied;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.util.script.ScriptContribution;@@ -139,8 +136,8 @@ public class SuggestionUtils {return suggest(projectNames, matchWith);}- public static List<InputSuggestion> suggestVariables(Project project, @Nullable ObjectId commitId,- BuildSpec buildSpec, Job job, String matchWith) {+ public static List<InputSuggestion> suggestVariables(Project project, BuildSpec buildSpec,+ @Nullable List<ParamSpec> paramSpecs, String matchWith) {matchWith = matchWith.toLowerCase();int numSuggestions = 0;List<InputSuggestion> suggestions = new ArrayList<>();@@ -148,10 +145,12 @@ public class SuggestionUtils {Map<String, String> variables = new LinkedHashMap<>();for (JobVariable var: JobVariable.values())variables.put(var.name().toLowerCase(), null);- for (ParamSpec paramSpec: job.getParamSpecs())- variables.put(VariableInterpolator.PREFIX_PARAMS + paramSpec.getName(), paramSpec.getDescription());- for (Property property: buildSpec.getProperties())- variables.put(VariableInterpolator.PREFIX_PROPERTIES + property.getName(), null);+ if (paramSpecs != null) {+ for (ParamSpec paramSpec: paramSpecs)+ variables.put(VariableInterpolator.PREFIX_PARAMS + paramSpec.getName(), paramSpec.getDescription());+ }+ for (String propertyName: buildSpec.getPropertyMap().keySet())+ variables.put(VariableInterpolator.PREFIX_PROPERTIES + propertyName, null);for (JobSecret secret: project.getBuildSetting().getJobSecrets())variables.put(VariableInterpolator.PREFIX_SECRETS + secret.getName(), null);for (GroovyScript script: OneDev.getInstance(SettingManager.class).getGroovyScripts())diff --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 0c6f7cda06..d3e1ff4fbb 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.buildspec.job.paramsupply.ParamSupply;+import io.onedev.server.buildspec.param.ParamUtils;import io.onedev.server.util.IssueUtils;/**@@ -64,7 +64,7 @@ public abstract class AbstractClassResolver implements IClassResolverif (clazz != null)return clazz;- clazz = ParamSupply.loadBeanClass(className);+ clazz = ParamUtils.loadBeanClass(className);if (clazz != null)return clazz;diff --git a/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java b/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.javaindex 77a8be762c..41eea9dcd5 100644--- a/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java+++ b/server-core/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java@@ -76,6 +76,8 @@ import org.hibernate.validator.internal.util.privilegedactions.SetAccessibility;import org.hibernate.validator.spi.time.TimeProvider;import org.hibernate.validator.spi.valuehandling.ValidatedValueUnwrapper;+import io.onedev.server.util.validation.annotation.ClassValidating;+/*** The main Bean Validation class. This is the core processing class of Hibernate Validator.*@@ -550,6 +552,10 @@ public class ValidatorImpl implements Validator, ExecutableValidator {BeanMetaData<?> beanMetaData = beanMetaDataManager.getBeanMetaData( valueContext.getCurrentBeanType() );PathImpl currentPath = valueContext.getPropertyPath();for ( MetaConstraint<?> metaConstraint : beanMetaData.getMetaConstraints() ) {+ if (metaConstraint.getDescriptor().getAnnotationType() == ClassValidating.class+ && !validationContext.getFailingConstraints().isEmpty()) {+ continue;+ }validateConstraint( validationContext, valueContext, false, metaConstraint );if ( shouldFailFast( validationContext ) ) {return;diff --git a/server-core/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintTree.java b/server-core/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintTree.javaindex 5e65bd22e7..854a560a38 100644--- a/server-core/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintTree.java+++ b/server-core/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintTree.java@@ -29,6 +29,7 @@ import org.hibernate.validator.internal.util.logging.LoggerFactory;import org.hibernate.validator.spi.valuehandling.ValidatedValueUnwrapper;import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.util.interpolative.VariableInterpolator;import io.onedev.server.util.validation.InterpolativeValidator;import io.onedev.server.web.editable.annotation.Interpolative;@@ -465,12 +466,12 @@ public class ConstraintTree<A extends Annotation> {if (valueContext.getCurrentValidatedValue() instanceof Collection) {List<String> list = new ArrayList<>();for (String each: (Collection<String>)validatedValue) {- list.add(io.onedev.server.util.interpolative.Interpolative.parse(each).interpolateWith(it->exampleVar));+ list.add(new VariableInterpolator(it->exampleVar).interpolate(each));}validatedValue = (V) list;} else {- validatedValue = (V) io.onedev.server.util.interpolative.Interpolative.parse(- (String) valueContext.getCurrentValidatedValue()).interpolateWith(it->exampleVar);+ validatedValue = (V) new VariableInterpolator(it->exampleVar)+ .interpolate((String) valueContext.getCurrentValidatedValue());}}}diff --git a/server-core/src/test/java/io/onedev/server/util/interpolative/InterpolativeTest.java b/server-core/src/test/java/io/onedev/server/util/interpolative/InterpolativeTest.javadeleted file mode 100644index 342c530156..0000000000--- a/server-core/src/test/java/io/onedev/server/util/interpolative/InterpolativeTest.java+++ /dev/null@@ -1,31 +0,0 @@-package io.onedev.server.util.interpolative;--import static org.junit.Assert.assertEquals;-import static org.junit.Assert.assertTrue;--import org.junit.Test;--public class InterpolativeTest {-- @Test- public void test() {- assertEquals("@", Interpolative.parse("@@").interpolateWith(it->"!"));- assertEquals("@@", Interpolative.parse("@@@@").interpolateWith(it->it));- assertEquals("hello", Interpolative.parse("@hello@").interpolateWith(it->it));- assertEquals("helloworlddo", Interpolative.parse("hello@world@do").interpolateWith(it->it));- assertEquals("1234", Interpolative.parse("1@2@@3@4").interpolateWith(it->it));- assertEquals("1!!4", Interpolative.parse("1@2@@3@4").interpolateWith(it->"!"));- assertEquals("1!-!4", Interpolative.parse("1@2@-@3@4").interpolateWith(it->"!"));- try {- Interpolative.parse("hello@world@@do");- assertTrue(false);- } catch (RuntimeException e) {- }- try {- Interpolative.parse("@@@");- assertTrue(false);- } catch (RuntimeException e) {- }- }--}diff --git a/server-core/src/test/java/io/onedev/server/util/interpolative/VariableInterpolatorTest.java b/server-core/src/test/java/io/onedev/server/util/interpolative/VariableInterpolatorTest.javanew file mode 100644index 0000000000..7e5801863f--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/util/interpolative/VariableInterpolatorTest.java@@ -0,0 +1,109 @@+package io.onedev.server.util.interpolative;++import static org.junit.Assert.assertEquals;+import static org.junit.Assert.assertTrue;++import java.util.ArrayList;+import java.util.List;++import org.junit.Test;++import com.google.common.collect.Lists;++import io.onedev.server.web.editable.annotation.Editable;++public class VariableInterpolatorTest {++ @Test+ public void test() {+ assertEquals("@", new VariableInterpolator(it->"!").interpolate("@@"));+ assertEquals("@@", new VariableInterpolator(it->it).interpolate("@@@@"));+ assertEquals("hello", new VariableInterpolator(it->it).interpolate("@hello@"));+ assertEquals("helloworlddo", new VariableInterpolator(it->it).interpolate("hello@world@do"));+ assertEquals("1234", new VariableInterpolator(it->it).interpolate("1@2@@3@4"));+ assertEquals("1!!4", new VariableInterpolator(it->"!").interpolate("1@2@@3@4"));+ assertEquals("1!-!4", new VariableInterpolator(it->"!").interpolate("1@2@-@3@4"));+ try {+ Interpolative.parse("hello@world@@do");+ assertTrue(false);+ } catch (RuntimeException e) {+ }+ try {+ Interpolative.parse("@@@");+ assertTrue(false);+ } catch (RuntimeException e) {+ }++ TestBean bean = new TestBean();+ bean.setName("@var@");+ bean.setChildren(Lists.newArrayList("@var@", "@var@"));+ bean.setParent(new TestParentBean());+ bean.getParent().setName("@var@");++ TestBean interpolated = new VariableInterpolator(it->"hello").interpolateProperties(bean);+ assertEquals("hello", interpolated.getName());+ assertEquals(Lists.newArrayList("hello", "hello"), interpolated.getChildren());+ assertEquals("hello", interpolated.getParent().getName());++ assertEquals("@var@", bean.getName());+ assertEquals(Lists.newArrayList("@var@", "@var@"), bean.getChildren());+ assertEquals("@var@", bean.getParent().getName());+ }++ @Editable+ static class TestBean {++ private String name;++ private List<String> children = new ArrayList<>();++ private TestParentBean parent = new TestParentBean();++ @Editable+ @io.onedev.server.web.editable.annotation.Interpolative+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable+ @io.onedev.server.web.editable.annotation.Interpolative+ public List<String> getChildren() {+ return children;+ }++ public void setChildren(List<String> children) {+ this.children = children;+ }++ @Editable+ public TestParentBean getParent() {+ return parent;+ }++ public void setParent(TestParentBean parent) {+ this.parent = parent;+ }++ }++ @Editable+ static class TestParentBean {++ private String name;++ @Editable+ @io.onedev.server.web.editable.annotation.Interpolative+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ }+}diff --git a/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java b/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.javaindex 7672be6d40..199b3dfbef 100644--- a/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java@@ -1,6 +1,6 @@package io.onedev.server.util.patternset;-import static org.junit.Assert.*;+import static org.junit.Assert.assertEquals;import java.util.function.Function;@@ -8,13 +8,13 @@ import org.junit.Test;import com.google.common.collect.Sets;-import io.onedev.server.util.interpolative.Interpolative;+import io.onedev.server.util.interpolative.VariableInterpolator;public class InterpolativePatternSetGrammarTest {@Testpublic void test() {- Function<String, String> interpolator = new Function<String, String>() {+ Function<String, String> variableResolver = new Function<String, String>() {@Overridepublic String apply(String t) {@@ -27,25 +27,25 @@ public class InterpolativePatternSetGrammarTest {String interpolated;expected = new PatternSet(Sets.newHashSet("\"hello\""), Sets.newHashSet("\"hello world\""));- interpolated = Interpolative.parse("\\\"hello\\\" -@\"\\\"hello world\\\"\"@").interpolateWith(interpolator);+ interpolated = new VariableInterpolator(variableResolver).interpolate("\\\"hello\\\" -@\"\\\"hello world\\\"\"@");actual = PatternSet.parse(interpolated);assertEquals(expected.getIncludes(), actual.getIncludes());assertEquals(expected.getExcludes(), actual.getExcludes());expected = new PatternSet(Sets.newHashSet("hello world"), Sets.newHashSet());- interpolated = Interpolative.parse("@\"@hello world\"").interpolateWith(interpolator);+ interpolated = new VariableInterpolator(variableResolver).interpolate("@\"@hello world\"");actual = PatternSet.parse(interpolated);assertEquals(expected.getIncludes(), actual.getIncludes());assertEquals(expected.getExcludes(), actual.getExcludes());expected = new PatternSet(Sets.newHashSet("@robin", "-@alive"), Sets.newHashSet("\"@"));- interpolated = Interpolative.parse("@@robin \"-@@alive\" -\\\"@@").interpolateWith(interpolator);+ interpolated = new VariableInterpolator(variableResolver).interpolate("@@robin \"-@@alive\" -\\\"@@");actual = PatternSet.parse(interpolated);assertEquals(expected.getIncludes(), actual.getIncludes());assertEquals(expected.getExcludes(), actual.getExcludes());expected = new PatternSet(Sets.newHashSet("@robin", "hello world", "world"), Sets.newHashSet("hello"));- interpolated = Interpolative.parse("@@robin @\"hello world\"@ -@hello world@").interpolateWith(interpolator);+ interpolated = new VariableInterpolator(variableResolver).interpolate("@@robin @\"hello world\"@ -@hello world@");actual = PatternSet.parse(interpolated);assertEquals(expected.getIncludes(), actual.getIncludes());assertEquals(expected.getExcludes(), actual.getExcludes());diff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex 84955fbeee..610fb0478b 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex b27ef82c4b..aca4d7be36 100644--- a/server-plugin/server-plugin-archetype/pom.xml+++ b/server-plugin/server-plugin-archetype/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version></parent><build><resources>diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xmlindex c0f9396c57..6710c7c72d 100644--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xmlindex dbde6800c5..5ddc36ffdc 100644--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleJobSuggestion.java b/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleJobSuggestion.javaindex 10fd4f1d2a..924a1be6e7 100644--- a/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleJobSuggestion.java+++ b/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleJobSuggestion.java@@ -14,7 +14,6 @@ import com.google.common.collect.Lists;import io.onedev.server.buildspec.job.CacheSpec;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobSuggestion;-import io.onedev.server.buildspec.job.VariableInterpolator;import io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger;import io.onedev.server.buildspec.job.trigger.PullRequestUpdateTrigger;import io.onedev.server.buildspec.step.CommandStep;@@ -23,6 +22,7 @@ import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GroovyScript;+import io.onedev.server.util.interpolative.VariableInterpolator;public class GradleJobSuggestion implements JobSuggestion {@@ -51,7 +51,8 @@ public class GradleJobSuggestion implements JobSuggestion {"echo \"##onedev[SetBuildVersion '$buildVersion']\"","gradle build"));- job.getSteps().add(step);+ job.setSteps(Lists.newArrayList(step));+setupTriggers(job);setupCaches(job);jobs.add(job);diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xmlindex 41c664e26c..e687dc30da 100644--- a/server-plugin/server-plugin-buildspec-maven/pom.xml+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenJobSuggestion.java b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenJobSuggestion.javaindex 76308e5e69..ef94753919 100644--- a/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenJobSuggestion.java+++ b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenJobSuggestion.java@@ -20,7 +20,6 @@ import com.google.common.collect.Lists;import io.onedev.server.buildspec.job.CacheSpec;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobSuggestion;-import io.onedev.server.buildspec.job.VariableInterpolator;import io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger;import io.onedev.server.buildspec.step.CommandStep;import io.onedev.server.git.Blob;@@ -28,6 +27,7 @@ import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GroovyScript;+import io.onedev.server.util.interpolative.VariableInterpolator;public class MavenJobSuggestion implements JobSuggestion {@@ -58,7 +58,7 @@ public class MavenJobSuggestion implements JobSuggestion {"echo","mvn clean test"));- job.getSteps().add(step);+ job.setSteps(Lists.newArrayList(step));// Trigger the job automatically when there is a push to the branchBranchUpdateTrigger trigger = new BranchUpdateTrigger();diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xmlindex a1506b8034..eaa759874a 100644--- a/server-plugin/server-plugin-buildspec-node/pom.xml+++ b/server-plugin/server-plugin-buildspec-node/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.javaindex 8b97a1c028..9e8cb9346b 100644--- a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java+++ b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java@@ -21,7 +21,6 @@ import io.onedev.server.OneDev;import io.onedev.server.buildspec.job.CacheSpec;import io.onedev.server.buildspec.job.Job;import io.onedev.server.buildspec.job.JobSuggestion;-import io.onedev.server.buildspec.job.VariableInterpolator;import io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger;import io.onedev.server.buildspec.step.CommandStep;import io.onedev.server.git.Blob;@@ -29,6 +28,7 @@ import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GroovyScript;+import io.onedev.server.util.interpolative.VariableInterpolator;public class NodeJobSuggestion implements JobSuggestion {@@ -103,7 +103,7 @@ public class NodeJobSuggestion implements JobSuggestion {}step.setCommands(commands);- job.getSteps().add(step);+ job.setSteps(Lists.newArrayList(step));setupTriggers(job);setupCaches(job);@@ -156,8 +156,7 @@ public class NodeJobSuggestion implements JobSuggestion {}step.setCommands(commands);-- job.getSteps().add(step);+ job.setSteps(Lists.newArrayList(step));setupTriggers(job);setupCaches(job);@@ -205,7 +204,7 @@ public class NodeJobSuggestion implements JobSuggestion {}step.setCommands(commands);- job.getSteps().add(step);+ job.setSteps(Lists.newArrayList(step));setupTriggers(job);setupCaches(job);@@ -252,7 +251,8 @@ public class NodeJobSuggestion implements JobSuggestion {}step.setCommands(commands);- job.getSteps().add(step);+ job.setSteps(Lists.newArrayList(step));+setupTriggers(job);setupCaches(job);jobs.add(job);diff --git a/server-plugin/server-plugin-executor-docker/pom.xml b/server-plugin/server-plugin-executor-docker/pom.xmlindex b00413bcba..dbd2fca608 100644--- a/server-plugin/server-plugin-executor-docker/pom.xml+++ b/server-plugin/server-plugin-executor-docker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.docker.DockerModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.javaindex 3b73cc12e7..234cac11ef 100644--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java@@ -49,10 +49,10 @@ import io.onedev.k8shelper.Executable;import io.onedev.k8shelper.KubernetesHelper;import io.onedev.k8shelper.SshCloneInfo;import io.onedev.server.OneDev;+import io.onedev.server.buildspec.Service;import io.onedev.server.buildspec.job.EnvVar;import io.onedev.server.buildspec.job.JobContext;import io.onedev.server.buildspec.job.JobManager;-import io.onedev.server.buildspec.job.JobService;import io.onedev.server.git.config.GitConfig;import io.onedev.server.model.support.RegistryLogin;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;@@ -277,7 +277,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V}@SuppressWarnings("resource")- private void startService(String network, JobService jobService, SimpleLogger jobLogger) {+ private void startService(String network, Service jobService, SimpleLogger jobLogger) {jobLogger.log("Creating service container...");String containerName = network + "-service-" + jobService.getName();@@ -438,7 +438,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, VcreateNetwork(network, jobContext, jobLogger);try {- for (JobService jobService: jobContext.getServices()) {+ for (Service jobService: jobContext.getServices()) {jobLogger.log("Starting service (name: " + jobService.getName() + ", image: " + jobService.getImage() + ")...");startService(network, jobService, jobLogger);}diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex 65089c024d..fb6378f540 100644--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>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 7673c0dda1..c71c2884ef 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@@ -54,11 +54,12 @@ import io.onedev.k8shelper.Action;import io.onedev.k8shelper.CommandExecutable;import io.onedev.k8shelper.CommandVisitor;import io.onedev.k8shelper.CompositeExecutable;+import io.onedev.k8shelper.ExecuteCondition;import io.onedev.server.OneDev;+import io.onedev.server.buildspec.Service;import io.onedev.server.buildspec.job.CacheSpec;import io.onedev.server.buildspec.job.EnvVar;import io.onedev.server.buildspec.job.JobContext;-import io.onedev.server.buildspec.job.JobService;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.RegistryLogin;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;@@ -539,7 +540,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}}- private void startService(String namespace, JobContext jobContext, JobService jobService,+ private void startService(String namespace, JobContext jobContext, Service jobService,@Nullable String imagePullSecretName, SimpleLogger jobLogger) {jobLogger.log("Creating service pod from image " + jobService.getImage() + "...");@@ -736,7 +737,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDatatry {String imagePullSecretName = createImagePullSecret(namespace, jobLogger);if (jobContext != null) {- for (JobService jobService: jobContext.getServices()) {+ for (Service jobService: jobContext.getServices()) {jobLogger.log("Starting service (name: " + jobService.getName() + ", image: " + jobService.getImage() + ")...");startService(namespace, jobContext, jobService, imagePullSecretName, jobLogger);}@@ -809,7 +810,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataList<Action> actions = new ArrayList<>();CommandExecutable executable = new CommandExecutable((String) executionContext,Lists.newArrayList("this does not matter"));- actions.add(new Action(true, executable));+ actions.add(new Action(executable, ExecuteCondition.ALWAYS));entryExecutable = new CompositeExecutable(actions);}diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xmlindex a9ad3053c7..f14f99cebc 100644--- a/server-plugin/server-plugin-report-checkstyle/pom.xml+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml@@ -5,9 +5,9 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version></parent><properties>- <moduleClass>org.server.plugin.report.checkstyle.CheckstylePluginModule</moduleClass>+ <moduleClass>io.onedev.server.plugin.report.checkstyle.CheckstylePluginModule</moduleClass></properties></project>diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/AbstractViolation.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/AbstractViolation.javasimilarity index 95%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/AbstractViolation.javarename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/AbstractViolation.javaindex ab4d2c6200..cc8f11734a 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/AbstractViolation.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/AbstractViolation.java@@ -1,4 +1,4 @@-package org.server.plugin.report.checkstyle;+package io.onedev.server.plugin.report.checkstyle;import java.io.Serializable;diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleFilesPage.html b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleFilesPage.htmlsimilarity index 100%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleFilesPage.htmlrename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleFilesPage.htmldiff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleFilesPage.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleFilesPage.javasimilarity index 98%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleFilesPage.javarename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleFilesPage.javaindex 08a6218f17..01f85dff7b 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleFilesPage.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleFilesPage.java@@ -1,4 +1,4 @@-package org.server.plugin.report.checkstyle;+package io.onedev.server.plugin.report.checkstyle;import java.io.Serializable;import java.util.ArrayList;@@ -30,7 +30,6 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.FileMode;-import org.server.plugin.report.checkstyle.ViolationFile.Violation;import com.google.common.base.Optional;import com.google.common.collect.Lists;@@ -39,6 +38,7 @@ import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Build;+import io.onedev.server.plugin.report.checkstyle.ViolationFile.Violation;import io.onedev.server.util.match.Matcher;import io.onedev.server.util.match.PathMatcher;import io.onedev.server.util.patternset.PatternSet;diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstylePluginModule.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstylePluginModule.javasimilarity index 99%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstylePluginModule.javarename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstylePluginModule.javaindex b2a2cfc63d..1bc7a878e6 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstylePluginModule.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstylePluginModule.java@@ -1,4 +1,4 @@-package org.server.plugin.report.checkstyle;+package io.onedev.server.plugin.report.checkstyle;import java.io.BufferedInputStream;import java.io.File;diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportCssResourceReference.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleReportCssResourceReference.javasimilarity index 87%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportCssResourceReference.javarename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleReportCssResourceReference.javaindex 40f87cbac3..62c453839f 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportCssResourceReference.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleReportCssResourceReference.java@@ -1,4 +1,4 @@-package org.server.plugin.report.checkstyle;+package io.onedev.server.plugin.report.checkstyle;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportData.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleReportData.javasimilarity index 96%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportData.javarename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleReportData.javaindex 95be220eff..a5c5f808ea 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportData.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleReportData.java@@ -1,4 +1,4 @@-package org.server.plugin.report.checkstyle;+package io.onedev.server.plugin.report.checkstyle;import java.io.BufferedInputStream;import java.io.BufferedOutputStream;@@ -16,7 +16,8 @@ import java.util.List;import java.util.Map;import org.apache.commons.lang.SerializationUtils;-import org.server.plugin.report.checkstyle.ViolationFile.Violation;++import io.onedev.server.plugin.report.checkstyle.ViolationFile.Violation;public class CheckstyleReportData implements Serializable {diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportPage.html b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleReportPage.htmlsimilarity index 100%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportPage.htmlrename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleReportPage.htmldiff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportPage.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleReportPage.javasimilarity index 98%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportPage.javarename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleReportPage.javaindex 269c112ce6..e56ef39028 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleReportPage.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleReportPage.java@@ -1,4 +1,4 @@-package org.server.plugin.report.checkstyle;+package io.onedev.server.plugin.report.checkstyle;import java.io.File;import java.util.ArrayList;diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleRulesPage.html b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleRulesPage.htmlsimilarity index 100%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleRulesPage.htmlrename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleRulesPage.htmldiff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleRulesPage.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleRulesPage.javasimilarity index 98%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleRulesPage.javarename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleRulesPage.javaindex 33e2fe9f91..f298bd8be1 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleRulesPage.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleRulesPage.java@@ -1,4 +1,4 @@-package org.server.plugin.report.checkstyle;+package io.onedev.server.plugin.report.checkstyle;import java.io.Serializable;import java.util.ArrayList;@@ -30,7 +30,6 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.FileMode;-import org.server.plugin.report.checkstyle.ViolationRule.Violation;import com.google.common.base.Optional;import com.google.common.collect.Lists;@@ -39,6 +38,7 @@ import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Build;+import io.onedev.server.plugin.report.checkstyle.ViolationRule.Violation;import io.onedev.server.util.match.Matcher;import io.onedev.server.util.match.StringMatcher;import io.onedev.server.util.patternset.PatternSet;diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleStatsPage.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleStatsPage.javasimilarity index 92%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleStatsPage.javarename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleStatsPage.javaindex 670e1e6cbe..54e37be340 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleStatsPage.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleStatsPage.java@@ -1,4 +1,4 @@-package org.server.plugin.report.checkstyle;+package io.onedev.server.plugin.report.checkstyle;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleViolation.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleViolation.javasimilarity index 93%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleViolation.javarename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleViolation.javaindex d9761310b4..8e7849f79f 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/CheckstyleViolation.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleViolation.java@@ -1,4 +1,4 @@-package org.server.plugin.report.checkstyle;+package io.onedev.server.plugin.report.checkstyle;import javax.annotation.Nullable;diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/JobCheckstyleReport.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/JobCheckstyleReport.javasimilarity index 95%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/JobCheckstyleReport.javarename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/JobCheckstyleReport.javaindex 51e326f4fd..525e3a682b 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/JobCheckstyleReport.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/JobCheckstyleReport.java@@ -1,4 +1,4 @@-package org.server.plugin.report.checkstyle;+package io.onedev.server.plugin.report.checkstyle;import java.io.File;import java.io.FileOutputStream;@@ -35,7 +35,7 @@ public class JobCheckstyleReport extends JobReport {private static final long serialVersionUID = 1L;- public static final String DIR = "checkstyle-reports";+ public static final String DIR = "checkstyle-reports2";public static final String VIOLATION_FILES = "violation-files";diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/JobESLintReport.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/JobESLintReport.javasimilarity index 91%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/JobESLintReport.javarename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/JobESLintReport.javaindex da379372db..6d0be761a7 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/JobESLintReport.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/JobESLintReport.java@@ -1,4 +1,4 @@-package org.server.plugin.report.checkstyle;+package io.onedev.server.plugin.report.checkstyle;import org.hibernate.validator.constraints.NotEmpty;diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/ViolationFile.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/ViolationFile.javasimilarity index 97%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/ViolationFile.javarename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/ViolationFile.javaindex 68d70c6113..1da6c45fe0 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/ViolationFile.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/ViolationFile.java@@ -1,4 +1,4 @@-package org.server.plugin.report.checkstyle;+package io.onedev.server.plugin.report.checkstyle;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/ViolationRule.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/ViolationRule.javasimilarity index 95%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/ViolationRule.javarename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/ViolationRule.javaindex 0503b2b381..aa0740819b 100644--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/ViolationRule.java+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/ViolationRule.java@@ -1,4 +1,4 @@-package org.server.plugin.report.checkstyle;+package io.onedev.server.plugin.report.checkstyle;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/checkstyle-report.css b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/checkstyle-report.csssimilarity index 100%rename from server-plugin/server-plugin-report-checkstyle/src/main/java/org/server/plugin/report/checkstyle/checkstyle-report.cssrename to server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/checkstyle-report.cssdiff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xmlindex f0d509febc..13ee19cc96 100644--- a/server-plugin/server-plugin-report-clover/pom.xml+++ b/server-plugin/server-plugin-report-clover/pom.xml@@ -5,9 +5,9 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version></parent><properties>- <moduleClass>org.server.plugin.report.clover.CloverPluginModule</moduleClass>+ <moduleClass>io.onedev.server.plugin.report.clover.CloverPluginModule</moduleClass></properties></project>diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverOrderBy.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverOrderBy.javasimilarity index 97%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverOrderBy.javarename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverOrderBy.javaindex 103ff1d511..ffa3b7ec87 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverOrderBy.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverOrderBy.java@@ -1,4 +1,4 @@-package org.server.plugin.report.clover;+package io.onedev.server.plugin.report.clover;import io.onedev.commons.utils.StringUtils;diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverPluginModule.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverPluginModule.javasimilarity index 99%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverPluginModule.javarename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverPluginModule.javaindex 1556f60ca2..a6667c4e95 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverPluginModule.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverPluginModule.java@@ -1,4 +1,4 @@-package org.server.plugin.report.clover;+package io.onedev.server.plugin.report.clover;import java.io.BufferedInputStream;import java.io.File;diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportCssResourceReference.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverReportCssResourceReference.javasimilarity index 87%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportCssResourceReference.javarename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverReportCssResourceReference.javaindex 8e5bf505fa..3ad536fe7b 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportCssResourceReference.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverReportCssResourceReference.java@@ -1,4 +1,4 @@-package org.server.plugin.report.clover;+package io.onedev.server.plugin.report.clover;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportData.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverReportData.javasimilarity index 97%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportData.javarename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverReportData.javaindex ac9f26143b..a1747f84dc 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportData.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverReportData.java@@ -1,4 +1,4 @@-package org.server.plugin.report.clover;+package io.onedev.server.plugin.report.clover;import java.io.BufferedInputStream;import java.io.BufferedOutputStream;diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportPage.html b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverReportPage.htmlsimilarity index 100%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportPage.htmlrename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverReportPage.htmldiff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportPage.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverReportPage.javasimilarity index 99%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportPage.javarename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverReportPage.javaindex 4298c4da6f..91c3ff3dd2 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverReportPage.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverReportPage.java@@ -1,4 +1,4 @@-package org.server.plugin.report.clover;+package io.onedev.server.plugin.report.clover;import java.io.File;import java.io.Serializable;diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverStatsPage.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverStatsPage.javasimilarity index 92%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverStatsPage.javarename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverStatsPage.javaindex e2727a3150..e63e5725c9 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CloverStatsPage.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CloverStatsPage.java@@ -1,4 +1,4 @@-package org.server.plugin.report.clover;+package io.onedev.server.plugin.report.clover;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfo.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CoverageInfo.javasimilarity index 95%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfo.javarename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CoverageInfo.javaindex c643c47825..8fc09e5d65 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfo.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CoverageInfo.java@@ -1,4 +1,4 @@-package org.server.plugin.report.clover;+package io.onedev.server.plugin.report.clover;import java.io.Serializable;diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfoPanel.html b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CoverageInfoPanel.htmlsimilarity index 100%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfoPanel.htmlrename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CoverageInfoPanel.htmldiff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfoPanel.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CoverageInfoPanel.javasimilarity index 97%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfoPanel.javarename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CoverageInfoPanel.javaindex 6781040af4..77c6c9c4c3 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/CoverageInfoPanel.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/CoverageInfoPanel.java@@ -1,4 +1,4 @@-package org.server.plugin.report.clover;+package io.onedev.server.plugin.report.clover;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.GenericPanel;diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/FileCoverageInfo.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/FileCoverageInfo.javasimilarity index 91%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/FileCoverageInfo.javarename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/FileCoverageInfo.javaindex 6f23c41fb9..cef2ad3ec7 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/FileCoverageInfo.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/FileCoverageInfo.java@@ -1,4 +1,4 @@-package org.server.plugin.report.clover;+package io.onedev.server.plugin.report.clover;import io.onedev.server.util.Coverage;diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobCloverReport.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/JobCloverReport.javasimilarity index 96%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobCloverReport.javarename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/JobCloverReport.javaindex fdfcf6bf55..49d0598c45 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobCloverReport.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/JobCloverReport.java@@ -1,4 +1,4 @@-package org.server.plugin.report.clover;+package io.onedev.server.plugin.report.clover;import java.io.File;import java.io.FileOutputStream;@@ -37,7 +37,7 @@ public class JobCloverReport extends JobReport {private static final long serialVersionUID = 1L;- public static final String DIR = "clover-reports";+ public static final String DIR = "clover-reports2";public static final String TEST_COUNTS_DIR = "test-count";diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobJestCoverageReport.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/JobJestCoverageReport.javasimilarity index 92%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobJestCoverageReport.javarename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/JobJestCoverageReport.javaindex 3e28a6caa1..ad68d37af5 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/JobJestCoverageReport.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/JobJestCoverageReport.java@@ -1,4 +1,4 @@-package org.server.plugin.report.clover;+package io.onedev.server.plugin.report.clover;import org.hibernate.validator.constraints.NotEmpty;diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/NamedCoverageInfo.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/NamedCoverageInfo.javasimilarity index 90%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/NamedCoverageInfo.javarename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/NamedCoverageInfo.javaindex 6df2daed6e..6f5ab0fcf8 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/NamedCoverageInfo.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/NamedCoverageInfo.java@@ -1,4 +1,4 @@-package org.server.plugin.report.clover;+package io.onedev.server.plugin.report.clover;import io.onedev.server.util.Coverage;diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/PackageCoverageInfo.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PackageCoverageInfo.javasimilarity index 93%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/PackageCoverageInfo.javarename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PackageCoverageInfo.javaindex 1fd4e1e689..aed6ccb1aa 100644--- a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/PackageCoverageInfo.java+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PackageCoverageInfo.java@@ -1,4 +1,4 @@-package org.server.plugin.report.clover;+package io.onedev.server.plugin.report.clover;import java.util.List;diff --git a/server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/clover-report.css b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/clover-report.csssimilarity index 100%rename from server-plugin/server-plugin-report-clover/src/main/java/org/server/plugin/report/clover/clover-report.cssrename to server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/clover-report.cssdiff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xmlindex 2c8769fbe7..00b0fdc2a8 100644--- a/server-plugin/server-plugin-report-jest/pom.xml+++ b/server-plugin/server-plugin-report-jest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.jest.JestTestReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xmlindex 4634fcfc53..e0840acc60 100644--- a/server-plugin/server-plugin-report-markdown/pom.xml+++ b/server-plugin/server-plugin-report-markdown/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xmlindex 89deaca092..845bdbcaff 100644--- a/server-plugin/server-plugin-sso-openid/pom.xml+++ b/server-plugin/server-plugin-sso-openid/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version></parent><dependencies><dependency>diff --git a/server-product/pom.xml b/server-product/pom.xmlindex ec20b3f50f..dc9edd69cc 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>4.2.5</version>+ <version>4.3.0</version></parent><dependencies><dependency>