The Unified and Autonomous Development Platform
Simplified pull request build requirement workflow
Robin Shen450c1791830e
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 492bb82190..72528825c1 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -109,7 +109,7 @@ import io.onedev.server.entitymanager.IssueWatchManager;import io.onedev.server.entitymanager.MembershipManager;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.PullRequestBuildManager;+import io.onedev.server.entitymanager.BuildRequirementManager;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestCommentManager;import io.onedev.server.entitymanager.PullRequestManager;@@ -142,7 +142,7 @@ import io.onedev.server.entitymanager.impl.DefaultIssueWatchManager;import io.onedev.server.entitymanager.impl.DefaultMembershipManager;import io.onedev.server.entitymanager.impl.DefaultMilestoneManager;import io.onedev.server.entitymanager.impl.DefaultProjectManager;-import io.onedev.server.entitymanager.impl.DefaultPullRequestBuildManager;+import io.onedev.server.entitymanager.impl.DefaultBuildRequirementManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestChangeManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestCommentManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestManager;@@ -252,7 +252,6 @@ import io.onedev.server.web.mapper.OnePageMapper;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.layout.MainNavContribution;import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;-import io.onedev.server.web.page.project.blob.render.renderers.cispec.CISpecRendererProvider;import io.onedev.server.web.page.test.TestPage;import io.onedev.server.web.websocket.BuildEventBroadcaster;import io.onedev.server.web.websocket.CodeCommentEventBroadcaster;@@ -318,7 +317,7 @@ public class CoreModule extends AbstractPluginModule {bind(BuildDependenceManager.class).to(DefaultBuildDependenceManager.class);bind(JobScheduler.class).to(DefaultJobScheduler.class);bind(LogManager.class).to(DefaultLogManager.class);- bind(PullRequestBuildManager.class).to(DefaultPullRequestBuildManager.class);+ bind(BuildRequirementManager.class).to(DefaultBuildRequirementManager.class);bind(MailManager.class).to(DefaultMailManager.class);bind(IssueManager.class).to(DefaultIssueManager.class);bind(IssueFieldEntityManager.class).to(DefaultIssueFieldEntityManager.class);@@ -431,7 +430,6 @@ public class CoreModule extends AbstractPluginModule {bind(WebSocketManager.class).to(DefaultWebSocketManager.class);contributeFromPackage(EditSupport.class, EditSupport.class);- contributeFromPackage(EditSupport.class, CISpecRendererProvider.class);bind(WebApplication.class).to(OneWebApplication.class);bind(Application.class).to(OneWebApplication.class);diff --git a/core/src/main/java/io/onedev/server/ci/CISpec.java b/core/src/main/java/io/onedev/server/ci/CISpec.javaindex 9ada98d044..3e53c943eb 100644--- a/core/src/main/java/io/onedev/server/ci/CISpec.java+++ b/core/src/main/java/io/onedev/server/ci/CISpec.java@@ -69,7 +69,7 @@ public class CISpec implements Serializable, Validatable {for (int i=0; i<jobs.size(); i++) {Job job = jobs.get(i);- for (Dependency dependency: job.getDependencies()) {+ for (JobDependency dependency: job.getDependencies()) {Job dependencyJob = getJobMap().get(dependency.getJobName());if (dependencyJob != null) {try {@@ -129,7 +129,7 @@ public class CISpec implements Serializable, Validatable {dependencyChain.add(jobName);Job job = getJobMap().get(jobName);if (job != null) {- for (Dependency dependency: job.getDependencies()) {+ for (JobDependency dependency: job.getDependencies()) {if (hasCircularDependencies(new ArrayList<>(dependencyChain), dependency.getJobName()))return true;}diff --git a/core/src/main/java/io/onedev/server/ci/CISpecAware.java b/core/src/main/java/io/onedev/server/ci/CISpecAware.javanew file mode 100644index 0000000000..a6b68f74b5--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/CISpecAware.java@@ -0,0 +1,10 @@+package io.onedev.server.ci;++import javax.annotation.Nullable;++public interface CISpecAware {++ @Nullable+ CISpec getCISpec();++}diff --git a/core/src/main/java/io/onedev/server/ci/Dependency.java b/core/src/main/java/io/onedev/server/ci/JobDependency.javasimilarity index 60%rename from core/src/main/java/io/onedev/server/ci/Dependency.javarename to core/src/main/java/io/onedev/server/ci/JobDependency.javaindex 5ec447dcc0..901bf218a9 100644--- a/core/src/main/java/io/onedev/server/ci/Dependency.java+++ b/core/src/main/java/io/onedev/server/ci/JobDependency.java@@ -7,9 +7,8 @@ import java.util.List;import org.apache.wicket.Component;import org.hibernate.validator.constraints.NotEmpty;-import com.google.common.base.Preconditions;-import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.JobAware;import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputSpec;@@ -17,12 +16,10 @@ 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.page.project.blob.render.renderers.cispec.CISpecAware;-import io.onedev.server.web.page.project.blob.render.renderers.cispec.job.dependency.DependencyEditPanel;import io.onedev.server.web.util.WicketUtils;@Editable-public class Dependency implements Serializable {+public class JobDependency implements Serializable {private static final long serialVersionUID = 1L;@@ -54,15 +51,24 @@ public class Dependency implements Serializable {@SuppressWarnings("unused")private static List<String> getJobChoices() {- DependencyEditPanel editor = OneContext.get().getComponent().findParent(DependencyEditPanel.class);- Preconditions.checkNotNull(editor);List<String> choices = new ArrayList<>();- Job belongingJob = editor.getJob();- for (Job job: editor.getCISpec().getJobs()) {- if (job.getName() != null)- choices.add(job.getName());+ Component component = OneContext.get().getComponent();+ CISpecAware ciSpecAware = WicketUtils.findInnermost(component, CISpecAware.class);+ if (ciSpecAware != null) {+ CISpec ciSpec = ciSpecAware.getCISpec();+ if (ciSpec != null) {+ for (Job eachJob: ciSpec.getJobs()) {+ if (eachJob.getName() != null)+ choices.add(eachJob.getName());+ }+ }+ JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);+ if (jobAware != null) {+ Job job = jobAware.getJob();+ if (job != null)+ choices.remove(job.getName());+ }}- choices.remove(belongingJob.getName());return choices;}@@ -71,13 +77,17 @@ public class Dependency implements Serializable {String jobName = (String) OneContext.get().getEditContext().getInputValue("jobName");if (jobName != null) {Component component = OneContext.get().getComponent();- CISpecAware ciSpecAware = Preconditions.checkNotNull(WicketUtils.findInnermost(component, CISpecAware.class));- CISpec ciSpec = Preconditions.checkNotNull(ciSpecAware.getCISpec());- Job job = Preconditions.checkNotNull(ciSpec.getJobMap().get(jobName));- return job.getParamSpecs();- } else {- return new ArrayList<>();- }+ CISpecAware ciSpecAware = WicketUtils.findInnermost(component, CISpecAware.class);+ if (ciSpecAware != null) {+ CISpec ciSpec = ciSpecAware.getCISpec();+ if (ciSpec != null) {+ Job job = ciSpec.getJobMap().get(jobName);+ if (job != null)+ return job.getParamSpecs();+ }+ }+ }+ return new ArrayList<>();}}diff --git a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.javaindex a57e299127..85a07b8700 100644--- a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java+++ b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java@@ -38,8 +38,8 @@ import io.onedev.commons.utils.schedule.SchedulableTask;import io.onedev.commons.utils.schedule.TaskScheduler;import io.onedev.server.OneException;import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.Dependency;import io.onedev.server.ci.InvalidCISpecException;+import io.onedev.server.ci.JobDependency;import io.onedev.server.ci.job.log.LogManager;import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.trigger.JobTrigger;@@ -150,14 +150,14 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableTpublic void run() {Project project = projectManager.load(projectId);User submitter = (submitterId != null? userManager.load(submitterId): null);- new MatrixRunner(paramMatrix).run(new MatrixRunner.Runnable() {+ new MatrixRunner(paramMatrix) {@Overridepublic void run(Map<String, String> params) {submit(project, submitter, commitHash, jobName, params, new ArrayList<>());}- });+ }.run();}});@@ -226,14 +226,14 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT}try {- JobParam.validateParamMap(job.getParamSpecs(), paramMap);+ JobParam.validateParams(job.getParamSpecs(), JobParam.getParamMatrix(paramMap));} catch (ValidationException e) {markBuildError(build, e.getMessage());return builds;}- for (Dependency dependency: job.getDependencies()) {- new MatrixRunner(getParamMatrix(dependency.getJobParams())).run(new MatrixRunner.Runnable() {+ for (JobDependency dependency: job.getDependencies()) {+ new MatrixRunner(getParamMatrix(dependency.getJobParams())) {@Overridepublic void run(Map<String, String> params) {@@ -247,7 +247,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableT}}- });+ }.run();}buildManager.create(build);@@ -380,6 +380,8 @@ public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableTprivate void markBuildError(Build build, String errorMessage) {build.setStatus(Build.Status.IN_ERROR, errorMessage);build.setFinishDate(new Date());+ if (build.isNew())+ buildManager.create(build);listenerRegistry.post(new BuildFinished(build));}diff --git a/core/src/main/java/io/onedev/server/ci/job/Job.java b/core/src/main/java/io/onedev/server/ci/job/Job.javaindex ef69a5a158..e238241d24 100644--- a/core/src/main/java/io/onedev/server/ci/job/Job.java+++ b/core/src/main/java/io/onedev/server/ci/job/Job.java@@ -10,7 +10,7 @@ import javax.validation.ConstraintValidatorContext;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.ci.Dependency;+import io.onedev.server.ci.JobDependency;import io.onedev.server.ci.job.cache.JobCache;import io.onedev.server.ci.job.log.LogLevel;import io.onedev.server.ci.job.trigger.JobTrigger;@@ -41,7 +41,7 @@ public class Job implements Serializable, Validatable {private boolean cloneSource = true;- private List<Dependency> dependencies = new ArrayList<>();+ private List<JobDependency> dependencies = new ArrayList<>();private List<JobOutcome> outcomes = new ArrayList<>();@@ -109,11 +109,11 @@ public class Job implements Serializable, Validatable {@Editable(name="Dependency Jobs", order=140, description="Job dependencies determines the order and "+ "concurrency when run different jobs")- public List<Dependency> getDependencies() {+ public List<JobDependency> getDependencies() {return dependencies;}- public void setDependencies(List<Dependency> dependencies) {+ public void setDependencies(List<JobDependency> dependencies) {this.dependencies = dependencies;}@@ -197,7 +197,7 @@ public class Job implements Serializable, Validatable {}Set<String> dependencyJobs = new HashSet<>();- for (Dependency dependency: dependencies) {+ for (JobDependency dependency: dependencies) {if (dependencyJobs.contains(dependency.getJobName())) {isValid = false;context.buildConstraintViolationWithTemplate("Duplicate dependency: " + dependency.getJobName())diff --git a/core/src/main/java/io/onedev/server/ci/job/JobAware.java b/core/src/main/java/io/onedev/server/ci/job/JobAware.javanew file mode 100644index 0000000000..52e28d1537--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/job/JobAware.java@@ -0,0 +1,10 @@+package io.onedev.server.ci.job;++import javax.annotation.Nullable;++public interface JobAware {++ @Nullable+ Job getJob();++}diff --git a/core/src/main/java/io/onedev/server/ci/job/param/JobParam.java b/core/src/main/java/io/onedev/server/ci/job/param/JobParam.javaindex 318c969f60..0f1c788f2b 100644--- a/core/src/main/java/io/onedev/server/ci/job/param/JobParam.java+++ b/core/src/main/java/io/onedev/server/ci/job/param/JobParam.java@@ -12,7 +12,6 @@ import javax.annotation.Nullable;import javax.validation.ValidationException;import javax.validation.constraints.NotNull;-import org.apache.commons.lang3.StringUtils;import org.hibernate.validator.constraints.NotEmpty;import com.google.common.base.Joiner;@@ -51,25 +50,17 @@ public class JobParam implements Serializable {@Nullablepublic static String toValue(List<String> strings) {- if (!strings.isEmpty()) {- if (strings.iterator().next() != null)- return Joiner.on(STRING_SEPARATOR).join(strings);- else- return null;- } else {- return "";- }+ if (!strings.isEmpty())+ return Joiner.on(STRING_SEPARATOR).join(strings);+ else+ return null;}public static List<String> fromValue(@Nullable String value) {- if (value != null) {- if (value.length() != 0)- return Splitter.on(STRING_SEPARATOR).splitToList(value);- else- return new ArrayList<>();- } else {- return Lists.newArrayList((String)null);- }+ if (value != null)+ return Splitter.on(STRING_SEPARATOR).splitToList(value);+ else+ return new ArrayList<>();}public static void validateValues(List<String> values) {@@ -78,7 +69,7 @@ public class JobParam implements Serializable {Set<String> valueSet = new HashSet<>();for (String value: values) {if (valueSet.contains(value)) {- if (StringUtils.isNotBlank(value))+ if (value != null)throw new ValidationException("Duplicate values are not allowed: " + value);elsethrow new ValidationException("Empty value added multiple times");@@ -88,7 +79,7 @@ public class JobParam implements Serializable {}}- public static void validateParamMatrix(List<InputSpec> paramSpecs, Map<String, List<String>> params) {+ public static void validateParams(List<InputSpec> paramSpecs, Map<String, List<String>> params) {Map<String, InputSpec> paramSpecMap = new HashMap<>();for (InputSpec paramSpec: paramSpecs) {paramSpecMap.put(paramSpec.getName(), paramSpec);@@ -114,37 +105,14 @@ public class JobParam implements Serializable {try {paramSpec.convertToObject(strings);} catch (Exception e) {- throw new ValidationException("Value is not eligible for parameter '"- + entry.getKey() + "': " + value);+ throw new ValidationException("Error validating value '" + value + "' of parameter '"+ + entry.getKey() + "': " + e.getMessage());}}}}}- public static void validateParamMap(List<InputSpec> paramSpecs, Map<String, String> params) {- Map<String, InputSpec> paramSpecMap = new HashMap<>();- for (InputSpec paramSpec: paramSpecs) {- paramSpecMap.put(paramSpec.getName(), paramSpec);- if (!params.containsKey(paramSpec.getName()))- throw new ValidationException("Missing job parameter: " + paramSpec.getName());- }-- for (Map.Entry<String, String> entry: params.entrySet()) {- InputSpec paramSpec = paramSpecMap.get(entry.getKey());- if (paramSpec == null)- throw new ValidationException("Unknown job parameter: " + entry.getKey());-- List<String> strings = fromValue(entry.getValue());- try {- paramSpec.convertToObject(strings);- } catch (Exception e) {- throw new ValidationException("Value is not eligible for parameter '"- + entry.getKey() + "': " + entry.getValue());- }- }- }-public static void validateParams(List<InputSpec> paramSpecs, List<JobParam> params) {Map<String, List<String>> paramMap = new HashMap<>();for (JobParam param: params) {@@ -156,7 +124,14 @@ public class JobParam implements Serializable {if (paramMap.put(param.getName(), values) != null)throw new ValidationException("Duplicate param: " + param.getName());}- validateParamMatrix(paramSpecs, paramMap);+ validateParams(paramSpecs, paramMap);+ }++ public static Map<String, List<String>> getParamMatrix(Map<String, String> paramMap) {+ Map<String, List<String>> paramMatrix = new HashMap<>();+ for (Map.Entry<String, String> entry: paramMap.entrySet())+ paramMatrix.put(entry.getKey(), Lists.newArrayList(entry.getValue()));+ return paramMatrix;}}diff --git a/core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java b/core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.javaindex d9ab1c762e..1624f19c4f 100644--- a/core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java@@ -1,6 +1,6 @@package io.onedev.server.ci.job.trigger;-import io.onedev.server.ci.Dependency;+import io.onedev.server.ci.JobDependency;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.event.ProjectEvent;@@ -20,7 +20,7 @@ public class DependencyBuiltTrigger extends JobTrigger {BuildFinished buildFinished = (BuildFinished) event;Build build = buildFinished.getBuild();if (build.getStatus() == Status.SUCCESSFUL) {- for (Dependency dependency: job.getDependencies()) {+ for (JobDependency dependency: job.getDependencies()) {if (dependency.getJobName().equals(build.getJobName())) {for (JobParam param: dependency.getJobParams()) {String paramValue = build.getParamMap().get(param.getName());diff --git a/core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java b/core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.javaindex 9b482e5f57..a24cdea35b 100644--- a/core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java@@ -6,9 +6,8 @@ import java.util.List;import org.apache.wicket.Component;-import com.google.common.base.Preconditions;-import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.JobAware;import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.event.ProjectEvent;import io.onedev.server.util.OneContext;@@ -16,7 +15,6 @@ import io.onedev.server.util.inputspec.InputSpec;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.page.project.blob.render.renderers.cispec.job.JobAware;import io.onedev.server.web.util.WicketUtils;@Editable@@ -40,8 +38,13 @@ public abstract class JobTrigger implements Serializable {@SuppressWarnings("unused")private static List<InputSpec> getParamSpecs() {Component component = OneContext.get().getComponent();- JobAware jobAware = Preconditions.checkNotNull(WicketUtils.findInnermost(component, JobAware.class));- return jobAware.getJob().getParamSpecs();+ JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);+ if (jobAware != null) {+ Job job = jobAware.getJob();+ if (job != null)+ return job.getParamSpecs();+ }+ return new ArrayList<>();}public abstract boolean matches(ProjectEvent event, Job job);diff --git a/core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.java b/core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.javadeleted file mode 100644index 1a5699c875..0000000000--- a/core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.java+++ /dev/null@@ -1,54 +0,0 @@-package io.onedev.server.ci.job.trigger;--import io.onedev.commons.utils.PathUtils;-import io.onedev.server.ci.job.Job;-import io.onedev.server.event.ProjectEvent;-import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;-import io.onedev.server.event.pullrequest.PullRequestOpened;-import io.onedev.server.web.editable.annotation.BranchPatterns;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;--@Editable(order=300, name="When pull requests are created/updated")-public class PullRequestTrigger extends JobTrigger {-- private static final long serialVersionUID = 1L;-- private String targetBranches;-- @Editable(order=100, description="Optionally specify target branches of the pull request to check. "- + "Use * or ? for wildcard match. Leave empty to match all pull requests")- @BranchPatterns- @NameOfEmptyValue("Any branch")- public String getTargetBranches() {- return targetBranches;- }-- public void setTargetBranches(String targetBranches) {- this.targetBranches = targetBranches;- }-- @Override- public boolean matches(ProjectEvent event, Job job) {- String branch;- if (event instanceof PullRequestOpened) {- PullRequestOpened pullRequestOpened = (PullRequestOpened) event;- branch = pullRequestOpened.getRequest().getTargetBranch();- } else if (event instanceof PullRequestMergePreviewCalculated) {- PullRequestMergePreviewCalculated pullRequestMergePreviewCalculated = (PullRequestMergePreviewCalculated) event;- branch = pullRequestMergePreviewCalculated.getRequest().getTargetBranch();- } else {- branch = null;- }- return branch != null && (getTargetBranches() == null || PathUtils.matchChildAware(getTargetBranches(), branch));- }-- @Override- public String getDescription() {- if (getTargetBranches() != null)- return String.format("When pull requests to branches '%s' are created/updated", getTargetBranches());- else- return "When pull requests are created/updated";- }--}diff --git a/core/src/main/java/io/onedev/server/entitymanager/BuildRequirementManager.java b/core/src/main/java/io/onedev/server/entitymanager/BuildRequirementManager.javanew file mode 100644index 0000000000..180105819d--- /dev/null+++ b/core/src/main/java/io/onedev/server/entitymanager/BuildRequirementManager.java@@ -0,0 +1,11 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.PullRequest;+import io.onedev.server.model.BuildRequirement;+import io.onedev.server.persistence.dao.EntityManager;++public interface BuildRequirementManager extends EntityManager<BuildRequirement> {++ void saveBuildRequirements(PullRequest request);++}diff --git a/core/src/main/java/io/onedev/server/entitymanager/PullRequestBuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/PullRequestBuildManager.javadeleted file mode 100644index aeb6ebf374..0000000000--- a/core/src/main/java/io/onedev/server/entitymanager/PullRequestBuildManager.java+++ /dev/null@@ -1,11 +0,0 @@-package io.onedev.server.entitymanager;--import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;-import io.onedev.server.persistence.dao.EntityManager;--public interface PullRequestBuildManager extends EntityManager<PullRequestBuild> {-- void saveBuilds(PullRequest request);--}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 65a3f3ed6e..4e663788f6 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -70,7 +70,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Transactional@Overridepublic void delete(Build build) {- Query<?> query = getSession().createQuery("update PullRequestBuild set build=null where build=:build");+ Query<?> query = getSession().createQuery("update BuildRequirement set build=null where build=:build");query.setParameter("build", build);query.executeUpdate();@@ -110,7 +110,10 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsfor (Map.Entry<String, String> entry: params.entrySet()) {Join<?, ?> join = root.join("params", JoinType.INNER);restrictions.add(builder.equal(join.get("name"), entry.getKey()));- restrictions.add(builder.equal(join.get("value"), entry.getValue()));+ if (entry.getValue() != null)+ restrictions.add(builder.equal(join.get("value"), entry.getValue()));+ else+ restrictions.add(builder.isNull(join.get("value")));}query.where(restrictions.toArray(new Predicate[0]));return getSession().createQuery(query).list();diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestBuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildRequirementManager.javasimilarity index 51%rename from core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestBuildManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildRequirementManager.javaindex bb3fa4aa1f..cd51fb7d72 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestBuildManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildRequirementManager.java@@ -7,37 +7,37 @@ import javax.inject.Inject;import javax.inject.Singleton;import javax.persistence.Query;-import io.onedev.server.entitymanager.PullRequestBuildManager;+import io.onedev.server.entitymanager.BuildRequirementManager;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.model.BuildRequirement;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;@Singleton-public class DefaultPullRequestBuildManager extends AbstractEntityManager<PullRequestBuild>- implements PullRequestBuildManager {+public class DefaultBuildRequirementManager extends AbstractEntityManager<BuildRequirement>+ implements BuildRequirementManager {@Inject- public DefaultPullRequestBuildManager(Dao dao) {+ public DefaultBuildRequirementManager(Dao dao) {super(dao);}@Transactional@Override- public void saveBuilds(PullRequest request) {+ public void saveBuildRequirements(PullRequest request) {Collection<Long> ids = new HashSet<>();- for (PullRequestBuild build: request.getBuilds()) {- save(build);- ids.add(build.getId());+ for (BuildRequirement requirement: request.getBuildRequirements()) {+ save(requirement);+ ids.add(requirement.getId());}if (!ids.isEmpty()) {- Query query = getSession().createQuery("delete from PullRequestBuild where request=:request and id not in (:ids)");+ Query query = getSession().createQuery("delete from BuildRequirement where request=:request and id not in (:ids)");query.setParameter("request", request);query.setParameter("ids", ids);query.executeUpdate();} else {- Query query = getSession().createQuery("delete from PullRequestBuild where request=:request");+ Query query = getSession().createQuery("delete from BuildRequirement where request=:request");query.setParameter("request", request);query.executeUpdate();}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex f13635ef93..68b27adaaf 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -5,12 +5,13 @@ import java.io.IOException;import java.io.InputStream;import java.nio.charset.Charset;import java.util.Collection;+import java.util.HashMap;import java.util.HashSet;import java.util.Iterator;import java.util.List;import java.util.Map;import java.util.concurrent.ConcurrentHashMap;-import java.util.stream.Collectors;+import java.util.concurrent.atomic.AtomicBoolean;import javax.annotation.Nullable;import javax.inject.Inject;@@ -36,6 +37,8 @@ import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.cache.CacheManager;import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.ci.JobDependency;+import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.UserAuthorizationManager;@@ -52,11 +55,13 @@ import io.onedev.server.model.UserAuthorization;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.FileProtection;import io.onedev.server.model.support.TagProtection;+import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ProjectPrivilege;+import io.onedev.server.util.MatrixRunner;import io.onedev.server.util.facade.GroupAuthorizationFacade;import io.onedev.server.util.facade.MembershipFacade;import io.onedev.server.util.facade.ProjectFacade;@@ -331,13 +336,14 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem}}+ @Sessional@Overridepublic boolean isModificationNeedsQualityCheck(User user, Project project, String branch, @Nullable String file) {BranchProtection branchProtection = project.getBranchProtection(branch, user);if (branchProtection != null) {if (!ReviewRequirement.fromString(branchProtection.getReviewRequirement()).satisfied(user))return true;- if (!branchProtection.getJobNames().isEmpty())+ if (!branchProtection.getJobDependencies().isEmpty())return true;if (file != null) {@@ -351,6 +357,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemreturn false;}+ @Sessional@Overridepublic boolean isPushNeedsQualityCheck(User user, Project project, String branch, ObjectId oldObjectId,ObjectId newObjectId, Map<String, String> gitEnvs) {@@ -360,9 +367,28 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemreturn true;List<Build> builds = buildManager.query(project, newObjectId.name());- if (!builds.stream().map(it->it.getJobName()).collect(Collectors.toSet())- .containsAll(branchProtection.getJobNames())) {- return true;++ for (JobDependency dependency: branchProtection.getJobDependencies()) {+ Map<String, List<String>> paramMatrix = new HashMap<>();+ for (JobParam param: dependency.getJobParams())+ paramMatrix.put(param.getName(), param.getValuesProvider().getValues());++ AtomicBoolean buildRequirementUnsatisfied = new AtomicBoolean(false);+ new MatrixRunner(paramMatrix) {++ @Override+ public void run(Map<String, String> params) {+ for (Build build: builds) {+ if (build.getJobName().equals(dependency.getJobName()) && build.getParamMap().equals(params))+ return;+ }+ buildRequirementUnsatisfied.set(true);+ }++ }.run();++ if (buildRequirementUnsatisfied.get())+ return true;}for (String changedFile: getChangedFiles(project, oldObjectId, newObjectId, gitEnvs)) {diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 3ef10cb66f..2c6229a833 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -17,7 +17,7 @@ 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.Set;@@ -60,8 +60,11 @@ import io.onedev.commons.utils.concurrent.Prioritized;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.ci.JobDependency;+import io.onedev.server.ci.job.JobScheduler;+import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.PullRequestBuildManager;+import io.onedev.server.entitymanager.BuildRequirementManager;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestReviewManager;@@ -79,10 +82,10 @@ import io.onedev.server.event.pullrequest.PullRequestOpened;import io.onedev.server.git.GitUtils;import io.onedev.server.git.command.FileChange;import io.onedev.server.model.Build;+import io.onedev.server.model.BuildRequirement;import io.onedev.server.model.Group;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.PullRequestUpdate;@@ -119,6 +122,7 @@ import io.onedev.server.search.entity.pullrequest.PullRequestQueryBuildContext;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.security.permission.ProjectPrivilege;+import io.onedev.server.util.MatrixRunner;import io.onedev.server.util.PullRequestConstants;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserFacade;@@ -148,7 +152,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestprivate final PullRequestReviewManager pullRequestReviewManager;- private final PullRequestBuildManager pullRequestBuildManager;+ private final BuildRequirementManager buildRequirementManager;private final BatchWorkManager batchWorkManager;@@ -158,13 +162,16 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestprivate final TransactionManager transactionManager;+ private final JobScheduler jobScheduler;+@Injectpublic DefaultPullRequestManager(Dao dao, PullRequestUpdateManager pullRequestUpdateManager,PullRequestReviewManager pullRequestReviewManager, UserManager userManager,MarkdownManager markdownManager, BatchWorkManager batchWorkManager,- ListenerRegistry listenerRegistry, SessionManager sessionManager,+ ListenerRegistry listenerRegistry, SessionManager sessionManager,PullRequestChangeManager pullRequestChangeManager, BuildManager buildManager,- PullRequestBuildManager pullRequestBuildManager, TransactionManager transactionManager) {+ BuildRequirementManager buildRequirementManager, TransactionManager transactionManager,+ JobScheduler jobScheduler) {super(dao);this.pullRequestUpdateManager = pullRequestUpdateManager;@@ -176,7 +183,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestthis.sessionManager = sessionManager;this.listenerRegistry = listenerRegistry;this.pullRequestChangeManager = pullRequestChangeManager;- this.pullRequestBuildManager = pullRequestBuildManager;+ this.buildRequirementManager = buildRequirementManager;+ this.jobScheduler = jobScheduler;}@Transactional@@ -367,7 +375,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestpullRequestUpdateManager.save(update, false);pullRequestReviewManager.saveReviews(request);- pullRequestBuildManager.saveBuilds(request);+ buildRequirementManager.saveBuildRequirements(request);checkAsync(request);@@ -436,7 +444,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestcheckQuality(request);pullRequestReviewManager.saveReviews(request);- pullRequestBuildManager.saveBuilds(request);+ buildRequirementManager.saveBuildRequirements(request);MergePreview mergePreview = request.getMergePreview();@@ -674,8 +682,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestif (branchProtection != null) {checkReviews(ReviewRequirement.fromString(branchProtection.getReviewRequirement()), request.getLatestUpdate());- if (branchProtection.getJobNames() != null)- checkBuilds(request, branchProtection.getJobNames());+ checkBuilds(request, branchProtection.getJobDependencies());Set<FileProtection> checkedFileProtections = new HashSet<>();for (int i=request.getSortedUpdates().size()-1; i>=0; i--) {@@ -702,7 +709,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest}}- private void checkBuilds(PullRequest request, List<String> jobNames) {+ private void checkBuilds(PullRequest request, List<JobDependency> jobDependencies) {String commit;MergePreview preview = request.getMergePreview();if (preview != null && preview.getMerged() != null)@@ -710,26 +717,53 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestelsecommit = null;- Map<String, Build> builds = new HashMap<>();- if (commit != null) {- for (Build build: buildManager.query(request.getTargetProject(), commit))- builds.put(build.getJobName(), build);- }- for (String jobName: jobNames) {- PullRequestBuild pullRequestBuild = request.getBuild(jobName);- if (pullRequestBuild == null) {- pullRequestBuild = new PullRequestBuild();- pullRequestBuild.setJobName(jobName);- pullRequestBuild.setRequest(request);- request.getBuilds().add(pullRequestBuild);- }- pullRequestBuild.setBuild(builds.get(jobName));- }+ List<Build> builds;+ if (commit != null)+ builds = buildManager.query(request.getTargetProject(), commit);+ else+ builds = new ArrayList<>();- for (Iterator<PullRequestBuild> it = request.getBuilds().iterator(); it.hasNext();) {- if (!jobNames.contains(it.next().getJobName()))- it.remove();+ Collection<BuildRequirement> effectiveRequirements = new HashSet<>();++ for (JobDependency dependency: jobDependencies) {+ Map<String, List<String>> paramMatrix = new HashMap<>();+ for (JobParam param: dependency.getJobParams())+ paramMatrix.put(param.getName(), param.getValuesProvider().getValues());++ new MatrixRunner(paramMatrix) {++ @Override+ public void run(Map<String, String> params) {+ BuildRequirement requirement = request.getBuildRequirement(dependency.getJobName(), params);+ if (requirement == null) {+ requirement = new BuildRequirement();+ requirement.setJobName(dependency.getJobName());+ requirement.setBuildParams(new LinkedHashMap<>(params));+ requirement.setRequest(request);+ request.getBuildRequirements().add(requirement);+ }+ effectiveRequirements.add(requirement);++ Build build = null;+ for (Build each: builds) {+ if (each.getJobName().equals(dependency.getJobName()) && each.getParamMap().equals(params)) {+ build = each;+ break;+ }+ }++ requirement.setBuild(build);++ if (commit != null) {+ jobScheduler.submit(request.getTargetProject(), commit,+ dependency.getJobName(), JobParam.getParamMatrix(params));+ }+ }++ }.run();}++ request.getBuildRequirements().retainAll(effectiveRequirements);}private void checkReviews(ReviewRequirement reviewRequirement, PullRequestUpdate update) {diff --git a/core/src/main/java/io/onedev/server/git/GitUtils.java b/core/src/main/java/io/onedev/server/git/GitUtils.javaindex ef48d24f36..c4be5ea645 100644--- a/core/src/main/java/io/onedev/server/git/GitUtils.java+++ b/core/src/main/java/io/onedev/server/git/GitUtils.java@@ -10,7 +10,6 @@ import java.util.HashSet;import java.util.List;import java.util.Map;import java.util.concurrent.Callable;-import java.util.regex.Pattern;import javax.annotation.Nullable;@@ -63,20 +62,14 @@ import io.onedev.server.util.diff.WhitespaceOption;public class GitUtils {- public static final Pattern PATTERN_HASH = Pattern.compile("[a-z0-9]{40}");-public static final int SHORT_SHA_LENGTH = 8;- public static boolean isHash(String sha) {- return PATTERN_HASH.matcher(sha).matches();- }-public static boolean isEmptyPath(String path) {return Strings.isNullOrEmpty(path) || Objects.equal(path, DiffEntry.DEV_NULL);}public static String abbreviateSHA(String sha, int length) {- Preconditions.checkArgument(isHash(sha));+ Preconditions.checkArgument(ObjectId.isId(sha));return sha.substring(0, length);}diff --git a/core/src/main/java/io/onedev/server/git/command/BlameCommand.java b/core/src/main/java/io/onedev/server/git/command/BlameCommand.javaindex d05c51f62b..76a5050c86 100644--- a/core/src/main/java/io/onedev/server/git/command/BlameCommand.java+++ b/core/src/main/java/io/onedev/server/git/command/BlameCommand.java@@ -15,6 +15,7 @@ import javax.annotation.Nullable;import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;import org.apache.commons.collections4.map.ReferenceMap;import org.apache.commons.lang3.StringUtils;+import org.eclipse.jgit.lib.ObjectId;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -78,7 +79,7 @@ public class BlameCommand extends GitCommand<Collection<BlameBlock>> {@Overridepublic Collection<BlameBlock> call() {- Preconditions.checkArgument(commitHash!=null && GitUtils.isHash(commitHash), "commit hash has to be specified.");+ Preconditions.checkArgument(commitHash!=null && ObjectId.isId(commitHash), "commit hash has to be specified.");Preconditions.checkNotNull(file, "file parameter has to be specified.");String cacheKey = commitHash + ":" + file + ":" + (range!=null?range.toString():"");diff --git a/core/src/main/java/io/onedev/server/model/BuildParam.java b/core/src/main/java/io/onedev/server/model/BuildParam.javaindex 0b317b9b7a..6e10f3cf32 100644--- a/core/src/main/java/io/onedev/server/model/BuildParam.java+++ b/core/src/main/java/io/onedev/server/model/BuildParam.java@@ -1,5 +1,6 @@package io.onedev.server.model;+import javax.annotation.Nullable;import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.FetchType;@@ -28,7 +29,6 @@ public class BuildParam extends AbstractEntity {@Column(nullable=false)private String name;- @Column(nullable=false)private String value;public Build getBuild() {@@ -47,11 +47,12 @@ public class BuildParam extends AbstractEntity {this.name = name;}+ @Nullablepublic String getValue() {return value;}- public void setValue(String value) {+ public void setValue(@Nullable String value) {this.value = value;}diff --git a/core/src/main/java/io/onedev/server/model/PullRequestBuild.java b/core/src/main/java/io/onedev/server/model/BuildRequirement.javasimilarity index 67%rename from core/src/main/java/io/onedev/server/model/PullRequestBuild.javarename to core/src/main/java/io/onedev/server/model/BuildRequirement.javaindex 627ab9d6a5..48f9e3b028 100644--- a/core/src/main/java/io/onedev/server/model/PullRequestBuild.java+++ b/core/src/main/java/io/onedev/server/model/BuildRequirement.java@@ -1,20 +1,19 @@package io.onedev.server.model;+import java.util.LinkedHashMap;+import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.FetchType;import javax.persistence.Index;import javax.persistence.JoinColumn;+import javax.persistence.Lob;import javax.persistence.ManyToOne;import javax.persistence.Table;-import javax.persistence.UniqueConstraint;@Entity-@Table(- indexes={@Index(columnList="o_request_id"), @Index(columnList="jobName")},- uniqueConstraints={@UniqueConstraint(columnNames={"jobName", "o_request_id"})}-)-public class PullRequestBuild extends AbstractEntity {+@Table(indexes={@Index(columnList="o_request_id")})+public class BuildRequirement extends AbstractEntity {private static final long serialVersionUID = 1L;@@ -23,6 +22,10 @@ public class PullRequestBuild extends AbstractEntity {@Column(nullable=false)private String jobName;+ @Column(nullable=false)+ @Lob+ private LinkedHashMap<String, String> buildParams = new LinkedHashMap<>();+@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)private PullRequest request;@@ -38,6 +41,14 @@ public class PullRequestBuild extends AbstractEntity {this.jobName = jobName;}+ public LinkedHashMap<String, String> getBuildParams() {+ return buildParams;+ }++ public void setBuildParams(LinkedHashMap<String, String> buildParams) {+ this.buildParams = buildParams;+ }+public Build getBuild() {return build;}diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex 9e642cd424..c618b720c5 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -419,17 +419,13 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStfield.setOrdinal(ordinal);field.setType(fieldSpec.getType());- if (fieldValue != null) {- List<String> strings = fieldSpec.convertToStrings(fieldValue);- if (!strings.isEmpty()) {- for (String string: strings) {- IssueFieldEntity cloned = (IssueFieldEntity) SerializationUtils.clone(field);- cloned.setIssue(this);- cloned.setValue(string);- getFieldEntities().add(cloned);- }- } else {- getFieldEntities().add(field);+ List<String> strings = fieldSpec.convertToStrings(fieldValue);+ if (!strings.isEmpty()) {+ for (String string: strings) {+ IssueFieldEntity cloned = (IssueFieldEntity) SerializationUtils.clone(field);+ cloned.setIssue(this);+ cloned.setValue(string);+ getFieldEntities().add(cloned);}} else {getFieldEntities().add(field);diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex 5d429ad2d6..449396cf1d 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -652,7 +652,7 @@ public class Project extends AbstractEntity {if (ciSpecOpt == null) {Blob blob = getBlob(new BlobIdent(commitId.name(), CISpec.BLOB_PATH, FileMode.TYPE_FILE), false);if (blob != null) {- ciSpecOpt = Optional.of(CISpec.parse(blob.getBytes()));+ ciSpecOpt = Optional.fromNullable(CISpec.parse(blob.getBytes()));} else {List<CISpecDetector> detectors = new ArrayList<>(OneDev.getExtensions(CISpecDetector.class));detectors.sort(Comparator.comparing(CISpecDetector::getPriority));diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.javaindex 8528cceae9..0f4e64d205 100644--- a/core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java@@ -8,6 +8,7 @@ import java.util.Collections;import java.util.Date;import java.util.HashSet;import java.util.List;+import java.util.Map;import java.util.Optional;import java.util.UUID;import java.util.stream.Collectors;@@ -155,7 +156,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachprivate Collection<PullRequestReview> reviews = new ArrayList<>();@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)- private Collection<PullRequestBuild> builds = new ArrayList<>();+ private Collection<BuildRequirement> buildRequirements = new ArrayList<>();@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)private Collection<PullRequestComment> comments = new ArrayList<>();@@ -342,12 +343,12 @@ public class PullRequest extends AbstractEntity implements Referenceable, AttachsortedUpdates = null;}- public Collection<PullRequestBuild> getBuilds() {- return builds;+ public Collection<BuildRequirement> getBuildRequirements() {+ return buildRequirements;}- public void setPullRequestBuilds(Collection<PullRequestBuild> builds) {- this.builds = builds;+ public void setBuildRequirements(Collection<BuildRequirement> buildRequirements) {+ this.buildRequirements = buildRequirements;}public Collection<PullRequestComment> getComments() {@@ -711,10 +712,10 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach}@Nullable- public PullRequestBuild getBuild(String jobName) {- for (PullRequestBuild build: getBuilds()) {- if (build.getJobName().equals(jobName))- return build;+ public BuildRequirement getBuildRequirement(String jobName, Map<String, String> buildParams) {+ for (BuildRequirement requirement: getBuildRequirements()) {+ if (requirement.getJobName().equals(jobName) && requirement.getBuildParams().equals(buildParams))+ return requirement;}return null;}@@ -818,10 +819,9 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach}public boolean isAllBuildsSuccessful() {- for (PullRequestBuild build: getBuilds()) {- if (build.getBuild() == null || build.getBuild().getStatus() != Build.Status.SUCCESSFUL) {+ for (BuildRequirement requirement: getBuildRequirements()) {+ if (requirement.getBuild() == null || requirement.getBuild().getStatus() != Build.Status.SUCCESSFUL)return false;- }}return true;}diff --git a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/core/src/main/java/io/onedev/server/model/support/BranchProtection.javaindex 6762780fb1..20f100e9b3 100644--- a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java+++ b/core/src/main/java/io/onedev/server/model/support/BranchProtection.java@@ -11,6 +11,7 @@ import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;+import io.onedev.server.ci.JobDependency;import io.onedev.server.model.Project;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.reviewrequirement.ReviewRequirement;@@ -18,10 +19,11 @@ import io.onedev.server.util.usermatcher.Anyone;import io.onedev.server.util.usermatcher.UserMatcher;import io.onedev.server.web.editable.annotation.BranchPatterns;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.JobChoice;+import io.onedev.server.web.editable.annotation.Horizontal;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@Editable+@Horizontalpublic class BranchProtection implements Serializable {private static final long serialVersionUID = 1L;@@ -40,7 +42,7 @@ public class BranchProtection implements Serializable {private String reviewRequirement;- private List<String> jobNames = new ArrayList<>();+ private List<JobDependency> jobDependencies = new ArrayList<>();private List<FileProtection> fileProtections = new ArrayList<>();@@ -114,15 +116,14 @@ public class BranchProtection implements Serializable {this.reviewRequirement = reviewRequirement;}- @Editable(order=500, name="Required Builds", description="Optionally choose required builds")- @JobChoice+ @Editable(order=500, name="Required Builds", description="Optionally specify required builds")@NameOfEmptyValue("No any")- public List<String> getJobNames() {- return jobNames;+ public List<JobDependency> getJobDependencies() {+ return jobDependencies;}- public void setJobNames(List<String> jobNames) {- this.jobNames = jobNames;+ public void setJobDependencies(List<JobDependency> jobDependencies) {+ this.jobDependencies = jobDependencies;}@Editable(order=700, description="Optionally specify additional users to review particular paths. For each changed file, "diff --git a/core/src/main/java/io/onedev/server/model/support/TagProtection.java b/core/src/main/java/io/onedev/server/model/support/TagProtection.javaindex feb8009038..d86132b495 100644--- a/core/src/main/java/io/onedev/server/model/support/TagProtection.java+++ b/core/src/main/java/io/onedev/server/model/support/TagProtection.java@@ -8,9 +8,11 @@ import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.usermatcher.Anyone;import io.onedev.server.util.usermatcher.UserMatcher;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Horizontal;import io.onedev.server.web.editable.annotation.TagPatterns;@Editable+@Horizontalpublic class TagProtection implements Serializable {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.javaindex ea50118270..d658f5c0a9 100644--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.model.BuildRequirement;import io.onedev.server.model.User;import io.onedev.server.search.entity.QueryBuildContext;import io.onedev.server.util.PullRequestConstants;@@ -18,7 +18,7 @@ public class HasFailedBuildsCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {- From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_BUILDS + "." + PullRequestBuild.ATTR_BUILD);+ From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_BUILDS + "." + BuildRequirement.ATTR_BUILD);Path<?> status = join.get(Build.STATUS);return context.getBuilder().or(@@ -30,7 +30,7 @@ public class HasFailedBuildsCriteria extends PullRequestCriteria {@Overridepublic boolean matches(PullRequest request, User user) {- for (PullRequestBuild build: request.getBuilds()) {+ for (BuildRequirement build: request.getBuildRequirements()) {if (build.getBuild() != null &&(build.getBuild().getStatus() == Build.Status.IN_ERROR|| build.getBuild().getStatus() == Build.Status.FAILEDdiff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.javaindex 96f4bc31c5..93b64a2408 100644--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.model.BuildRequirement;import io.onedev.server.model.User;import io.onedev.server.search.entity.QueryBuildContext;import io.onedev.server.util.PullRequestConstants;@@ -18,7 +18,7 @@ public class HasPendingBuildsCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {- From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_BUILDS + "." + PullRequestBuild.ATTR_BUILD);+ From<?, ?> join = context.getJoin(PullRequestConstants.ATTR_BUILDS + "." + BuildRequirement.ATTR_BUILD);Path<?> status = join.get(Build.STATUS);return context.getBuilder().or(@@ -30,7 +30,7 @@ public class HasPendingBuildsCriteria extends PullRequestCriteria {@Overridepublic boolean matches(PullRequest request, User user) {- for (PullRequestBuild build: request.getBuilds()) {+ for (BuildRequirement build: request.getBuildRequirements()) {if (build.getBuild() == null|| build.getBuild().getStatus() == Build.Status.RUNNING|| build.getBuild().getStatus() == Build.Status.QUEUEINGdiff --git a/core/src/main/java/io/onedev/server/util/IssueField.java b/core/src/main/java/io/onedev/server/util/IssueField.javaindex 8261cdb590..ae96462187 100644--- a/core/src/main/java/io/onedev/server/util/IssueField.java+++ b/core/src/main/java/io/onedev/server/util/IssueField.java@@ -4,6 +4,7 @@ import java.io.Serializable;import java.util.List;import javax.annotation.Nullable;+import javax.validation.ValidationException;import org.apache.commons.lang3.builder.EqualsBuilder;import org.apache.commons.lang3.builder.HashCodeBuilder;@@ -75,13 +76,13 @@ public class IssueField implements Serializable {@Nullablepublic Object getValue(Project project) {- InputSpec fieldSpec = OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpec(name);+ InputSpec fieldSpec = OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpec(getName());if (fieldSpec != null) {try {- if (!getValues().isEmpty())- return fieldSpec.convertToObject(getValues());- } catch (Exception e) {- logger.error("Error converting field values to object: " + name, e);+ return fieldSpec.convertToObject(getValues());+ } catch (ValidationException e) {+ logger.error("Error converting field value (field: {}, value: {}, error: {})",+ getName(), getValues(), e.getMessage());}}return null;diff --git a/core/src/main/java/io/onedev/server/util/JobUtils.java b/core/src/main/java/io/onedev/server/util/JobUtils.javaindex 7a98d03e52..4406cec0bc 100644--- a/core/src/main/java/io/onedev/server/util/JobUtils.java+++ b/core/src/main/java/io/onedev/server/util/JobUtils.java@@ -2,9 +2,7 @@ package io.onedev.server.util;import java.io.Serializable;import java.util.Collection;-import java.util.HashMap;import java.util.List;-import java.util.Map;import javax.annotation.Nullable;@@ -12,10 +10,7 @@ import org.apache.commons.codec.DecoderException;import org.apache.commons.codec.binary.Hex;import org.apache.commons.lang.SerializationUtils;-import io.onedev.server.ci.job.Job;import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.web.editable.BeanDescriptor;-import io.onedev.server.web.editable.PropertyDescriptor;public class JobUtils {@@ -46,31 +41,4 @@ public class JobUtils {}}- public static Map<String, List<String>> getParamValues(OneContext context, Job job, Serializable paramBean) {- OneContext.push(context);- try {- Map<String, List<String>> paramValues = new HashMap<>();- BeanDescriptor beanDescriptor = new BeanDescriptor(paramBean.getClass());- Map<String, InputSpec> paramSpecs = new HashMap<>();- for (InputSpec paramSpec: job.getParamSpecs())- paramSpecs.put(paramSpec.getName(), paramSpec);-- for (List<PropertyDescriptor> groupProperties: beanDescriptor.getPropertyDescriptors().values()) {- for (PropertyDescriptor property: groupProperties) {- Object paramValue = property.getPropertyValue(paramBean);- InputSpec paramSpec = paramSpecs.get(property.getDisplayName());- if (paramSpec != null && paramValue != null) {- List<String> strings = paramSpec.convertToStrings(paramValue);- if (!strings.isEmpty())- paramValues.put(property.getDisplayName(), strings);- }- }- }-- return paramValues;- } finally {- OneContext.pop();- }- }-}diff --git a/core/src/main/java/io/onedev/server/util/MatrixRunner.java b/core/src/main/java/io/onedev/server/util/MatrixRunner.javaindex 927a3c0f63..1a3f4e51a1 100644--- a/core/src/main/java/io/onedev/server/util/MatrixRunner.java+++ b/core/src/main/java/io/onedev/server/util/MatrixRunner.java@@ -4,7 +4,7 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-public class MatrixRunner {+public abstract class MatrixRunner {private final Map<String, String> params;@@ -19,7 +19,7 @@ public class MatrixRunner {this.paramMatrix = paramMatrix;}- public void run(Runnable runnable) {+ public void run() {if (!paramMatrix.isEmpty()) {Map.Entry<String, List<String>> entry = paramMatrix.entrySet().iterator().next();for (String value: entry.getValue()) {@@ -27,17 +27,20 @@ public class MatrixRunner {paramsCopy.put(entry.getKey(), value);Map<String, List<String>> matrixCopy = new LinkedHashMap<>(paramMatrix);matrixCopy.remove(entry.getKey());- new MatrixRunner(paramsCopy, matrixCopy).run(runnable);+ new MatrixRunner(paramsCopy, matrixCopy) {++ @Override+ protected void run(Map<String, String> paramMap) {+ MatrixRunner.this.run(paramMap);+ }++ }.run();}} else {- runnable.run(params);+ run(params);}}- public static interface Runnable {-- void run(Map<String, String> params);-- }+ protected abstract void run(Map<String, String> paramMap);}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.javaindex fda4c2a4e0..11d425002c 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/BuildChoiceInput.java@@ -1,12 +1,15 @@package io.onedev.server.util.inputspec;+import java.util.ArrayList;import java.util.List;import java.util.Map;+import javax.validation.ValidationException;+import io.onedev.server.web.editable.annotation.Editable;import jersey.repackaged.com.google.common.collect.Lists;-@Editable(order=160, name=InputSpec.BUILD)+@Editable(order=1200, name=InputSpec.BUILD)public class BuildChoiceInput extends InputSpec {private static final long serialVersionUID = 1L;@@ -25,20 +28,34 @@ public class BuildChoiceInput extends InputSpec {return buffer.toString();}- @Override- public Object convertToObject(List<String> strings) {- return Long.valueOf(strings.iterator().next());- }-@Editable@Overridepublic boolean isAllowMultiple() {return false;}+ @Override+ public Object convertToObject(List<String> strings) {+ if (strings.size() == 0) {+ return null;+ } else if (strings.size() == 1) {+ String value = strings.iterator().next();+ try {+ return Long.valueOf(value);+ } catch (NumberFormatException e) {+ throw new ValidationException("Invalid build number");+ }+ } else {+ throw new ValidationException("Not eligible for multi-value");+ }+ }+@Overridepublic List<String> convertToStrings(Object value) {- return Lists.newArrayList(value.toString());+ if (value != null)+ return Lists.newArrayList((String) value);+ else+ return new ArrayList<>();}@Overridediff --git a/core/src/main/java/io/onedev/server/util/inputspec/CommitInput.java b/core/src/main/java/io/onedev/server/util/inputspec/CommitInput.javaindex e634b947e4..597ec83654 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/CommitInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/CommitInput.java@@ -1,12 +1,17 @@package io.onedev.server.util.inputspec;+import java.util.ArrayList;import java.util.List;import java.util.Map;+import javax.validation.ValidationException;++import org.eclipse.jgit.lib.ObjectId;+import io.onedev.server.web.editable.annotation.Editable;import jersey.repackaged.com.google.common.collect.Lists;-@Editable(order=100, name=InputSpec.COMMIT)+@Editable(order=1400, name=InputSpec.COMMIT)public class CommitInput extends InputSpec {private static final long serialVersionUID = 1L;@@ -26,12 +31,25 @@ public class CommitInput extends InputSpec {@Overridepublic Object convertToObject(List<String> strings) {- return strings.iterator().next();+ if (strings.size() == 0) {+ return null;+ } else if (strings.size() == 1) {+ String value = strings.iterator().next();+ if (ObjectId.isId(value))+ return value;+ else+ throw new ValidationException("Invalid commit id");+ } else {+ throw new ValidationException("Not eligible for multi-value");+ }}@Overridepublic List<String> convertToStrings(Object value) {- return Lists.newArrayList((String) value);+ if (value != null)+ return Lists.newArrayList((String) value);+ else+ return new ArrayList<>();}}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.javaindex 6e46d94497..1c9c2993a7 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java@@ -320,16 +320,17 @@ public abstract class InputSpec implements Serializable {return false;}- public abstract List<String> convertToStrings(Object object);+ public abstract List<String> convertToStrings(@Nullable Object object);/*** Convert list of strings to object** @param strings- * list of strings, will not be empty+ * list of strings* @return* converted object*/+ @Nullablepublic abstract Object convertToObject(List<String> strings);public long getOrdinal(Object fieldValue) {diff --git a/core/src/main/java/io/onedev/server/util/inputspec/IssueChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/IssueChoiceInput.javaindex 1e1019ae00..4df7776a11 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/IssueChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/IssueChoiceInput.java@@ -1,12 +1,15 @@package io.onedev.server.util.inputspec;+import java.util.ArrayList;import java.util.List;import java.util.Map;+import javax.validation.ValidationException;+import io.onedev.server.web.editable.annotation.Editable;import jersey.repackaged.com.google.common.collect.Lists;-@Editable(order=160, name=InputSpec.ISSUE)+@Editable(order=1100, name=InputSpec.ISSUE)public class IssueChoiceInput extends InputSpec {private static final long serialVersionUID = 1L;@@ -25,20 +28,34 @@ public class IssueChoiceInput extends InputSpec {return buffer.toString();}- @Override- public Object convertToObject(List<String> strings) {- return Long.valueOf(strings.iterator().next());- }-@Editable@Overridepublic boolean isAllowMultiple() {return false;}+ @Override+ public Object convertToObject(List<String> strings) {+ if (strings.size() == 0) {+ return null;+ } else if (strings.size() == 1) {+ String value = strings.iterator().next();+ try {+ return Long.valueOf(value);+ } catch (NumberFormatException e) {+ throw new ValidationException("Invalid issue number");+ }+ } else {+ throw new ValidationException("Not eligible for multi-value");+ }+ }+@Overridepublic List<String> convertToStrings(Object value) {- return Lists.newArrayList(value.toString());+ if (value != null)+ return Lists.newArrayList((String) value);+ else+ return new ArrayList<>();}@Overridediff --git a/core/src/main/java/io/onedev/server/util/inputspec/PullRequestChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/PullRequestChoiceInput.javaindex 5af3a27e0a..03c76c9d66 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/PullRequestChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/PullRequestChoiceInput.java@@ -1,12 +1,15 @@package io.onedev.server.util.inputspec;+import java.util.ArrayList;import java.util.List;import java.util.Map;+import javax.validation.ValidationException;+import io.onedev.server.web.editable.annotation.Editable;import jersey.repackaged.com.google.common.collect.Lists;-@Editable(order=160, name=InputSpec.PULLREQUEST)+@Editable(order=1000, name=InputSpec.PULLREQUEST)public class PullRequestChoiceInput extends InputSpec {private static final long serialVersionUID = 1L;@@ -25,20 +28,34 @@ public class PullRequestChoiceInput extends InputSpec {return buffer.toString();}- @Override- public Object convertToObject(List<String> strings) {- return Long.valueOf(strings.iterator().next());- }-@Editable@Overridepublic boolean isAllowMultiple() {return false;}+ @Override+ public Object convertToObject(List<String> strings) {+ if (strings.size() == 0) {+ return null;+ } else if (strings.size() == 1) {+ String value = strings.iterator().next();+ try {+ return Long.valueOf(value);+ } catch (NumberFormatException e) {+ throw new ValidationException("Invalid pull request number");+ }+ } else {+ throw new ValidationException("Not eligible for multi-value");+ }+ }+@Overridepublic List<String> convertToStrings(Object value) {- return Lists.newArrayList(value.toString());+ if (value != null)+ return Lists.newArrayList((String) value);+ else+ return new ArrayList<>();}@Overridediff --git a/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java b/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.javaindex f5d780a998..286de7bf62 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java@@ -62,13 +62,19 @@ public class BooleanInput extends InputSpec {@Overridepublic Object convertToObject(List<String> strings) {- String string = strings.iterator().next();- if (string.equalsIgnoreCase("true"))- return true;- else if (string.equalsIgnoreCase("false"))- return false;- else- throw new ValidationException("Invalid boolean value: " + string);+ if (strings.size() == 0) {+ throw new ValidationException("Invalid boolean value");+ } else if (strings.size() == 1) {+ String string = strings.iterator().next();+ if (string.equalsIgnoreCase("true"))+ return true;+ else if (string.equalsIgnoreCase("false"))+ return false;+ else+ throw new ValidationException("Invalid boolean value");+ } else {+ throw new ValidationException("Not eligible for multi-value");+ }}@Overridediff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.javaindex 5445c42891..404c5baba8 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java@@ -106,15 +106,24 @@ public class ChoiceInput extends InputSpec {@Overridepublic Object convertToObject(List<String> strings) {- List<String> copyOfStrings = new ArrayList<>(strings);- copyOfStrings.removeAll(getPossibleValues());- if (!copyOfStrings.isEmpty())- throw new ValidationException("Invalid choice value: " + copyOfStrings);-- if (isAllowMultiple())- return strings;- else- return strings.iterator().next();+ if (isAllowMultiple()) {+ List<String> copyOfStrings = new ArrayList<>(strings);+ copyOfStrings.removeAll(getPossibleValues());+ if (!copyOfStrings.isEmpty())+ throw new ValidationException("Invalid choice values: " + copyOfStrings);+ else+ return strings;+ } else if (strings.size() == 0) {+ return null;+ } else if (strings.size() == 1) {+ String value = strings.iterator().next();+ if (!getPossibleValues().contains(value))+ throw new ValidationException("Invalid choice value");+ else+ return value;+ } else {+ throw new ValidationException("Not eligible for multi-value");+ }}@SuppressWarnings("unchecked")@@ -122,8 +131,10 @@ public class ChoiceInput extends InputSpec {public List<String> convertToStrings(Object value) {if (isAllowMultiple())return (List<String>) value;- else+ else if (value != null)return Lists.newArrayList((String) value);+ else+ return new ArrayList<>();}@Overridediff --git a/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java b/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.javaindex 21b0a67cc1..bc70dd675a 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java@@ -1,9 +1,12 @@package io.onedev.server.util.inputspec.dateinput;+import java.util.ArrayList;import java.util.Date;import java.util.List;import java.util.Map;+import javax.validation.ValidationException;+import org.joda.time.DateTime;import com.google.common.collect.Lists;@@ -46,7 +49,12 @@ public class DateInput extends InputSpec {@Overridepublic Object convertToObject(List<String> strings) {- return Constants.DATE_FORMATTER.parseDateTime(strings.iterator().next()).toDate();+ if (strings.size() == 1)+ return Constants.DATE_FORMATTER.parseDateTime(strings.iterator().next()).toDate();+ else if (strings.size() == 0)+ return null;+ else+ throw new ValidationException("Not eligible for multi-value");}@Editable@@ -57,7 +65,10 @@ public class DateInput extends InputSpec {@Overridepublic List<String> convertToStrings(Object value) {- return Lists.newArrayList(Constants.DATE_FORMATTER.print(new DateTime(value)));+ if (value != null)+ return Lists.newArrayList(Constants.DATE_FORMATTER.print(new DateTime(value)));+ else+ return new ArrayList<>();}@Overridediff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.javaindex d88a3e950d..e329edb934 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java@@ -4,6 +4,7 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;+import javax.validation.ValidationException;import javax.validation.Validator;import javax.validation.constraints.NotNull;@@ -79,12 +80,20 @@ public class GroupChoiceInput extends InputSpec {@Overridepublic Object convertToObject(List<String> strings) {- return strings.iterator().next();+ if (strings.size() == 0)+ return null;+ else if (strings.size() == 1)+ return strings.iterator().next();+ else+ throw new ValidationException("Not eligible for multi-value");}@Overridepublic List<String> convertToStrings(Object value) {- return Lists.newArrayList((String) value);+ if (value != null)+ return Lists.newArrayList((String) value);+ else+ return new ArrayList<>();}@Overridediff --git a/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java b/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.javaindex 4a090b81d8..cf8d2f2abc 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java@@ -1,8 +1,11 @@package io.onedev.server.util.inputspec.numberinput;+import java.util.ArrayList;import java.util.List;import java.util.Map;+import javax.validation.ValidationException;+import com.google.common.collect.Lists;import io.onedev.server.util.inputspec.InputSpec;@@ -73,12 +76,25 @@ public class NumberInput extends InputSpec {@Overridepublic Object convertToObject(List<String> strings) {- return Integer.valueOf(strings.iterator().next());+ if (strings.size() == 0) {+ return null;+ } else if (strings.size() == 1) {+ try {+ return Integer.valueOf(strings.iterator().next());+ } catch (NumberFormatException e) {+ throw new ValidationException("Invalid number value");+ }+ } else {+ throw new ValidationException("Not eligible for multi-value");+ }}@Overridepublic List<String> convertToStrings(Object value) {- return Lists.newArrayList(String.valueOf(value));+ if (value != null)+ return Lists.newArrayList(String.valueOf(value));+ else+ return new ArrayList<>();}@Editablediff --git a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.java b/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.javaindex e4d92aee6f..8f90622786 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.java@@ -1,8 +1,11 @@package io.onedev.server.util.inputspec.passwordinput;+import java.util.ArrayList;import java.util.List;import java.util.Map;+import javax.validation.ValidationException;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.passwordinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;@@ -48,12 +51,20 @@ public class PasswordInput extends InputSpec {@Overridepublic Object convertToObject(List<String> strings) {- return strings.iterator().next();+ if (strings.size() == 0)+ return null;+ else if (strings.size() == 1)+ return strings.iterator().next();+ else+ throw new ValidationException("Not eligible for multi-value");}@Overridepublic List<String> convertToStrings(Object value) {- return Lists.newArrayList((String)value);+ if (value != null)+ return Lists.newArrayList((String)value);+ else+ return new ArrayList<>();}}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.javaindex fa5a9769f1..a23f32accc 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/showcondition/ShowCondition.java@@ -59,17 +59,13 @@ public class ShowCondition implements Serializable {InputSpec inputSpec = OneContext.get().getInputContext().getInputSpec(getInputName());if (inputSpec != null) {Object inputValue = OneContext.get().getEditContext().getInputValue(getInputName());- if (inputValue != null) {- List<String> strings = inputSpec.convertToStrings(inputValue);- if (strings.isEmpty())- return getValueMatcher().matches(null);- else if (strings.size() == 1)- return getValueMatcher().matches(strings.iterator().next());- else- throw new OneException("Show condition should not be based on a multi-value input");- } else {+ List<String> strings = inputSpec.convertToStrings(inputValue);+ if (strings.isEmpty())return getValueMatcher().matches(null);- }+ else if (strings.size() == 1)+ return getValueMatcher().matches(strings.iterator().next());+ else+ throw new OneException("Show condition should not be based on a multi-value input");} else {logger.error("Unable to find input spec: " + getInputName());return false;diff --git a/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java b/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.javaindex 2f2dad1a7e..10edcd9b95 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java@@ -1,13 +1,15 @@package io.onedev.server.util.inputspec.textinput;+import java.util.ArrayList;import java.util.List;import java.util.Map;+import javax.validation.ValidationException;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import jersey.repackaged.com.google.common.collect.Lists;@Editable(order=100, name=InputSpec.TEXT)public class TextInput extends InputSpec {@@ -74,12 +76,20 @@ public class TextInput extends InputSpec {@Overridepublic Object convertToObject(List<String> strings) {- return strings.iterator().next();+ if (strings.size() == 0)+ return null;+ else if (strings.size() == 1)+ return strings.iterator().next();+ else+ throw new ValidationException("Not eligible for multi-value");}@Overridepublic List<String> convertToStrings(Object value) {- return Lists.newArrayList((String) value);+ List<String> strings = new ArrayList<>();+ if (value != null)+ strings.add((String) value);+ return strings;}}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.javaindex 4bff06854c..f68d7aa65c 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java@@ -1,9 +1,11 @@package io.onedev.server.util.inputspec.userchoiceinput;+import java.util.ArrayList;import java.util.List;import java.util.Map;import java.util.stream.Collectors;+import javax.validation.ValidationException;import javax.validation.constraints.NotNull;import io.onedev.server.OneDev;@@ -116,12 +118,20 @@ public class UserChoiceInput extends InputSpec {@Overridepublic Object convertToObject(List<String> strings) {- return strings.iterator().next();+ if (strings.size() == 0)+ return null;+ else if (strings.size() == 1)+ return strings.iterator().next();+ else+ throw new ValidationException("Not eligible for multi-value");}@Overridepublic List<String> convertToStrings(Object value) {- return Lists.newArrayList((String) value);+ if (value != null)+ return Lists.newArrayList((String) value);+ else+ return new ArrayList<>();}}diff --git a/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java b/core/src/main/java/io/onedev/server/util/patternset/PatternSet.javaindex 35ba92f347..52d3a682e5 100644--- a/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java+++ b/core/src/main/java/io/onedev/server/util/patternset/PatternSet.java@@ -46,16 +46,23 @@ public class PatternSet implements Serializable {return excludes;}- public boolean matches(Matcher matcher, String value) {+ public int getMatchIndex(Matcher matcher, String value) {for (String exclude: excludes) {if (matcher.matches(exclude, value))- return false;+ return -1;}+ int index = 0;for (String include: includes) {if (matcher.matches(include, value))- return true;+ return index;+ else+ index++;}- return false;+ return -1;+ }++ public boolean matches(Matcher matcher, String value) {+ return getMatchIndex(matcher, value) != -1;}public Collection<File> listFiles(File dir) {diff --git a/core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.java b/core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.javaindex 2eb358dd85..115f0db8f3 100644--- a/core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.java+++ b/core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.java@@ -3,7 +3,8 @@ package io.onedev.server.util.validation;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;-import io.onedev.server.git.GitUtils;+import org.eclipse.jgit.lib.ObjectId;+import io.onedev.server.util.validation.annotation.CommitHash;public class CommitHashValidator implements ConstraintValidator<CommitHash, String> {@@ -16,7 +17,7 @@ public class CommitHashValidator implements ConstraintValidator<CommitHash, Stripublic boolean isValid(String value, ConstraintValidatorContext constraintContext) {if (value == null) {return true;- } else if (!GitUtils.isHash(value)) {+ } else if (!ObjectId.isId(value)) {constraintContext.disableDefaultConstraintViolation();String message = "'" + value + "' is not a valid commit hash";constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();diff --git a/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildStatusListPanel.html b/core/src/main/java/io/onedev/server/web/component/build/status/BuildRequirementListPanel.htmlsimilarity index 79%rename from core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildStatusListPanel.htmlrename to core/src/main/java/io/onedev/server/web/component/build/status/BuildRequirementListPanel.htmlindex 81a63b81c5..bcd6ea6158 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildStatusListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/build/status/BuildRequirementListPanel.html@@ -1,12 +1,12 @@<wicket:panel><table class="build-status-list">- <tr wicket:id="builds">+ <tr wicket:id="requirements"><td class="status"><span wicket:id="icon"></span> <span wicket:id="name"></span></td><td class="title"><a wicket:id="title"><span wicket:id="label"></span></a>- </td>+ </td></tr></table></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildStatusListPanel.java b/core/src/main/java/io/onedev/server/web/component/build/status/BuildRequirementListPanel.javasimilarity index 72%rename from core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildStatusListPanel.javarename to core/src/main/java/io/onedev/server/web/component/build/status/BuildRequirementListPanel.javaindex 3dcb4f0aa7..ee82d1b33b 100644--- a/core/src/main/java/io/onedev/server/web/component/build/status/PullRequestBuildStatusListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/status/BuildRequirementListPanel.java@@ -23,14 +23,14 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.model.BuildRequirement;import io.onedev.server.web.page.project.builds.detail.BuildLogPage;import io.onedev.server.web.websocket.PageDataChanged;@SuppressWarnings("serial")-public class PullRequestBuildStatusListPanel extends GenericPanel<PullRequest> {+public class BuildRequirementListPanel extends GenericPanel<PullRequest> {- public PullRequestBuildStatusListPanel(String id, IModel<PullRequest> model) {+ public BuildRequirementListPanel(String id, IModel<PullRequest> model) {super(id, model);}@@ -52,16 +52,16 @@ public class PullRequestBuildStatusListPanel extends GenericPanel<PullRequest> {protected void onInitialize() {super.onInitialize();- add(new ListView<PullRequestBuild>("builds", new LoadableDetachableModel<List<PullRequestBuild>>() {+ add(new ListView<BuildRequirement>("requirements", new LoadableDetachableModel<List<BuildRequirement>>() {@Override- protected List<PullRequestBuild> load() {- List<PullRequestBuild> builds = new ArrayList<>(getPullRequest().getBuilds());+ protected List<BuildRequirement> load() {+ List<BuildRequirement> requirements = new ArrayList<>(getPullRequest().getBuildRequirements());List<String> jobNames = getPullRequest().getTargetProject().getJobNames();- Collections.sort(builds, new Comparator<PullRequestBuild>() {+ Collections.sort(requirements, new Comparator<BuildRequirement>() {@Override- public int compare(PullRequestBuild o1, PullRequestBuild o2) {+ public int compare(BuildRequirement o1, BuildRequirement o2) {int index1 = jobNames.indexOf(o1.getJobName());int index2 = jobNames.indexOf(o2.getJobName());if (index1 != index2)@@ -75,16 +75,16 @@ public class PullRequestBuildStatusListPanel extends GenericPanel<PullRequest> {}});- return builds;+ return requirements;}}) {@Override- protected void populateItem(ListItem<PullRequestBuild> item) {- PullRequestBuild build = item.getModelObject();+ protected void populateItem(ListItem<BuildRequirement> item) {+ BuildRequirement requirement = item.getModelObject();- if (build.getBuild() != null) {+ if (requirement.getBuild() != null) {item.add(new BuildStatusIcon("icon", new AbstractReadOnlyModel<Build>() {@Override@@ -93,14 +93,14 @@ public class PullRequestBuildStatusListPanel extends GenericPanel<PullRequest> {}}));- item.add(new Label("name", build.getBuild().getStatus().getDisplayName()));+ item.add(new Label("name", requirement.getBuild().getStatus().getDisplayName()));Link<Void> link = new BookmarkablePageLink<Void>("title", BuildLogPage.class,- BuildLogPage.paramsOf(build.getBuild(), null));- StringBuilder builder = new StringBuilder("#" + build.getBuild().getNumber());- if (build.getBuild().getVersion() != null)- builder.append(" (" + build.getBuild().getVersion() + ")");- builder.append(" : ").append(build.getBuild().getJobName());+ BuildLogPage.paramsOf(requirement.getBuild(), null));+ StringBuilder builder = new StringBuilder("#" + requirement.getBuild().getNumber());+ if (requirement.getBuild().getVersion() != null)+ builder.append(" (" + requirement.getBuild().getVersion() + ")");+ builder.append(" : ").append(requirement.getBuild().getJobName());link.add(new Label("label", builder.toString()));item.add(link);} else {@@ -119,7 +119,7 @@ public class PullRequestBuildStatusListPanel extends GenericPanel<PullRequest> {}};- titleLink.add(new Label("label", build.getJobName()));+ titleLink.add(new Label("label", requirement.getJobName()));item.add(titleLink);}}@@ -132,7 +132,7 @@ public class PullRequestBuildStatusListPanel extends GenericPanel<PullRequest> {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!getPullRequest().getBuilds().isEmpty());+ setVisible(!getPullRequest().getBuildRequirements().isEmpty());}@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.javaindex 3f15696989..476cbe218d 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java@@ -7,12 +7,12 @@ import org.apache.wicket.markup.html.image.Image;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.resource.DynamicImageResource;import org.apache.wicket.request.resource.PackageResourceReference;+import org.eclipse.jgit.lib.ObjectId;import io.onedev.commons.utils.Provider;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobChange;import io.onedev.server.git.BlobIdent;-import io.onedev.server.git.GitUtils;@SuppressWarnings("serial")public class ImageDiffPanel extends Panel {@@ -57,7 +57,7 @@ public class ImageDiffPanel extends Panel {@Overrideprotected void configureResponse(ResourceResponse response, Attributes attributes) {super.configureResponse(response, attributes);- if (!GitUtils.isHash(blobIdent.revision))+ if (!ObjectId.isId(blobIdent.revision))response.disableCaching();response.setContentType(blobProvider.get().getMediaType().toString());response.setFileName(blobIdent.getName());diff --git a/core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java b/core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.javaindex ef19e28440..b76ffdcac9 100644--- a/core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java+++ b/core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java@@ -6,6 +6,7 @@ import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;+import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;@@ -82,7 +83,7 @@ public abstract class RevisionPicker extends DropdownLink {iconClass = "fa fa-tag";} else {label = revision;- if (GitUtils.isHash(label))+ if (ObjectId.isId(label))label = GitUtils.abbreviateSHA(label);iconClass = "fa fa-ext fa-commit";}diff --git a/core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java b/core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.javaindex cf589ca225..f4ef91b91e 100644--- a/core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java+++ b/core/src/main/java/io/onedev/server/web/download/RawBlobDownloadResource.java@@ -17,6 +17,7 @@ import org.apache.shiro.authz.UnauthorizedException;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.AbstractResource;+import org.eclipse.jgit.lib.ObjectId;import com.google.common.base.Charsets;@@ -24,7 +25,6 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;-import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;@@ -87,7 +87,7 @@ public class RawBlobDownloadResource extends AbstractResource {response.setContentType(MediaType.TEXT_PLAIN);}- if (!GitUtils.isHash(revision))+ if (!ObjectId.isId(revision))response.disableCaching();try {diff --git a/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.javaindex 2e45206008..a4fc4d0b76 100644--- a/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.java@@ -39,7 +39,7 @@ public class BuildChoiceEditor extends PropertyEditor<Long> {Build build;if (getModelObject() != null)- build = OneDev.getInstance(BuildManager.class).get(getModelObject());+ build = OneDev.getInstance(BuildManager.class).find(getProject(), getModelObject());elsebuild = null;@@ -86,7 +86,7 @@ public class BuildChoiceEditor extends PropertyEditor<Long> {protected Long convertInputToValue() throws ConversionException {Build build = input.getConvertedInput();if (build != null)- return build.getId();+ return build.getNumber();elsereturn null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.htmlindex f1c90cbe9e..3817227265 100644--- a/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.html@@ -1,3 +1,3 @@<wicket:panel>- <input wicket:id="input" type="hidden"></input>+ <input wicket:id="input" type="hidden"></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobChoiceEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/job/choice/JobChoiceEditSupport.javasimilarity index 98%rename from core/src/main/java/io/onedev/server/web/editable/jobchoice/JobChoiceEditSupport.javarename to core/src/main/java/io/onedev/server/web/editable/job/choice/JobChoiceEditSupport.javaindex f7e9a3f2f8..9264f0dab4 100644--- a/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobChoiceEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/choice/JobChoiceEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.jobchoice;+package io.onedev.server.web.editable.job.choice;import java.lang.reflect.Method;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobMultiChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/job/choice/JobMultiChoiceEditor.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/editable/jobchoice/JobMultiChoiceEditor.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/choice/JobMultiChoiceEditor.htmldiff --git a/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/job/choice/JobMultiChoiceEditor.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/editable/jobchoice/JobMultiChoiceEditor.javarename to core/src/main/java/io/onedev/server/web/editable/job/choice/JobMultiChoiceEditor.javaindex 49aa86fcc3..1164339a19 100644--- a/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/choice/JobMultiChoiceEditor.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.jobchoice;+package io.onedev.server.web.editable.job.choice;import java.util.ArrayList;import java.util.Collection;diff --git a/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobSingleChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/job/choice/JobSingleChoiceEditor.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/editable/jobchoice/JobSingleChoiceEditor.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/choice/JobSingleChoiceEditor.htmldiff --git a/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/job/choice/JobSingleChoiceEditor.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/web/editable/jobchoice/JobSingleChoiceEditor.javarename to core/src/main/java/io/onedev/server/web/editable/job/choice/JobSingleChoiceEditor.javaindex 3c53a840c1..e0279562f1 100644--- a/core/src/main/java/io/onedev/server/web/editable/jobchoice/JobSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/choice/JobSingleChoiceEditor.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.jobchoice;+package io.onedev.server.web.editable.job.choice;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;diff --git a/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyCssResourceReference.java b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyCssResourceReference.javanew file mode 100644index 0000000000..976423b2f1--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.editable.job.dependency;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class DependencyCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public DependencyCssResourceReference() {+ super(DependencyCssResourceReference.class, "dependency.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyEditPanel.html b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyEditPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyEditPanel.javasimilarity index 79%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyEditPanel.javarename to core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyEditPanel.javaindex 2ad8a528f7..6ecd91906b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.dependency;+package io.onedev.server.web.editable.job.dependency;import java.util.List;@@ -11,22 +11,22 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.server.ci.Dependency;-import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.CISpecAware;+import io.onedev.server.ci.JobDependency;+import io.onedev.server.ci.job.JobAware;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathElement;-import io.onedev.server.web.page.project.blob.render.renderers.cispec.CISpecAware;@SuppressWarnings("serial")-public abstract class DependencyEditPanel extends Panel implements CISpecAware {+abstract class DependencyEditPanel extends Panel implements CISpecAware, JobAware {- private final List<Dependency> dependencies;+ private final List<JobDependency> dependencies;private final int dependencyIndex;- public DependencyEditPanel(String id, List<Dependency> dependencies, int dependencyIndex) {+ public DependencyEditPanel(String id, List<JobDependency> dependencies, int dependencyIndex) {super(id);this.dependencies = dependencies;@@ -37,11 +37,11 @@ public abstract class DependencyEditPanel extends Panel implements CISpecAware {protected void onInitialize() {super.onInitialize();- Dependency dependency;+ JobDependency dependency;if (dependencyIndex != -1)dependency = dependencies.get(dependencyIndex);else- dependency = new Dependency();+ dependency = new JobDependency();Form<?> form = new Form<Void>("form") {@@ -79,7 +79,7 @@ public abstract class DependencyEditPanel extends Panel implements CISpecAware {super.onSubmit(target, form);if (dependencyIndex != -1) {- Dependency oldDependency = dependencies.get(dependencyIndex);+ JobDependency oldDependency = dependencies.get(dependencyIndex);if (!dependency.getJobName().equals(oldDependency.getJobName()) && getDependency(dependency.getJobName()) != null) {editor.getErrorContext(new PathElement.Named("jobName")).addError("Dependency to this job is already defined");@@ -122,8 +122,8 @@ public abstract class DependencyEditPanel extends Panel implements CISpecAware {add(form);}- private Dependency getDependency(String job) {- for (Dependency dependency: dependencies) {+ private JobDependency getDependency(String job) {+ for (JobDependency dependency: dependencies) {if (job.equals(dependency.getJobName()))return dependency;}@@ -134,6 +134,4 @@ public abstract class DependencyEditPanel extends Panel implements CISpecAware {protected abstract void onCancel(AjaxRequestTarget target);- public abstract Job getJob();-}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditPanel.html b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.javasimilarity index 69%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditPanel.javarename to core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.javaindex 3ef1e513e5..c871473c86 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.dependency;+package io.onedev.server.web.editable.job.dependency;import java.io.Serializable;import java.util.ArrayList;@@ -15,6 +15,8 @@ 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.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.Item;@@ -25,34 +27,50 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.Dependency;+import io.onedev.server.ci.CISpecAware;+import io.onedev.server.ci.JobDependency;import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.JobAware;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.editable.BeanEditor;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;-import io.onedev.server.web.page.project.blob.render.renderers.cispec.CISpecEditPanel;@SuppressWarnings("serial")-public class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {+class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {- private final List<Dependency> dependencies;+ private final List<JobDependency> dependencies;public DependencyListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {super(id, propertyDescriptor, model);dependencies = new ArrayList<>();for (Serializable each: model.getObject()) {- dependencies.add((Dependency) each);+ dependencies.add((JobDependency) each);}}+ private CISpec getCISpec() {+ CISpecAware ciSpecAware = findParent(CISpecAware.class);+ if (ciSpecAware != null)+ return ciSpecAware.getCISpec();+ else+ return null;+ }++ private Job getJob() {+ JobAware jobAware = findParent(JobAware.class);+ if (jobAware != null)+ return jobAware.getJob();+ else+ return null;+ }+@Overrideprotected void onInitialize() {super.onInitialize();@@ -76,12 +94,12 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>@Overridepublic CISpec getCISpec() {- return DependencyListEditPanel.this.findParent(CISpecEditPanel.class).getCISpec();+ return DependencyListEditPanel.this.getCISpec();}@Overridepublic Job getJob() {- return (Job) DependencyListEditPanel.this.findParent(BeanEditor.class).getConvertedInput();+ return DependencyListEditPanel.this.getJob();}};@@ -89,12 +107,12 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>});- List<IColumn<Dependency, Void>> columns = new ArrayList<>();+ List<IColumn<JobDependency, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<Dependency, Void>(Model.of("Name")) {+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Name")) {@Override- public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {Fragment fragment = new Fragment(componentId, "jobColumnFrag", DependencyListEditPanel.this);ModalLink link = new ModalLink("link") {@@ -116,12 +134,12 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>@Overridepublic CISpec getCISpec() {- return DependencyListEditPanel.this.findParent(CISpecEditPanel.class).getCISpec();+ return DependencyListEditPanel.this.getCISpec();}@Overridepublic Job getJob() {- return (Job) DependencyListEditPanel.this.findParent(BeanEditor.class).getConvertedInput();+ return DependencyListEditPanel.this.getJob();}};@@ -135,19 +153,19 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>}});- columns.add(new AbstractColumn<Dependency, Void>(Model.of("#Params")) {+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("#Params")) {@Override- public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {cellItem.add(new Label(componentId, rowModel.getObject().getJobParams().size()));}});- columns.add(new AbstractColumn<Dependency, Void>(Model.of("")) {+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("")) {@Override- public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {Fragment fragment = new Fragment(componentId, "actionColumnFrag", DependencyListEditPanel.this);fragment.add(new AjaxLink<Void>("delete") {@@ -169,17 +187,17 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>});- IDataProvider<Dependency> dataProvider = new ListDataProvider<Dependency>() {+ IDataProvider<JobDependency> dataProvider = new ListDataProvider<JobDependency>() {@Override- protected List<Dependency> getData() {+ protected List<JobDependency> getData() {return dependencies;}};- DataTable<Dependency, Void> dataTable;- add(dataTable = new DataTable<Dependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE));+ DataTable<JobDependency, Void> dataTable;+ add(dataTable = new DataTable<JobDependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE));dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));@@ -218,11 +236,17 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>@Overrideprotected List<Serializable> convertInputToValue() throws ConversionException {List<Serializable> value = new ArrayList<>();- for (Dependency each: dependencies)+ for (JobDependency each: dependencies)value.add(each);return value;}+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new DependencyCssResourceReference()));+ }+@Overridepublic ErrorContext getErrorContext(PathElement element) {return null;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditSupport.javasimilarity index 75%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditSupport.javarename to core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditSupport.javaindex 587b5ec8e3..b27e4f2c0d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.dependency;+package io.onedev.server.web.editable.job.dependency;import java.io.Serializable;import java.util.List;@@ -7,8 +7,7 @@ import org.apache.wicket.Component;import org.apache.wicket.model.IModel;import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.server.ci.Dependency;-import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.JobDependency;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;@@ -21,9 +20,9 @@ public class DependencyListEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {- if (descriptor.getBeanClass() == Job.class && List.class.isAssignableFrom(descriptor.getPropertyClass())) {- final Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());- if (elementClass == Dependency.class) {+ if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {+ Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());+ if (elementClass == JobDependency.class) {return new PropertyContext<List<Serializable>>(descriptor) {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListViewPanel.html b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListViewPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListViewPanel.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListViewPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListViewPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListViewPanel.javasimilarity index 71%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListViewPanel.javarename to core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListViewPanel.javaindex 8d351722d7..b5169f3176 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/dependency/DependencyListViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListViewPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.dependency;+package io.onedev.server.web.editable.job.dependency;import java.io.Serializable;import java.util.ArrayList;@@ -14,6 +14,8 @@ 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.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;@@ -23,34 +25,34 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import io.onedev.server.ci.Dependency;+import io.onedev.server.ci.JobDependency;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.layout.SideFloating;import io.onedev.server.web.page.layout.SideFloating.Placement;import jersey.repackaged.com.google.common.collect.Sets;@SuppressWarnings("serial")-public class DependencyListViewPanel extends Panel {+class DependencyListViewPanel extends Panel {- private final List<Dependency> dependencies = new ArrayList<>();+ private final List<JobDependency> dependencies = new ArrayList<>();public DependencyListViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {super(id);for (Serializable each: elements)- dependencies.add((Dependency) each);+ dependencies.add((JobDependency) each);}@Overrideprotected void onInitialize() {super.onInitialize();- List<IColumn<Dependency, Void>> columns = new ArrayList<>();+ List<IColumn<JobDependency, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<Dependency, Void>(Model.of("Name")) {+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Name")) {@Override- public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {@Override@@ -62,10 +64,10 @@ public class DependencyListViewPanel extends Panel {}});- columns.add(new AbstractColumn<Dependency, Void>(Model.of("#Params")) {+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("#Params")) {@Override- public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {@Override@@ -77,10 +79,10 @@ public class DependencyListViewPanel extends Panel {}});- columns.add(new AbstractColumn<Dependency, Void>(Model.of("")) {+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("")) {@Override- public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {if (!rowModel.getObject().getJobParams().isEmpty()) {cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {@@ -102,16 +104,16 @@ public class DependencyListViewPanel extends Panel {});- IDataProvider<Dependency> dataProvider = new ListDataProvider<Dependency>() {+ IDataProvider<JobDependency> dataProvider = new ListDataProvider<JobDependency>() {@Override- protected List<Dependency> getData() {+ protected List<JobDependency> getData() {return dependencies;}};- add(new DataTable<Dependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE) {+ add(new DataTable<JobDependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE) {@Overrideprotected void onInitialize() {@@ -166,6 +168,12 @@ public class DependencyListViewPanel extends Panel {link.add(newLabel("label"));add(link);}-}++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new DependencyCssResourceReference()));+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/job/dependency/dependency.css b/core/src/main/java/io/onedev/server/web/editable/job/dependency/dependency.cssnew file mode 100644index 0000000000..e6aaf2e3fc--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/job/dependency/dependency.css@@ -0,0 +1,56 @@+.job-params-edit>.job-param>* {+ margin-bottom: 12px;+}+.job-params-edit>.job-param>.name {+ font-weight: bold;+}+.job-params-edit>.job-param .specified-value {+ position: relative;+ margin-bottom: 12px;+ background: #F0F0F0;+ border-radius: 4px;+ padding: 8px 36px 8px 8px;+}+.job-params-edit>.job-param .specified-value>a {+ position: absolute;+ right: 8px;+ top: 8px;+ color: #666;+}+.job-params-edit>.job-param .specified-value>a>i {+ font-size: 20px;+}+.job-params-edit>.job-param>.values>.help {+ color: #444;+ font-size: 18px;+ margin-left: 8px;+ vertical-align: middle;+}+.job-params-view>tbody>tr>td {+ padding: 0 8px 16px 0;+ vertical-align: top;+}+.job-params-view>tbody>tr>td.name {+ font-weight: bold;+ text-align: right;+ width: 20%;+ font-size: 12px;+ line-height: 20px;+ white-space: nowrap;+ border-right: 1px solid #E0E0E0;+}+.job-params-view>tbody>tr>td.value {+ padding-left: 8px;+}+.job-params-view .values-provider {+ font-style: italic;+ margin-bottom: 8px;+}+.job-params-view .specified-values {+ padding-left: 30px;+}+.floating.dependency td.name, .floating.job-trigger td.name {+ width: 120px !important;+ word-break: break-all !important;+ white-space: normal !important;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeBean.java b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeBean.javasimilarity index 82%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeBean.javarename to core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeBean.javaindex 1b3873b706..03130a7dba 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeBean.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.outcome;+package io.onedev.server.web.editable.job.outcome;import java.io.Serializable;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeEditPanel.html b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeEditPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeEditPanel.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeEditPanel.javarename to core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeEditPanel.javaindex a6b34c250c..e9f37219e6 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.outcome;+package io.onedev.server.web.editable.job.outcome;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditPanel.html b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditPanel.javarename to core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.javaindex 7ea0575a95..2ed2e9e7b9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.outcome;+package io.onedev.server.web.editable.job.outcome;import java.io.Serializable;import java.util.ArrayList;@@ -37,7 +37,7 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;@SuppressWarnings("serial")-public class OutcomeListEditPanel extends PropertyEditor<List<Serializable>> {+class OutcomeListEditPanel extends PropertyEditor<List<Serializable>> {private final List<JobOutcome> outcomes;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditSupport.javasimilarity index 80%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditSupport.javarename to core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditSupport.javaindex f3de3d79d5..605e27ae8f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.outcome;+package io.onedev.server.web.editable.job.outcome;import java.io.Serializable;import java.util.List;@@ -7,7 +7,6 @@ import org.apache.wicket.Component;import org.apache.wicket.model.IModel;import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.JobOutcome;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;@@ -21,8 +20,8 @@ public class OutcomeListEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {- if (descriptor.getBeanClass() == Job.class && List.class.isAssignableFrom(descriptor.getPropertyClass())) {- final Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());+ if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {+ Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());if (elementClass == JobOutcome.class) {return new PropertyContext<List<Serializable>>(descriptor) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListViewPanel.html b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListViewPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListViewPanel.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListViewPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListViewPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListViewPanel.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListViewPanel.javarename to core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListViewPanel.javaindex 45d6e50327..6073c6f48c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/outcome/OutcomeListViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListViewPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.outcome;+package io.onedev.server.web.editable.job.outcome;import java.io.Serializable;import java.util.ArrayList;@@ -29,7 +29,7 @@ import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.layout.SideFloating;@SuppressWarnings("serial")-public class OutcomeListViewPanel extends Panel {+class OutcomeListViewPanel extends Panel {private final List<JobOutcome> outcomes = new ArrayList<>();diff --git a/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListCssResourceReference.java b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListCssResourceReference.javanew file mode 100644index 0000000000..0da8a713a8--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.editable.job.param;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class ParamListCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public ParamListCssResourceReference() {+ super(ParamListCssResourceReference.class, "param-list.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsEditPanel.html b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsEditPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsEditPanel.javarename to core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.javaindex 38523d60c6..faa036a267 100644--- a/core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.jobparam;+package io.onedev.server.web.editable.job.param;import java.io.Serializable;import java.util.ArrayList;@@ -50,9 +50,9 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.annotation.ParamSpecProvider;@SuppressWarnings("serial")-public class JobParamsEditPanel extends PropertyEditor<List<Serializable>> {+class ParamListEditPanel extends PropertyEditor<List<Serializable>> {- private static final Logger logger = LoggerFactory.getLogger(JobParamsEditPanel.class);+ private static final Logger logger = LoggerFactory.getLogger(ParamListEditPanel.class);private final Map<String, JobParam> params = new HashMap<>();@@ -62,7 +62,7 @@ public class JobParamsEditPanel extends PropertyEditor<List<Serializable>> {private transient Serializable defaultParamBean;- public JobParamsEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ public ParamListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {super(id, propertyDescriptor, model);ParamSpecProvider paramSpecProvider = Preconditions.checkNotNull(@@ -332,7 +332,7 @@ public class JobParamsEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new JobParamsCssResourceReference()));+ response.render(CssHeaderItem.forReference(new ParamListCssResourceReference()));}}diff --git a/core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditSupport.javasimilarity index 88%rename from core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsEditSupport.javarename to core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditSupport.javaindex c08d54d9db..056e4acbd8 100644--- a/core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.jobparam;+package io.onedev.server.web.editable.job.param;import java.io.Serializable;import java.util.List;@@ -17,7 +17,7 @@ import io.onedev.server.web.editable.PropertyViewer;import io.onedev.server.web.editable.annotation.ParamSpecProvider;@SuppressWarnings("serial")-public class JobParamsEditSupport implements EditSupport {+public class ParamListEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {@@ -33,7 +33,7 @@ public class JobParamsEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {if (model.getObject() != null && !model.getObject().isEmpty())- return new JobParamsViewPanel(id, elementClass, model.getObject());+ return new ParamListViewPanel(id, elementClass, model.getObject());elsereturn new WebMarkupContainer(id);}@@ -43,7 +43,7 @@ public class JobParamsEditSupport implements EditSupport {@Overridepublic PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {- return new JobParamsEditPanel(componentId, descriptor, model);+ return new ParamListEditPanel(componentId, descriptor, model);}};diff --git a/core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsViewPanel.html b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsViewPanel.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsViewPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.javasimilarity index 91%rename from core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsViewPanel.javarename to core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.javaindex 3ddc4a7c7e..427a8309bc 100644--- a/core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/param/ParamListViewPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.jobparam;+package io.onedev.server.web.editable.job.param;import java.io.Serializable;import java.util.ArrayList;@@ -19,11 +19,11 @@ import io.onedev.server.ci.job.param.SpecifiedValues;import io.onedev.server.web.editable.PropertyContext;@SuppressWarnings("serial")-public class JobParamsViewPanel extends Panel {+class ParamListViewPanel extends Panel {private final List<JobParam> params = new ArrayList<>();- public JobParamsViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {+ public ParamListViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {super(id);for (Serializable each: elements)@@ -66,7 +66,7 @@ public class JobParamsViewPanel extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new JobParamsCssResourceReference()));+ response.render(CssHeaderItem.forReference(new ParamListCssResourceReference()));}}diff --git a/core/src/main/java/io/onedev/server/web/editable/jobparam/job-params.css b/core/src/main/java/io/onedev/server/web/editable/job/param/param-list.csssimilarity index 100%rename from core/src/main/java/io/onedev/server/web/editable/jobparam/job-params.cssrename to core/src/main/java/io/onedev/server/web/editable/job/param/param-list.cssdiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecBean.java b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecBean.javasimilarity index 82%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecBean.javarename to core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecBean.javaindex 74b9568b2b..986fe62b9a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecBean.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.paramspec;+package io.onedev.server.web.editable.job.paramspec;import java.io.Serializable;diff --git a/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecCssResourceReference.java b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecCssResourceReference.javanew file mode 100644index 0000000000..2ab97411f3--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.editable.job.paramspec;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class ParamSpecCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public ParamSpecCssResourceReference() {+ super(ParamSpecCssResourceReference.class, "param-spec.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecEditPanel.html b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecEditPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecEditPanel.javarename to core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.javaindex 0648efd3f0..dad9cfd804 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.paramspec;+package io.onedev.server.web.editable.job.paramspec;import java.util.ArrayList;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecEditPanel.properties b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.propertiessimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecEditPanel.propertiesrename to core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.propertiesdiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecListEditPanel.html b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecListEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecListEditPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.javasimilarity index 91%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecListEditPanel.javarename to core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.javaindex 9a656f20e7..d8b0fe0971 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.paramspec;+package io.onedev.server.web.editable.job.paramspec;import java.io.Serializable;import java.util.ArrayList;@@ -15,6 +15,8 @@ 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.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.Item;@@ -38,7 +40,7 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;@SuppressWarnings("serial")-public class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {+class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {private final List<InputSpec> params;@@ -214,4 +216,10 @@ public class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {return null;}+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ParamSpecCssResourceReference()));+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecListEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditSupport.javasimilarity index 80%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecListEditSupport.javarename to core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditSupport.javaindex 921238e501..11e4debfaf 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecListEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.paramspec;+package io.onedev.server.web.editable.job.paramspec;import java.io.Serializable;import java.util.List;@@ -7,7 +7,6 @@ import org.apache.wicket.Component;import org.apache.wicket.model.IModel;import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.server.ci.job.Job;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;@@ -21,8 +20,8 @@ public class ParamSpecListEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {- if (descriptor.getBeanClass() == Job.class && List.class.isAssignableFrom(descriptor.getPropertyClass())) {- final Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());+ if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {+ Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());if (elementClass == InputSpec.class) {return new PropertyContext<List<Serializable>>(descriptor) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecListViewPanel.html b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecListViewPanel.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecListViewPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecListViewPanel.javarename to core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.javaindex 6942edf7f2..b7bdf52d45 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/paramspec/ParamSpecListViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.paramspec;+package io.onedev.server.web.editable.job.paramspec;import java.io.Serializable;import java.util.ArrayList;@@ -14,6 +14,8 @@ 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.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;@@ -31,7 +33,7 @@ import io.onedev.server.web.page.layout.SideFloating;import jersey.repackaged.com.google.common.collect.Sets;@SuppressWarnings("serial")-public class ParamSpecListViewPanel extends Panel {+class ParamSpecListViewPanel extends Panel {private final List<InputSpec> paramSpecs = new ArrayList<>();@@ -137,6 +139,12 @@ public class ParamSpecListViewPanel extends Panel {});}+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ParamSpecCssResourceReference()));+ }+private abstract class ColumnFragment extends Fragment {private final int index;diff --git a/core/src/main/java/io/onedev/server/web/editable/job/paramspec/param-spec.css b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/param-spec.cssnew file mode 100644index 0000000000..d1b94befa5--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/job/paramspec/param-spec.css@@ -0,0 +1,6 @@+.floating.job-param-spec>.content>.body>.bean-viewer>.bean-properties>table>tbody>tr>td.name {+ min-width: 150px;+}+.floating.job-param-spec .property-uuid, .job-param-spec-edit .property-uuid {+ display: none;+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerBean.java b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerBean.javasimilarity index 82%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerBean.javarename to core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerBean.javaindex 80fb0bd70b..057113b0e4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerBean.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.trigger;+package io.onedev.server.web.editable.job.trigger;import java.io.Serializable;diff --git a/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerCssResourceReference.java b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerCssResourceReference.javanew file mode 100644index 0000000000..8f65987326--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.editable.job.trigger;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class TriggerCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public TriggerCssResourceReference() {+ super(TriggerCssResourceReference.class, "trigger.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerEditPanel.html b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerEditPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerEditPanel.javarename to core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.javaindex 935c9a96f0..dc105004db 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.trigger;+package io.onedev.server.web.editable.job.trigger;import java.util.List;@@ -10,11 +10,11 @@ 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.ci.job.JobAware;import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.page.project.blob.render.renderers.cispec.job.JobAware;@SuppressWarnings("serial")abstract class TriggerEditPanel extends Panel implements JobAware {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditPanel.html b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditPanel.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.javasimilarity index 87%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditPanel.javarename to core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.javaindex 1d6f58aae8..e92a41a644 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.trigger;+package io.onedev.server.web.editable.job.trigger;import java.io.Serializable;import java.util.ArrayList;@@ -15,6 +15,8 @@ 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.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.Item;@@ -25,12 +27,12 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.JobAware;import io.onedev.server.ci.job.trigger.JobTrigger;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.editable.BeanEditor;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;@@ -38,7 +40,7 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;@SuppressWarnings("serial")-public class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {+class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {private final List<JobTrigger> triggers;@@ -51,6 +53,14 @@ public class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {}}+ private Job getJob() {+ JobAware jobAware = findParent(JobAware.class);+ if (jobAware != null)+ return jobAware.getJob();+ else+ return null;+ }+@Overrideprotected void onInitialize() {super.onInitialize();@@ -74,7 +84,7 @@ public class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic Job getJob() {- return (Job) TriggerListEditPanel.this.findParent(BeanEditor.class).getConvertedInput();+ return TriggerListEditPanel.this.getJob();}};@@ -109,7 +119,7 @@ public class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic Job getJob() {- return (Job) TriggerListEditPanel.this.findParent(BeanEditor.class).getConvertedInput();+ return TriggerListEditPanel.this.getJob();}};@@ -211,6 +221,12 @@ public class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {return value;}+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new TriggerCssResourceReference()));+ }+@Overridepublic ErrorContext getErrorContext(PathElement element) {return null;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditSupport.javasimilarity index 80%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditSupport.javarename to core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditSupport.javaindex f722646c93..5fb56b3a7d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.trigger;+package io.onedev.server.web.editable.job.trigger;import java.io.Serializable;import java.util.List;@@ -7,7 +7,6 @@ import org.apache.wicket.Component;import org.apache.wicket.model.IModel;import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;@@ -21,8 +20,8 @@ public class TriggerListEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {- if (descriptor.getBeanClass() == Job.class && List.class.isAssignableFrom(descriptor.getPropertyClass())) {- final Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());+ if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {+ Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());if (elementClass == JobTrigger.class) {return new PropertyContext<List<Serializable>>(descriptor) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListViewPanel.html b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListViewPanel.htmlrename to core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListViewPanel.java b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListViewPanel.javarename to core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.javaindex bc91c8f851..37bb15d87e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/trigger/TriggerListViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job.trigger;+package io.onedev.server.web.editable.job.trigger;import java.io.Serializable;import java.util.ArrayList;@@ -14,6 +14,8 @@ 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.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;@@ -29,7 +31,7 @@ import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.layout.SideFloating;@SuppressWarnings("serial")-public class TriggerListViewPanel extends Panel {+class TriggerListViewPanel extends Panel {private final List<JobTrigger> triggers = new ArrayList<>();@@ -122,6 +124,12 @@ public class TriggerListViewPanel extends Panel {});}+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new TriggerCssResourceReference()));+ }+private abstract class ColumnFragment extends Fragment {private final int index;diff --git a/core/src/main/java/io/onedev/server/web/editable/job/trigger/trigger.css b/core/src/main/java/io/onedev/server/web/editable/job/trigger/trigger.cssnew file mode 100644index 0000000000..440a20dc05--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/job/trigger/trigger.css@@ -0,0 +1,5 @@+.floating.job-trigger td.name {+ width: 120px !important;+ word-break: break-all !important;+ white-space: normal !important;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsCssResourceReference.java b/core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsCssResourceReference.javadeleted file mode 100644index 55265346b1..0000000000--- a/core/src/main/java/io/onedev/server/web/editable/jobparam/JobParamsCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.editable.jobparam;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class JobParamsCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public JobParamsCssResourceReference() {- super(JobParamsCssResourceReference.class, "job-params.css");- }--}diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.javaindex b97d114fe2..3762d9acbb 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java@@ -113,8 +113,8 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {for (List<PropertyDescriptor> prevGroupProperties: prevDescriptor.getPropertyDescriptors().values()) {for (PropertyDescriptor prevProperty: prevGroupProperties) {Class<?> declaringClass = prevProperty.getPropertyGetter().getDeclaringClass();- Class<?> baseClass = prevProperty.getPropertyGetter().getDeclaringClass();- if (!prevProperty.isPropertyExcluded() && declaringClass.isAssignableFrom(baseClass))+ Class<?> baseClass = descriptor.getPropertyClass();+ if (!prevProperty.isPropertyExcluded() && declaringClass.isAssignableFrom(baseClass))prevProperty.copyProperty(prevPropertyValue, propertyValue);}}diff --git a/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.htmlindex f1c90cbe9e..3817227265 100644--- a/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.html@@ -1,3 +1,3 @@<wicket:panel>- <input wicket:id="input" type="hidden"></input>+ <input wicket:id="input" type="hidden"></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecAware.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecAware.javadeleted file mode 100644index 111ccd654d..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecAware.java+++ /dev/null@@ -1,12 +0,0 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec;--import javax.annotation.Nullable;--import io.onedev.server.ci.CISpec;--public interface CISpecAware {-- @Nullable- CISpec getCISpec();--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.javaindex 84b223f89a..38ed9cb05a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java@@ -2,7 +2,6 @@ package io.onedev.server.web.page.project.blob.render.renderers.cispec;import java.io.Serializable;-import javax.annotation.Nullable;import javax.validation.ConstraintViolation;import javax.validation.Validator;@@ -28,12 +27,14 @@ import com.google.common.base.Throwables;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.ci.CISpec;+import io.onedev.server.ci.CISpecAware;import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.JobAware;import io.onedev.server.migration.VersionedDocument;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.component.MultilineLabel;-import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathElement;@@ -94,7 +95,7 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpe}private Component newJobContent(Job job) {- BeanEditor content = BeanContext.edit(jobContents.newChildId(), job);+ BeanEditor content = new JobEditor(jobContents.newChildId(), job);content.add(new Behavior() {@Override@@ -230,9 +231,9 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpe@Overridepublic void convertInput() {- CISpec editingCISpec = getCISpec();- if (editingCISpec != null) {- setConvertedInput(VersionedDocument.fromBean(editingCISpec).toXML().getBytes(Charsets.UTF_8));+ if (parseResult instanceof CISpec) {+ CISpec ciSpec = getCISpec();+ setConvertedInput(VersionedDocument.fromBean(ciSpec).toXML().getBytes(Charsets.UTF_8));} else {setConvertedInput(getModelObject());}@@ -249,7 +250,6 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpe}@Override- @Nullablepublic CISpec getCISpec() {if (parseResult instanceof CISpec) {CISpec ciSpec = new CISpec();@@ -263,4 +263,16 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpe}}+ private static class JobEditor extends BeanEditor implements JobAware {++ public JobEditor(String id, Job job) {+ super(id, new BeanDescriptor(Job.class), Model.of(job));+ }++ @Override+ public Job getJob() {+ return (Job) getConvertedInput();+ }++ }}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.cssindex a9118c74f3..28d17802b9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css@@ -98,15 +98,3 @@.ci-spec>.valid .def-list table>tbody>tr>td:first-child>div>a {margin-left: 0;}-.floating.job-param-spec>.content>.body>.bean-viewer>.bean-properties>table>tbody>tr>td.name {- min-width: 150px;-}-.floating.job-param-spec .property-uuid, .job-param-spec-edit .property-uuid {- display: none;-}--.floating.dependency td.name, .floating.job-trigger td.name {- width: 120px !important;- word-break: break-all !important;- white-space: normal !important;-}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/JobAware.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/JobAware.javadeleted file mode 100644index 997e0d1d1c..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/job/JobAware.java+++ /dev/null@@ -1,9 +0,0 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec.job;--import io.onedev.server.ci.job.Job;--public interface JobAware {-- Job getJob();--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 0f2152014f..c2eace1ff2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -65,7 +65,7 @@ import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;import io.onedev.server.web.component.branch.BranchLink;import io.onedev.server.web.component.branch.picker.AffinalBranchPicker;-import io.onedev.server.web.component.build.status.PullRequestBuildStatusListPanel;+import io.onedev.server.web.component.build.status.BuildRequirementListPanel;import io.onedev.server.web.component.commit.list.CommitListPanel;import io.onedev.server.web.component.diff.revision.CommentSupport;import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;@@ -634,7 +634,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {form.add(new ReviewListPanel("reviewers", requestModel));- form.add(new PullRequestBuildStatusListPanel("builds", requestModel));+ form.add(new BuildRequirementListPanel("builds", requestModel));return fragment;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 912cd48461..ce7b6d8d50 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -87,7 +87,7 @@ import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.component.branch.BranchLink;-import io.onedev.server.web.component.build.status.PullRequestBuildStatusListPanel;+import io.onedev.server.web.component.build.status.BuildRequirementListPanel;import io.onedev.server.web.component.entity.nav.EntityNavPanel;import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;import io.onedev.server.web.component.floating.FloatingPanel;@@ -451,7 +451,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {fragment.add(newMergeStrategyContainer());fragment.add(new ReviewListPanel("reviews", requestModel));- fragment.add(new PullRequestBuildStatusListPanel("builds", requestModel));+ fragment.add(new BuildRequirementListPanel("builds", requestModel));fragment.add(new EntityWatchesPanel("watches") {diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.htmlindex 03ab7d417f..b9dc06ddb4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.html@@ -3,7 +3,7 @@<div wicket:id="feedback"></div><div wicket:id="editor"></div><div class="actions">- <button wicket:id="save" class="btn btn-primary dirty-aware">Save</button> + <button wicket:id="save" class="btn btn-primary">Save</button> <button wicket:id="cancel" class="btn btn-default">Cancel</button></div></form>diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.javaindex fefaf9f71a..359566b095 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.java@@ -5,13 +5,18 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;+import org.eclipse.jgit.lib.ObjectId;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.ci.CISpec;+import io.onedev.server.ci.CISpecAware;+import io.onedev.server.model.Project;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")-abstract class BranchProtectionEditPanel extends Panel {+abstract class BranchProtectionEditPanel extends Panel implements CISpecAware {private final BranchProtection protection;@@ -58,6 +63,13 @@ abstract class BranchProtectionEditPanel extends Panel {add(form);}+ @Override+ public CISpec getCISpec() {+ Project project = ((ProjectPage) getPage()).getProject();+ ObjectId commitId = project.getObjectId(project.getDefaultBranch(), true);+ return project.getCISpec(commitId);+ }+protected abstract void onSave(AjaxRequestTarget target, BranchProtection protection);protected abstract void onCancel(AjaxRequestTarget target);diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditPanel.htmlindex 03ab7d417f..b9dc06ddb4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditPanel.html@@ -3,7 +3,7 @@<div wicket:id="feedback"></div><div wicket:id="editor"></div><div class="actions">- <button wicket:id="save" class="btn btn-primary dirty-aware">Save</button> + <button wicket:id="save" class="btn btn-primary">Save</button> <button wicket:id="cancel" class="btn btn-default">Cancel</button></div></form>diff --git a/core/src/test/java/io/onedev/server/util/MatrixRunnerTest.java b/core/src/test/java/io/onedev/server/util/MatrixRunnerTest.javaindex 6ccf567cf1..a0c3ae3e47 100644--- a/core/src/test/java/io/onedev/server/util/MatrixRunnerTest.java+++ b/core/src/test/java/io/onedev/server/util/MatrixRunnerTest.java@@ -20,14 +20,14 @@ public class MatrixRunnerTest {Map<String, List<String>> matrix = new LinkedHashMap<>();List<Map<String, String>> usedParams = new ArrayList<>();- new MatrixRunner(matrix).run(new MatrixRunner.Runnable() {+ new MatrixRunner(matrix) {@Overridepublic void run(Map<String, String> params) {usedParams.add(params);}- });+ }.run();assertEquals(1, usedParams.size());assertTrue(usedParams.iterator().next().isEmpty());@@ -37,14 +37,14 @@ public class MatrixRunnerTest {usedParams.clear();- new MatrixRunner(matrix).run(new MatrixRunner.Runnable() {+ new MatrixRunner(matrix) {@Overridepublic void run(Map<String, String> params) {usedParams.add(params);}- });+ }.run();assertEquals(4, usedParams.size());Map<String, String> params = new HashMap<>();params.put("db", "oracle");