The Unified and Autonomous Development Platform
Retrieve artifacts from different projects into job workspace
Robin Shen95fd47a7c459
diff --git a/server-core/src/main/java/io/onedev/server/ci/CISpec.java b/server-core/src/main/java/io/onedev/server/ci/CISpec.javaindex 32f5292180..6d045a233c 100644--- a/server-core/src/main/java/io/onedev/server/ci/CISpec.java+++ b/server-core/src/main/java/io/onedev/server/ci/CISpec.java@@ -22,6 +22,7 @@ import io.onedev.commons.utils.DependencyAware;import io.onedev.commons.utils.DependencyUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.JobDependency;import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.migration.VersionedDocument;@@ -81,7 +82,7 @@ public class CISpec implements Serializable, Validatable {@Overridepublic Set<String> getDependencies() {- return job.getDependencies().stream().map(it->it.getJobName()).collect(toSet());+ return job.getJobDependencies().stream().map(it->it.getJobName()).collect(toSet());}});@@ -107,7 +108,7 @@ public class CISpec implements Serializable, Validatable {for (int i=0; i<jobs.size(); i++) {Job job = jobs.get(i);- for (JobDependency dependency: job.getDependencies()) {+ for (JobDependency dependency: job.getJobDependencies()) {Job dependencyJob = getJobMap().get(dependency.getJobName());if (dependencyJob != null) {try {@@ -167,7 +168,7 @@ public class CISpec implements Serializable, Validatable {dependencyChain.add(jobName);Job job = getJobMap().get(jobName);if (job != null) {- for (JobDependency dependency: job.getDependencies()) {+ for (JobDependency dependency: job.getJobDependencies()) {if (hasCircularDependencies(new ArrayList<>(dependencyChain), dependency.getJobName()))return true;}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/Authentication.java b/server-core/src/main/java/io/onedev/server/ci/job/Authentication.javanew file mode 100644index 0000000000..6d32a39fcd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/Authentication.java@@ -0,0 +1,48 @@+package io.onedev.server.ci.job;++import java.io.Serializable;+import java.util.List;+import java.util.stream.Collectors;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.OneContext;+import io.onedev.server.web.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class Authentication implements Serializable {++ private static final long serialVersionUID = 1L;++ private String userName;++ private String passwordSecret;++ @Editable(order=10000)+ @NotEmpty+ public String getUserName() {+ return userName;+ }++ public void setUserName(String userName) {+ this.userName = userName;+ }++ @Editable(order=10100, description="Specify a project secret to be used as password")+ @ChoiceProvider("getPasswordSecretChoices")+ @NotEmpty+ public String getPasswordSecret() {+ return passwordSecret;+ }++ public void setPasswordSecret(String passwordSecret) {+ this.passwordSecret = passwordSecret;+ }++ @SuppressWarnings("unused")+ private static List<String> getPasswordSecretChoices() {+ return OneContext.get().getProject().getSecrets().stream().map(it->it.getName()).collect(Collectors.toList());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.javaindex 289dfa8925..92401371ce 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java@@ -30,6 +30,8 @@ import javax.inject.Singleton;import javax.servlet.http.HttpServletRequest;import org.apache.commons.lang3.StringUtils;+import org.apache.shiro.authc.credential.PasswordService;+import org.apache.shiro.subject.Subject;import org.eclipse.jgit.lib.ObjectId;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -48,12 +50,12 @@ import io.onedev.k8shelper.CacheInstance;import io.onedev.server.OneException;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.InvalidCISpecException;-import io.onedev.server.ci.JobDependency;import io.onedev.server.ci.job.log.JobLogManager;import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildParamManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.BuildCommitAware;@@ -78,6 +80,8 @@ import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.security.CodePullAuthorizationSource;+import io.onedev.server.security.permission.ProjectPermission;+import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.Input;import io.onedev.server.util.JobLogger;import io.onedev.server.util.inputspec.InputSpec;@@ -97,6 +101,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizprivate final Map<Long, JobExecution> jobExecutions = new ConcurrentHashMap<>();+ private final ProjectManager projectManager;+private final BuildManager buildManager;private final ListenerRegistry listenerRegistry;@@ -115,6 +121,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizprivate final BuildParamManager buildParamManager;+ private final PasswordService passwordService;+private volatile List<JobExecutor> jobExecutors;private volatile Status status;@@ -122,7 +130,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Injectpublic DefaultJobManager(BuildManager buildManager, UserManager userManager, ListenerRegistry listenerRegistry,SettingManager settingManager, TransactionManager transactionManager, JobLogManager logManager,- ExecutorService executorService, SessionManager sessionManager, BuildParamManager buildParamManager) {+ ExecutorService executorService, SessionManager sessionManager, BuildParamManager buildParamManager,+ ProjectManager projectManager, PasswordService passwordService) {this.settingManager = settingManager;this.buildManager = buildManager;this.userManager = userManager;@@ -132,6 +141,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizthis.executorService = executorService;this.sessionManager = sessionManager;this.buildParamManager = buildParamManager;+ this.projectManager = projectManager;+ this.passwordService = passwordService;}@Transactional@@ -204,7 +215,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}}- for (JobDependency dependency: build.getJob().getDependencies()) {+ for (JobDependency dependency: build.getJob().getJobDependencies()) {new MatrixRunner<List<String>>(JobParam.getParamMatrix(dependency.getJobParams())) {@Override@@ -220,6 +231,47 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}.run();}++ for (ProjectDependency dependency: build.getJob().getProjectDependencies()) {+ Project dependencyProject = projectManager.find(dependency.getProjectName());+ if (dependencyProject == null)+ throw new OneException("Unable to find dependency project: " + dependency.getProjectName());++ Subject subject;+ if (dependency.getAuthentication() != null) {+ String userName = dependency.getAuthentication().getUserName();+ User user = userManager.findByName(userName);+ if (user == null) {+ throw new OneException("Unable to access dependency project '"+ + dependency.getProjectName() + "': user not found");+ }+ String password = project.getSecretValue(dependency.getAuthentication().getPasswordSecret(), commitId);+ if (!passwordService.passwordsMatch(password, user.getPassword())) {+ throw new OneException("Unable to access dependency project '"+ + dependency.getProjectName() + "': password incorrect");+ }+ subject = user.asSubject();+ } else {+ subject = User.asSubject(0L);+ }+ if (!subject.isPermitted(new ProjectPermission(dependencyProject.getFacade(),+ ProjectPrivilege.CODE_READ))) {+ throw new OneException("Unable to access dependency project '"+ + dependency.getProjectName() + "': permission denied");+ }++ Build dependencyBuild = buildManager.find(dependencyProject, dependency.getBuildNumber());+ if (dependencyBuild == null) {+ String errorMessage = String.format("Unable to find dependency build (project: %s, build number: %d)",+ dependency.getProjectName(), dependency.getBuildNumber());+ throw new OneException(errorMessage);+ }+ BuildDependence dependence = new BuildDependence();+ dependence.setDependency(dependencyBuild);+ dependence.setDependent(build);+ dependence.setArtifacts(dependency.getArtifacts());+ build.getDependencies().add(dependence);+ }buildManager.create(build);listenerRegistry.post(new BuildSubmitted(build));@@ -575,7 +627,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}if (hasUnsuccessful) {- markBuildError(build, "There are failed dependency jobs");+ markBuildError(build, "There are failed dependencies");} else if (!hasUnfinished) {build.setStatus(Build.Status.PENDING);build.setPendingDate(new Date());diff --git a/server-core/src/main/java/io/onedev/server/ci/job/Job.java b/server-core/src/main/java/io/onedev/server/ci/job/Job.javaindex 324390f32f..ba6c9f8a9d 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/Job.java@@ -20,7 +20,6 @@ import javax.validation.constraints.Size;import org.eclipse.jgit.lib.ObjectId;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.ci.JobDependency;import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.event.ProjectEvent;@@ -56,7 +55,9 @@ public class Job implements Serializable, Validatable {private List<SubmoduleCredential> submoduleCredentials = new ArrayList<>();- private List<JobDependency> dependencies = new ArrayList<>();+ private List<JobDependency> jobDependencies = new ArrayList<>();++ private List<ProjectDependency> projectDependencies = new ArrayList<>();private String artifacts;@@ -152,14 +153,24 @@ public class Job implements Serializable, Validatable {return (boolean) OneContext.get().getEditContext().getInputValue("retrieveSource");}- @Editable(name="Dependency Jobs", order=9110, group="Dependencies", description="Job dependencies determines the order and "- + "concurrency when run different jobs")- public List<JobDependency> getDependencies() {- return dependencies;+ @Editable(name="Job Dependencies", order=9110, group="Dependencies", description="Job dependencies determines the order and "+ + "concurrency when run different jobs. You may also specify artifacts to retrieve from upstream jobs")+ public List<JobDependency> getJobDependencies() {+ return jobDependencies;+ }++ public void setJobDependencies(List<JobDependency> jobDependencies) {+ this.jobDependencies = jobDependencies;+ }++ @Editable(name="Project Dependencies", order=9113, group="Dependencies", description="Use project dependency to retrieve "+ + "artifacts from other projects")+ public List<ProjectDependency> getProjectDependencies() {+ return projectDependencies;}- public void setDependencies(List<JobDependency> dependencies) {- this.dependencies = dependencies;+ public void setProjectDependencies(List<ProjectDependency> projectDependencies) {+ this.projectDependencies = projectDependencies;}@Editable(order=9115, group="Artifacts & Reports", description="Optionally specify files to publish as job artifacts. "@@ -267,7 +278,7 @@ public class Job implements Serializable, Validatable {}Set<String> dependencyJobs = new HashSet<>();- for (JobDependency dependency: dependencies) {+ for (JobDependency dependency: jobDependencies) {if (dependencyJobs.contains(dependency.getJobName())) {isValid = false;context.buildConstraintViolationWithTemplate("Duplicate dependency: " + dependency.getJobName())diff --git a/server-core/src/main/java/io/onedev/server/ci/JobDependency.java b/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/ci/JobDependency.javarename to server-core/src/main/java/io/onedev/server/ci/job/JobDependency.javaindex 157c0341a1..011dd96b09 100644--- a/server-core/src/main/java/io/onedev/server/ci/JobDependency.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java@@ -1,4 +1,4 @@-package io.onedev.server.ci;+package io.onedev.server.ci.job;import java.io.Serializable;import java.util.ArrayList;@@ -7,8 +7,8 @@ import java.util.List;import org.apache.wicket.Component;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.ci.job.Job;-import io.onedev.server.ci.job.JobAware;+import io.onedev.server.ci.CISpec;+import io.onedev.server.ci.CISpecAware;import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputSpec;@@ -31,7 +31,7 @@ public class JobDependency implements Serializable {private String artifacts = "**";- @Editable(order=100)+ @Editable(order=100, name="Job")@ChoiceProvider("getJobChoices")@NotEmptypublic String getJobName() {diff --git a/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.javanew file mode 100644index 0000000000..2f4636a8e7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java@@ -0,0 +1,124 @@+package io.onedev.server.ci.job;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import javax.annotation.Nullable;+import javax.validation.constraints.NotNull;++import org.hibernate.validator.constraints.NotEmpty;++import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.editable.annotation.BuildChoice;+import io.onedev.server.web.editable.annotation.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.util.SuggestionUtils;+import io.onedev.server.web.util.WicketUtils;++@Editable+public class ProjectDependency implements Serializable {++ private static final long serialVersionUID = 1L;++ private Authentication authentication;++ private String projectName;++ private Long buildNumber;++ private String artifacts = "**";++ @Editable(order=200, name="Project", description="Specify project to retrieve artifacts from")+ @ChoiceProvider("getProjectChoices")+ @NotEmpty+ public String getProjectName() {+ return projectName;+ }++ public void setProjectName(String projectName) {+ this.projectName = projectName;+ }++ @SuppressWarnings("unused")+ private static List<String> getProjectChoices() {+ List<String> choices = new ArrayList<>();+ Project project = ((ProjectPage)WicketUtils.getPage()).getProject();+ for (Project each: OneDev.getInstance(ProjectManager.class).query()) {+ if (!each.equals(project) && SecurityUtils.canReadCode(each.getFacade()))+ choices.add(each.getName());+ }++ Collections.sort(choices);++ return choices;+ }++ @Editable(order=300, name="Build", description="Specify build to retrieve artifacts from")+ @BuildChoice("getEditingProject")+ @NotNull+ public Long getBuildNumber() {+ return buildNumber;+ }++ public void setBuildNumber(Long buildNumber) {+ this.buildNumber = buildNumber;+ }++ @Nullable+ private static Project getEditingProject() {+ String projectName = (String) OneContext.get().getEditContext().getInputValue("projectName");+ if (projectName != null) {+ Project project = OneDev.getInstance(ProjectManager.class).find(projectName);+ if (SecurityUtils.canReadCode(project.getFacade()))+ return project;+ }+ return null;+ }++ @Editable(order=400, name="Artifacts to Retrieve", description="Specify artifacts to retrieve "+ + "into job workspace")+ @Patterns("suggestArtifacts")+ @NotEmpty+ public String getArtifacts() {+ return artifacts;+ }++ public void setArtifacts(String artifacts) {+ this.artifacts = artifacts;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestArtifacts(String matchWith) {+ Project project = getEditingProject();+ Long buildNumber = (Long) OneContext.get().getEditContext().getInputValue("buildNumber");+ if (project != null && buildNumber != null) {+ Build build = OneDev.getInstance(BuildManager.class).find(project, buildNumber);+ if (build != null)+ return SuggestionUtils.suggestArtifacts(build, matchWith);+ }+ return new ArrayList<>();+ }++ @Editable(order=500, description="Optionally authenticate to specified project. If not specified, "+ + "project artifacts will be accessed anonymously")+ @Nullable+ public Authentication getAuthentication() {+ return authentication;+ }++ public void setAuthentication(Authentication authentication) {+ this.authentication = authentication;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ci/job/SubmoduleCredential.java b/server-core/src/main/java/io/onedev/server/ci/job/SubmoduleCredential.javaindex f8d6d963dc..cfaee07da8 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/SubmoduleCredential.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/SubmoduleCredential.java@@ -1,26 +1,16 @@package io.onedev.server.ci.job;-import java.io.Serializable;-import java.util.List;-import java.util.stream.Collectors;-import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.util.OneContext;-import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;@Editable-public class SubmoduleCredential implements Serializable {+public class SubmoduleCredential extends Authentication {private static final long serialVersionUID = 1L;private String url;- private String userName;-- private String passwordSecret;-@Editable(order=100)@NotEmptypublic String getUrl() {@@ -31,30 +21,4 @@ public class SubmoduleCredential implements Serializable {this.url = url;}- @Editable(order=200)- @NotEmpty- public String getUserName() {- return userName;- }-- public void setUserName(String userName) {- this.userName = userName;- }-- @Editable(order=300, description="Specify a project secret to be used as password")- @ChoiceProvider("getPasswordSecretChoices")- @NotEmpty- public String getPasswordSecret() {- return passwordSecret;- }-- public void setPasswordSecret(String passwordSecret) {- this.passwordSecret = passwordSecret;- }-- @SuppressWarnings("unused")- private static List<String> getPasswordSecretChoices() {- return OneContext.get().getProject().getSecrets().stream().map(it->it.getName()).collect(Collectors.toList());- }-}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java b/server-core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.javaindex 06d4fa1040..6928665bf4 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java@@ -2,8 +2,8 @@ package io.onedev.server.ci.job.trigger;import java.util.List;-import io.onedev.server.ci.JobDependency;import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.JobDependency;import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.build.BuildFinished;@@ -22,7 +22,7 @@ public class DependencyBuiltTrigger extends JobTrigger {BuildFinished buildFinished = (BuildFinished) event;Build build = buildFinished.getBuild();if (build.getStatus() == Status.SUCCESSFUL) {- for (JobDependency dependency: job.getDependencies()) {+ for (JobDependency dependency: job.getJobDependencies()) {if (dependency.getJobName().equals(build.getJobName())) {for (JobParam param: dependency.getJobParams()) {if (!param.isSecret()) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 064dec4cc6..5a15ebcafe 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -174,6 +174,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsList<Build> builds = new ArrayList<>();EntityCriteria<Build> criteria = newCriteria();+ criteria.add(Restrictions.eq("project", project));if (StringUtils.isNotBlank(term)) {if (term.startsWith("#")) {@@ -184,13 +185,11 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements} catch (NumberFormatException e) {criteria.add(Restrictions.ilike("version", "#" + term, MatchMode.ANYWHERE));}- } else {- try {- long buildNumber = Long.parseLong(term);- criteria.add(Restrictions.eq("number", buildNumber));- } catch (NumberFormatException e) {- criteria.add(Restrictions.ilike("version", term, MatchMode.ANYWHERE));- }+ } else try {+ long buildNumber = Long.parseLong(term);+ criteria.add(Restrictions.eq("number", buildNumber));+ } catch (NumberFormatException e) {+ criteria.add(Restrictions.ilike("version", term, MatchMode.ANYWHERE));}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex d0e0c50b53..244d5b2b6c 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -273,6 +273,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsList<Issue> issues = new ArrayList<>();EntityCriteria<Issue> criteria = newCriteria();+ criteria.add(Restrictions.eq("project", project));if (StringUtils.isNotBlank(term)) {if (term.startsWith("#")) {@@ -285,15 +286,13 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsRestrictions.ilike("title", "#" + term, MatchMode.ANYWHERE),Restrictions.ilike("noSpaceTitle", "#" + term, MatchMode.ANYWHERE)));}- } else {- try {- long buildNumber = Long.parseLong(term);- criteria.add(Restrictions.eq("number", buildNumber));- } catch (NumberFormatException e) {- criteria.add(Restrictions.or(- Restrictions.ilike("title", term, MatchMode.ANYWHERE),- Restrictions.ilike("noSpaceTitle", term, MatchMode.ANYWHERE)));- }+ } else try {+ long buildNumber = Long.parseLong(term);+ criteria.add(Restrictions.eq("number", buildNumber));+ } catch (NumberFormatException e) {+ criteria.add(Restrictions.or(+ Restrictions.ilike("title", term, MatchMode.ANYWHERE),+ Restrictions.ilike("noSpaceTitle", term, MatchMode.ANYWHERE)));}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex b7fd35adae..b6cc6df0e9 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -1048,6 +1048,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestList<PullRequest> requests = new ArrayList<>();EntityCriteria<PullRequest> criteria = newCriteria();+ criteria.add(Restrictions.eq("project", targetProject));if (StringUtils.isNotBlank(term)) {if (term.startsWith("#")) {@@ -1060,15 +1061,13 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestRestrictions.ilike("title", "#" + term, MatchMode.ANYWHERE),Restrictions.ilike("noSpaceTitle", "#" + term, MatchMode.ANYWHERE)));}- } else {- try {- long buildNumber = Long.parseLong(term);- criteria.add(Restrictions.eq("number", buildNumber));- } catch (NumberFormatException e) {- criteria.add(Restrictions.or(- Restrictions.ilike("title", term, MatchMode.ANYWHERE),- Restrictions.ilike("noSpaceTitle", term, MatchMode.ANYWHERE)));- }+ } else try {+ long buildNumber = Long.parseLong(term);+ criteria.add(Restrictions.eq("number", buildNumber));+ } catch (NumberFormatException e) {+ criteria.add(Restrictions.or(+ Restrictions.ilike("title", term, MatchMode.ANYWHERE),+ Restrictions.ilike("noSpaceTitle", term, MatchMode.ANYWHERE)));}}diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 1e17433458..a1e7a547ab 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -50,7 +50,6 @@ import io.onedev.server.cache.BuildInfoManager;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.job.Job;import io.onedev.server.ci.job.param.JobParam;-import io.onedev.server.model.support.Secret;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.Input;import io.onedev.server.util.IssueUtils;@@ -476,21 +475,10 @@ public class Build extends AbstractEntity implements Referenceable {}public String getSecretValue(String secretKey) {- if (secretKey.startsWith(SecretInput.LITERAL_VALUE_PREFIX)) {+ if (secretKey.startsWith(SecretInput.LITERAL_VALUE_PREFIX))return secretKey.substring(SecretInput.LITERAL_VALUE_PREFIX.length());- } else {- Project project = getProject();- Secret secret = project.getSecretMap().get(secretKey);- if (secret == null)- throw new OneException("Can not find project secret: " + secretKey);- ObjectId commitId = ObjectId.fromString(getCommitHash());- if (secret.getBranches() != null && !project.isCommitOnBranches(commitId, secret.getBranches())) {- String message = String.format("Project secret '%s' can only be accessed by builds on branches '%s'",- secretKey, secret.getBranches());- throw new OneException(message);- }- return secret.getValue();- }+ else+ return project.getSecretValue(secretKey, ObjectId.fromString(getCommitHash()));}public CISpec getCISpec() {diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex b6d3ee24a5..9da59c8858 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -76,6 +76,7 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;import io.onedev.commons.utils.stringmatch.Matcher;import io.onedev.server.OneDev;+import io.onedev.server.OneException;import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.DefaultCISpecProvider;@@ -356,8 +357,7 @@ public class Project extends AbstractEntity implements Validatable {this.description = description;}- @Editable(order=300, description="Optionally specify default privilege for users not "- + "joining any teams of the project")+ @Editable(order=300, description="Optionally specify default privilege of the project")@NameOfEmptyValue("No default privilege")@Nullablepublic DefaultPrivilege getDefaultPrivilege() {@@ -1554,4 +1554,15 @@ public class Project extends AbstractEntity implements Validatable {return isValid;}+ public String getSecretValue(String secretKey, ObjectId commitId) {+ Secret secret = getSecretMap().get(secretKey);+ if (secret == null)+ throw new OneException("Can not find project secret: " + secretKey);+ if (secret.getBranches() != null && !isCommitOnBranches(commitId, secret.getBranches())) {+ String message = String.format("Project secret '%s' can only be accessed by builds on branches '%s'",+ secretKey, secret.getBranches());+ throw new OneException(message);+ }+ return secret.getValue();+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.javaindex 7e4e2b96ef..a50950e65c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java@@ -57,8 +57,12 @@ public class BuildChoiceProvider extends ChoiceProvider<Build> {public void query(String term, int page, Response<Build> response) {int count = (page+1) * WebConstants.PAGE_SIZE;Project project = projectModel.getObject();- List<Build> builds = OneDev.getInstance(BuildManager.class).query(project, term, count);- new ResponseFiller<>(response).fill(builds, page, WebConstants.PAGE_SIZE);+ if (project != null) {+ List<Build> builds = OneDev.getInstance(BuildManager.class).query(project, term, count);+ new ResponseFiller<>(response).fill(builds, page, WebConstants.PAGE_SIZE);+ } else {+ response.setHasMore(false);+ }}}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js b/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.jsindex 58bf927435..4e7b527611 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js+++ b/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js@@ -7,7 +7,7 @@ onedev.server.buildChoiceFormatter = {if (build.version)return "<div class='build'>#" + build.number + " (" + build.version + ") : " + build.jobName + "</div>";else- return "<div class='build'>#" + build.number + " (" + build.version + ")</div>";+ return "<div class='build'>#" + build.number + " : " + build.jobName + "</div>";},escapeMarkup: function(m) {return m;diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css b/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.cssindex ba74429918..fec3300435 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css@@ -6,9 +6,6 @@table.project-list td:not(.project) a {color: #444;}-table.project-list td.project img.project-avatar {- vertical-align: text-top;-}table.project-list td.project, table.project-list td.author {white-space: nowrap;}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.javaindex fc30029fb7..4c268e4667 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java@@ -22,8 +22,8 @@ public class PatternsEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {Method propertyGetter = descriptor.getPropertyGetter();- Patterns pathPatterns = propertyGetter.getAnnotation(Patterns.class);- if (pathPatterns != null) {+ Patterns patterns = propertyGetter.getAnnotation(Patterns.class);+ if (patterns != null) {if (propertyGetter.getReturnType() == String.class) {return new PropertyContext<String>(descriptor) {@@ -43,7 +43,7 @@ public class PatternsEditSupport implements EditSupport {@SuppressWarnings("unchecked")@Overrideprotected List<InputSuggestion> suggest(String matchWith) {- String suggestionMethod = pathPatterns.value();+ String suggestionMethod = patterns.value();if (suggestionMethod.length() != 0) {return (List<InputSuggestion>) ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), suggestionMethod, new Object[] {matchWith});diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildChoice.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildChoice.javaindex 5ad7482dcb..ad6ddc135e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildChoice.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/BuildChoice.java@@ -8,4 +8,8 @@ import java.lang.annotation.Target;@Target(ElementType.METHOD)@Retention(RetentionPolicy.RUNTIME)public @interface BuildChoice {++ // optionally specify a method to return project for build query+ String value() default "";+}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.javaindex a4fc4d0b76..56757c6008 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.java@@ -1,5 +1,7 @@package io.onedev.server.web.editable.buildchoice;+import javax.annotation.Nullable;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.model.AbstractReadOnlyModel;@@ -7,17 +9,22 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import com.google.common.base.Preconditions;++import io.onedev.commons.utils.ReflectionUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;+import io.onedev.server.util.OneContext;import io.onedev.server.web.component.build.choice.BuildChoiceProvider;import io.onedev.server.web.component.build.choice.BuildSingleChoice;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.page.project.ProjectPage;+import io.onedev.server.web.editable.annotation.BuildChoice;+import io.onedev.server.web.util.ProjectAware;@SuppressWarnings("serial")public class BuildChoiceEditor extends PropertyEditor<Long> {@@ -29,8 +36,29 @@ public class BuildChoiceEditor extends PropertyEditor<Long> {super(id, propertyDescriptor, propertyModel);}+ @Nullableprivate Project getProject() {- return ((ProjectPage)getPage()).getProject();+ OneContext.push(new OneContext(this));+ try {+ BuildChoice choice = Preconditions.checkNotNull(descriptor+ .getPropertyGetter().getAnnotation(BuildChoice.class));+ if (choice.value().length() != 0) {+ return (Project) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(), choice.value());+ } else {+ return findParent(ProjectAware.class).getProject();+ }+ } finally {+ OneContext.pop();+ }+ }++ @Nullable+ private Build getBuild() {+ if (getProject() != null && getModelObject() != null)+ return OneDev.getInstance(BuildManager.class).find(getProject(), getModelObject());+ else+ return null;}@Override@@ -38,7 +66,7 @@ public class BuildChoiceEditor extends PropertyEditor<Long> {super.onInitialize();Build build;- if (getModelObject() != null)+ if (getProject() != null && getModelObject() != null)build = OneDev.getInstance(BuildManager.class).find(getProject(), getModelObject());elsebuild = null;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildEditSupport.javaindex 3ef9b11fa4..2169e649d8 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildEditSupport.java@@ -6,8 +6,6 @@ import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;@@ -33,11 +31,10 @@ public class BuildEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null) {- return new Label(id, OneDev.getInstance(BuildManager.class).load(model.getObject()));- } else {+ if (model.getObject() != null)+ return new Label(id, "#" + model.getObject());+ elsereturn new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());- }}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueEditSupport.javaindex 9721d38e12..6b8d1cbc78 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueEditSupport.java@@ -31,11 +31,10 @@ public class IssueEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {- if (model.getObject() != null) {+ if (model.getObject() != null)return new Label(id, "#" + model.getObject());- } else {+ elsereturn new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());- }}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyCssResourceReference.javadeleted file mode 100644index 976423b2f1..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-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/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyCssResourceReference.javanew file mode 100644index 0000000000..57658a0850--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.editable.job.jobdependency;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class JobDependencyCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public JobDependencyCssResourceReference() {+ super(JobDependencyCssResourceReference.class, "job-dependency.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.htmlsimilarity index 80%rename from server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyEditPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.htmlindex c67b77a414..a938af6990 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.html@@ -1,9 +1,9 @@<wicket:panel>- <form wicket:id="form" class="dependency-edit leave-confirm">+ <form wicket:id="form" class="job-dependency-edit leave-confirm"><div class="modal-header"><button wicket:id="close" type="button" class="close">×</button><h4 id="modal-title" class="modal-title">- Dependency+ Job Dependency</h4></div><div class="modal-body">diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.javasimilarity index 85%rename from server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.javaindex 6ecd91906b..96f0055936 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.job.dependency;+package io.onedev.server.web.editable.job.jobdependency;import java.util.List;@@ -12,21 +12,21 @@ import org.apache.wicket.request.cycle.RequestCycle;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.ci.CISpecAware;-import io.onedev.server.ci.JobDependency;import io.onedev.server.ci.job.JobAware;+import io.onedev.server.ci.job.JobDependency;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;@SuppressWarnings("serial")-abstract class DependencyEditPanel extends Panel implements CISpecAware, JobAware {+abstract class JobDependencyEditPanel extends Panel implements CISpecAware, JobAware {private final List<JobDependency> dependencies;private final int dependencyIndex;- public DependencyEditPanel(String id, List<JobDependency> dependencies, int dependencyIndex) {+ public JobDependencyEditPanel(String id, List<JobDependency> dependencies, int dependencyIndex) {super(id);this.dependencies = dependencies;@@ -60,7 +60,7 @@ abstract class DependencyEditPanel extends Panel implements CISpecAware, JobAwar@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(DependencyEditPanel.this));+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobDependencyEditPanel.this));}@Override@@ -108,7 +108,7 @@ abstract class DependencyEditPanel extends Panel implements CISpecAware, JobAwar@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(DependencyEditPanel.this));+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(JobDependencyEditPanel.this));}@Override@@ -122,9 +122,9 @@ abstract class DependencyEditPanel extends Panel implements CISpecAware, JobAwaradd(form);}- private JobDependency getDependency(String job) {+ private JobDependency getDependency(String jobName) {for (JobDependency dependency: dependencies) {- if (job.equals(dependency.getJobName()))+ if (jobName.equals(dependency.getJobName()))return dependency;}return null;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.htmlsimilarity index 87%rename from server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.htmlindex 3bbbf53a6b..c401f32189 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="dependency-list list">+ <div class="job-dependency-list list"><div class="head"><a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.javasimilarity index 82%rename from server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.javaindex e64b046553..5bdcbac1e2 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.job.dependency;+package io.onedev.server.web.editable.job.jobdependency;import java.io.Serializable;import java.util.ArrayList;@@ -28,14 +28,13 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.ci.CISpec;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.ci.job.JobDependency;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.EmptyValueLabel;import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathElement;import io.onedev.server.web.editable.PropertyDescriptor;@@ -43,11 +42,11 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyUpdating;@SuppressWarnings("serial")-class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {+class JobDependencyListEditPanel extends PropertyEditor<List<Serializable>> {private final List<JobDependency> dependencies;- public DependencyListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ public JobDependencyListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {super(id, propertyDescriptor, model);dependencies = new ArrayList<>();@@ -79,7 +78,7 @@ class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new DependencyEditPanel(id, dependencies, -1) {+ return new JobDependencyEditPanel(id, dependencies, -1) {@Overrideprotected void onCancel(AjaxRequestTarget target) {@@ -91,17 +90,17 @@ class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {markFormDirty(target);modal.close();onPropertyUpdating(target);- target.add(DependencyListEditPanel.this);+ target.add(JobDependencyListEditPanel.this);}@Overridepublic CISpec getCISpec() {- return DependencyListEditPanel.this.getCISpec();+ return JobDependencyListEditPanel.this.getCISpec();}@Overridepublic Job getJob() {- return DependencyListEditPanel.this.getJob();+ return JobDependencyListEditPanel.this.getJob();}};@@ -125,7 +124,7 @@ class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {});- columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Name")) {+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Job")) {@Overridepublic void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {@@ -147,13 +146,10 @@ class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {JobDependency dependency = rowModel.getObject();- if (dependency.getArtifacts() != null) {+ if (dependency.getArtifacts() != null)cellItem.add(new Label(componentId, dependency.getArtifacts()));- } else try {- cellItem.add(new EmptyValueLabel(componentId, dependency.getClass().getDeclaredMethod("getArtifacts")));- } catch (NoSuchMethodException | SecurityException e) {- throw new RuntimeException(e);- }+ else+ cellItem.add(new Label(componentId, "<i>Do not retrieve</i>").setEscapeModelStrings(false));}});@@ -161,12 +157,12 @@ class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {- Fragment fragment = new Fragment(componentId, "actionColumnFrag", DependencyListEditPanel.this);+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", JobDependencyListEditPanel.this);fragment.add(new ModalLink("edit") {@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new DependencyEditPanel(id, dependencies, cellItem.findParent(Item.class).getIndex()) {+ return new JobDependencyEditPanel(id, dependencies, cellItem.findParent(Item.class).getIndex()) {@Overrideprotected void onCancel(AjaxRequestTarget target) {@@ -178,17 +174,17 @@ class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {markFormDirty(target);modal.close();onPropertyUpdating(target);- target.add(DependencyListEditPanel.this);+ target.add(JobDependencyListEditPanel.this);}@Overridepublic CISpec getCISpec() {- return DependencyListEditPanel.this.getCISpec();+ return JobDependencyListEditPanel.this.getCISpec();}@Overridepublic Job getJob() {- return DependencyListEditPanel.this.getJob();+ return JobDependencyListEditPanel.this.getJob();}};@@ -202,7 +198,7 @@ class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {markFormDirty(target);dependencies.remove(rowModel.getObject());onPropertyUpdating(target);- target.add(DependencyListEditPanel.this);+ target.add(JobDependencyListEditPanel.this);}});@@ -244,7 +240,7 @@ class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {Collections.swap(dependencies, fromIndex-i, fromIndex-i-1);}onPropertyUpdating(target);- target.add(DependencyListEditPanel.this);+ target.add(JobDependencyListEditPanel.this);}}.sortable("tbody"));@@ -271,7 +267,7 @@ class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new DependencyCssResourceReference()));+ response.render(CssHeaderItem.forReference(new JobDependencyCssResourceReference()));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditSupport.javasimilarity index 81%rename from server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditSupport.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditSupport.javaindex fc853f85d3..fc9ef7052f 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditSupport.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.job.dependency;+package io.onedev.server.web.editable.job.jobdependency;import java.io.Serializable;import java.util.List;@@ -7,7 +7,7 @@ import org.apache.wicket.Component;import org.apache.wicket.model.IModel;import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.server.ci.JobDependency;+import io.onedev.server.ci.job.JobDependency;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;@@ -16,7 +16,7 @@ import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.PropertyViewer;@SuppressWarnings("serial")-public class DependencyListEditSupport implements EditSupport {+public class JobDependencyListEditSupport implements EditSupport {@Overridepublic PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {@@ -32,7 +32,7 @@ public class DependencyListEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {if (model.getObject() != null)- return new DependencyListViewPanel(id, model.getObject());+ return new JobDependencyListViewPanel(id, model.getObject());elsereturn new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());}@@ -42,7 +42,7 @@ public class DependencyListEditSupport implements EditSupport {@Overridepublic PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {- return new DependencyListEditPanel(componentId, descriptor, model);+ return new JobDependencyListEditPanel(componentId, descriptor, model);}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.htmlsimilarity index 81%rename from server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListViewPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.htmlindex 032ba6fb28..ba822dd3c0 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListViewPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="def-list dependency-list">+ <div class="def-list job-dependency-list"><div class="body"><table wicket:id="dependencies" class="table table-condensed table-hover"></table></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.javasimilarity index 77%rename from server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListViewPanel.javarename to server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.javaindex 4945ffce4f..8cd74f47cb 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.editable.job.dependency;+package io.onedev.server.web.editable.job.jobdependency;import java.io.Serializable;import java.util.ArrayList;@@ -25,20 +25,17 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import com.google.common.collect.Sets;--import io.onedev.server.ci.JobDependency;+import io.onedev.server.ci.job.JobDependency;import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.page.layout.SideFloating;import io.onedev.server.web.page.layout.SideFloating.Placement;@SuppressWarnings("serial")-class DependencyListViewPanel extends Panel {+class JobDependencyListViewPanel extends Panel {private final List<JobDependency> dependencies = new ArrayList<>();- public DependencyListViewPanel(String id, List<Serializable> elements) {+ public JobDependencyListViewPanel(String id, List<Serializable> elements) {super(id);for (Serializable each: elements)@@ -51,7 +48,7 @@ class DependencyListViewPanel extends Panel {List<IColumn<JobDependency, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Name")) {+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("Job")) {@Overridepublic void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {@@ -90,13 +87,10 @@ class DependencyListViewPanel extends Panel {@Overrideprotected Component newLabel(String componentId) {JobDependency dependency = rowModel.getObject();- if (dependency.getArtifacts() != null) {+ if (dependency.getArtifacts() != null)return new Label(componentId, dependency.getArtifacts());- } else try {- return new EmptyValueLabel(componentId, dependency.getClass().getDeclaredMethod("getArtifacts"));- } catch (NoSuchMethodException | SecurityException e) {- throw new RuntimeException(e);- }+ else+ return new Label(componentId, "<i>Do not retrieve</i>").setEscapeModelStrings(false);}});@@ -107,18 +101,17 @@ class DependencyListViewPanel extends Panel {@Overridepublic 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()) {+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {- @Override- protected Component newLabel(String componentId) {+ @Override+ protected Component newLabel(String componentId) {+ if (!rowModel.getObject().getJobParams().isEmpty())return new Label(componentId, "<i class='fa fa-ellipsis-h'></i>").setEscapeModelStrings(false);- }-- });- } else {- cellItem.add(new Label(componentId));- }+ else+ return new Label(componentId);+ }++ });}@Override@@ -154,7 +147,7 @@ class DependencyListViewPanel extends Panel {private final int index;public ColumnFragment(String id, int index) {- super(id, "columnFrag", DependencyListViewPanel.this);+ super(id, "columnFrag", JobDependencyListViewPanel.this);this.index = index;}@@ -171,18 +164,18 @@ class DependencyListViewPanel extends Panel {@Overrideprotected String getTitle() {- return dependencies.get(index).getJobName();+ return "Job Dependency";}@Overrideprotected void onInitialize() {super.onInitialize();- add(AttributeAppender.append("class", "dependency def-detail"));+ add(AttributeAppender.append("class", "job-dependency def-detail"));}@Overrideprotected Component newBody(String id) {- return BeanContext.view(id, dependencies.get(index), Sets.newHashSet("job"), true);+ return BeanContext.view(id, dependencies.get(index));}};@@ -197,7 +190,7 @@ class DependencyListViewPanel extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new DependencyCssResourceReference()));+ response.render(CssHeaderItem.forReference(new JobDependencyCssResourceReference()));}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/dependency.css b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/job-dependency.csssimilarity index 74%rename from server-core/src/main/java/io/onedev/server/web/editable/job/dependency/dependency.cssrename to server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/job-dependency.cssindex b82a503762..55b15516f2 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/dependency.css+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/job-dependency.css@@ -1,4 +1,4 @@-.floating.dependency td.name {+.floating.job-dependency td.name {width: 160px !important;word-break: break-all !important;white-space: normal !important;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.javaindex c8ae9ca4fa..7e0b6c9657 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java@@ -84,7 +84,7 @@ abstract class ParamSpecEditPanel extends Panel implements InputContext {editor.getErrorContext(new PathElement.Named("paramSpec")).getErrorContext(new PathElement.Named("name")).addError("This name has already been used by another parameter");- }+ }} else if (getInputSpec(param.getName()) != null) {editor.getErrorContext(new PathElement.Named("paramSpec")).getErrorContext(new PathElement.Named("name"))diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.javaindex dbcb8793aa..09ee93d016 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java@@ -170,7 +170,7 @@ class ParamSpecListViewPanel extends Panel {@Overrideprotected String getTitle() {InputSpec param = paramSpecs.get(index);- return param.getName() + " (type: " + EditableUtils.getDisplayName(param.getClass()) + ")";+ return "Parameter Spec (type: " + EditableUtils.getDisplayName(param.getClass()) + ")";}@Override@@ -181,7 +181,7 @@ class ParamSpecListViewPanel extends Panel {@Overrideprotected Component newBody(String id) {- Set<String> excludedProperties = Sets.newHashSet("name", "canBeChangedBy", "nameOfEmptyValue");+ Set<String> excludedProperties = Sets.newHashSet("canBeChangedBy", "nameOfEmptyValue");return BeanContext.view(id, paramSpecs.get(index), excludedProperties, true);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyCssResourceReference.javanew file mode 100644index 0000000000..c079741084--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.editable.job.projectdependency;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class ProjectDependencyCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public ProjectDependencyCssResourceReference() {+ super(ProjectDependencyCssResourceReference.class, "project-dependency.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.htmlnew file mode 100644index 0000000000..f2da4e9c52--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.html@@ -0,0 +1,18 @@+<wicket:panel>+ <form wicket:id="form" class="job-dependency-edit leave-confirm">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">+ Project Dependency+ </h4>+ </div>+ <div class="modal-body">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer">+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.javanew file mode 100644index 0000000000..b4cb72be11--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.java@@ -0,0 +1,135 @@+package io.onedev.server.web.editable.job.projectdependency;++import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.html.form.Form;+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.job.ProjectDependency;+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;++@SuppressWarnings("serial")+abstract class ProjectDependencyEditPanel extends Panel {++ private final List<ProjectDependency> dependencies;++ private final int dependencyIndex;++ public ProjectDependencyEditPanel(String id, List<ProjectDependency> dependencies, int dependencyIndex) {+ super(id);++ this.dependencies = dependencies;+ this.dependencyIndex = dependencyIndex;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ ProjectDependency dependency;+ if (dependencyIndex != -1)+ dependency = dependencies.get(dependencyIndex);+ else+ dependency = new ProjectDependency();++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ }++ };++ form.add(new NotificationPanel("feedback", form));++ form.add(new AjaxLink<Void>("close") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ProjectDependencyEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });++ BeanEditor editor = BeanContext.edit("editor", dependency);+ form.add(editor);+ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ if (dependencyIndex != -1) {+ ProjectDependency oldDependency = dependencies.get(dependencyIndex);+ if (!dependency.getProjectName().equals(oldDependency.getProjectName()) && getDependency(dependency.getProjectName()) != null) {+ editor.getErrorContext(new PathElement.Named("projectName"))+ .addError("Dependency to this project is already defined");+ }+ } else if (getDependency(dependency.getProjectName()) != null) {+ editor.getErrorContext(new PathElement.Named("projectName"))+ .addError("Dependency to this project is already defined");+ }++ if (!editor.hasErrors(true)) {+ if (dependencyIndex != -1) {+ dependencies.set(dependencyIndex, dependency);+ } else {+ dependencies.add(dependency);+ }+ onSave(target);+ } else {+ target.add(form);+ }+ }++ });++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ProjectDependencyEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });+ form.setOutputMarkupId(true);++ add(form);+ }++ private ProjectDependency getDependency(String projectName) {+ for (ProjectDependency dependency: dependencies) {+ if (projectName.equals(dependency.getProjectName()))+ return dependency;+ }+ return null;+ }++ protected abstract void onSave(AjaxRequestTarget target);++ protected abstract void onCancel(AjaxRequestTarget target);++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.htmlnew file mode 100644index 0000000000..c401f32189--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.html@@ -0,0 +1,12 @@+<wicket:panel>+ <div class="job-dependency-list list">+ <div class="head">+ <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>+ </div>+ <table wicket:id="dependencies" class="table table-condensed table-hover"></table>+ </div>+ <wicket:fragment wicket:id="actionColumnFrag">+ <a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>+ <a wicket:id="delete" title="Delete"><i class="fa fa-trash"></i></a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.javanew file mode 100644index 0000000000..7a8af9bc1f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java@@ -0,0 +1,236 @@+package io.onedev.server.web.editable.job.projectdependency;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collections;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+import org.apache.wicket.markup.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;+import org.apache.wicket.markup.repeater.data.IDataProvider;+import org.apache.wicket.markup.repeater.data.ListDataProvider;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.ci.job.ProjectDependency;+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.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;++@SuppressWarnings("serial")+class ProjectDependencyListEditPanel extends PropertyEditor<List<Serializable>> {++ private final List<ProjectDependency> dependencies;++ public ProjectDependencyListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ super(id, propertyDescriptor, model);++ dependencies = new ArrayList<>();+ for (Serializable each: model.getObject()) {+ dependencies.add((ProjectDependency) each);+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new ModalLink("addNew") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new ProjectDependencyEditPanel(id, dependencies, -1) {++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected void onSave(AjaxRequestTarget target) {+ markFormDirty(target);+ modal.close();+ onPropertyUpdating(target);+ target.add(ProjectDependencyListEditPanel.this);+ }++ };+ }++ });++ List<IColumn<ProjectDependency, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {+ cellItem.add(new Label(componentId, "<span class=\"drag-indicator fa fa-reorder\"></span>").setEscapeModelStrings(false));+ }++ @Override+ public String getCssClass() {+ return "minimum actions";+ }++ });++ columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("Project")) {++ @Override+ public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getProjectName()));+ }++ });++ columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("Build")) {++ @Override+ public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {+ cellItem.add(new Label(componentId, "#" + rowModel.getObject().getBuildNumber()));+ }++ });++ columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("Artifacts to Retrieve")) {++ @Override+ public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getArtifacts()));+ }++ });++ columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", ProjectDependencyListEditPanel.this);+ fragment.add(new ModalLink("edit") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new ProjectDependencyEditPanel(id, dependencies, cellItem.findParent(Item.class).getIndex()) {++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected void onSave(AjaxRequestTarget target) {+ markFormDirty(target);+ modal.close();+ onPropertyUpdating(target);+ target.add(ProjectDependencyListEditPanel.this);+ }++ };+ }++ });+ fragment.add(new AjaxLink<Void>("delete") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ markFormDirty(target);+ dependencies.remove(rowModel.getObject());+ onPropertyUpdating(target);+ target.add(ProjectDependencyListEditPanel.this);+ }++ });+ cellItem.add(fragment);+ }++ @Override+ public String getCssClass() {+ return "actions";+ }++ });++ IDataProvider<ProjectDependency> dataProvider = new ListDataProvider<ProjectDependency>() {++ @Override+ protected List<ProjectDependency> getData() {+ return dependencies;+ }++ };++ DataTable<ProjectDependency, Void> dataTable;+ add(dataTable = new DataTable<ProjectDependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE));+ dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));++ dataTable.add(new SortBehavior() {++ @Override+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {+ int fromIndex = from.getItemIndex();+ int toIndex = to.getItemIndex();+ if (fromIndex < toIndex) {+ for (int i=0; i<toIndex-fromIndex; i++)+ Collections.swap(dependencies, fromIndex+i, fromIndex+i+1);+ } else {+ for (int i=0; i<fromIndex-toIndex; i++)+ Collections.swap(dependencies, fromIndex-i, fromIndex-i-1);+ }+ onPropertyUpdating(target);+ target.add(ProjectDependencyListEditPanel.this);+ }++ }.sortable("tbody"));+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PropertyUpdating) {+ event.stop();+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());+ }+ }++ @Override+ protected List<Serializable> convertInputToValue() throws ConversionException {+ List<Serializable> value = new ArrayList<>();+ for (ProjectDependency each: dependencies)+ value.add(each);+ return value;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ProjectDependencyCssResourceReference()));+ }++ @Override+ public ErrorContext getErrorContext(PathElement element) {+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditSupport.javanew file mode 100644index 0000000000..e3664fdfb7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditSupport.java@@ -0,0 +1,59 @@+package io.onedev.server.web.editable.job.projectdependency;++import java.io.Serializable;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;++import io.onedev.commons.utils.ReflectionUtils;+import io.onedev.server.ci.job.ProjectDependency;+import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.EmptyValueLabel;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;++@SuppressWarnings("serial")+public class ProjectDependencyListEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {+ Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());+ if (elementClass == ProjectDependency.class) {+ return new PropertyContext<List<Serializable>>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null)+ return new ProjectDependencyListViewPanel(id, model.getObject());+ else+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }++ };+ }++ @Override+ public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {+ return new ProjectDependencyListEditPanel(componentId, descriptor, model);+ }++ };+ }+ }+ return null;+ }++ @Override+ public int getPriority() {+ return 0;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.htmlnew file mode 100644index 0000000000..ba822dd3c0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.html@@ -0,0 +1,10 @@+<wicket:panel>+ <div class="def-list job-dependency-list">+ <div class="body">+ <table wicket:id="dependencies" class="table table-condensed table-hover"></table>+ </div>+ </div>+ <wicket:fragment wicket:id="columnFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.javanew file mode 100644index 0000000000..65974600ce--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java@@ -0,0 +1,190 @@+package io.onedev.server.web.editable.job.projectdependency;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+import org.apache.wicket.markup.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;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.repeater.data.IDataProvider;+import org.apache.wicket.markup.repeater.data.ListDataProvider;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;++import io.onedev.server.ci.job.ProjectDependency;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.page.layout.SideFloating;+import io.onedev.server.web.page.layout.SideFloating.Placement;++@SuppressWarnings("serial")+class ProjectDependencyListViewPanel extends Panel {++ private final List<ProjectDependency> dependencies = new ArrayList<>();++ public ProjectDependencyListViewPanel(String id, List<Serializable> elements) {+ super(id);++ for (Serializable each: elements)+ dependencies.add((ProjectDependency) each);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<IColumn<ProjectDependency, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("Project")) {++ @Override+ public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, rowModel.getObject().getProjectName());+ }++ });+ }+ });++ columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("Build")) {++ @Override+ public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, "#" + rowModel.getObject().getBuildNumber());+ }++ });+ }+ });++ columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("Artifacts to Retrieve")) {++ @Override+ public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, rowModel.getObject().getArtifacts());+ }++ });+ }+ });++ columns.add(new AbstractColumn<ProjectDependency, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<ProjectDependency>> cellItem, String componentId, IModel<ProjectDependency> rowModel) {+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, "<i class='fa fa-ellipsis-h'></i>").setEscapeModelStrings(false);+ }++ });++ }++ @Override+ public String getCssClass() {+ return "ellipsis";+ }++ });++ IDataProvider<ProjectDependency> dataProvider = new ListDataProvider<ProjectDependency>() {++ @Override+ protected List<ProjectDependency> getData() {+ return dependencies;+ }++ };++ add(new DataTable<ProjectDependency, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ addTopToolbar(new HeadersToolbar<Void>(this, null));+ addBottomToolbar(new NoRecordsToolbar(this));+ }++ });+ }++ private abstract class ColumnFragment extends Fragment {++ private final int index;++ public ColumnFragment(String id, int index) {+ super(id, "columnFrag", ProjectDependencyListViewPanel.this);+ this.index = index;+ }++ protected abstract Component newLabel(String componentId);++ @Override+ protected void onInitialize() {+ super.onInitialize();+ AjaxLink<Void> link = new AjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new SideFloating(target, Placement.RIGHT) {++ @Override+ protected String getTitle() {+ return "Project Dependency";+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(AttributeAppender.append("class", "project-dependency def-detail"));+ }++ @Override+ protected Component newBody(String id) {+ return BeanContext.view(id, dependencies.get(index));+ }++ };+ }++ };+ link.add(newLabel("label"));+ add(link);+ }+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ProjectDependencyCssResourceReference()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/project-dependency.css b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/project-dependency.cssnew file mode 100644index 0000000000..f0cd632c86--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/project-dependency.css@@ -0,0 +1,5 @@+.floating.project-dependency td.name {+ width: 160px !important;+ word-break: break-all !important;+ white-space: normal !important;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListViewPanel.javaindex 0b998610a2..a095131005 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListViewPanel.java@@ -141,7 +141,8 @@ class ReportListViewPanel extends Panel {@Overrideprotected String getTitle() {- return EditableUtils.getDisplayName(reports.get(index).getClass());+ JobReport report = reports.get(index);+ return "Report (type: " + EditableUtils.getDisplayName(report.getClass()) + ")";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.javaindex dba24421d3..65e954ee61 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.java@@ -25,8 +25,6 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import com.google.common.collect.Sets;-import io.onedev.server.ci.job.JobService;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.layout.SideFloating;@@ -150,7 +148,7 @@ class ServiceListViewPanel extends Panel {@Overrideprotected String getTitle() {- return services.get(index).getName();+ return "Service";}@Override@@ -161,7 +159,7 @@ class ServiceListViewPanel extends Panel {@Overrideprotected Component newBody(String id) {- return BeanContext.view(id, services.get(index), Sets.newHashSet("job"), true);+ return BeanContext.view(id, services.get(index));}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.javaindex 3bdb64c162..bbb420108e 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.java@@ -152,7 +152,7 @@ class TriggerListViewPanel extends Panel {@Overrideprotected String getTitle() {- return EditableUtils.getDisplayName(triggers.get(index).getClass());+ return "Trigger (type: " + EditableUtils.getDisplayName(triggers.get(index).getClass()) + ")";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/util/ProjectAware.java b/server-core/src/main/java/io/onedev/server/web/util/ProjectAware.javaindex 2f93094382..8687da1e93 100644--- a/server-core/src/main/java/io/onedev/server/web/util/ProjectAware.java+++ b/server-core/src/main/java/io/onedev/server/web/util/ProjectAware.java@@ -1,9 +1,12 @@package io.onedev.server.web.util;+import javax.annotation.Nullable;+import io.onedev.server.model.Project;public interface ProjectAware {+ @NullableProject getProject();}diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex 26e2d2e162..4bc181a819 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -1,5 +1,6 @@package io.onedev.server.web.util;+import java.io.File;import java.util.ArrayList;import java.util.HashMap;import java.util.HashSet;@@ -7,11 +8,15 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.Set;+import java.util.concurrent.Callable;import com.google.common.base.Preconditions;+import com.google.common.collect.Lists;import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LinearRange;+import io.onedev.commons.utils.LockUtils;import io.onedev.commons.utils.stringmatch.PatternApplied;import io.onedev.commons.utils.stringmatch.WildcardUtils;import io.onedev.server.OneDev;@@ -185,6 +190,24 @@ public class SuggestionUtils {return suggestions;}+ public static List<InputSuggestion> suggestArtifacts(Build build, String matchWith) {+ return LockUtils.read(build.getArtifactsLockKey(), new Callable<List<InputSuggestion>>() {++ @Override+ public List<InputSuggestion> call() throws Exception {+ List<String> paths = new ArrayList<>();+ File artifactsDir = build.getArtifactsDir();+ if (artifactsDir.exists()) {+ int baseLen = artifactsDir.getAbsolutePath().length()+1;+ for (File file: FileUtils.listFiles(artifactsDir, Lists.newArrayList("**"), new ArrayList<>()))+ paths.add(file.getAbsolutePath().substring(baseLen));+ }+ return suggestPaths(paths, matchWith);+ }++ });+ }+private static Set<String> getChildren(List<PatternApplied> allApplied, String path) {Set<String> children = new HashSet<>();for (PatternApplied applied: allApplied) {@@ -200,12 +223,12 @@ public class SuggestionUtils {return children;}- public static List<InputSuggestion> suggestPaths(List<String> files, String matchWith) {+ public static List<InputSuggestion> suggestPaths(List<String> paths, String matchWith) {matchWith = matchWith.toLowerCase();List<InputSuggestion> suggestions = new ArrayList<>();List<PatternApplied> allApplied = new ArrayList<>();- for (String path: files) {+ for (String path: paths) {PatternApplied applied = WildcardUtils.applyPattern(matchWith, path, false);if (applied != null)allApplied.add(applied);diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.javaindex 0a7b158ea6..8c618d92dc 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java@@ -624,6 +624,25 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}private void execute(String dockerImage, String jobToken, JobLogger jobLogger, @Nullable JobContext jobContext) {+ jobLogger.log("Checking cluster access...");+ Commandline kubectl = newKubeCtl();+ kubectl.addArgs("cluster-info");+ kubectl.execute(new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.debug(line);+ }++ }, new LineConsumer() {++ @Override+ public void consume(String line) {+ jobLogger.log(line);+ }++ }).checkReturnCode();+String namespace = createNamespace(jobContext, jobLogger);jobLogger.log("Executing job with kubernetes under namespace " + namespace + "...");@@ -832,7 +851,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDatajobContext.notifyJobRunning();AtomicReference<String> nodeNameRef = new AtomicReference<>(null);- Commandline kubectl = newKubeCtl();++ kubectl.clearArgs();kubectl.addArgs("get", "pod", podName, "-n", namespace, "-o", "jsonpath={.spec.nodeName}");kubectl.execute(new LineConsumer() {